From caeb50d136ae13505271dbc18ccb82dc285315eb Mon Sep 17 00:00:00 2001
From: zzk <skr2acaba@163.com>
Date: Mon, 18 Sep 2023 15:19:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E5=8E=86=E5=8F=B2=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E9=9C=80=E8=A6=81=E6=9F=A5=E7=9C=8B=E5=AE=A1=E6=89=B9?=
 =?UTF-8?q?=E4=B8=AD=E7=9A=84=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Comm/CustomerHistory/CustomerHistory_Info_temp.jsp       | 2 +-
 .../Customer/Lessee/Comm/CustomerHistory/LoanedInfo.jsp      | 2 +-
 .../Customer/Lessee/Comm/CustomerHistory/OutstandInfo.jsp    | 3 ++-
 WebContent/WEB-INF/etc/jbo/jbo_comm.xml                      | 1 +
 .../jbo/com/tenwa/entity/comm/flow/VI_CUSTOMERHISTORY.java   | 5 +++++
 5 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/WebContent/Tenwa/Customer/Lessee/Comm/CustomerHistory/CustomerHistory_Info_temp.jsp b/WebContent/Tenwa/Customer/Lessee/Comm/CustomerHistory/CustomerHistory_Info_temp.jsp
index 108a385fa..7c33e6205 100644
--- a/WebContent/Tenwa/Customer/Lessee/Comm/CustomerHistory/CustomerHistory_Info_temp.jsp
+++ b/WebContent/Tenwa/Customer/Lessee/Comm/CustomerHistory/CustomerHistory_Info_temp.jsp
@@ -20,7 +20,7 @@
     String compClientID = request.getParameter("CompClientID");
 
     dwTemp.replaceColumn("loaned", "<iframe type='iframe' id='frame_list' name=\"frame_list\" width=\"100%\" height=\"200px\" frameborder=\"0\" src=\""+sWebRootPath+ "/Tenwa/Customer/Lessee/Comm/CustomerHistory/LoanedInfo.jsp?CompClientID=" +compClientID+"&certId="+certId+"\"></iframe>", CurPage.getObjectWindowOutput());
-    dwTemp.replaceColumn("outstand", "<iframe type='iframe' id='frame_list' name=\"frame_list\" width=\"100%\" height=\"200px\" frameborder=\"0\" src=\""+sWebRootPath+ "/Tenwa/Customer/Lessee/Comm/CustomerHistory/OutstandInfo.jsp?CompClientID=" +compClientID+"&certId="+certId+"\"></iframe>", CurPage.getObjectWindowOutput());
+    dwTemp.replaceColumn("outstand", "<iframe type='iframe' id='frame_list' name=\"frame_list\" width=\"100%\" height=\"200px\" frameborder=\"0\" src=\""+sWebRootPath+ "/Tenwa/Customer/Lessee/Comm/CustomerHistory/OutstandInfo.jsp?CompClientID=" +compClientID+"&certId="+certId+"&flowunId="+flowunId+"\"></iframe>", CurPage.getObjectWindowOutput());
 
 
     String sButtons[][] = {
diff --git a/WebContent/Tenwa/Customer/Lessee/Comm/CustomerHistory/LoanedInfo.jsp b/WebContent/Tenwa/Customer/Lessee/Comm/CustomerHistory/LoanedInfo.jsp
index 86c6f450d..20f239a6a 100644
--- a/WebContent/Tenwa/Customer/Lessee/Comm/CustomerHistory/LoanedInfo.jsp
+++ b/WebContent/Tenwa/Customer/Lessee/Comm/CustomerHistory/LoanedInfo.jsp
@@ -6,7 +6,7 @@
     String certId = CurPage.getParameter("certId");
 
     ASObjectModel doTemp = new ASObjectModel("LoanedList");
-    doTemp.appendJboWhere(" and O.CONTRACT_STATUS >= 31 and O.CONTRACT_STATUS <> '104' ");
+    doTemp.appendJboWhere(" and O.CONTRACT_STATUS >= 31 and O.CONTRACT_STATUS <> '104' and O.CONTRACT_STATUS <> '101' ");
     ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
     dwTemp.Style="1";//--设置为Grid风格--
     dwTemp.ReadOnly = "1";//只读模式
diff --git a/WebContent/Tenwa/Customer/Lessee/Comm/CustomerHistory/OutstandInfo.jsp b/WebContent/Tenwa/Customer/Lessee/Comm/CustomerHistory/OutstandInfo.jsp
index b7fee3ef2..50df292a2 100644
--- a/WebContent/Tenwa/Customer/Lessee/Comm/CustomerHistory/OutstandInfo.jsp
+++ b/WebContent/Tenwa/Customer/Lessee/Comm/CustomerHistory/OutstandInfo.jsp
@@ -5,9 +5,10 @@
 <%
 
     String certId = CurPage.getParameter("certId");
+    String flowunId = CurPage.getParameter("flowunId");
 
     ASObjectModel doTemp = new ASObjectModel("LoanedList");
-    doTemp.appendJboWhere(" and O.CONTRACT_STATUS < 31 ");
+    doTemp.appendJboWhere(" and (O.CONTRACT_STATUS < 31 or O.CONTRACT_STATUS = '104' or O.CONTRACT_STATUS = '101') and O.FLOWUNID <> '"+flowunId+"'");
     ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
     dwTemp.Style="1";//--设置为Grid风格--
     dwTemp.ReadOnly = "1";//只读模式
diff --git a/WebContent/WEB-INF/etc/jbo/jbo_comm.xml b/WebContent/WEB-INF/etc/jbo/jbo_comm.xml
index 0f067c42a..ecf50004e 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_comm.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_comm.xml
@@ -998,6 +998,7 @@
 				<attribute name="CONTRACT_STATUS" label="鍚堝悓鐘舵��" type="STRING" length="32"/>
 				<attribute name="PROJECT_ID" label="椤圭洰ID" type="STRING" length="32"/>
 				<attribute name="PROJ_NAME" label="椤圭洰鍚嶇О" type="STRING" length="200"/>
+				<attribute name="FLOWUNID" label="娴佺▼缂栧彿" type="STRING" length="32"/>
 			</attributes>
 			<manager>
 				<managerProperties>
diff --git a/src_jbo/jbo/com/tenwa/entity/comm/flow/VI_CUSTOMERHISTORY.java b/src_jbo/jbo/com/tenwa/entity/comm/flow/VI_CUSTOMERHISTORY.java
index 8275c65a5..ed04471f7 100644
--- a/src_jbo/jbo/com/tenwa/entity/comm/flow/VI_CUSTOMERHISTORY.java
+++ b/src_jbo/jbo/com/tenwa/entity/comm/flow/VI_CUSTOMERHISTORY.java
@@ -82,4 +82,9 @@ public interface VI_CUSTOMERHISTORY {
      */
     public static final String PROJ_NAME = "PROJ_NAME";
 
+    /**
+     * 流程编号 STRING(32)<br>
+     */
+    public static final String FLOWUNID = "FLOWUNID";
+
 }