diff --git a/WebContent/Tenwa/Lease/Flow/Rent/RentReback/RentIncomeHisList.jsp b/WebContent/Tenwa/Lease/Flow/Rent/RentReback/RentIncomeHisList.jsp index 0bc76b9b0..c88afbf7f 100644 --- a/WebContent/Tenwa/Lease/Flow/Rent/RentReback/RentIncomeHisList.jsp +++ b/WebContent/Tenwa/Lease/Flow/Rent/RentReback/RentIncomeHisList.jsp @@ -1,6 +1,8 @@ <%@page import="com.amarsoft.app.lc.workflow.action.GetFlowAction"%> <%@ page contentType="text/html; charset=GBK"%> <%@ include file="/Frame/resources/include/include_begin_list.jspf"%><% + + String flowNo = CurPage.getParameter("FlowNo");//流程编号 String sFlowUnid = CurPage.getParameter("FlowUnid");//流程编号 if(sFlowUnid == null)sFlowUnid = ""; String sTempletNo = CurPage.getParameter("TempletNo");//模板号 @@ -18,6 +20,9 @@ ASObjectModel doTemp = new ASObjectModel(sTempletNo); doTemp.setHtmlEvent("MEMO", "onmouseover", "showMemo"); doTemp.setHtmlEvent("MEMO", "onmouseout", "hideMemo"); + if("RentRebackFlow".equals(flowNo)){ //租金红冲流程不显示保证金抵扣的数据 + doTemp.appendJboWhere(" and SETTLE_METHOD <> 'settlemethod7'"); + } ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); dwTemp.Style="1"; //--设置为Grid风格-- dwTemp.ReadOnly = "1"; //只读模式 diff --git a/src_core/com/tenwa/officetempalte/importcallback/impl/LCEbankCallBack.java b/src_core/com/tenwa/officetempalte/importcallback/impl/LCEbankCallBack.java index fd7f51d28..d5e0a41e4 100644 --- a/src_core/com/tenwa/officetempalte/importcallback/impl/LCEbankCallBack.java +++ b/src_core/com/tenwa/officetempalte/importcallback/impl/LCEbankCallBack.java @@ -18,6 +18,7 @@ import com.amarsoft.are.jbo.JBOTransaction; import com.amarsoft.awe.util.Transaction; import com.amarsoft.context.ASUser; import com.tenwa.comm.exception.BusinessException; +import com.tenwa.comm.util.jboutil.DataOperatorUtil; public class LCEbankCallBack extends BaseImportExcelCallBack { @@ -145,9 +146,11 @@ public class LCEbankCallBack extends BaseImportExcelCallBack { List ebankSns = new ArrayList(); boolean flag = false; String ebs = ""; - List list=JBOFactory.createBizObjectQuery(LC_EBANK.CLASS_NAME,null).getResultList(false); +// List list=JBOFactory.createBizObjectQuery(LC_EBANK.CLASS_NAME,null).getResultList(false); + List> list = DataOperatorUtil.getDataBySql("select EBANK_SN from LC_EBANK"); for(int i=0;i