From 7dcab78ecb85ae09deab21316d02b304a93075f4 Mon Sep 17 00:00:00 2001 From: tangfutang <3218982385@qq.com> Date: Thu, 2 Jun 2022 16:44:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=91=E7=9C=A0=E6=B5=81=E7=A8=8B=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=9C=AC=E9=87=91=E7=9B=B8=E7=AD=89=E9=A3=8E=E9=99=A9?= =?UTF-8?q?=E9=A2=84=E8=AD=A6=E3=80=81=E7=A7=9F=E9=87=91=E7=BA=A2=E5=86=B2?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E4=B8=8D=E6=98=BE=E7=A4=BA=E4=BF=9D=E8=AF=81?= =?UTF-8?q?=E9=87=91=E6=8A=B5=E6=89=A3=E3=80=81=E7=BD=91=E9=93=B6=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Tenwa/Lease/Flow/Rent/RentReback/RentIncomeHisList.jsp | 5 +++++ .../importcallback/impl/LCEbankCallBack.java | 7 +++++-- src_sql/鎶曚骇SQL/v20211231/tft_20211231.sql | 7 +++++++ 3 files changed, 17 insertions(+), 2 deletions(-) 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