From 6a846b853d52f4918e5b1032cbeefe9dd4a6fefe Mon Sep 17 00:00:00 2001
From: ap007 <snow9man@vip.qq.com>
Date: Wed, 26 May 2021 15:12:04 +0800
Subject: [PATCH 01/29] =?UTF-8?q?=E5=A2=9E=E5=8A=A0alt+7=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E7=BC=93=E5=AD=98=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WebContent/Frame/page/js/as_debug.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/WebContent/Frame/page/js/as_debug.js b/WebContent/Frame/page/js/as_debug.js
index abe81a6d4..64019afe2 100644
--- a/WebContent/Frame/page/js/as_debug.js
+++ b/WebContent/Frame/page/js/as_debug.js
@@ -121,8 +121,8 @@ var AsDebug = {
 	},
 	reloadCache:function(CacheType){
 		var sReturn = RunJavaMethod("com.amarsoft.app.util.ReloadCacheConfigAction","reloadCache","ConfigName="+CacheType);
-		if(sReturn=="SUCCESS") alert( "重载模板缓存成功"); // 刷新参数缓存成功！
-		else alert( "重载模板缓存失败" ); // 刷新参数缓存失败！
+		if(sReturn=="SUCCESS") alert( "重载"+CacheType+"成功"); // 刷新参数缓存成功！
+		else alert( "重载"+CacheType+"失败" ); // 刷新参数缓存失败！
 	},
 	/**
 	 * 重置自定义类型的缓存
@@ -233,6 +233,9 @@ function keydownAction(event){
 	}else if(event.altKey && event.keyCode == 53){ //alt+5 清空模板缓存
 		AsDebug.reloadCache('ObjectWindow缓存');
 		return true;
+	}else if(event.altKey && event.keyCode == 55){
+		AsDebug.reloadCache('菜单');
+		return true;
 	} else if ( event.altKey && event.keyCode === 56 ) { //alt+8 清空产品缓存 by zhulh
 		AsDebug.reloadCacheCustom('产品参数,核算交易定义' );
 		return true;

From 68eae1bf585c903191450b1b070444b92469c7c9 Mon Sep 17 00:00:00 2001
From: ap007 <snow9man@vip.qq.com>
Date: Wed, 26 May 2021 15:15:05 +0800
Subject: [PATCH 02/29] =?UTF-8?q?=E4=BA=A7=E5=93=81=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E8=B5=84=E9=87=91=E6=B8=A0=E9=81=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Apzl/productCorpus/LbCorpusSourceList.jsp | 62 +++++++++++++++
 .../LbProductCorpusSourceList.jsp             | 78 +++++++++++++++++++
 .../productCorpus/LbProductCorpusUpDown.jsp   | 20 +++++
 .../Apzl/productCorpus/LbProductInfo.jsp      | 26 +++++++
 .../productCorpus/deleteProductCorpus.jsp     | 20 +++++
 WebContent/WEB-INF/etc/jbo/jbo_prd.xml        | 52 ++++++++++---
 src_jbo/jbo/prd/LB_PRODUCT_CORPUS_SOURCE.java | 48 ++++++++++++
 src_jbo/jbo/prd/VI_PRODUCT_CORPUS_SOURCE.java | 28 +++++++
 8 files changed, 323 insertions(+), 11 deletions(-)
 create mode 100644 WebContent/Tenwa/Apzl/productCorpus/LbCorpusSourceList.jsp
 create mode 100644 WebContent/Tenwa/Apzl/productCorpus/LbProductCorpusSourceList.jsp
 create mode 100644 WebContent/Tenwa/Apzl/productCorpus/LbProductCorpusUpDown.jsp
 create mode 100644 WebContent/Tenwa/Apzl/productCorpus/LbProductInfo.jsp
 create mode 100644 WebContent/Tenwa/Apzl/productCorpus/deleteProductCorpus.jsp
 create mode 100644 src_jbo/jbo/prd/LB_PRODUCT_CORPUS_SOURCE.java
 create mode 100644 src_jbo/jbo/prd/VI_PRODUCT_CORPUS_SOURCE.java

diff --git a/WebContent/Tenwa/Apzl/productCorpus/LbCorpusSourceList.jsp b/WebContent/Tenwa/Apzl/productCorpus/LbCorpusSourceList.jsp
new file mode 100644
index 000000000..e55d1bfe4
--- /dev/null
+++ b/WebContent/Tenwa/Apzl/productCorpus/LbCorpusSourceList.jsp
@@ -0,0 +1,62 @@
+<%@page import="com.amarsoft.app.base.util.ObjectWindowHelper"%>
+<%@page import="com.amarsoft.app.base.businessobject.*"%>
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><%	
+	/*
+        本金资源顺序列表
+    */
+	String productId= CurPage.getParameter("productId");
+	ASObjectModel doTemp = new ASObjectModel("LB_PRODUCT_CORPUS_SOURCE");
+	ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
+
+	dwTemp.Style="1";      	     //--设置为Grid风格--
+	dwTemp.ReadOnly = "1";	 //只读模式
+	dwTemp.setPageSize(10);
+	dwTemp.genHTMLObjectWindow(productId);
+
+	//0、是否展示 1、	权限控制  2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码	6、	7、	8、	9、图标，CSS层叠样式 10、风格
+	String sButtons[][] = {
+		{"true","All","Button","新增","新增","newRecord();","","","","btn_icon_add",""},
+			{"true","","Button","保存","保存","save()","","","","",""},
+		{"true","","Button","删除","删除","if(confirm('确实要删除吗?'))as_delete(0)","","","","btn_icon_delete",""},
+	};
+%><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
+<script type="text/javascript">
+	function newRecord(){
+		var position= getRowCount(0);
+		as_add(0);
+		tableDatas['myiframe0'][position][0]='<%=productId%>';
+	}
+	function save(){
+		if(checkAll()=='s'){
+			as_save(0);
+			self.location.reload();
+		}
+	}
+	function checkAll(){
+		//双循环来遍历查重
+		for(var i=0;i<getRowCount(0);i++){
+			for(var j = i+1; j < getRowCount(0); j++){
+				var orderList = getItemValue(0,i,'ORDER_LIST');
+				var corpusSource = getItemValue(0,i,'CORPUS_SOURCE');
+				var orderListLast = getItemValue(0,j,'ORDER_LIST');
+				var corpusSourceLast = getItemValue(0,j,'CORPUS_SOURCE');
+				if(i==0){
+					if(orderList==null||orderList==''||corpusSource==null||corpusSourceLast==''||orderListLast==null||orderListLast==''||corpusSourceLast==null||corpusSourceLast==''){
+						alert('资金来源或排序号不能为空');
+						return;
+					}
+				}
+				if(orderList==orderListLast){
+					alert('排序号不可以重复');
+					return;
+				}else if(corpusSource==corpusSourceLast){
+					alert('资金来源不可以重复');
+					return;
+				}
+			}
+		}
+		return 's';
+	}
+</script>
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/Apzl/productCorpus/LbProductCorpusSourceList.jsp b/WebContent/Tenwa/Apzl/productCorpus/LbProductCorpusSourceList.jsp
new file mode 100644
index 000000000..b1f5d8117
--- /dev/null
+++ b/WebContent/Tenwa/Apzl/productCorpus/LbProductCorpusSourceList.jsp
@@ -0,0 +1,78 @@
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><%	
+
+/*
+	产品配置资金来源顺序主页面
+ */
+	ASObjectModel doTemp = new ASObjectModel("VI_PRODUCT_CORPUS_SOURCE");
+	ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
+//	dwTemp.Style="1";      	     //--设置为Grid风格--
+	dwTemp.ReadOnly = "1";	 //只读模式
+	dwTemp.setPageSize(10);
+	dwTemp.genHTMLObjectWindow("");
+
+	//0、是否展示 1、	权限控制  2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码	6、	7、	8、	9、图标，CSS层叠样式 10、风格
+	String sButtons[][] = {
+		{"true","All","Button","新增","新增","newRecord()","","","","btn_icon_add",""},
+		{"true","","Button","编辑","编辑","viewAndEdit()","","","","btn_icon_detail",""},
+		{"true","","Button","删除","删除","deleteProduct()","","","","btn_icon_delete",""},
+	};
+%><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
+<script type="text/javascript">
+	function newRecord(){
+		var productId='';
+		AsDialog.OpenSelector("selectProductList","","dialogWidth=" + parseInt(window.screen.width * 0.6) + "px dialogHeight=" + parseInt(window.screen.height * 0.6) + "px",
+				function(sReturn){
+					if(!sReturn||sReturn=="_CANCEL_"||sReturn=="")
+					{
+						//alert(getHtmlMessage('1'));//请选择一条信息！
+						return;
+					}
+					sReturn = sReturn.split("@");
+					productId = sReturn[0];
+
+					var sUrl = "/Tenwa/Apzl/productCorpus/LbProductCorpusUpDown.jsp";
+					AsDialog.PopView(sUrl,'productId='+productId,'dialogWidth=950px;dialogHeight=500px;resizable=no;scrollbars=no;status:yes;maximize:no;help:no;',function(){reloadSelf();},'新建');
+				},"请选择产品",'');
+		//将返回的产品ID传输到编辑的info页面，info页面只是展示作用，然后list页面新增的时候再保存。
+		//编辑按钮不采用在后面添加超连接形式，曾经有的页面采用这种方式数据量大时特别卡。采用系统封装按钮事件来实现。
+
+	}
+	function viewAndEdit(){
+		var sUrl = "/Tenwa/Apzl/productCorpus/LbProductCorpusUpDown.jsp";
+		 var sPara = getItemValue(0,getRow(0),'PRODUCT_ID');
+		 if(typeof(sPara)=="undefined" || sPara.length==0 ){
+			alert("参数不能为空！");
+			return ;
+		 }
+		AsDialog.PopView(sUrl,'productId=' +sPara ,'dialogWidth=950px;dialogHeight=500px;resizable=no;scrollbars=no;status:yes;maximize:no;help:no;',function(){reloadSelf();},'编辑');
+	}
+	/*function afterSearch(){
+		for(var i=0;i<getRowCount(0);i++){
+			if(getObj(0,i,"action")!=null){
+				getObj(0,i,"action").innerHTML='<a class="box" style="text-align:center;" onclick="edit(\''+getItemValue(0,i,"PRODUCT_ID")+'\')" style={color:#000;text-decoration:underline;}><font color="blue">&nbsp&nbsp&nbsp&nbsp&nbsp编辑</font></ a>';
+			}
+		};
+	}
+	function edit(productId){
+		var sUrl="/Tenwa/Apzl/productCar/LmProductUpAndDown.jsp";
+		var sPara = "productId="+productId;
+		AsDialog.PopView(sUrl,sPara,"dialogWidth=950px;dialogHeight=500px;resizable=no;scrollbars=no;status:yes;maximize:no;help:no;",function(){reloadSelf();},"配置车辆");
+	}*/
+	function deleteProduct(){
+		var sPara ='productId='+ getItemValue(0,getRow(0),'PRODUCT_ID');
+		var sResult = AsControl.RunJsp('/Tenwa/Apzl/productCorpus/deleteProductCorpus.jsp',sPara);
+		alert(sResult);
+		parent.reloadSelf();
+	}
+
+	/*
+	function mySelectRow(){
+		 var TYPENO = getItemValue(0,getRow(0),"TYPENO");
+		 parent.OpenInfo(TYPENO);
+		 //list 页面同步info页面的联动传至单击事件
+	}
+		*/
+
+</script>
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/Apzl/productCorpus/LbProductCorpusUpDown.jsp b/WebContent/Tenwa/Apzl/productCorpus/LbProductCorpusUpDown.jsp
new file mode 100644
index 000000000..36534915c
--- /dev/null
+++ b/WebContent/Tenwa/Apzl/productCorpus/LbProductCorpusUpDown.jsp
@@ -0,0 +1,20 @@
+<%@ page contentType="text/html; charset=GBK"%><%@
+ include file="/IncludeBegin.jsp"%><%
+/*
+	页面说明: 示例上下联动框架页面
+ */
+ String productId = CurPage.getParameter("productId");
+%><%@include file="/Resources/CodeParts/Frame02.jsp"%>
+<script type="text/javascript">
+	mytoptd.height=100;
+    OpenInfo();
+	OpenList();
+	function OpenInfo(){
+		AsControl.OpenView("/Tenwa/Apzl/productCorpus/LbProductInfo.jsp","productId=<%=productId%>","rightup");
+	}
+
+	function OpenList(){
+		AsControl.OpenView("/Tenwa/Apzl/productCorpus/LbCorpusSourceList.jsp","productId=<%=productId%>", "rightdown");
+	}
+</script>
+<%@ include file="/IncludeEnd.jsp"%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/Apzl/productCorpus/LbProductInfo.jsp b/WebContent/Tenwa/Apzl/productCorpus/LbProductInfo.jsp
new file mode 100644
index 000000000..5fa4daa05
--- /dev/null
+++ b/WebContent/Tenwa/Apzl/productCorpus/LbProductInfo.jsp
@@ -0,0 +1,26 @@
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_info.jspf"%><%
+	/*
+        产品简介
+    */
+	String productId = CurPage.getParameter("productId");
+	String sTempletNo = "LbProductInfo";//--模板号--
+	ASObjectModel doTemp = new ASObjectModel(sTempletNo);
+	ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request);
+	dwTemp.Style = "2";//freeform
+	dwTemp.ReadOnly = "-2";//只读模式
+	dwTemp.genHTMLObjectWindow(productId);
+	
+	String sButtons[][] = {
+		//{"true","All","Button","保存","保存所有修改","save()","","","",""},
+		//{"true","All","Button","返回","返回列表","returnList()","","","",""}
+	};
+	sButtonPosition = "south";
+%><%@ include file="/Frame/resources/include/ui/include_info.jspf"%>
+<script type="text/javascript">
+	/* function save(){
+		as_save("myiframe0","returnList()");
+	} */
+
+</script>
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/Apzl/productCorpus/deleteProductCorpus.jsp b/WebContent/Tenwa/Apzl/productCorpus/deleteProductCorpus.jsp
new file mode 100644
index 000000000..bc71928ad
--- /dev/null
+++ b/WebContent/Tenwa/Apzl/productCorpus/deleteProductCorpus.jsp
@@ -0,0 +1,20 @@
+
+<%@page import="com.amarsoft.are.jbo.JBOTransaction"%>
+<%@page import="com.amarsoft.are.jbo.JBOFactory"%>
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/IncludeBeginMDAJAX.jsp"%><%
+	String sResult = "";
+	String productId = CurPage.getParameter("productId");
+	int count = JBOFactory.createBizObjectQuery("jbo.prd.LB_PRODUCT_CORPUS_SOURCE", "select 1 from O where PRODUCT_ID=:productId").setParameter("productId", productId).getTotalCount();
+	int count_d = JBOFactory.createBizObjectQuery("jbo.prd.LB_PRODUCT_CORPUS_SOURCE", "delete from O where PRODUCT_ID=:productId").setParameter("productId", productId).executeUpdate();
+	if(count==count_d){
+		sResult="删除成功";
+	}else if(count_d==0){
+		sResult="删除失败";
+	}else if(count>count_d&&count_d>0){
+		sResult="部分删除，请记录当前产品ID或产品名称，并联系系统管理员";
+	}else{
+		sResult="未知错误，请记录当前产品ID或产品名称，并联系系统管理员";
+	}
+	out.println(sResult);
+%><%@ include file="/IncludeEndAJAX.jsp"%>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/etc/jbo/jbo_prd.xml b/WebContent/WEB-INF/etc/jbo/jbo_prd.xml
index 19e8a2402..e6d96e58d 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_prd.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_prd.xml
@@ -182,26 +182,26 @@
 				</managerProperties>
 			</manager>
 		</class>
-		<class name="VI_PRODUCTS_NUMBER" label="" keyAttributes="">
+		<class name="VI_PRODUCTS_NUMBER" label="" keyAttributes="">
 			<attributes>
 				<attribute name="TYPENO" label="产品编号" type="STRING"/>
 				<attribute name="TYPENAME" label="产品名称" type="STRING"/>
 				<attribute name="payType" label="投放方式" type="STRING"/>
 				<attribute name="LeasForm" label="租赁形式" type="STRING"/>
 				<attribute name="equip_type" label="租赁物类型" type="STRING"/>
-				<attribute name="EFFECTIVEDATE" label="生效日期" type="STRING"/>
+				<attribute name="EFFECTIVEDATE" label="生效日期" type="STRING"/>
 				<attribute name="INCOME_NUMBER" label="期数" type="STRING"/>
 				<attribute name="fact_money" label="投放金额" type="STRING"/>
 				<attribute name="fact_date" label="初次投放时间" type="STRING"/>
 				<attribute name="Attribute2" label="产品类型" type="STRING"/>
-				<attribute name="distributor_name" label="经销商名称" type="STRING"/>
-			</attributes>
-			<manager>
-				<managerProperties>
-					<property name="table" value="vi_products_number" />
-					<property name="createKey" value="true" />
-				</managerProperties>
-			</manager>
+				<attribute name="distributor_name" label="经销商名称" type="STRING"/>
+			</attributes>
+			<manager>
+				<managerProperties>
+					<property name="table" value="vi_products_number" />
+					<property name="createKey" value="true" />
+				</managerProperties>
+			</manager>
 		</class>
 		<class name="LB_PRODUCTTOCOMPANY_INFO" label="" keyAttributes="ID">
 			<attributes>
@@ -246,7 +246,37 @@
 					<property name="createKey" value="true" />
 				</managerProperties>
 			</manager>
-		</class>
+		</class>
+		<class name="VI_PRODUCT_CORPUS_SOURCE" label="产品资金来源清单" keyAttributes="">
+			<attributes>
+				<attribute name="PRODUCT_ID" label="产品编号" type="STRING"/>
+				<attribute name="PRODUCT_NAME" label="产品名称" type="STRING"/>
+				<attribute name="CORPUS_SOURCE_LIST" label="资金来源顺序" type="STRING"/>
+			</attributes>
+			<manager>
+				<managerProperties>
+					<property name="table" value="vi_product_corpus_source" />
+				</managerProperties>
+			</manager>
+		</class>
+		<class name="LB_PRODUCT_CORPUS_SOURCE" label="产品资金来源表" keyAttributes="ID">
+			<attributes>
+				<attribute name="ID" label="ID" type="STRING" length="32"/>
+				<attribute name="PRODUCT_ID" label="产品ID" type="STRING" length="32"/>
+				<attribute name="CORPUS_SOURCE" label="资金来源" type="STRING" length="32"/>
+				<attribute name="ORDER_LIST" label="资金顺序" type="STRING" length="20"/>
+				<attribute name="INPUTTIME" label="创建时间" type="STRING" length="30"/>
+				<attribute name="INPUTUSERID" label="创建人" type="STRING" length="30"/>
+				<attribute name="UPDATETIME" label="更新时间" type="STRING" length="30"/>
+				<attribute name="UPDATEUSERID" label="更新人" type="STRING" length="30"/>
+			</attributes>
+			<manager>
+				<managerProperties>
+					<property name="table" value="lb_product_corpus_source" />
+					<property name="createKey" value="true" />
+				</managerProperties>
+			</manager>
+		</class>
 	</package>
 </jbo>
 
diff --git a/src_jbo/jbo/prd/LB_PRODUCT_CORPUS_SOURCE.java b/src_jbo/jbo/prd/LB_PRODUCT_CORPUS_SOURCE.java
new file mode 100644
index 000000000..5eceb647b
--- /dev/null
+++ b/src_jbo/jbo/prd/LB_PRODUCT_CORPUS_SOURCE.java
@@ -0,0 +1,48 @@
+package jbo.prd;
+
+import java.lang.String;
+
+/**
+* 产品资金来源表 - JBO命名常量类<br><br>
+* Note: This file is generated by ADE tools, <em>dont</em> modify it.<br>
+
+*/
+public interface LB_PRODUCT_CORPUS_SOURCE{
+	/**
+	* 产品资金来源表<br><br>
+	* 代表本类映射的BizObjectClass
+	*/
+	public static final String CLASS_NAME = "jbo.prd.LB_PRODUCT_CORPUS_SOURCE";
+	/**
+	* ID STRING(32)<br>
+	*/
+	public static final String ID = "ID";
+	/**
+	* 产品ID STRING(32)<br>
+	*/
+	public static final String PRODUCT_ID = "PRODUCT_ID";
+	/**
+	* 资金来源 STRING(32)<br>
+	*/
+	public static final String CORPUS_SOURCE = "CORPUS_SOURCE";
+	/**
+	* 资金顺序 STRING(20)<br>
+	*/
+	public static final String ORDER_LIST = "ORDER_LIST";
+	/**
+	* 创建时间 STRING(30)<br>
+	*/
+	public static final String INPUTTIME = "INPUTTIME";
+	/**
+	* 创建人 STRING(30)<br>
+	*/
+	public static final String INPUTUSERID = "INPUTUSERID";
+	/**
+	* 更新时间 STRING(30)<br>
+	*/
+	public static final String UPDATETIME = "UPDATETIME";
+	/**
+	* 更新人 STRING(30)<br>
+	*/
+	public static final String UPDATEUSERID = "UPDATEUSERID";
+}
\ No newline at end of file
diff --git a/src_jbo/jbo/prd/VI_PRODUCT_CORPUS_SOURCE.java b/src_jbo/jbo/prd/VI_PRODUCT_CORPUS_SOURCE.java
new file mode 100644
index 000000000..0c518138e
--- /dev/null
+++ b/src_jbo/jbo/prd/VI_PRODUCT_CORPUS_SOURCE.java
@@ -0,0 +1,28 @@
+package jbo.prd;
+
+import java.lang.String;
+
+/**
+* 产品资金来源清单 - JBO命名常量类<br><br>
+* Note: This file is generated by ADE tools, <em>dont</em> modify it.<br>
+
+*/
+public interface VI_PRODUCT_CORPUS_SOURCE{
+	/**
+	* 产品资金来源清单<br><br>
+	* 代表本类映射的BizObjectClass
+	*/
+	public static final String CLASS_NAME = "jbo.prd.VI_PRODUCT_CORPUS_SOURCE";
+	/**
+	* 产品编号 STRING(20)<br>
+	*/
+	public static final String PRODUCT_ID = "PRODUCT_ID";
+	/**
+	* 产品名称 STRING(20)<br>
+	*/
+	public static final String PRODUCT_NAME = "PRODUCT_NAME";
+	/**
+	* 资金来源顺序 STRING(20)<br>
+	*/
+	public static final String CORPUS_SOURCE_LIST = "CORPUS_SOURCE_LIST";
+}
\ No newline at end of file

From f6e6fe997c95d9942c92a692cedb2b9333a0f825 Mon Sep 17 00:00:00 2001
From: ap007 <snow9man@vip.qq.com>
Date: Wed, 26 May 2021 15:16:52 +0800
Subject: [PATCH 03/29] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E4=BA=A7=E5=93=81?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E8=B5=84=E9=87=91=E6=B8=A0=E9=81=93=EF=BC=8C?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E9=80=89=E6=8B=A9=E5=B9=B6=E5=9C=A8=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CautionMoneyDeduction/ContractInfoPay.jsp     |  3 ++-
 WebContent/WEB-INF/etc/jbo/jbo_lease.xml          |  5 +++++
 .../com/tenwa/lease/comm/LB_CONTRACT_INFO.java    |  4 ++++
 .../tenwa/lease/comm/LB_CONTRACT_INFO_HIS.java    |  4 ++++
 .../tenwa/lease/comm/LB_CONTRACT_INFO_TEMP.java   |  4 ++++
 .../jbo/com/tenwa/lease/comm/LB_PROJECT_INFO.java |  4 ++++
 .../tenwa/lease/comm/LB_PROJECT_INFO_TEMP.java    |  4 ++++
 .../LBProjectIntoTempInitCarBusiness.java         | 15 +++++++++++++++
 8 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/WebContent/Tenwa/Lease/Flow/Rent/CautionMoneyDeduction/ContractInfoPay.jsp b/WebContent/Tenwa/Lease/Flow/Rent/CautionMoneyDeduction/ContractInfoPay.jsp
index 90ab72f59..05e2a9815 100644
--- a/WebContent/Tenwa/Lease/Flow/Rent/CautionMoneyDeduction/ContractInfoPay.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Rent/CautionMoneyDeduction/ContractInfoPay.jsp
@@ -13,7 +13,7 @@
 	String compClientID = CurPage.getParameter("CompClientID");
 	String phaseNo = CurPage.getParameter("PhaseNo");
 	String ProductId = CurPage.getParameter("ProductId");
-	String productid = Sqlca.getString("select PRODUCT_ID from LB_CONTRACT_INFO_TEMP where flowunid = '"+flowunid+"'");
+	//String corpusSource = Sqlca.getString("select corpus_source from LB_CONTRACT_INFO_TEMP where flowunid = '"+flowunid+"'");
 	String projectId = CurPage.getParameter("ProjectId");
 	String gpsVendor = Sqlca.getString("select cl.itemname from lb_project_info lpi left join LM_GPS_ORDER lgr on lgr.apply_no=lpi.project_no left join code_library cl on cl.itemno=lgr.source and cl.codeno='gpsVendor' where lpi.id='"+projectId+"'");
 	String userId = CurUser.getUserID();
@@ -36,6 +36,7 @@
 		 doTemp.setDataQueryClass("com.tenwa.flow.flowHistory.FlowDataInfoHistory");//如果是历史则新显示历史数据
 	} */
 	ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request);
+
 	dwTemp.Style = "2";
 	dwTemp.ReadOnly = "1";
 	dwTemp.genHTMLObjectWindow(contractId);
diff --git a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml
index 954f30099..b0fb7833e 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml
@@ -143,6 +143,7 @@
 				<attribute name="CHANNEL" label="娓犻亾" type="STRING" length="32"/>
 				<attribute name="ZC_PROJECT_NUMBER" label="涓溅鐢宠鍙�" type="STRING" length="32"/>
 				<attribute name="ZC_CONTRACT_NUMBER" label="涓溅鍚堝悓鍙�" type="STRING" length="32"/>
+				<attribute name="CORPUS_SOURCE" label="璧勬柟鍚嶇О" type="STRING" length="10"/>
 			</attributes>
 			<manager>
 				<managerProperties>
@@ -292,6 +293,7 @@
 				<attribute name="CHANNEL" label="娓犻亾" type="STRING" length="32"/>
 				<attribute name="ZC_PROJECT_NUMBER" label="涓溅鐢宠鍙�" type="STRING" length="32"/>
 				<attribute name="ZC_CONTRACT_NUMBER" label="涓溅鍚堝悓鍙�" type="STRING" length="32"/>
+				<attribute name="CORPUS_SOURCE" label="璧勬柟鍚嶇О" type="STRING" length="10"/>
 			</attributes>
 			<manager>
 				<managerProperties>
@@ -805,6 +807,7 @@
 				<attribute name="CHANNEL" label="娓犻亾" type="STRING" length="32"/>
 				<attribute name="ZC_PROJECT_NUMBER" label="涓溅鐢宠鍙�" type="STRING" length="32"/>
 				<attribute name="ZC_CONTRACT_NUMBER" label="涓溅鍚堝悓鍙�" type="STRING" length="32"/>
+				<attribute name="CORPUS_SOURCE" label="璧勬柟鍚嶇О" type="STRING" length="10"/>
 			</attributes>
 			<manager>
 				<managerProperties>
@@ -1076,6 +1079,7 @@
 				<attribute name="CHANNEL" label="娓犻亾" type="STRING" length="32"/>
 				<attribute name="ZC_PROJECT_NUMBER" label="涓溅鐢宠鍙�" type="STRING" length="32"/>
 				<attribute name="ZC_CONTRACT_NUMBER" label="涓溅鍚堝悓鍙�" type="STRING" length="32"/>
+				<attribute name="CORPUS_SOURCE" label="璧勬柟鍚嶇О" type="STRING" length="10"/>
 			</attributes>
 			<manager>
 				<managerProperties>
@@ -2812,6 +2816,7 @@
 				<attribute name="CHANNEL" label="娓犻亾" type="STRING" length="32"/>
 				<attribute name="ZC_PROJECT_NUMBER" label="涓溅鐢宠鍙�" type="STRING" length="32"/>
 				<attribute name="ZC_CONTRACT_NUMBER" label="涓溅鍚堝悓鍙�" type="STRING" length="32"/>
+				<attribute name="CORPUS_SOURCE" label="璧勬柟鍚嶇О" type="STRING" length="10"/>
 			</attributes>
 			<manager>
 				<managerProperties>
diff --git a/src_jbo/jbo/com/tenwa/lease/comm/LB_CONTRACT_INFO.java b/src_jbo/jbo/com/tenwa/lease/comm/LB_CONTRACT_INFO.java
index 55fb1ff49..8ce98454d 100644
--- a/src_jbo/jbo/com/tenwa/lease/comm/LB_CONTRACT_INFO.java
+++ b/src_jbo/jbo/com/tenwa/lease/comm/LB_CONTRACT_INFO.java
@@ -341,4 +341,8 @@ public interface LB_CONTRACT_INFO{
 	* 中车合同号 STRING(32)<br>
 	*/
 	public static final String ZC_CONTRACT_NUMBER = "ZC_CONTRACT_NUMBER";
+	/**
+	* 资方名称 STRING(10)<br>
+	*/
+	public static final String CORPUS_SOURCE = "CORPUS_SOURCE";
 }
\ No newline at end of file
diff --git a/src_jbo/jbo/com/tenwa/lease/comm/LB_CONTRACT_INFO_HIS.java b/src_jbo/jbo/com/tenwa/lease/comm/LB_CONTRACT_INFO_HIS.java
index b8998ed78..9b6b12fa0 100644
--- a/src_jbo/jbo/com/tenwa/lease/comm/LB_CONTRACT_INFO_HIS.java
+++ b/src_jbo/jbo/com/tenwa/lease/comm/LB_CONTRACT_INFO_HIS.java
@@ -329,4 +329,8 @@ public interface LB_CONTRACT_INFO_HIS{
 	* 中车合同号 STRING(32)<br>
 	*/
 	public static final String ZC_CONTRACT_NUMBER = "ZC_CONTRACT_NUMBER";
+	/**
+	* 资方名称 STRING(10)<br>
+	*/
+	public static final String CORPUS_SOURCE = "CORPUS_SOURCE";
 }
\ No newline at end of file
diff --git a/src_jbo/jbo/com/tenwa/lease/comm/LB_CONTRACT_INFO_TEMP.java b/src_jbo/jbo/com/tenwa/lease/comm/LB_CONTRACT_INFO_TEMP.java
index 1bcb44c02..bae40922b 100644
--- a/src_jbo/jbo/com/tenwa/lease/comm/LB_CONTRACT_INFO_TEMP.java
+++ b/src_jbo/jbo/com/tenwa/lease/comm/LB_CONTRACT_INFO_TEMP.java
@@ -333,4 +333,8 @@ public interface LB_CONTRACT_INFO_TEMP{
 	* 中车合同号 STRING(32)<br>
 	*/
 	public static final String ZC_CONTRACT_NUMBER = "ZC_CONTRACT_NUMBER";
+	/**
+	* 资方名称 STRING(10)<br>
+	*/
+	public static final String CORPUS_SOURCE = "CORPUS_SOURCE";
 }
\ No newline at end of file
diff --git a/src_jbo/jbo/com/tenwa/lease/comm/LB_PROJECT_INFO.java b/src_jbo/jbo/com/tenwa/lease/comm/LB_PROJECT_INFO.java
index 54d0297fd..023036b35 100644
--- a/src_jbo/jbo/com/tenwa/lease/comm/LB_PROJECT_INFO.java
+++ b/src_jbo/jbo/com/tenwa/lease/comm/LB_PROJECT_INFO.java
@@ -265,4 +265,8 @@ public interface LB_PROJECT_INFO{
 	* 中车合同号 STRING(32)<br>
 	*/
 	public static final String ZC_CONTRACT_NUMBER = "ZC_CONTRACT_NUMBER";
+	/**
+	* 资方名称 STRING(10)<br>
+	*/
+	public static final String CORPUS_SOURCE = "CORPUS_SOURCE";
 }
\ No newline at end of file
diff --git a/src_jbo/jbo/com/tenwa/lease/comm/LB_PROJECT_INFO_TEMP.java b/src_jbo/jbo/com/tenwa/lease/comm/LB_PROJECT_INFO_TEMP.java
index 729e815a0..ee7bece3d 100644
--- a/src_jbo/jbo/com/tenwa/lease/comm/LB_PROJECT_INFO_TEMP.java
+++ b/src_jbo/jbo/com/tenwa/lease/comm/LB_PROJECT_INFO_TEMP.java
@@ -265,4 +265,8 @@ public interface LB_PROJECT_INFO_TEMP{
 	* 中车合同号 STRING(32)<br>
 	*/
 	public static final String ZC_CONTRACT_NUMBER = "ZC_CONTRACT_NUMBER";
+	/**
+	* 资方名称 STRING(10)<br>
+	*/
+	public static final String CORPUS_SOURCE = "CORPUS_SOURCE";
 }
\ No newline at end of file
diff --git a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProjectIntoTempInitCarBusiness.java b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProjectIntoTempInitCarBusiness.java
index 68ed90490..77e3c0a71 100644
--- a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProjectIntoTempInitCarBusiness.java
+++ b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProjectIntoTempInitCarBusiness.java
@@ -22,6 +22,7 @@ import jbo.com.tenwa.lease.comm.LB_PROJECT_INFO;
 import jbo.com.tenwa.lease.comm.LB_PROJECT_INFO_TEMP;
 import jbo.com.tenwa.lease.comm.LB_UNION_LESSEE;
 import jbo.com.tenwa.lease.comm.LB_UNION_LESSEE_TEMP;
+import jbo.prd.LB_PRODUCT_CORPUS_SOURCE;
 import jbo.prd.PRD_SPECIFIC_LIBRARY;
 
 import java.util.*;
@@ -389,6 +390,19 @@ public class LBProjectIntoTempInitCarBusiness extends BaseBussiness {
 			if("03".equals(this.getAttribute("CustomerType")) && "app".equals(sourcetype)){
 				bo.setAttributeValue("is_netcar",this.getAttribute("isnetcar") );
 			}
+
+			/*
+			排名顺序第n个的sql =
+			select o.corpus_source from lb_product_corpus_source o where o.product_id='H01-C01-E-CXC1-DB-3'
+			and order_list =(select ot.order_list from lb_product_corpus_source ot where ot.product_id='H01-C01-E-CXC1-DB-3'  order by ot.order_list limit n-1,1);
+			*/
+			String sql = "select O.CORPUS_SOURCE from O where PRODUCT_ID=:PRODUCTID and O.ORDER_LIST = (select min(ot.order_list) from jbo.prd.LB_PRODUCT_CORPUS_SOURCE ot where ot.PRODUCT_ID=:PRODUCTID)";
+			BizObject boLPCS = JBOFactory.createBizObjectQuery(LB_PRODUCT_CORPUS_SOURCE.CLASS_NAME,sql).setParameter("PRODUCTID",productId).getSingleResult(false);
+			String corpusSource = "AP";
+			if(boLPCS!=null&&boLPCS.getAttribute("CORPUS_SOURCE")!=null){
+				corpusSource=boLPCS.getAttribute("CORPUS_SOURCE").toString();
+			}
+			bo.setAttributeValue("CORPUS_SOURCE",corpusSource);
 			bomLPI.saveObject(bo);
 		}catch (Exception e){
 			tx.rollback();
@@ -409,4 +423,5 @@ public class LBProjectIntoTempInitCarBusiness extends BaseBussiness {
 		e.printStackTrace();
 	 }
 	}
+
 }

From 48918e93033dec8e4b679dc95c23f455e6d0ee4e Mon Sep 17 00:00:00 2001
From: ap007 <zhanglei@ap-leasing.com.cn>
Date: Thu, 17 Jun 2021 19:06:33 +0800
Subject: [PATCH 04/29] =?UTF-8?q?=E9=82=AE=E5=82=A8=E8=B5=84=E6=96=B9?=
 =?UTF-8?q?=E7=A7=9F=E5=89=8D=E9=83=A8=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WebContent/Ample/Doc/DocListInfoNew.jsp       | 325 ++++++++++++++++++
 WebContent/Ample/Doc/DocListUploadNew.jsp     |  90 +++++
 WebContent/Ample/Doc/showImage.jsp            | 114 ++++++
 WebContent/Ample/Doc/showPDF.jsp              |  11 +
 .../Apzl/productCorpus/LbCorpusSourceList.jsp |  62 ----
 .../LbProductCorpusSourceList.jsp             |  78 -----
 .../productCorpus/LbProductCorpusUpDown.jsp   |  20 --
 .../Apzl/productCorpus/LbProductInfo.jsp      |  26 --
 .../productCorpus/deleteProductCorpus.jsp     |  20 --
 .../ContractApprovalApplyList.jsp             |  15 +-
 WebContent/WEB-INF/etc/jbo/jbo_oti.xml        |  55 +++
 WebContent/WEB-INF/web.xml                    |  16 +
 .../apzl/CorpusSource/FcRequestDocTab.jsp     |  33 ++
 .../apzl/CorpusSource/FcRequestFileList.jsp   | 117 +++++++
 .../tenwa/apzl/CorpusSource/FcRequestLIst.jsp |  42 +++
 src/com/ap/CorpusSourceCheck.java             |  98 ++++++
 .../fundchannel/doc/action/DocListAction.java |  52 +++
 .../fundchannel/doc/cache/DocListCache.java   |  83 +++++
 .../doc/servlet/DocDownloadServletByPath.java | 104 ++++++
 .../doc/servlet/PublicShowImageServlet.java   |  70 ++++
 src_jbo/jbo/oti/FC_REQUEST.java               |  92 +++++
 src_jbo/jbo/oti/FC_REQUEST_FILE.java          |  80 +++++
 22 files changed, 1396 insertions(+), 207 deletions(-)
 create mode 100644 WebContent/Ample/Doc/DocListInfoNew.jsp
 create mode 100644 WebContent/Ample/Doc/DocListUploadNew.jsp
 create mode 100644 WebContent/Ample/Doc/showImage.jsp
 create mode 100644 WebContent/Ample/Doc/showPDF.jsp
 delete mode 100644 WebContent/Tenwa/Apzl/productCorpus/LbCorpusSourceList.jsp
 delete mode 100644 WebContent/Tenwa/Apzl/productCorpus/LbProductCorpusSourceList.jsp
 delete mode 100644 WebContent/Tenwa/Apzl/productCorpus/LbProductCorpusUpDown.jsp
 delete mode 100644 WebContent/Tenwa/Apzl/productCorpus/LbProductInfo.jsp
 delete mode 100644 WebContent/Tenwa/Apzl/productCorpus/deleteProductCorpus.jsp
 create mode 100644 WebContent/com/tenwa/apzl/CorpusSource/FcRequestDocTab.jsp
 create mode 100644 WebContent/com/tenwa/apzl/CorpusSource/FcRequestFileList.jsp
 create mode 100644 WebContent/com/tenwa/apzl/CorpusSource/FcRequestLIst.jsp
 create mode 100644 src/com/ap/CorpusSourceCheck.java
 create mode 100644 src_core/com/ample/fundchannel/doc/action/DocListAction.java
 create mode 100644 src_core/com/ample/fundchannel/doc/cache/DocListCache.java
 create mode 100644 src_core/com/ample/fundchannel/doc/servlet/DocDownloadServletByPath.java
 create mode 100644 src_core/com/ample/fundchannel/doc/servlet/PublicShowImageServlet.java
 create mode 100644 src_jbo/jbo/oti/FC_REQUEST.java
 create mode 100644 src_jbo/jbo/oti/FC_REQUEST_FILE.java

diff --git a/WebContent/Ample/Doc/DocListInfoNew.jsp b/WebContent/Ample/Doc/DocListInfoNew.jsp
new file mode 100644
index 000000000..810ad98e2
--- /dev/null
+++ b/WebContent/Ample/Doc/DocListInfoNew.jsp
@@ -0,0 +1,325 @@
+<%@page import="com.tenwa.util.QuartzPropertiesUtil"%>
+<%@ page contentType="text/html; charset=GBK"%>
+<%@include file="/Frame/resources/include/include_begin_info.jspf"%>
+<%
+	//获得组件参数
+	String flowNo=CurPage.getParameter("FlowNo");
+	String fcQueuestId = CurPage.getParameter("fcQueuestId");
+	String fcFlowType = CurPage.getParameter("fcFlowType");
+	String fcFileCode = CurPage.getParameter("fcFileCode");
+
+%>
+<html>
+<head>
+<meta charset="GBK">
+<title>File Upload</title>
+<!--引入CSS-->
+<link rel="stylesheet" type="text/css" href="<%=sWebRootPath%>/Frame/page/webuploader/webuploader.css">
+<link rel="stylesheet" type="text/css" href="<%=sWebRootPath%>/Frame/page/webuploader/upload.css">
+<link rel="stylesheet" type="text/css" href="<%=sWebRootPath%>/Frame/page/bootstrap/css/bootstrap.min.css"/>
+<link rel="stylesheet" type="text/css" href="<%=sWebRootPath%>/Frame/page/bootstrap/css/bootstrap-theme.min.css"/>
+<!--引入JS-->
+<script type="text/javascript" src="<%=sWebRootPath%>/js/jquery/jquery-1.11.0.min.js"></script>
+<script type="text/javascript" src="<%=sWebRootPath%>/Frame/page/webuploader/webuploader.js"></script>
+<script type="text/javascript" src="<%=sWebRootPath%>/Frame/page/bootstrap/js/bootstrap.min.js"></script>
+</head>
+<body>
+<div style="overflow:auto;height:500px">
+	<div class="form-group">
+			<table class="table table-striped">
+				<%-- <tr>
+					<td><label for="docType">一级分类</label><input readonly type="text" class="form-control" id="docType" value="<%=docType %>"></td>
+					<td><label for="oneClassify">二级分类</label><input readonly type="text" class="form-control" id="oneClassify" value="<%=oneClassify %>"></td>
+				</tr> --%>
+				<tr>
+					<td><h5><b>上传附件</b></h5></td>
+				</tr>
+				<!-- <tr>
+					<td colspan="2">
+						<label for="remark">备注</label>
+	    				<textarea class="form-control" rows="4" id="remark"></textarea>
+					</td>
+				</tr> -->
+			</table>
+	</div>
+	<div id="uploader" class="wu-example">
+		<div class="memo">未选择任何文件</div>
+	    <!--用来存放文件信息-->
+	    <div id="thelist" class="uploader-list filelist"></div>
+	    <div class="btns">
+	        <div id="picker" style="display:inline-block">选择文件</div>
+	        <%
+				if(!"true".equals(QuartzPropertiesUtil.get("autoUpload"))) {%>
+			        <button id="ctlBtn" class="btn btn-default">开始上传</button>
+			  <%}
+	        %>
+	        <button id="backBtn" class="btn btn-default" style="margin-left:11px;" onclick="AsDialog.ClosePage();">返回</button>
+	    </div>
+	</div>
+</div>
+<script>
+	// 文件上传
+	jQuery(function() {
+		var $ = jQuery,
+			$list = $('#thelist'),
+			$btn = $('#ctlBtn'),
+			state = 'pending',
+			// 优化retina, 在retina下这个值是2
+	        ratio = window.devicePixelRatio || 1,
+
+	        // 缩略图大小
+	        thumbnailWidth = 100 * ratio,
+	        thumbnailHeight = 100 * ratio,
+			uploader,
+			
+			percentages = {},
+
+	        supportTransition = (function(){
+	            var s = document.createElement('p').style,
+	                r = 'transition' in s ||
+	                      'WebkitTransition' in s ||
+	                      'MozTransition' in s ||
+	                      'msTransition' in s ||
+	                      'OTransition' in s;
+	            s = null;
+	            return r;
+	        })(),
+
+		uploader = WebUploader.create({
+			fileNumLimit: <%=QuartzPropertiesUtil.get("fileNumLimit") %>,
+			fileSizeLimit: <%=QuartzPropertiesUtil.get("fileSizeLimit") %> * 1024 * 1024,
+			fileSingleSizeLimit: <%=QuartzPropertiesUtil.get("fileSingleSizeLimit") %> * 1024 * 1024,
+			
+			dnd: document.body,
+			paste: document.body,
+			disableGlobalDnd: true,
+			// 不压缩image
+			//resize: false,
+			//设置文件是否压缩，如果不压缩直接写false，如果需要压缩则需要添加对应的参数，详情请看百度文档。
+			compress:false,
+			
+			auto: <%=QuartzPropertiesUtil.get("autoUpload") %>,
+			
+			prepareNextFile: true,
+			
+			threads:<%=QuartzPropertiesUtil.get("fileNumLimit") %>,
+			
+			formData: {
+				fcQueuestId:'<%=fcQueuestId%>',
+				fcFlowType:'<%=fcFlowType%>',
+				fcFileCode:'<%=fcFileCode%>'
+			},
+
+			// swf文件路径
+			swf: '<%=sWebRootPath%>/Frame/page/webuploader/Uploader.swf',
+
+			// 文件接收服务端。
+			server: '<%=sWebRootPath%>/Ample/Doc/DocListUploadNew.jsp?CompClientID=<%=CurComp.getClientID()%>',
+
+			// 选择文件的按钮。可选。
+			// 内部根据当前运行是创建，可能是input元素，也可能是flash.
+			pick: {
+					id: '#picker',
+					multiple: true
+				  },
+			accept: {
+				extensions: '<%=QuartzPropertiesUtil.get("fileType") %>'
+			}
+		});
+		uploader.on('beforeFileQueued',function(file){
+			var reg = RegExp(/[^%&',;=?$\x22]+/);
+			if(file.name.match(reg)){
+				AsDebug.alert("警告","上传出错！请不要上传名称中带有%&',;=?$等特殊字符的文件");
+				return false;
+			}
+		});
+		// 当有文件添加进来的时候
+		uploader.on( 'fileQueued', function( file ) {
+			var $li = $(
+	                '<div id="' + file.id + '" class="file-item thumbnail">' +
+	                    '<img>' +
+	                    '<div class="info" style = "height:0px">' + file.name + '</div>' +
+	                '</div>'
+	                ),
+	            $img = $li.find('img');
+
+			var $btns = $('<div class="file-panel">' +
+	                '<span class="cancel">取消</span>' +
+	                '<span class="rotateRight">向左旋转</span>' +
+	                '<span class="rotateLeft">向右旋转</span></div>').appendTo( $li );
+	
+	                
+            $li.on( 'mouseenter', function() {
+                $btns.stop().animate({height: 30});
+                $li.find(".info").stop().animate({height: 20});
+            });
+
+            $li.on( 'mouseleave', function() {
+                $btns.stop().animate({height: 0});
+                $li.find(".info").stop().animate({height: 0});
+            });
+			
+            percentages[file.id] = file.size;
+            file.rotation = 0;
+            
+            $btns.on( 'click', 'span', function() {
+                var index = $(this).index()
+
+                switch ( index ) {
+                    case 0:
+                        removeFile( file );
+                        return;
+
+                    case 1:
+                        file.rotation += 90;
+                        break;
+
+                    case 2:
+                        file.rotation -= 90;
+                        break;
+                }
+                
+                if ( supportTransition ) {
+                    deg = 'rotate(' + file.rotation + 'deg)';
+                    $img.css({
+                        '-webkit-transform': deg,
+                        '-mos-transform': deg,
+                        '-o-transform': deg,
+                        'transform': deg
+                    });
+                } else {
+                	$img.css( 'filter', 'progid:DXImageTransform.Microsoft.BasicImage(rotation='+ (~~((file.rotation/90)%4 + 4)%4) +')');
+                }
+            });
+	                
+	        $list.append( $li );
+	
+	        // 创建缩略图
+	        uploader.makeThumb( file, function( error, src ) {
+	            if ( error ) {
+	                $img.replaceWith('<span>无法预览</span>');
+	                $li.css("width",thumbnailWidth + 10).css("height",thumbnailHeight + 10);
+	                return;
+	            }
+	
+	            $img.attr( 'src', src );
+	        }, thumbnailWidth, thumbnailHeight );
+			$(".memo").hide();
+		});
+
+		// 文件上传过程中创建进度条实时显示。
+		uploader.on( 'uploadProgress', function( file, percentage ) {
+			var $li = $( '#'+file.id ),
+            $percent = $li.find('.progress span');
+
+	        // 避免重复创建
+	        if ( !$percent.length ) {
+	            $percent = $('<p class="progress" style="height:7%"><span></span></p>')
+	                    .appendTo( $li )
+	                    .find('span');
+	        }
+
+			$percent.css( 'width', percentage * 100 + '%' );
+		});
+
+		// 文件上传成功，给item添加成功class, 用样式标记上传成功。
+	    uploader.on( 'uploadSuccess', function( file, ret) {
+	    	file["attribute_id"] = ret["_raw"];
+	        $( '#'+file.id ).addClass('upload-state-done');
+	    });
+
+	    // 文件上传失败，现实上传出错。
+	    uploader.on( 'uploadError', function( file ) {
+	        var $li = $( '#'+file.id ),
+	            $error = $li.find('div.error');
+
+	        // 避免重复创建
+	        if ( !$error.length ) {
+	            $error = $('<div class="error"></div>').appendTo( $li );
+	        }
+
+	        $error.text('上传失败');
+	    });
+	    
+		uploader.on( 'all', function( type ) {
+			if ( type === 'startUpload' ) {
+				state = 'uploading';
+			} else if ( type === 'stopUpload' ) {
+				state = 'paused';
+			} else if ( type === 'uploadFinished' ) {
+				state = 'done';
+			}
+
+			if ( state === 'uploading' ) {
+				$btn.text('暂停上传');
+			} else {
+				$btn.text('开始上传');
+			}
+		});
+
+		$btn.on( 'click', function() {
+			if ( state === 'uploading' ) {
+				uploader.stop();
+			} else {
+				uploader.upload();
+			}
+		});
+		
+		// 完成上传完了，成功或者失败，先删除进度条。
+	    uploader.on( 'uploadComplete', function( file ) {
+	        $( '#'+file.id ).find('.progress').remove();
+	    });
+		
+	    uploader.on("error", function (type) {
+	    	if(file.name=='测试用图片.jpg'){
+				AsDebug.alert("警告","上传出错！");
+			}
+	        if (type == "Q_TYPE_DENIED") {
+	        	AsDebug.alert("警告","请上传" + "<%=QuartzPropertiesUtil.get("fileType") %>".toUpperCase() + "格式文件");
+	        } else if (type == "Q_EXCEED_SIZE_LIMIT") {
+	        	AsDebug.alert("警告","文件大小不能超过<%=QuartzPropertiesUtil.get("fileSingleSizeL imit") %>M");
+	        }else {
+	            AsDebug.alert("警告","上传出错！请检查后重新上传！错误代码"+type);
+	        }
+
+	    });
+
+	    uploader.on( 'fileDequeued', function( file ) {
+	        //removeFile( file );
+	    });
+	    
+	    function removeFile( file ) {
+	        var $li = $('#'+file.id);
+	    	if(file["attribute_id"]) {
+	    		var result = AsControl.RunJsp("/Tenwa/Comm/DocList/DeleteDocFile.jsp", "AttributeId=" + file["attribute_id"]);
+	    		if(result == "FAILED") {
+		            $error = $li.find('div.error');
+
+		        // 避免重复创建
+		        if ( !$error.length ) {
+		            $error = $('<div class="error"></div>').appendTo( $li );
+		        }
+
+		        $error.text('删除失败');
+	    		return;
+	    		}
+	    	}
+	    	uploader.removeFile(file);
+	        delete percentages[ file.id ];
+	        
+	        var flag = false;
+	        for(var p in percentages) {
+	        	flag = true;
+	        	break;
+	        }
+	        
+	        if(!flag) {
+	        	$(".memo").show();
+	        }
+	        $li.off().find('.file-panel').off().end().remove();
+	    }
+	});
+</script>
+</body>
+</html>
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/Ample/Doc/DocListUploadNew.jsp b/WebContent/Ample/Doc/DocListUploadNew.jsp
new file mode 100644
index 000000000..e7274dbb3
--- /dev/null
+++ b/WebContent/Ample/Doc/DocListUploadNew.jsp
@@ -0,0 +1,90 @@
+<%@page import="java.io.File"
+%><%@page import="org.apache.commons.io.FileUtils"
+%><%@page import="com.amarsoft.are.jbo.BizObject"
+%><%@page import="com.amarsoft.are.jbo.BizObjectManager"
+%><%@page import="com.amarsoft.are.jbo.JBOFactory"
+%><%@page import="org.apache.commons.fileupload.FileItem"
+%><%@page import="org.apache.commons.fileupload.servlet.ServletFileUpload"
+%><%@page import="org.apache.commons.fileupload.disk.DiskFileItemFactory"
+%>
+<%@ page import="com.amarsoft.are.jbo.JBOException" %>
+<%@ page import="java.util.regex.Pattern" %>
+<%@ page import="java.util.regex.Matcher" %>
+<%@ page contentType="text/html; charset=GBK"
+%><%@ include file="/IncludeBeginMDAJAX.jsp"%><%
+
+		//1.创建DiskFileItemFactory对象，配置缓存用
+		DiskFileItemFactory diskFileItemFactory = new DiskFileItemFactory();
+		
+		// 2. 创建 ServletFileUpload对象
+		ServletFileUpload servletFileUpload = new ServletFileUpload(diskFileItemFactory);
+		
+		// 3. 设置文件名称编码
+		servletFileUpload.setHeaderEncoding("utf-8");
+		
+		List<FileItem> items = servletFileUpload.parseRequest(request);
+
+		String inputTime = StringFunction.getTodayNow(); //附件编号上传时间
+
+		InputStream is = null;
+		//当一次传多个图片时，会多次执行这个页面，下面for循环，只是将参数读取出来，将普通数据封装为map，然后将map传给写入数据库的方法。
+		Map<String,String> params = new HashMap<>();
+        for (FileItem fileItem : items) {
+            if (fileItem.isFormField()) { // >> 普通数据
+                String fieldValue = fileItem.getString("utf-8");
+                String fieldName = fileItem.getFieldName();
+				params.put(fieldName,fieldValue);
+                ARE.getLog().info(fieldName + ": " + fieldValue);
+            } else {
+                //获取文件的实际内容
+                is = fileItem.getInputStream();
+            }
+        }
+
+		//找出配置的存储路径
+		String sFileSavePath = CurConfig.getConfigure("FileSavePath");
+
+		String uuid = java.util.UUID.randomUUID().toString().replaceAll("-", "");
+		String sFullPath = com.tenwa.officetempalte.util.FileOperatorUtil.getuploadFileDir(sFileSavePath) + uuid + "_" + params.get("name");
+		params.put("filePath",sFullPath);
+		params.put("inputTime",inputTime);
+		params.put("inputUserId",CurUser.getUserID());
+
+		try{
+			if(Integer.parseInt(params.get("size")) <= 0){
+				throw new Exception("上传文件失败,请联系管理员!");
+			}
+			//保存实体文件
+			FileUtils.copyInputStreamToFile(is, new File(sFullPath));
+			//保存文件信息
+			fileInfoSave(params,Sqlca);
+			Sqlca.commit();
+		}catch (Exception e){
+			e.printStackTrace();
+			Sqlca.rollback();
+			out.print("FAILED");
+		}
+
+%>
+<%!
+	public void fileInfoSave(Map<String,String> params,Transaction Sqlca) throws JBOException {
+		if(params.size()>0){
+			BizObjectManager frfBom = JBOFactory.getBizObjectManager("jbo.oti.FC_REQUEST_FILE",Sqlca);
+			BizObject frfBo = frfBom.newObject();
+			frfBo.setAttributeValue("FC_REQUEST_ID",params.get("fcQueuestId"));
+			frfBo.setAttributeValue("FC_FLOW_TYPE",params.get("fcFlowType"));
+			frfBo.setAttributeValue("FC_FILE_CODE",params.get("fcFileCode"));
+			frfBo.setAttributeValue("FC_FILE_TYPE",params.get("type"));
+			frfBo.setAttributeValue("FILE_NAME",params.get("name"));
+			frfBo.setAttributeValue("FILE_PATH",params.get("filePath"));
+			frfBo.setAttributeValue("FC_FILE_STS","");
+			frfBo.setAttributeValue("CREATE_TIME",params.get("inputTime"));
+			frfBo.setAttributeValue("UPDATE_TIME",params.get("inputTime"));
+			frfBo.setAttributeValue("DEL_FLAG","0");
+			frfBo.setAttributeValue("INPUTTIME",params.get("inputTime"));
+			frfBo.setAttributeValue("INPUTUSER",params.get("inputUserId"));
+			frfBom.saveObject(frfBo);
+		}
+	}
+%>
+<%@ include file="/IncludeEndAJAX.jsp"%>
\ No newline at end of file
diff --git a/WebContent/Ample/Doc/showImage.jsp b/WebContent/Ample/Doc/showImage.jsp
new file mode 100644
index 000000000..5067e5424
--- /dev/null
+++ b/WebContent/Ample/Doc/showImage.jsp
@@ -0,0 +1,114 @@
+<%@ page contentType="text/html; charset=GBK"%>
+<%@page import="com.amarsoft.awe.res.JspfText"%>
+<%@ page import="com.tenwa.doc.action.DocListInitAction" %>
+<%@include file="/Frame/page/jspf/include/jsp_runtime_context.jspf"
+%><%@page import="com.amarsoft.web.dw.*"%><%@include file="/Frame/page/jspf/include/jsp_sqlca_head.jspf"
+%><html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=GBK">
+<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7">
+<%@include file="/Frame/page/jspf/include/jsp_head_res.jspf"%>
+<link rel="stylesheet" href="<%=sWebRootPath%>/Frame/page/resources/css/Style.css">
+<script type="text/javascript" src="<%=sWebRootPath%>/Frame/resources/js/checkdatavalidity.js"> </script>
+<script type="text/javascript" src="<%=sWebRootPath%>/Frame/resources/js/as_autoScan.js"> </script>
+<script type="text/javascript" src="<%=sWebRootPath%>/Frame/resources/js/chart/json2.js"></script>
+<script type="text/javascript" src="<%=sWebRootPath%>/Frame/resources/js/as_formatdoc.js"></script>
+<script type="text/javascript" src="<%=sWebRootPath%>/Frame/page/js/xls.js"> </script>
+<script type="text/javascript" src="<%=sWebRootPath%>/Frame/page/js/as_webcalendar.js"></script>
+<script type="text/javascript" src="<%=sWebRootPath%>/Frame/page/js/as_treeview.js"> </script>
+<script type="text/javascript" src="<%=sWebRootPath%>/Frame/page/js/widget/htmltree.js"></script>
+<script type="text/javascript" src="<%=sWebRootPath%>/Frame/page/js/common.js"> </script>
+<script type="text/javascript" src="<%=sWebRootPath%>/Frame/page/js/htmlcontrol.js"> </script>
+<script type="text/javascript" src="<%=sWebRootPath%>/Frame/page/js/message.js"> </script>
+<script type="text/javascript" src="<%=sWebRootPath%>/Frame/page/js/dw/as_dz.js"> </script>
+<script type="text/javascript" src="<%=sWebRootPath%>/Frame/page/js/dw/as_dz_page.js"> </script>
+<script type="text/javascript" src="<%=sWebRootPath%>/Frame/page/js/dw/as_dz_middle.js"> </script>
+<script type="text/javascript" src="<%=sWebRootPath%>/Frame/page/js/as_contextmenu.js"></script>
+<script type="text/javascript" src="<%=sWebRootPath%>/Frame/resources/js/dialog/dialog-min.js"></script>
+<script type="text/javascript" >
+var AsOne = {SetDefault:function(sURL) {document.write("<iframe name=myform999 src='"+sURL+"' frameborder=0 width=1 height=1 style='display:none'> </iframe>");},AsInit:function() {} };
+top.status="<%=LanguageManager.getSystemLanguage(CurUser.getLanguage(), JspfText.Organization)%>：<%=CurUser.getOrgID()%>-<%=CurUser.getOrgName()%>  <%=LanguageManager.getSystemLanguage(CurUser.getLanguage(), JspfText.User)%>：<%=CurUser.getUserID()%>-<%=CurUser.getUserName()%> ";
+</script>
+</head>
+<%
+	String compClientID = request.getParameter("CompClientID");
+	String attrid = CurPage.getParameter("attrid");
+	String className = CurPage.getParameter("className");
+	String flowunid = CurPage.getParameter("flowunid");
+	String projectid = CurPage.getParameter("projectid");
+	String docClassItemno = CurPage.getParameter("docClassItemno");
+	String objecttype = CurPage.getParameter("objecttype");
+	List<String> Imagelist = new ArrayList();
+	if(flowunid!=null&&Imagelist.size()==0){
+		 Imagelist=DocListInitAction.nextImagebyFlowunid(flowunid,docClassItemno,objecttype);
+	}
+// 	if(projectid!=null&&Imagelist.size()==0){
+// 		 Imagelist=DocListInitAction.nextImagebyProjectId(projectid,docClassItemno,objecttype);
+// 	}
+	int imageattridv = 0;
+	int index = 0;
+%>
+<body style="overflow:hidden;">
+<link rel="stylesheet" href="<%=sWebRootPath%>/js/viewpicture/cssv/viewer.min.css">
+<style>
+* { margin: 0; padding: 0;}
+#jq22 { width: 100%; margin: 0 auto; font-size: 0;}
+#jq22 li { display: inline-block; width: 32%; margin-left: 1%; padding-top: 1%;}
+#jq22 li img { width: 100%;}
+</style>
+<div style="overflow:scroll;width:100%;" >
+    <ul id="jq22">
+        <%
+        if(Imagelist.size()>0){
+        	for(String imageattrid:Imagelist){
+        		imageattridv++;
+        		if(imageattrid.equals(attrid)){
+        			index=imageattridv;
+        		}
+        %>
+		<%%>
+     	<l=i><img style="display:none"  data-original="<%=sWebRootPath%>/servlet/view/image/public?CompClientID=<%=compClientID%>&attrid=<%=imageattrid %>&className=<%=className%>" src="<%=sWebRootPath%>/servlet/view/image/public?CompClientID=<%=compClientID%>&attrid=<%=imageattrid %>&className=<%=className%>" /></li>
+		<% 		
+			}
+        }else{
+        	index=1;
+		%>
+		<li><img style="display:none"  data-original="<%=sWebRootPath%>/servlet/view/image/public?CompClientID=<%=compClientID%>&attrid=<%=attrid %>&className=<%=className%>" src="<%=sWebRootPath%>/servlet/view/image/public?CompCle%>" /></li>
+		<%
+        }
+		%>
+	</ul>
+</div>
+</body>
+
+<script src="<%=sWebRootPath%>/js/viewpicture/js/jquery.min.js"></script>
+<script src="<%=sWebRootPath%>/js/viewpicture/js/viewer-jquery.min.js"></script>
+<script src="<%=sWebRootPath%>/js/viewpicture/jsv/viewer.min.js"></script>
+<script type="text/javascript">
+var curWindowWidth=$(document).width();
+$(function() {
+		viewer = new Viewer(document.getElementById('jq22'), {
+			url: 'data-original',
+			navbar:true,
+			inline:false,
+ 			keyboard:false,
+			button:false,
+			title:false,
+			zoomRatio:0.4
+			
+		});
+    	var res = viewer.show();
+		if(res.element){
+		setTimeout("clickImage()",600);
+		}
+});
+
+function clickImage(){
+	if('<%=index-1%>'!='0'){
+		$(".viewer-list").find("li").eq(<%=index-1%>).attr('class',''); 
+		$(".viewer-list").find("li").eq(<%=index-1%>).find('img').click();
+	}
+}
+
+</script>
+<%@ include file="/IncludeEnd.jsp"%>
\ No newline at end of file
diff --git a/WebContent/Ample/Doc/showPDF.jsp b/WebContent/Ample/Doc/showPDF.jsp
new file mode 100644
index 000000000..1981da12d
--- /dev/null
+++ b/WebContent/Ample/Doc/showPDF.jsp
@@ -0,0 +1,11 @@
+<%@page import="com.tenwa.doc.action.WordAction"%>
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_info.jspf"%>
+<%
+    
+	String filePath=CurPage.getAttribute("filePath");//
+	String compClientID = request.getParameter("CompClientID");
+	filePath = java.net.URLEncoder.encode(filePath,"UTF-8");
+%>
+<iframe src="<%=sWebRootPath%>/servlet/view/topathpdf?CompClientID=<%=compClientID%>&filePath=<%=filePath%>" width="100%" height="800"></iframe>
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/Apzl/productCorpus/LbCorpusSourceList.jsp b/WebContent/Tenwa/Apzl/productCorpus/LbCorpusSourceList.jsp
deleted file mode 100644
index e55d1bfe4..000000000
--- a/WebContent/Tenwa/Apzl/productCorpus/LbCorpusSourceList.jsp
+++ /dev/null
@@ -1,62 +0,0 @@
-<%@page import="com.amarsoft.app.base.util.ObjectWindowHelper"%>
-<%@page import="com.amarsoft.app.base.businessobject.*"%>
-<%@ page contentType="text/html; charset=GBK"%>
-<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><%	
-	/*
-        本金资源顺序列表
-    */
-	String productId= CurPage.getParameter("productId");
-	ASObjectModel doTemp = new ASObjectModel("LB_PRODUCT_CORPUS_SOURCE");
-	ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
-
-	dwTemp.Style="1";      	     //--设置为Grid风格--
-	dwTemp.ReadOnly = "1";	 //只读模式
-	dwTemp.setPageSize(10);
-	dwTemp.genHTMLObjectWindow(productId);
-
-	//0、是否展示 1、	权限控制  2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码	6、	7、	8、	9、图标，CSS层叠样式 10、风格
-	String sButtons[][] = {
-		{"true","All","Button","新增","新增","newRecord();","","","","btn_icon_add",""},
-			{"true","","Button","保存","保存","save()","","","","",""},
-		{"true","","Button","删除","删除","if(confirm('确实要删除吗?'))as_delete(0)","","","","btn_icon_delete",""},
-	};
-%><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
-<script type="text/javascript">
-	function newRecord(){
-		var position= getRowCount(0);
-		as_add(0);
-		tableDatas['myiframe0'][position][0]='<%=productId%>';
-	}
-	function save(){
-		if(checkAll()=='s'){
-			as_save(0);
-			self.location.reload();
-		}
-	}
-	function checkAll(){
-		//双循环来遍历查重
-		for(var i=0;i<getRowCount(0);i++){
-			for(var j = i+1; j < getRowCount(0); j++){
-				var orderList = getItemValue(0,i,'ORDER_LIST');
-				var corpusSource = getItemValue(0,i,'CORPUS_SOURCE');
-				var orderListLast = getItemValue(0,j,'ORDER_LIST');
-				var corpusSourceLast = getItemValue(0,j,'CORPUS_SOURCE');
-				if(i==0){
-					if(orderList==null||orderList==''||corpusSource==null||corpusSourceLast==''||orderListLast==null||orderListLast==''||corpusSourceLast==null||corpusSourceLast==''){
-						alert('资金来源或排序号不能为空');
-						return;
-					}
-				}
-				if(orderList==orderListLast){
-					alert('排序号不可以重复');
-					return;
-				}else if(corpusSource==corpusSourceLast){
-					alert('资金来源不可以重复');
-					return;
-				}
-			}
-		}
-		return 's';
-	}
-</script>
-<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/Apzl/productCorpus/LbProductCorpusSourceList.jsp b/WebContent/Tenwa/Apzl/productCorpus/LbProductCorpusSourceList.jsp
deleted file mode 100644
index b1f5d8117..000000000
--- a/WebContent/Tenwa/Apzl/productCorpus/LbProductCorpusSourceList.jsp
+++ /dev/null
@@ -1,78 +0,0 @@
-<%@ page contentType="text/html; charset=GBK"%>
-<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><%	
-
-/*
-	产品配置资金来源顺序主页面
- */
-	ASObjectModel doTemp = new ASObjectModel("VI_PRODUCT_CORPUS_SOURCE");
-	ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
-//	dwTemp.Style="1";      	     //--设置为Grid风格--
-	dwTemp.ReadOnly = "1";	 //只读模式
-	dwTemp.setPageSize(10);
-	dwTemp.genHTMLObjectWindow("");
-
-	//0、是否展示 1、	权限控制  2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码	6、	7、	8、	9、图标，CSS层叠样式 10、风格
-	String sButtons[][] = {
-		{"true","All","Button","新增","新增","newRecord()","","","","btn_icon_add",""},
-		{"true","","Button","编辑","编辑","viewAndEdit()","","","","btn_icon_detail",""},
-		{"true","","Button","删除","删除","deleteProduct()","","","","btn_icon_delete",""},
-	};
-%><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
-<script type="text/javascript">
-	function newRecord(){
-		var productId='';
-		AsDialog.OpenSelector("selectProductList","","dialogWidth=" + parseInt(window.screen.width * 0.6) + "px dialogHeight=" + parseInt(window.screen.height * 0.6) + "px",
-				function(sReturn){
-					if(!sReturn||sReturn=="_CANCEL_"||sReturn=="")
-					{
-						//alert(getHtmlMessage('1'));//请选择一条信息！
-						return;
-					}
-					sReturn = sReturn.split("@");
-					productId = sReturn[0];
-
-					var sUrl = "/Tenwa/Apzl/productCorpus/LbProductCorpusUpDown.jsp";
-					AsDialog.PopView(sUrl,'productId='+productId,'dialogWidth=950px;dialogHeight=500px;resizable=no;scrollbars=no;status:yes;maximize:no;help:no;',function(){reloadSelf();},'新建');
-				},"请选择产品",'');
-		//将返回的产品ID传输到编辑的info页面，info页面只是展示作用，然后list页面新增的时候再保存。
-		//编辑按钮不采用在后面添加超连接形式，曾经有的页面采用这种方式数据量大时特别卡。采用系统封装按钮事件来实现。
-
-	}
-	function viewAndEdit(){
-		var sUrl = "/Tenwa/Apzl/productCorpus/LbProductCorpusUpDown.jsp";
-		 var sPara = getItemValue(0,getRow(0),'PRODUCT_ID');
-		 if(typeof(sPara)=="undefined" || sPara.length==0 ){
-			alert("参数不能为空！");
-			return ;
-		 }
-		AsDialog.PopView(sUrl,'productId=' +sPara ,'dialogWidth=950px;dialogHeight=500px;resizable=no;scrollbars=no;status:yes;maximize:no;help:no;',function(){reloadSelf();},'编辑');
-	}
-	/*function afterSearch(){
-		for(var i=0;i<getRowCount(0);i++){
-			if(getObj(0,i,"action")!=null){
-				getObj(0,i,"action").innerHTML='<a class="box" style="text-align:center;" onclick="edit(\''+getItemValue(0,i,"PRODUCT_ID")+'\')" style={color:#000;text-decoration:underline;}><font color="blue">&nbsp&nbsp&nbsp&nbsp&nbsp编辑</font></ a>';
-			}
-		};
-	}
-	function edit(productId){
-		var sUrl="/Tenwa/Apzl/productCar/LmProductUpAndDown.jsp";
-		var sPara = "productId="+productId;
-		AsDialog.PopView(sUrl,sPara,"dialogWidth=950px;dialogHeight=500px;resizable=no;scrollbars=no;status:yes;maximize:no;help:no;",function(){reloadSelf();},"配置车辆");
-	}*/
-	function deleteProduct(){
-		var sPara ='productId='+ getItemValue(0,getRow(0),'PRODUCT_ID');
-		var sResult = AsControl.RunJsp('/Tenwa/Apzl/productCorpus/deleteProductCorpus.jsp',sPara);
-		alert(sResult);
-		parent.reloadSelf();
-	}
-
-	/*
-	function mySelectRow(){
-		 var TYPENO = getItemValue(0,getRow(0),"TYPENO");
-		 parent.OpenInfo(TYPENO);
-		 //list 页面同步info页面的联动传至单击事件
-	}
-		*/
-
-</script>
-<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/Apzl/productCorpus/LbProductCorpusUpDown.jsp b/WebContent/Tenwa/Apzl/productCorpus/LbProductCorpusUpDown.jsp
deleted file mode 100644
index 36534915c..000000000
--- a/WebContent/Tenwa/Apzl/productCorpus/LbProductCorpusUpDown.jsp
+++ /dev/null
@@ -1,20 +0,0 @@
-<%@ page contentType="text/html; charset=GBK"%><%@
- include file="/IncludeBegin.jsp"%><%
-/*
-	页面说明: 示例上下联动框架页面
- */
- String productId = CurPage.getParameter("productId");
-%><%@include file="/Resources/CodeParts/Frame02.jsp"%>
-<script type="text/javascript">
-	mytoptd.height=100;
-    OpenInfo();
-	OpenList();
-	function OpenInfo(){
-		AsControl.OpenView("/Tenwa/Apzl/productCorpus/LbProductInfo.jsp","productId=<%=productId%>","rightup");
-	}
-
-	function OpenList(){
-		AsControl.OpenView("/Tenwa/Apzl/productCorpus/LbCorpusSourceList.jsp","productId=<%=productId%>", "rightdown");
-	}
-</script>
-<%@ include file="/IncludeEnd.jsp"%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/Apzl/productCorpus/LbProductInfo.jsp b/WebContent/Tenwa/Apzl/productCorpus/LbProductInfo.jsp
deleted file mode 100644
index 5fa4daa05..000000000
--- a/WebContent/Tenwa/Apzl/productCorpus/LbProductInfo.jsp
+++ /dev/null
@@ -1,26 +0,0 @@
-<%@ page contentType="text/html; charset=GBK"%>
-<%@ include file="/Frame/resources/include/include_begin_info.jspf"%><%
-	/*
-        产品简介
-    */
-	String productId = CurPage.getParameter("productId");
-	String sTempletNo = "LbProductInfo";//--模板号--
-	ASObjectModel doTemp = new ASObjectModel(sTempletNo);
-	ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request);
-	dwTemp.Style = "2";//freeform
-	dwTemp.ReadOnly = "-2";//只读模式
-	dwTemp.genHTMLObjectWindow(productId);
-	
-	String sButtons[][] = {
-		//{"true","All","Button","保存","保存所有修改","save()","","","",""},
-		//{"true","All","Button","返回","返回列表","returnList()","","","",""}
-	};
-	sButtonPosition = "south";
-%><%@ include file="/Frame/resources/include/ui/include_info.jspf"%>
-<script type="text/javascript">
-	/* function save(){
-		as_save("myiframe0","returnList()");
-	} */
-
-</script>
-<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/Apzl/productCorpus/deleteProductCorpus.jsp b/WebContent/Tenwa/Apzl/productCorpus/deleteProductCorpus.jsp
deleted file mode 100644
index bc71928ad..000000000
--- a/WebContent/Tenwa/Apzl/productCorpus/deleteProductCorpus.jsp
+++ /dev/null
@@ -1,20 +0,0 @@
-
-<%@page import="com.amarsoft.are.jbo.JBOTransaction"%>
-<%@page import="com.amarsoft.are.jbo.JBOFactory"%>
-<%@ page contentType="text/html; charset=GBK"%>
-<%@ include file="/IncludeBeginMDAJAX.jsp"%><%
-	String sResult = "";
-	String productId = CurPage.getParameter("productId");
-	int count = JBOFactory.createBizObjectQuery("jbo.prd.LB_PRODUCT_CORPUS_SOURCE", "select 1 from O where PRODUCT_ID=:productId").setParameter("productId", productId).getTotalCount();
-	int count_d = JBOFactory.createBizObjectQuery("jbo.prd.LB_PRODUCT_CORPUS_SOURCE", "delete from O where PRODUCT_ID=:productId").setParameter("productId", productId).executeUpdate();
-	if(count==count_d){
-		sResult="删除成功";
-	}else if(count_d==0){
-		sResult="删除失败";
-	}else if(count>count_d&&count_d>0){
-		sResult="部分删除，请记录当前产品ID或产品名称，并联系系统管理员";
-	}else{
-		sResult="未知错误，请记录当前产品ID或产品名称，并联系系统管理员";
-	}
-	out.println(sResult);
-%><%@ include file="/IncludeEndAJAX.jsp"%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/Lease/Flow/Contract/ContractApproval/ContractApprovalApplyList.jsp b/WebContent/Tenwa/Lease/Flow/Contract/ContractApproval/ContractApprovalApplyList.jsp
index 07ced7196..d2ef15c33 100644
--- a/WebContent/Tenwa/Lease/Flow/Contract/ContractApproval/ContractApprovalApplyList.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Contract/ContractApproval/ContractApprovalApplyList.jsp
@@ -64,7 +64,20 @@
 			var signType = sReturn[9];
 			var sealType = sReturn[10];
 			var channel = sReturn[13];
-			
+			//todo 通过projectid先看corpus_source字段是否是带有外资方的项目，如果时则去查找资方返回的对应的状态，
+            // 如果通过则可以发起，如果暂时没有结果，则提示；如果审批失败，则按顺序转换资金方，然后重新发起业务申请后的另外一个资方的调用接口；
+            // 如果都失败，最终转换为自有资金，将corpus_source字段设为AP(代码已给张磊，在接口平台实现此功能);
+            var checkParam = 'project_id='+project_id;
+            var checkResult = RunJavaMethod('com.ap.CorpusSourceCheck','corpusApplyCheck',checkParam);
+            if(checkResult=='F'){
+                alert('资金方尚未审批结束，请稍后再试');
+                return;
+            }else if(checkResult!='S'){
+                alert(checkResult);
+                return;
+            }
+
+
 			if(flowno=="BContractApproveApply"&&"03" == customertype){
 				if(""== signType||null == signType||"undefined" == signType){
 					alert("请在产品中配置签约方式！！！");
diff --git a/WebContent/WEB-INF/etc/jbo/jbo_oti.xml b/WebContent/WEB-INF/etc/jbo/jbo_oti.xml
index 2f96ea48a..13e16b05b 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_oti.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_oti.xml
@@ -301,5 +301,60 @@
                 </managerProperties>
             </manager>	  	
 		</class>
+		<class name="FC_REQUEST" label="接口状态表" describe="邮储/九江申请状态页面" keyAttributes="ID">
+			<attributes>
+				<attribute name="ID"    label="唯一标识"     type="STRING" length="32" />
+				<attribute name="FC_LOAN_QUEUEST_ID"    label="资金渠道申请ID"    type="STRING" length="32"/>
+				<attribute name="CHANNEL_NO"    label="资金渠道编号"    type="STRING" length="32"/>
+				<attribute name="CHANNEL_NAME"    label="资金渠道名称"    type="STRING" length="32"/>
+				<attribute name="PROJECT_ID"    label="项目ID"    type="STRING" length="32"/>
+				<attribute name="PROJECT_NO"    label="项目编号"    type="STRING" length="32"/>
+				<attribute name="CONTRACT_ID"    label="合同ID"    type="STRING" length="32"/>
+				<attribute name="CONTRACT_NO"    label="合同编号"    type="STRING" length="32"/>
+				<attribute name="PRODUCT_ID"    label="产品ID"    type="STRING" length="32"/>
+				<attribute name="PRODUCT_NAME"    label="产品名称"    type="STRING" length="32"/>
+				<attribute name="DISTRIBUTOR_ID"    label="资经销商ID"    type="STRING" length="32"/>
+				<attribute name="DISTRIBUTOR_NAME"    label="经销商名称"    type="STRING" length="32"/>
+				<attribute name="CUSTOMER_ID"    label="客户ID"    type="STRING" length="32"/>
+				<attribute name="CUSTOMER_NAME"    label="客户名称"    type="STRING" length="32"/>
+				<attribute name="FC_STATUS"    label="当前状态"    type="STRING" length="32"/>
+				<attribute name="FC_REMARK"    label="返回状态描述"    type="STRING" length="32"/>
+				<attribute name="CREATE_TIME"    label="创建时间"    type="STRING" length="32"/>
+				<attribute name="UPDATE_TIME"    label="修改时间"    type="STRING" length="32"/>
+				<attribute name="DEL_FLAG"    label="有效标志"    type="STRING" length="32"/>
+			</attributes>
+			<manager>
+				<managerProperties>
+					<property name="table" value="FC_REQUEST"/>
+					<property name="createKey" value="true" />
+				</managerProperties>
+			</manager>
+		</class>
+		<class name="FC_REQUEST_FILE" label="接口资料表" describe="邮储/九江资料页面" keyAttributes="ID">
+			<attributes>
+				<attribute name="ID"    label="唯一标识"     type="STRING" length="32" />
+				<attribute name="FC_REQUEST_ID"    label="资金渠道申请ID"    type="STRING" length="32"/>
+				<attribute name="FC_FLOW_TYPE"    label="流程类型"    type="STRING" length="32"/>
+				<attribute name="FC_FLOW_TYPE_NAME"    label="流程类型名称"    type="STRING" length="32"/>
+				<attribute name="FC_FILE_CODE"    label="资方：文件编号"    type="STRING" length="32"/>
+				<attribute name="FC_FILE_CODE_NAME"    label="资方：文件编号名称"    type="STRING" length="32"/>
+				<attribute name="FC_FILE_TYPE"    label="资方：文件类型：JPG,PNG,FDP等"    type="STRING" length="32"/>
+				<attribute name="FILE_NAME"    label="文件名称"    type="STRING" length="32"/>
+				<attribute name="FILE_PATH"    label="文件路径"    type="STRING" length="32"/>
+				<attribute name="FC_FILE_STS"    label="文件状态"    type="STRING" length="32"/>
+				<attribute name="FC_FILE_STS_DESC"    label="文件状态描述"    type="STRING" length="32"/>
+				<attribute name="CREATE_TIME"    label="创建时间"    type="STRING" length="32"/>
+				<attribute name="UPDATE_TIME"    label="修改时间"    type="STRING" length="32"/>
+				<attribute name="DEL_FLAG"    label="有效标志"    type="STRING" length="32"/>
+				<attribute name="INPUTTIME"    label="上传时间"    type="STRING" length="32"/>
+				<attribute name="INPUTUSER"    label="上传人"    type="STRING" length="32"/>
+			</attributes>
+			<manager>
+				<managerProperties>
+					<property name="table" value="fc_request_file"/>
+					<property name="createKey" value="true" />
+				</managerProperties>
+			</manager>
+		</class>
 	</package>
 </jbo>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml
index 56097b694..34e2f133a 100644
--- a/WebContent/WEB-INF/web.xml
+++ b/WebContent/WEB-INF/web.xml
@@ -210,6 +210,14 @@
 		<servlet-name>ShowImageServlet</servlet-name>
 		<servlet-class>com.tenwa.doc.servlet.ShowImageServlet</servlet-class>
 	</servlet>
+	<servlet>
+		<servlet-name>PublicShowImageServlet</servlet-name>
+		<servlet-class>com.ample.fundchannel.doc.servlet.PublicShowImageServlet</servlet-class>
+	</servlet>
+	<servlet>
+		<servlet-name>DocDownloadServletByPath</servlet-name>
+		<servlet-class>com.ample.fundchannel.doc.servlet.DocDownloadServletByPath</servlet-class>
+	</servlet>
 	<servlet>
 		<servlet-name>ShowPDFServlet</servlet-name>
 		<servlet-class>com.tenwa.doc.servlet.ShowPDFServlet</servlet-class>
@@ -314,6 +322,14 @@
 		<servlet-name>ShowImageServlet</servlet-name>
 		<url-pattern>/servlet/view/image</url-pattern>
 	</servlet-mapping>
+	<servlet-mapping>
+		<servlet-name>PublicShowImageServlet</servlet-name>
+		<url-pattern>/servlet/view/image/public</url-pattern>
+	</servlet-mapping>
+	<servlet-mapping>
+		<servlet-name>DocDownloadServletByPath</servlet-name>
+		<url-pattern>/servlet/view/docDownloadServletByPath</url-pattern>
+	</servlet-mapping>
 	<servlet-mapping>
 		<servlet-name>ShowPDFServlet</servlet-name>
 		<url-pattern>/servlet/view/pdf</url-pattern>
diff --git a/WebContent/com/tenwa/apzl/CorpusSource/FcRequestDocTab.jsp b/WebContent/com/tenwa/apzl/CorpusSource/FcRequestDocTab.jsp
new file mode 100644
index 000000000..355eea51c
--- /dev/null
+++ b/WebContent/com/tenwa/apzl/CorpusSource/FcRequestDocTab.jsp
@@ -0,0 +1,33 @@
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/IncludeBegin.jsp"%>
+<%
+	String fcLoanQueuestId = CurPage.getParameter("fcLoanQueuestId");
+	String channelNo=CurPage.getParameter("channelNo");
+	String projectId=CurPage.getParameter("projectId");
+	String contractId=CurPage.getParameter("contractId");
+	String params="fcLoanQueuestId="+fcLoanQueuestId+"&channelNo="+channelNo+"&projectId="+projectId+"&contractId="+contractId;
+	//动态实现固定总数页面
+	String buttonFlagBAF = "false";
+	String buttonFlagFPCF = "false";
+	if(1==1){
+		buttonFlagBAF="true";
+		buttonFlagFPCF = "true";
+	}
+	//参数：0.是否显示, 1.标题，2.URL，3，参数串, 4. Strip高度(默认600px)，5. 是否有关闭按钮(默认无) 6. 是否缓存(默认是)
+
+	//动态实现多个页面
+	/*List<String[]> tabStrip = new ArrayList<String[]>();
+	for(int i=0;i<3;i++){
+		String tabName = "";
+		String url = "/com/tenwa/apzl/CorpusSource/FcRequestFileList.jsp";
+		String param = params+"&fcFlowType=BusinessApplyFlow";
+		tabStrip.add(new String[]{"true", tabName, url,param, "", "", "false"});
+	}
+	String sTabStrip[][] = tabStrip.toArray(new String[0][]);*/
+	String sTabStrip[][] = {
+		{buttonFlagBAF, "业务申请资料", "/com/tenwa/apzl/CorpusSource/FcRequestFileList.jsp",params+"&fcFlowType=BusinessApplyFlow", "", "", "false"},
+		{buttonFlagFPCF, "放款申请资料", "/com/tenwa/apzl/CorpusSource/FcRequestFileList.jsp",params+"&fcFlowType=FundPaymentCarFlow", "", "", "false"},
+	};
+%>
+<%@ include file="/Resources/CodeParts/Tab01.jsp"%>
+<%@ include file="/IncludeEnd.jsp"%>
\ No newline at end of file
diff --git a/WebContent/com/tenwa/apzl/CorpusSource/FcRequestFileList.jsp b/WebContent/com/tenwa/apzl/CorpusSource/FcRequestFileList.jsp
new file mode 100644
index 000000000..6f30af6fe
--- /dev/null
+++ b/WebContent/com/tenwa/apzl/CorpusSource/FcRequestFileList.jsp
@@ -0,0 +1,117 @@
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_simplelist.jspf"%>
+<%@ page import="java.util.List" %>
+<%@ page import="java.util.Map" %>
+<%@ page import="com.amarsoft.app.util.ProductParamUtil" %>
+<%
+	/*
+        Author: undefined 2021-05-31
+        Content: 示例详情页面
+        History Log: 
+    */
+	String productId=CurPage.getParameter("productId");
+	String fcFlowType=CurPage.getParameter("fcFlowType");
+	String fcQueuestId=CurPage.getParameter("fcLoanQueuestId");
+	String isReadOnly = CurPage.getParameter("isReadOnly");
+	String sPrevUrl = CurPage.getParameter("PrevUrl");
+	if(sPrevUrl == null) sPrevUrl = "";
+	String sTempletNo=CurPage.getParameter("TempletNo");
+	if(sTempletNo==null){
+		sTempletNo="FcRequestFileList";
+	}
+	ASObjectModel doTemp = new ASObjectModel(sTempletNo);
+	doTemp.setLockCount(0);
+	ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request);
+	dwTemp.Style = "1";//freeform
+	//dwTemp.ReadOnly = "-2";//只读模式
+	dwTemp.genHTMLObjectWindow(fcFlowType+","+fcQueuestId);
+
+
+
+	String sButtons[][] = {
+		{isReadOnly=="Y"?"true":"false","All","Button","提交","修改完毕，确认提交","updateStatus()","","","",""},
+	//	{String.valueOf(!com.amarsoft.are.lang.StringX.isSpace(sPrevUrl)),"All","Button","返回","返回列表","returnList()","","","",""}
+	};
+	sButtonPosition = "north";
+%><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
+<script type="text/javascript">
+	function returnList(){
+		 AsControl.OpenView("<%=sPrevUrl%>", "","_self","");
+	}
+	function updateStatus(){
+		if(confirm("确认已修改完毕，完成提交？")){
+
+		}
+	}
+	function showPDF(filePath,name){
+		var sUrl="/Ample/Doc/showPDF.jsp";
+		var param="filePath="+filePath;
+		AsControl.OpenPage(sUrl,param,"",name);
+	}
+
+	function showImage(id,name){
+		var sUrl="/Ample/Doc/showImage.jsp";
+		var param="attrid="+id+"&className=jbo.oti.FC_REQUEST_FILE";
+		AsDialog.PopView(sUrl,param,"dialogWidth=1080px;dialogHeight=500px;",function(message){
+
+		},name);
+	}
+
+	function upload(fcFileCode){
+		var param="fcQueuestId=<%=fcQueuestId%>&fcFlowType=<%=fcFlowType%>&fcFileCode="+fcFileCode;
+		var sUrl="/Ample/Doc/DocListInfoNew.jsp";
+		AsDialog.PopView(sUrl,param,"dialogWidth=800px;dialogHeight=500px;resizable=no;scrollbars=no;status:yes;maximize:no;help:no;",function(message){
+
+		},"上传附件");
+		reloadSelf();
+	}
+	function downloadFile(filePath,fileName){
+		debugger;
+		if(!frames["downloadTemplate"]) $("<iframe name='downloadTemplate' style='display:none;'></iframe>").appendTo("body");
+		var src = sWebRootPath+"/servlet/view/docDownloadServletByPath?CompClientID=<%=sCompClientID%>&filePath="+encodeURIComponent(encodeURIComponent(filePath))+"&fileName="+encodeURIComponent(encodeURIComponent(fileName));
+		window.open(src, "downloadTemplate");
+	}
+	function deleteFile(id){
+		var sParams="frfId="+id+",userId=<%=CurUser.getUserID()%>";
+		var sReturnInfo = RunJavaMethodTrans("com.ample.fundchannel.doc.action.DocListAction","deleteFileForFundChannel",sParams);
+		if(sReturnInfo=="error"){
+			alert("删除失败");
+		}
+		reloadSelf();
+	}
+
+	function afterSearch(){
+		var isReadOnly="<%=isReadOnly%>";
+		for(var i=0;i<getRowCount(0);i++){
+			if(getObj(0,i,"operation")!=null&&getObj(0,i,"operation")!="null"){
+				getObj(0,i,"operation").innerHTML='<a class="box"  onclick="upload(\''+getItemValue(0,i,"FC_FILE_CODE")+'\')" style={color:#000;text-decoration:underline;}><font color="blue">上传</font></a>';
+			}
+			var filelist=getObj(0,i,"fileList").innerHTML;
+			var obj=eval('('+filelist+')');
+			var html="";
+			for(var file in obj){
+				html+='<a onclick=downloadFile(\''+obj[file]['filepath']+'\',\''+obj[file]['filename']+'\')><font color="blue">'+obj[file]['filename']+'</font></a>';
+				html+='【上传时间:'+obj[file]['inputtime']+'】';
+				html+='【上传人:'+obj[file]['inputuser']+'】';
+// 			html+='【大小:'+Math.floor(obj[file]['FileSize']/1024*100)/100+'kb】<a class="btn_icon_detail" onclick="editOffice(\''+obj[file]['id']+'\',\''+obj[file]['filename']+'\',\''+sRightType+'\')">&nbsp;</a> ';
+				if(isReadOnly!="Y"){
+					html+='<a class="btn_icon btn_icon_close" onclick="deleteFile(\''+obj[file]['id']+'\');">&nbsp;</a>';
+				}
+				if(obj[file]['image']=="true"){
+					html+='<a class="btn_icon btn_icon_search" onclick="showImage(\''+obj[file]['id']+'\',\''+obj[file]['filename']+'\');">&nbsp;</a>';
+				}
+				/*if(obj[file]['word']=="true"){
+					html+='<a class="btn_icon btn_icon_search" onclick="showWord(\''+obj[file]['id']+'\',\''+obj[file]['filename']+'\');">&nbsp;</a>';
+				}*/
+				if(obj[file]['pdf']=="true"){
+					html+='<a class="btn_icon btn_icon_search" onclick="showPDF(\''+obj[file]['filepath']+'\',\''+obj[file]['filename']+'\');">&nbsp;</a>';
+				}
+				html+='</br>';
+			}
+			getObj(0,i,"fileList").innerHTML=html;
+			getObj(0,i,"fileList").style["white-space"]="pre-wrap";
+
+		}
+	}
+</script>
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/com/tenwa/apzl/CorpusSource/FcRequestLIst.jsp b/WebContent/com/tenwa/apzl/CorpusSource/FcRequestLIst.jsp
new file mode 100644
index 000000000..886192b5b
--- /dev/null
+++ b/WebContent/com/tenwa/apzl/CorpusSource/FcRequestLIst.jsp
@@ -0,0 +1,42 @@
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><%	
+	/*
+        Author: undefined 2021-05-31
+        Content: 
+        History Log: 
+    */
+	ASObjectModel doTemp = new ASObjectModel("FC_REQUEST");
+	ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
+	dwTemp.Style="1";      	     //--设置为Grid风格--
+	dwTemp.ReadOnly = "1";	 //只读模式
+	dwTemp.setPageSize(20);
+	dwTemp.genHTMLObjectWindow("");
+
+	//0、是否展示 1、	权限控制  2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码	6、	7、	8、	9、图标，CSS层叠样式 10、风格
+	String sButtons[][] = {
+	//	{"true","All","Button","新增","新增","newRecord()","","","","btn_icon_add",""},
+	//	{"true","","Button","详情","详情","viewAndEdit()","","","","btn_icon_detail",""},
+	//	{"true","","Button","删除","删除","if(confirm('确实要删除吗?'))as_delete(0,'alert(getRowCount(0))')","","","","btn_icon_delete",""},
+	 	{"true","","Button","补充资料","补充资料","viewAndEdit()","","","","btn_icon_detail",""},
+	};
+%><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
+<script type="text/javascript">
+	function newRecord(){
+		 var sUrl = "";
+		 AsControl.OpenView(sUrl,'','_self','');
+	}
+	function viewAndEdit(){
+		var sUrl = "/com/tenwa/apzl/CorpusSource/FcRequestDocTab.jsp";
+		var fcLoanQueuestId =  getItemValue(0,getRow(0),'FC_LOAN_QUEUEST_ID');
+		var channelNo =  getItemValue(0,getRow(0),'CHANNEL_NO');
+		var projectId =  getItemValue(0,getRow(0),'PROJECT_ID');
+		var contractId =  getItemValue(0,getRow(0),'CONTRACT_ID');
+		var sPara ='fcLoanQueuestId='+fcLoanQueuestId+'&channelNo='+channelNo+ '&projectId='+projectId+'&contractId='+contractId;
+		if(projectId==null || fcLoanQueuestId==null ){
+			alert("参数不能为空！");
+			return ;
+		}
+		AsControl.OpenView(sUrl,sPara ,'_self','');
+	}
+</script>
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/src/com/ap/CorpusSourceCheck.java b/src/com/ap/CorpusSourceCheck.java
new file mode 100644
index 000000000..eeb702fb6
--- /dev/null
+++ b/src/com/ap/CorpusSourceCheck.java
@@ -0,0 +1,98 @@
+package com.ap;
+
+import com.amarsoft.are.ARE;
+import com.amarsoft.are.jbo.BizObject;
+import com.amarsoft.are.jbo.BizObjectManager;
+import com.amarsoft.are.jbo.JBOException;
+import com.amarsoft.are.jbo.JBOFactory;
+import com.amarsoft.awe.util.Transaction;
+import jbo.com.tenwa.entity.comm.message.BT_BUSSINESS_MESSAGE_CONFIG;
+import jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO;
+import jbo.com.tenwa.lease.comm.LB_PROJECT_INFO;
+import jbo.prd.LB_PRODUCT_CORPUS_SOURCE;
+
+import java.util.List;
+
+public class CorpusSourceCheck {
+
+    private String projectId;
+    public void setNextCorpusChannel() throws JBOException {
+        String nextCorpusChannel = getNextCorpusChannel(projectId);
+        BizObjectManager bomLPI = JBOFactory.getBizObjectManager(LB_PROJECT_INFO.CLASS_NAME);
+        BizObject boLPI = bomLPI.createQuery("id=:projectId").setParameter("projectId",projectId).getSingleResult(true);
+        boLPI.setAttributeValue("CORPUS_SOURCE",nextCorpusChannel);
+        bomLPI.saveObject(boLPI);
+        BizObjectManager bomLCI = JBOFactory.getBizObjectManager(LB_CONTRACT_INFO.CLASS_NAME);
+        BizObject boLCI = bomLCI.createQuery("PROJECT_ID=:projectId").setParameter("projectId",projectId).getSingleResult(true);
+        if(boLCI!=null){
+            boLCI.setAttributeValue("CORPUS_SOURCE",nextCorpusChannel);
+            bomLCI.saveObject(boLCI);
+        }
+        ARE.getLog().debug("项目ID："+projectId+"的资金方变更为-->"+nextCorpusChannel);
+
+    }
+    public String getNextCorpusChannel(String projectId) throws JBOException {
+        BizObjectManager bomLPCS = JBOFactory.getBizObjectManager(LB_PRODUCT_CORPUS_SOURCE.CLASS_NAME);
+        BizObjectManager bomLPI = JBOFactory.getBizObjectManager(LB_PROJECT_INFO.CLASS_NAME);
+        BizObject boLPI= bomLPI.createQuery("id=:projectId").setParameter("projectId",projectId).getSingleResult(false);
+        String productId = boLPI.getAttribute("PRODUCT_ID").toString();
+        String corpusSource = "AP";
+        if(boLPI.getAttribute("CORPUS_SOURCE")!=null&&!"".equals(boLPI.getAttribute("CORPUS_SOURCE"))){
+            corpusSource = boLPI.getAttribute("CORPUS_SOURCE").toString();
+        }
+        if("AP".equals(corpusSource)){
+            return "AP";
+        }
+        List<BizObject> boLPCSs = bomLPCS.createQuery("product_id=:productId order by order_list").setParameter("productId",productId).getResultList(false);
+        int nextIndex = -1;
+        if(boLPCSs.size()>0){
+            for(int i=0;i<boLPCSs.size();i++){
+               String corpusSourceTable =  boLPCSs.get(i).getAttribute("CORPUS_SOURCE").toString();
+               if(corpusSource.equals(corpusSourceTable)){
+                   nextIndex=i+1;
+                   break;
+               }
+            }
+            if(nextIndex>=boLPCSs.size()||nextIndex==-1){
+                return "AP";
+            }else {
+                return boLPCSs.get(nextIndex).getAttribute("CORPUS_SOURCE").toString();
+            }
+        }
+        return "AP";
+    }
+    public String corpusApplyCheck(){
+        String sResult = "F";
+        Transaction Sqlca = Transaction.createTransaction("als");
+        try {
+            String corpusSource = Sqlca.getString("select corpus_source from lb_project_info where id = '"+projectId+"'");
+            if(!"AP".equals(corpusSource)&&!"".equals(corpusSource)&&corpusSource!=null){
+                //TODO 具体的不同状态，不同提示信息，需要再优化
+                String fcStatus = Sqlca.getString("select FC_STATUS from fc_request where del_flag='0' and project_id = '"+projectId+"'");
+                if(Integer.parseInt(fcStatus)==1300){
+                    sResult = "S";
+                }
+            }
+        } catch (Exception e) {
+            sResult = "检验资金渠道信息出错，请联系系统管理员！";
+            e.printStackTrace();
+        }finally {
+            if(Sqlca!=null) {
+                try {
+                    Sqlca.commit();
+                    Sqlca.disConnect();
+                } catch (JBOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+        return sResult;
+    }
+    public String getProjectId() {
+        return projectId;
+    }
+
+    public void setProjectId(String projectId) {
+        this.projectId = projectId;
+    }
+}
diff --git a/src_core/com/ample/fundchannel/doc/action/DocListAction.java b/src_core/com/ample/fundchannel/doc/action/DocListAction.java
new file mode 100644
index 000000000..071dfff4d
--- /dev/null
+++ b/src_core/com/ample/fundchannel/doc/action/DocListAction.java
@@ -0,0 +1,52 @@
+package com.ample.fundchannel.doc.action;
+
+import com.amarsoft.are.jbo.*;
+import com.amarsoft.are.util.StringFunction;
+import jbo.oti.FC_REQUEST_FILE;
+
+public class DocListAction {
+
+    private String frfId;
+    private String userId;
+
+    /**
+     * 删除文件时，只添加删除标记，不进行物理删除
+     * @param tx
+     * @return
+     * @throws JBOException
+     */
+    public String deleteFileForFundChannel(JBOTransaction tx){
+        String sResult = "S";
+        BizObjectManager FRFbom = null;
+        String updateTime = StringFunction.getTodayNow();
+        try {
+            FRFbom = JBOFactory.getBizObjectManager(FC_REQUEST_FILE.CLASS_NAME,tx);
+            BizObject FRFBO = FRFbom.createQuery("id=:id").setParameter("id",frfId).getSingleResult(true);
+            FRFBO.setAttributeValue("DEL_FLAG","1");
+            FRFBO.setAttributeValue("UPDATE_TIME",updateTime);
+            FRFBO.setAttributeValue("INPUTUSER",userId);
+            FRFbom.saveObject(FRFBO);
+        } catch (JBOException e) {
+            sResult="error";
+            e.printStackTrace();
+        }
+
+        return sResult;
+    }
+
+    public String getFrfId() {
+        return frfId;
+    }
+
+    public void setFrfId(String frfId) {
+        this.frfId = frfId;
+    }
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+}
diff --git a/src_core/com/ample/fundchannel/doc/cache/DocListCache.java b/src_core/com/ample/fundchannel/doc/cache/DocListCache.java
new file mode 100644
index 000000000..beee1b2b2
--- /dev/null
+++ b/src_core/com/ample/fundchannel/doc/cache/DocListCache.java
@@ -0,0 +1,83 @@
+package com.ample.fundchannel.doc.cache;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import com.alibaba.fastjson.JSONObject;
+import com.amarsoft.are.jbo.BizObject;
+import com.amarsoft.are.jbo.JBOException;
+import com.amarsoft.are.jbo.JBOFactory;
+import com.amarsoft.are.util.StringFunction;
+import com.amarsoft.dict.als.manage.NameManager;
+
+
+public class DocListCache {
+
+
+
+	public static String getFileByRequestId(String fcRequestId,String fcFileCode) throws Exception {
+
+		@SuppressWarnings("unchecked")
+		List<BizObject> list=JBOFactory.getBizObjectManager("jbo.oti.FC_REQUEST_FILE").createQuery("FC_REQUEST_ID=:fcRequestId and FC_FILE_CODE=:fcFileCode and (DEL_FLAG<>'1' or DEL_FLAG is null)").setParameter("fcRequestId", fcRequestId).setParameter("fcFileCode", fcFileCode).getResultList(false);
+		List<JSONObject> boJsonList = new ArrayList<JSONObject>();
+		if(list.size()==0){
+			return "0";
+		}
+		for(BizObject bo : list){
+			JSONObject boJson = new JSONObject();
+			boJson.put("id",bo.getAttribute("id").getString());
+			boJson.put("FC_FILE_TYPE",bo.getAttribute("FC_FILE_TYPE").getString());
+			boJson.put("FC_FLOW_TYPE",bo.getAttribute("FC_FLOW_TYPE").getString());
+			boJson.put("FILE_NAME",bo.getAttribute("FILE_NAME").getString());
+			boJson.put("FILE_PATH",bo.getAttribute("FILE_PATH").getString());
+			boJson.put("INPUTTIME",bo.getAttribute("INPUTTIME").getString());
+			boJson.put("INPUTUSER",bo.getAttribute("INPUTUSER").getString());
+			boJsonList.add(boJson);
+		}
+		String FileHtml = getFileHtml(boJsonList);
+		return FileHtml;
+	}
+	public static String getFileHtml(List<JSONObject> list) throws Exception {
+		StringBuffer sb=new StringBuffer();
+		sb.append("{");
+		for(int i=0;i<list.size();i++){
+			JSONObject bo=list.get(i);
+			sb.append("\"" +i+"\""+":{");
+			String type= bo.get("FC_FILE_TYPE").toString();
+			if(type.indexOf("image")>=0){
+				sb.append("\"image\":\""+true+"\",");
+			}else{
+				sb.append("\"image\":\""+false+"\",");
+			}
+			if(type.indexOf("application/msword")>=0||type.indexOf("application/vnd.openxmlformats-officedocument.wordprocessingml.document")>=0||type.indexOf("application/vnd.ms-excel")>=0||type.indexOf("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet")>=0){
+				sb.append("\"word\":\""+true+"\",");
+			}else{
+				sb.append("\"word\":\""+false+"\",");
+			}
+			if(type.indexOf("application/pdf")>=0){
+				sb.append("\"pdf\":\""+true+"\",");
+			}else{
+				sb.append("\"pdf\":\""+false+"\",");
+			}
+			sb.append("\"id\":\""+bo.get("id").toString()+"\",");
+			sb.append("\"objecttype\":\""+bo.get("FC_FLOW_TYPE").toString()+"\",");
+			sb.append("\"filename\":\""+bo.get("FILE_NAME").toString()+"\",");
+			sb.append("\"filepath\":\""+bo.get("FILE_PATH").toString()+"\",");
+			sb.append("\"inputtime\":\""+bo.get("INPUTTIME").toString()+"\",");
+			sb.append("\"inputuser\":\""+NameManager.getUserName(bo.get("INPUTUSER").toString())+"\"");
+			sb.append("},");
+		}
+		//删除最后一个逗号
+		if(sb.length()>1){
+			sb.deleteCharAt(sb.length() - 1);
+		}
+		sb.append("}");
+
+		return sb.toString();
+	}
+
+
+}
diff --git a/src_core/com/ample/fundchannel/doc/servlet/DocDownloadServletByPath.java b/src_core/com/ample/fundchannel/doc/servlet/DocDownloadServletByPath.java
new file mode 100644
index 000000000..b86bd70d4
--- /dev/null
+++ b/src_core/com/ample/fundchannel/doc/servlet/DocDownloadServletByPath.java
@@ -0,0 +1,104 @@
+package com.ample.fundchannel.doc.servlet;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.URLDecoder;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+import com.amarsoft.are.ARE;
+import com.amarsoft.are.jbo.BizObject;
+import com.amarsoft.are.jbo.JBOException;
+import com.amarsoft.are.jbo.JBOFactory;
+import com.amarsoft.are.lang.StringX;
+import com.amarsoft.are.util.DataConvert;
+import com.amarsoft.are.util.StringFunction;
+import com.amarsoft.awe.Configure;
+
+
+public class DocDownloadServletByPath extends HttpServlet {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * @see HttpServlet#HttpServlet()
+     */
+    public DocDownloadServletByPath() {
+        super();
+        // TODO Auto-generated constructor stub
+    }
+
+    @Override
+    protected void service(HttpServletRequest request, HttpServletResponse response)
+            throws ServletException, IOException {
+
+        try {
+
+            ServletContext s1 = this.getServletContext();
+            String rootPath = s1.getRealPath("/");
+
+            HttpSession session = request.getSession(true);
+            if ((session == null) || (session.getAttributeNames() == null)) {
+                throw new Exception("------Timeout------");
+            }
+            Configure CurConfig = Configure.getInstance(session.getServletContext());
+            if (CurConfig == null) {
+                throw new ServletException("读取配置文件错误！请检查配置文件。");
+            }
+            String filePath = DataConvert.toString(request.getParameter("filePath"));
+            String fileName = DataConvert.toString(request.getParameter("fileName"));
+            if (filePath.length() < 1) {
+                ARE.getLog().warn("AttachViewServlet DownLoad filePath不完整[" + filePath + "]");
+            } else {
+
+                String sFileSavePath = CurConfig.getConfigure("fileSavePath");
+                sFileSavePath = rootPath + sFileSavePath;
+                File fileSS = new File(sFileSavePath);
+                if (!fileSS.exists()) fileSS.mkdirs();
+
+                fileName = URLDecoder.decode(fileName, "UTF-8");
+                filePath = URLDecoder.decode(filePath, "UTF-8");
+                System.out.println("文件名=====" + fileName);
+                //设置文件MIME类型
+                response.setContentType(getServletContext().getMimeType(fileName));
+//		        response.setContentType("multipart/form-data");
+                //设置Content-Disposition
+                response.setHeader("Content-Disposition", "attachment;filename=" + java.net.URLEncoder.encode(fileName, "UTF-8"));
+                //读取目标文件，通过response将目标文件写到客户端
+                //读取文件
+                InputStream in = new FileInputStream(filePath);
+                OutputStream out = response.getOutputStream();
+                //写文件
+                int b;
+                while ((b = in.read()) != -1) {
+                    out.write(b);
+                }
+
+                in.close();
+                out.close();
+
+            }
+        } catch (Exception e1) {
+            ARE.getLog().error("AttachmentView DownLoad Error1:", e1);
+        }
+    }
+
+    protected Map<String, String> getAttr(String id, String className) throws JBOException {
+        Map<String, String> attrMap = new HashMap<>();
+        BizObject attr = JBOFactory.createBizObjectQuery(className, "id=:id").setParameter("id", id).getSingleResult(false);
+        String absolutePath = attr.getAttribute("FILE_PATH").getString();
+        String fileName = attr.getAttribute("FILE_NAME").getString();
+        attrMap.put("absolutePath", absolutePath);
+        attrMap.put("fileName", fileName);
+        return attrMap;
+    }
+}
\ No newline at end of file
diff --git a/src_core/com/ample/fundchannel/doc/servlet/PublicShowImageServlet.java b/src_core/com/ample/fundchannel/doc/servlet/PublicShowImageServlet.java
new file mode 100644
index 000000000..6bba660e5
--- /dev/null
+++ b/src_core/com/ample/fundchannel/doc/servlet/PublicShowImageServlet.java
@@ -0,0 +1,70 @@
+package com.ample.fundchannel.doc.servlet;
+
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import jbo.app.tenwa.doc.LB_DOCATTRIBUTE;
+
+import com.amarsoft.are.jbo.BizObject;
+import com.amarsoft.are.jbo.JBOException;
+import com.amarsoft.are.jbo.JBOFactory;
+
+/**
+ * Servlet implementation class ShowImage
+ */
+public class PublicShowImageServlet extends HttpServlet {
+
+
+	@Override
+	protected void service(HttpServletRequest request, HttpServletResponse response)
+			throws ServletException, IOException {
+		
+		response.setContentType("text/html; charset=UTF-8");
+		response.setContentType("image/jpeg");
+		String attrid = request.getParameter("attrid");
+		String className = request.getParameter("className");
+		String absolutePath="";
+		try {
+			absolutePath = this.getFullPath(attrid,className);
+		} catch (JBOException e1) {
+			// TODO Auto-generated catch block
+			e1.printStackTrace();
+		}
+		FileInputStream fis = new FileInputStream(absolutePath);
+		OutputStream os = response.getOutputStream();
+		try
+		{
+			int count = 0;
+			byte[] buffer = new byte[1024 * 1024];
+			while ((count = fis.read(buffer)) != -1)
+			os.write(buffer, 0, count);
+			os.flush();
+		}
+		catch (IOException e)
+		{
+			e.printStackTrace();
+		}
+		finally
+		{
+			if (os != null)
+			os.close();
+			if (fis != null)
+			fis.close();
+		}
+		
+		
+	}
+	protected String getFullPath(String id,String className) throws JBOException {
+		BizObject attr = JBOFactory.createBizObjectQuery(className,"id=:id").setParameter("id", id).getSingleResult(false);
+		String absolutePath =attr.getAttribute("FILE_PATH").getString();
+		return absolutePath;
+	}
+
+}
diff --git a/src_jbo/jbo/oti/FC_REQUEST.java b/src_jbo/jbo/oti/FC_REQUEST.java
new file mode 100644
index 000000000..c7d149289
--- /dev/null
+++ b/src_jbo/jbo/oti/FC_REQUEST.java
@@ -0,0 +1,92 @@
+package jbo.oti;
+
+import java.lang.String;
+
+/**
+* 接口状态表 - JBO命名常量类<br><br>
+* Note: This file is generated by ADE tools, <em>dont</em> modify it.<br>
+
+*/
+public interface FC_REQUEST{
+	/**
+	* 接口状态表<br><br>
+	* 代表本类映射的BizObjectClass
+	*/
+	public static final String CLASS_NAME = "jbo.oti.FC_REQUEST";
+	/**
+	* 唯一标识 STRING(32)<br>
+	*/
+	public static final String ID = "ID";
+	/**
+	* 资金渠道申请ID STRING(32)<br>
+	*/
+	public static final String FC_LOAN_QUEUEST_ID = "FC_LOAN_QUEUEST_ID";
+	/**
+	* 资金渠道编号 STRING(32)<br>
+	*/
+	public static final String CHANNEL_NO = "CHANNEL_NO";
+	/**
+	* 资金渠道名称 STRING(32)<br>
+	*/
+	public static final String CHANNEL_NAME = "CHANNEL_NAME";
+	/**
+	* 项目ID STRING(32)<br>
+	*/
+	public static final String PROJECT_ID = "PROJECT_ID";
+	/**
+	* 项目编号 STRING(32)<br>
+	*/
+	public static final String PROJECT_NO = "PROJECT_NO";
+	/**
+	* 合同ID STRING(32)<br>
+	*/
+	public static final String CONTRACT_ID = "CONTRACT_ID";
+	/**
+	* 合同编号 STRING(32)<br>
+	*/
+	public static final String CONTRACT_NO = "CONTRACT_NO";
+	/**
+	* 产品ID STRING(32)<br>
+	*/
+	public static final String PRODUCT_ID = "PRODUCT_ID";
+	/**
+	* 产品名称 STRING(32)<br>
+	*/
+	public static final String PRODUCT_NAME = "PRODUCT_NAME";
+	/**
+	* 资经销商ID STRING(32)<br>
+	*/
+	public static final String DISTRIBUTOR_ID = "DISTRIBUTOR_ID";
+	/**
+	* 经销商名称 STRING(32)<br>
+	*/
+	public static final String DISTRIBUTOR_NAME = "DISTRIBUTOR_NAME";
+	/**
+	* 客户ID STRING(32)<br>
+	*/
+	public static final String CUSTOMER_ID = "CUSTOMER_ID";
+	/**
+	* 客户名称 STRING(32)<br>
+	*/
+	public static final String CUSTOMER_NAME = "CUSTOMER_NAME";
+	/**
+	* 当前状态 STRING(32)<br>
+	*/
+	public static final String FC_STATUS = "FC_STATUS";
+	/**
+	* 返回状态描述 STRING(32)<br>
+	*/
+	public static final String FC_REMARK = "FC_REMARK";
+	/**
+	* 创建时间 STRING(32)<br>
+	*/
+	public static final String CREATE_TIME = "CREATE_TIME";
+	/**
+	* 修改时间 STRING(32)<br>
+	*/
+	public static final String UPDATE_TIME = "UPDATE_TIME";
+	/**
+	* 有效标志 STRING(32)<br>
+	*/
+	public static final String DEL_FLAG = "DEL_FLAG";
+}
\ No newline at end of file
diff --git a/src_jbo/jbo/oti/FC_REQUEST_FILE.java b/src_jbo/jbo/oti/FC_REQUEST_FILE.java
new file mode 100644
index 000000000..f738d3526
--- /dev/null
+++ b/src_jbo/jbo/oti/FC_REQUEST_FILE.java
@@ -0,0 +1,80 @@
+package jbo.oti;
+
+import java.lang.String;
+
+/**
+* 接口资料表 - JBO命名常量类<br><br>
+* Note: This file is generated by ADE tools, <em>dont</em> modify it.<br>
+
+*/
+public interface FC_REQUEST_FILE{
+	/**
+	* 接口资料表<br><br>
+	* 代表本类映射的BizObjectClass
+	*/
+	public static final String CLASS_NAME = "jbo.oti.FC_REQUEST_FILE";
+	/**
+	* 唯一标识 STRING(32)<br>
+	*/
+	public static final String ID = "ID";
+	/**
+	* 资金渠道申请ID STRING(32)<br>
+	*/
+	public static final String FC_REQUEST_ID = "FC_REQUEST_ID";
+	/**
+	* 流程类型 STRING(32)<br>
+	*/
+	public static final String FC_FLOW_TYPE = "FC_FLOW_TYPE";
+	/**
+	* 流程类型名称 STRING(32)<br>
+	*/
+	public static final String FC_FLOW_TYPE_NAME = "FC_FLOW_TYPE_NAME";
+	/**
+	* 资方：文件编号 STRING(32)<br>
+	*/
+	public static final String FC_FILE_CODE = "FC_FILE_CODE";
+	/**
+	* 资方：文件编号名称 STRING(32)<br>
+	*/
+	public static final String FC_FILE_CODE_NAME = "FC_FILE_CODE_NAME";
+	/**
+	* 资方：文件类型：JPG,PNG,FDP等 STRING(32)<br>
+	*/
+	public static final String FC_FILE_TYPE = "FC_FILE_TYPE";
+	/**
+	* 文件名称 STRING(32)<br>
+	*/
+	public static final String FILE_NAME = "FILE_NAME";
+	/**
+	* 文件路径 STRING(32)<br>
+	*/
+	public static final String FILE_PATH = "FILE_PATH";
+	/**
+	* 文件状态 STRING(32)<br>
+	*/
+	public static final String FC_FILE_STS = "FC_FILE_STS";
+	/**
+	* 文件状态描述 STRING(32)<br>
+	*/
+	public static final String FC_FILE_STS_DESC = "FC_FILE_STS_DESC";
+	/**
+	* 创建时间 STRING(32)<br>
+	*/
+	public static final String CREATE_TIME = "CREATE_TIME";
+	/**
+	* 修改时间 STRING(32)<br>
+	*/
+	public static final String UPDATE_TIME = "UPDATE_TIME";
+	/**
+	* 有效标志 STRING(32)<br>
+	*/
+	public static final String DEL_FLAG = "DEL_FLAG";
+	/**
+	 * 上传时间 STRING(32)<br>
+	 */
+	public static final String INPUTTIME = "INPUTTIME";
+	/**
+	 * 上传人 STRING(32)<br>
+	 */
+	public static final String INPUTUSER = "INPUTUSER";
+}
\ No newline at end of file

From 505c0461cf3320910e59110670c83314984a1411 Mon Sep 17 00:00:00 2001
From: ap007 <zhanglei@ap-leasing.com.cn>
Date: Wed, 23 Jun 2021 09:38:47 +0800
Subject: [PATCH 05/29] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E9=99=84=E4=BB=B6=E5=90=8D=E7=A7=B0=E6=A0=A1=E9=AA=8C=E8=A7=84?=
 =?UTF-8?q?=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WebContent/Ample/Doc/DocListInfoNew.jsp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WebContent/Ample/Doc/DocListInfoNew.jsp b/WebContent/Ample/Doc/DocListInfoNew.jsp
index 810ad98e2..ffa45bfc8 100644
--- a/WebContent/Ample/Doc/DocListInfoNew.jsp
+++ b/WebContent/Ample/Doc/DocListInfoNew.jsp
@@ -127,7 +127,7 @@
 			}
 		});
 		uploader.on('beforeFileQueued',function(file){
-			var reg = RegExp(/[^%&',;=?$\x22]+/);
+			var reg = RegExp(/[%&',;=?$]/);
 			if(file.name.match(reg)){
 				AsDebug.alert("警告","上传出错！请不要上传名称中带有%&',;=?$等特殊字符的文件");
 				return false;

From b0f7ebd7f3d42c670fb970f11a001f9ac42fe006 Mon Sep 17 00:00:00 2001
From: ap007 <zhanglei@ap-leasing.com.cn>
Date: Wed, 23 Jun 2021 14:35:13 +0800
Subject: [PATCH 06/29] =?UTF-8?q?=E6=92=A4=E9=94=80=E8=AF=AF=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Apzl/productCorpus/LbCorpusSourceList.jsp | 62 +++++++++++++++
 .../LbProductCorpusSourceList.jsp             | 78 +++++++++++++++++++
 .../productCorpus/LbProductCorpusUpDown.jsp   | 20 +++++
 .../Apzl/productCorpus/LbProductInfo.jsp      | 26 +++++++
 .../productCorpus/deleteProductCorpus.jsp     | 20 +++++
 5 files changed, 206 insertions(+)
 create mode 100644 WebContent/Tenwa/Apzl/productCorpus/LbCorpusSourceList.jsp
 create mode 100644 WebContent/Tenwa/Apzl/productCorpus/LbProductCorpusSourceList.jsp
 create mode 100644 WebContent/Tenwa/Apzl/productCorpus/LbProductCorpusUpDown.jsp
 create mode 100644 WebContent/Tenwa/Apzl/productCorpus/LbProductInfo.jsp
 create mode 100644 WebContent/Tenwa/Apzl/productCorpus/deleteProductCorpus.jsp

diff --git a/WebContent/Tenwa/Apzl/productCorpus/LbCorpusSourceList.jsp b/WebContent/Tenwa/Apzl/productCorpus/LbCorpusSourceList.jsp
new file mode 100644
index 000000000..e55d1bfe4
--- /dev/null
+++ b/WebContent/Tenwa/Apzl/productCorpus/LbCorpusSourceList.jsp
@@ -0,0 +1,62 @@
+<%@page import="com.amarsoft.app.base.util.ObjectWindowHelper"%>
+<%@page import="com.amarsoft.app.base.businessobject.*"%>
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><%	
+	/*
+        本金资源顺序列表
+    */
+	String productId= CurPage.getParameter("productId");
+	ASObjectModel doTemp = new ASObjectModel("LB_PRODUCT_CORPUS_SOURCE");
+	ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
+
+	dwTemp.Style="1";      	     //--设置为Grid风格--
+	dwTemp.ReadOnly = "1";	 //只读模式
+	dwTemp.setPageSize(10);
+	dwTemp.genHTMLObjectWindow(productId);
+
+	//0、是否展示 1、	权限控制  2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码	6、	7、	8、	9、图标，CSS层叠样式 10、风格
+	String sButtons[][] = {
+		{"true","All","Button","新增","新增","newRecord();","","","","btn_icon_add",""},
+			{"true","","Button","保存","保存","save()","","","","",""},
+		{"true","","Button","删除","删除","if(confirm('确实要删除吗?'))as_delete(0)","","","","btn_icon_delete",""},
+	};
+%><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
+<script type="text/javascript">
+	function newRecord(){
+		var position= getRowCount(0);
+		as_add(0);
+		tableDatas['myiframe0'][position][0]='<%=productId%>';
+	}
+	function save(){
+		if(checkAll()=='s'){
+			as_save(0);
+			self.location.reload();
+		}
+	}
+	function checkAll(){
+		//双循环来遍历查重
+		for(var i=0;i<getRowCount(0);i++){
+			for(var j = i+1; j < getRowCount(0); j++){
+				var orderList = getItemValue(0,i,'ORDER_LIST');
+				var corpusSource = getItemValue(0,i,'CORPUS_SOURCE');
+				var orderListLast = getItemValue(0,j,'ORDER_LIST');
+				var corpusSourceLast = getItemValue(0,j,'CORPUS_SOURCE');
+				if(i==0){
+					if(orderList==null||orderList==''||corpusSource==null||corpusSourceLast==''||orderListLast==null||orderListLast==''||corpusSourceLast==null||corpusSourceLast==''){
+						alert('资金来源或排序号不能为空');
+						return;
+					}
+				}
+				if(orderList==orderListLast){
+					alert('排序号不可以重复');
+					return;
+				}else if(corpusSource==corpusSourceLast){
+					alert('资金来源不可以重复');
+					return;
+				}
+			}
+		}
+		return 's';
+	}
+</script>
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/Apzl/productCorpus/LbProductCorpusSourceList.jsp b/WebContent/Tenwa/Apzl/productCorpus/LbProductCorpusSourceList.jsp
new file mode 100644
index 000000000..b1f5d8117
--- /dev/null
+++ b/WebContent/Tenwa/Apzl/productCorpus/LbProductCorpusSourceList.jsp
@@ -0,0 +1,78 @@
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><%	
+
+/*
+	产品配置资金来源顺序主页面
+ */
+	ASObjectModel doTemp = new ASObjectModel("VI_PRODUCT_CORPUS_SOURCE");
+	ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
+//	dwTemp.Style="1";      	     //--设置为Grid风格--
+	dwTemp.ReadOnly = "1";	 //只读模式
+	dwTemp.setPageSize(10);
+	dwTemp.genHTMLObjectWindow("");
+
+	//0、是否展示 1、	权限控制  2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码	6、	7、	8、	9、图标，CSS层叠样式 10、风格
+	String sButtons[][] = {
+		{"true","All","Button","新增","新增","newRecord()","","","","btn_icon_add",""},
+		{"true","","Button","编辑","编辑","viewAndEdit()","","","","btn_icon_detail",""},
+		{"true","","Button","删除","删除","deleteProduct()","","","","btn_icon_delete",""},
+	};
+%><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
+<script type="text/javascript">
+	function newRecord(){
+		var productId='';
+		AsDialog.OpenSelector("selectProductList","","dialogWidth=" + parseInt(window.screen.width * 0.6) + "px dialogHeight=" + parseInt(window.screen.height * 0.6) + "px",
+				function(sReturn){
+					if(!sReturn||sReturn=="_CANCEL_"||sReturn=="")
+					{
+						//alert(getHtmlMessage('1'));//请选择一条信息！
+						return;
+					}
+					sReturn = sReturn.split("@");
+					productId = sReturn[0];
+
+					var sUrl = "/Tenwa/Apzl/productCorpus/LbProductCorpusUpDown.jsp";
+					AsDialog.PopView(sUrl,'productId='+productId,'dialogWidth=950px;dialogHeight=500px;resizable=no;scrollbars=no;status:yes;maximize:no;help:no;',function(){reloadSelf();},'新建');
+				},"请选择产品",'');
+		//将返回的产品ID传输到编辑的info页面，info页面只是展示作用，然后list页面新增的时候再保存。
+		//编辑按钮不采用在后面添加超连接形式，曾经有的页面采用这种方式数据量大时特别卡。采用系统封装按钮事件来实现。
+
+	}
+	function viewAndEdit(){
+		var sUrl = "/Tenwa/Apzl/productCorpus/LbProductCorpusUpDown.jsp";
+		 var sPara = getItemValue(0,getRow(0),'PRODUCT_ID');
+		 if(typeof(sPara)=="undefined" || sPara.length==0 ){
+			alert("参数不能为空！");
+			return ;
+		 }
+		AsDialog.PopView(sUrl,'productId=' +sPara ,'dialogWidth=950px;dialogHeight=500px;resizable=no;scrollbars=no;status:yes;maximize:no;help:no;',function(){reloadSelf();},'编辑');
+	}
+	/*function afterSearch(){
+		for(var i=0;i<getRowCount(0);i++){
+			if(getObj(0,i,"action")!=null){
+				getObj(0,i,"action").innerHTML='<a class="box" style="text-align:center;" onclick="edit(\''+getItemValue(0,i,"PRODUCT_ID")+'\')" style={color:#000;text-decoration:underline;}><font color="blue">&nbsp&nbsp&nbsp&nbsp&nbsp编辑</font></ a>';
+			}
+		};
+	}
+	function edit(productId){
+		var sUrl="/Tenwa/Apzl/productCar/LmProductUpAndDown.jsp";
+		var sPara = "productId="+productId;
+		AsDialog.PopView(sUrl,sPara,"dialogWidth=950px;dialogHeight=500px;resizable=no;scrollbars=no;status:yes;maximize:no;help:no;",function(){reloadSelf();},"配置车辆");
+	}*/
+	function deleteProduct(){
+		var sPara ='productId='+ getItemValue(0,getRow(0),'PRODUCT_ID');
+		var sResult = AsControl.RunJsp('/Tenwa/Apzl/productCorpus/deleteProductCorpus.jsp',sPara);
+		alert(sResult);
+		parent.reloadSelf();
+	}
+
+	/*
+	function mySelectRow(){
+		 var TYPENO = getItemValue(0,getRow(0),"TYPENO");
+		 parent.OpenInfo(TYPENO);
+		 //list 页面同步info页面的联动传至单击事件
+	}
+		*/
+
+</script>
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/Apzl/productCorpus/LbProductCorpusUpDown.jsp b/WebContent/Tenwa/Apzl/productCorpus/LbProductCorpusUpDown.jsp
new file mode 100644
index 000000000..36534915c
--- /dev/null
+++ b/WebContent/Tenwa/Apzl/productCorpus/LbProductCorpusUpDown.jsp
@@ -0,0 +1,20 @@
+<%@ page contentType="text/html; charset=GBK"%><%@
+ include file="/IncludeBegin.jsp"%><%
+/*
+	页面说明: 示例上下联动框架页面
+ */
+ String productId = CurPage.getParameter("productId");
+%><%@include file="/Resources/CodeParts/Frame02.jsp"%>
+<script type="text/javascript">
+	mytoptd.height=100;
+    OpenInfo();
+	OpenList();
+	function OpenInfo(){
+		AsControl.OpenView("/Tenwa/Apzl/productCorpus/LbProductInfo.jsp","productId=<%=productId%>","rightup");
+	}
+
+	function OpenList(){
+		AsControl.OpenView("/Tenwa/Apzl/productCorpus/LbCorpusSourceList.jsp","productId=<%=productId%>", "rightdown");
+	}
+</script>
+<%@ include file="/IncludeEnd.jsp"%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/Apzl/productCorpus/LbProductInfo.jsp b/WebContent/Tenwa/Apzl/productCorpus/LbProductInfo.jsp
new file mode 100644
index 000000000..5fa4daa05
--- /dev/null
+++ b/WebContent/Tenwa/Apzl/productCorpus/LbProductInfo.jsp
@@ -0,0 +1,26 @@
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_info.jspf"%><%
+	/*
+        产品简介
+    */
+	String productId = CurPage.getParameter("productId");
+	String sTempletNo = "LbProductInfo";//--模板号--
+	ASObjectModel doTemp = new ASObjectModel(sTempletNo);
+	ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request);
+	dwTemp.Style = "2";//freeform
+	dwTemp.ReadOnly = "-2";//只读模式
+	dwTemp.genHTMLObjectWindow(productId);
+	
+	String sButtons[][] = {
+		//{"true","All","Button","保存","保存所有修改","save()","","","",""},
+		//{"true","All","Button","返回","返回列表","returnList()","","","",""}
+	};
+	sButtonPosition = "south";
+%><%@ include file="/Frame/resources/include/ui/include_info.jspf"%>
+<script type="text/javascript">
+	/* function save(){
+		as_save("myiframe0","returnList()");
+	} */
+
+</script>
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/Apzl/productCorpus/deleteProductCorpus.jsp b/WebContent/Tenwa/Apzl/productCorpus/deleteProductCorpus.jsp
new file mode 100644
index 000000000..bc71928ad
--- /dev/null
+++ b/WebContent/Tenwa/Apzl/productCorpus/deleteProductCorpus.jsp
@@ -0,0 +1,20 @@
+
+<%@page import="com.amarsoft.are.jbo.JBOTransaction"%>
+<%@page import="com.amarsoft.are.jbo.JBOFactory"%>
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/IncludeBeginMDAJAX.jsp"%><%
+	String sResult = "";
+	String productId = CurPage.getParameter("productId");
+	int count = JBOFactory.createBizObjectQuery("jbo.prd.LB_PRODUCT_CORPUS_SOURCE", "select 1 from O where PRODUCT_ID=:productId").setParameter("productId", productId).getTotalCount();
+	int count_d = JBOFactory.createBizObjectQuery("jbo.prd.LB_PRODUCT_CORPUS_SOURCE", "delete from O where PRODUCT_ID=:productId").setParameter("productId", productId).executeUpdate();
+	if(count==count_d){
+		sResult="删除成功";
+	}else if(count_d==0){
+		sResult="删除失败";
+	}else if(count>count_d&&count_d>0){
+		sResult="部分删除，请记录当前产品ID或产品名称，并联系系统管理员";
+	}else{
+		sResult="未知错误，请记录当前产品ID或产品名称，并联系系统管理员";
+	}
+	out.println(sResult);
+%><%@ include file="/IncludeEndAJAX.jsp"%>
\ No newline at end of file

From 4dc8ff9cf583c1d1a3eb99e6d335b2c7b86330d3 Mon Sep 17 00:00:00 2001
From: ap007 <zhanglei@ap-leasing.com.cn>
Date: Mon, 28 Jun 2021 11:05:21 +0800
Subject: [PATCH 07/29] =?UTF-8?q?=E7=A7=9F=E5=89=8D=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LbProductCorpusSourceList.jsp             |  2 +-
 .../ContractApprovalApplyList.jsp             |  8 +-
 WebContent/WEB-INF/etc/jbo/jbo_oti.xml        | 19 ++++
 .../apzl/CorpusSource/FcRequestDocTab.jsp     | 15 +--
 .../apzl/CorpusSource/FcRequestFileList.jsp   | 32 ++++---
 .../tenwa/apzl/CorpusSource/FcRequestLIst.jsp |  9 +-
 src/com/ap/CorpusSourceCheck.java             | 73 +++++++++------
 .../fundchannel/doc/action/DocListAction.java | 92 +++++++++++++++++--
 .../fundchannel/doc/cache/DocListCache.java   |  2 +
 src_jbo/jbo/oti/FC_REQUEST.java               |  8 ++
 src_jbo/jbo/oti/FC_REQUEST_FILE_PUSH.java     | 43 +++++++++
 .../LBProjectIntoTempInitCarBusiness.java     | 10 +-
 12 files changed, 244 insertions(+), 69 deletions(-)
 create mode 100644 src_jbo/jbo/oti/FC_REQUEST_FILE_PUSH.java

diff --git a/WebContent/Tenwa/Apzl/productCorpus/LbProductCorpusSourceList.jsp b/WebContent/Tenwa/Apzl/productCorpus/LbProductCorpusSourceList.jsp
index b1f5d8117..788c423a4 100644
--- a/WebContent/Tenwa/Apzl/productCorpus/LbProductCorpusSourceList.jsp
+++ b/WebContent/Tenwa/Apzl/productCorpus/LbProductCorpusSourceList.jsp
@@ -63,7 +63,7 @@
 		var sPara ='productId='+ getItemValue(0,getRow(0),'PRODUCT_ID');
 		var sResult = AsControl.RunJsp('/Tenwa/Apzl/productCorpus/deleteProductCorpus.jsp',sPara);
 		alert(sResult);
-		parent.reloadSelf();
+		reloadSelf();
 	}
 
 	/*
diff --git a/WebContent/Tenwa/Lease/Flow/Contract/ContractApproval/ContractApprovalApplyList.jsp b/WebContent/Tenwa/Lease/Flow/Contract/ContractApproval/ContractApprovalApplyList.jsp
index d2ef15c33..3ece53f3b 100644
--- a/WebContent/Tenwa/Lease/Flow/Contract/ContractApproval/ContractApprovalApplyList.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Contract/ContractApproval/ContractApprovalApplyList.jsp
@@ -66,18 +66,14 @@
 			var channel = sReturn[13];
 			//todo 通过projectid先看corpus_source字段是否是带有外资方的项目，如果时则去查找资方返回的对应的状态，
             // 如果通过则可以发起，如果暂时没有结果，则提示；如果审批失败，则按顺序转换资金方，然后重新发起业务申请后的另外一个资方的调用接口；
-            // 如果都失败，最终转换为自有资金，将corpus_source字段设为AP(代码已给张磊，在接口平台实现此功能);
+            // 如果都失败，最终转换为自有资金，将corpus_source字段设为AP(在接口平台实现此功能);
             var checkParam = 'project_id='+project_id;
             var checkResult = RunJavaMethod('com.ap.CorpusSourceCheck','corpusApplyCheck',checkParam);
-            if(checkResult=='F'){
-                alert('资金方尚未审批结束，请稍后再试');
-                return;
-            }else if(checkResult!='S'){
+            if(checkResult!='S'){
                 alert(checkResult);
                 return;
             }
 
-
 			if(flowno=="BContractApproveApply"&&"03" == customertype){
 				if(""== signType||null == signType||"undefined" == signType){
 					alert("请在产品中配置签约方式！！！");
diff --git a/WebContent/WEB-INF/etc/jbo/jbo_oti.xml b/WebContent/WEB-INF/etc/jbo/jbo_oti.xml
index 13e16b05b..652f16a47 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_oti.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_oti.xml
@@ -319,6 +319,8 @@
 				<attribute name="CUSTOMER_NAME"    label="客户名称"    type="STRING" length="32"/>
 				<attribute name="FC_STATUS"    label="当前状态"    type="STRING" length="32"/>
 				<attribute name="FC_REMARK"    label="返回状态描述"    type="STRING" length="32"/>
+				<attribute name="SUPPLEMENT_STS"    label="是否需要补充资料清单"    type="STRING" length="32"/>
+				<attribute name="SUPPLEMENT_DESC"    label="通知需要补充资料清单描述"    type="STRING" length="32"/>
 				<attribute name="CREATE_TIME"    label="创建时间"    type="STRING" length="32"/>
 				<attribute name="UPDATE_TIME"    label="修改时间"    type="STRING" length="32"/>
 				<attribute name="DEL_FLAG"    label="有效标志"    type="STRING" length="32"/>
@@ -356,5 +358,22 @@
 				</managerProperties>
 			</manager>
 		</class>
+		<class name="FC_REQUEST_FILE_PUSH" label="接口资料推送状态" describe="接口资料推送状态" keyAttributes="ID">
+			<attributes>
+				<attribute name="ID"    label="唯一标识"     type="STRING" length="32" />
+				<attribute name="FC_REQUEST_ID"    label="资金渠道申请ID"    type="STRING" length="32"/>
+				<attribute name="PUSH_STS"    label="文件状态"    type="STRING" length="32"/>
+				<attribute name="PUSH_STS_DESC"    label="文件状态描述"    type="STRING" length="32"/>
+				<attribute name="CREATE_TIME"    label="创建时间"    type="STRING" length="32"/>
+				<attribute name="UPDATE_TIME"    label="修改时间"    type="STRING" length="32"/>
+				<attribute name="DEL_FLAG"    label="有效标志"    type="STRING" length="32"/>
+			</attributes>
+			<manager>
+				<managerProperties>
+					<property name="table" value="fc_request_file_push"/>
+					<property name="createKey" value="true" />
+				</managerProperties>
+			</manager>
+		</class>
 	</package>
 </jbo>
\ No newline at end of file
diff --git a/WebContent/com/tenwa/apzl/CorpusSource/FcRequestDocTab.jsp b/WebContent/com/tenwa/apzl/CorpusSource/FcRequestDocTab.jsp
index 355eea51c..7de490eb3 100644
--- a/WebContent/com/tenwa/apzl/CorpusSource/FcRequestDocTab.jsp
+++ b/WebContent/com/tenwa/apzl/CorpusSource/FcRequestDocTab.jsp
@@ -5,14 +5,9 @@
 	String channelNo=CurPage.getParameter("channelNo");
 	String projectId=CurPage.getParameter("projectId");
 	String contractId=CurPage.getParameter("contractId");
-	String params="fcLoanQueuestId="+fcLoanQueuestId+"&channelNo="+channelNo+"&projectId="+projectId+"&contractId="+contractId;
-	//动态实现固定总数页面
-	String buttonFlagBAF = "false";
-	String buttonFlagFPCF = "false";
-	if(1==1){
-		buttonFlagBAF="true";
-		buttonFlagFPCF = "true";
-	}
+	String isReadOnly = CurPage.getParameter("isReadOnly");
+	String params="fcLoanQueuestId="+fcLoanQueuestId+"&channelNo="+channelNo+"&projectId="+projectId+"&contractId="+contractId+"&isReadOnly="+isReadOnly;
+
 	//参数：0.是否显示, 1.标题，2.URL，3，参数串, 4. Strip高度(默认600px)，5. 是否有关闭按钮(默认无) 6. 是否缓存(默认是)
 
 	//动态实现多个页面
@@ -25,8 +20,8 @@
 	}
 	String sTabStrip[][] = tabStrip.toArray(new String[0][]);*/
 	String sTabStrip[][] = {
-		{buttonFlagBAF, "业务申请资料", "/com/tenwa/apzl/CorpusSource/FcRequestFileList.jsp",params+"&fcFlowType=BusinessApplyFlow", "", "", "false"},
-		{buttonFlagFPCF, "放款申请资料", "/com/tenwa/apzl/CorpusSource/FcRequestFileList.jsp",params+"&fcFlowType=FundPaymentCarFlow", "", "", "false"},
+		{"true", "业务申请资料", "/com/tenwa/apzl/CorpusSource/FcRequestFileList.jsp",params+"&fcFlowType=BusinessApplyFlow", "", "", "false"},
+		{"true", "放款申请资料", "/com/tenwa/apzl/CorpusSource/FcRequestFileList.jsp",params+"&fcFlowType=FundPaymentCarFlow", "", "", "false"},
 	};
 %>
 <%@ include file="/Resources/CodeParts/Tab01.jsp"%>
diff --git a/WebContent/com/tenwa/apzl/CorpusSource/FcRequestFileList.jsp b/WebContent/com/tenwa/apzl/CorpusSource/FcRequestFileList.jsp
index 6f30af6fe..2a2213b89 100644
--- a/WebContent/com/tenwa/apzl/CorpusSource/FcRequestFileList.jsp
+++ b/WebContent/com/tenwa/apzl/CorpusSource/FcRequestFileList.jsp
@@ -1,8 +1,6 @@
 <%@ page contentType="text/html; charset=GBK"%>
 <%@ include file="/Frame/resources/include/include_begin_simplelist.jspf"%>
-<%@ page import="java.util.List" %>
-<%@ page import="java.util.Map" %>
-<%@ page import="com.amarsoft.app.util.ProductParamUtil" %>
+<%@ page import="com.ample.fundchannel.doc.action.DocListAction" %>
 <%
 	/*
         Author: undefined 2021-05-31
@@ -19,6 +17,9 @@
 	if(sTempletNo==null){
 		sTempletNo="FcRequestFileList";
 	}
+	if("N".equals(isReadOnly)){
+		isReadOnly = new DocListAction(fcQueuestId,fcFlowType).isFileAppendCheck();
+	}
 	ASObjectModel doTemp = new ASObjectModel(sTempletNo);
 	doTemp.setLockCount(0);
 	ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request);
@@ -26,10 +27,8 @@
 	//dwTemp.ReadOnly = "-2";//只读模式
 	dwTemp.genHTMLObjectWindow(fcFlowType+","+fcQueuestId);
 
-
-
 	String sButtons[][] = {
-		{isReadOnly=="Y"?"true":"false","All","Button","提交","修改完毕，确认提交","updateStatus()","","","",""},
+		{"Y".equals(isReadOnly)?"false":"true","All","Button","提交资料","修改完毕，确认提交","updateStatus()","","","",""},
 	//	{String.valueOf(!com.amarsoft.are.lang.StringX.isSpace(sPrevUrl)),"All","Button","返回","返回列表","returnList()","","","",""}
 	};
 	sButtonPosition = "north";
@@ -39,8 +38,14 @@
 		 AsControl.OpenView("<%=sPrevUrl%>", "","_self","");
 	}
 	function updateStatus(){
-		if(confirm("确认已修改完毕，完成提交？")){
-
+		if(confirm("确认已补充完本合同所有资料？")){
+			var sParams = "fcQueuestId=<%=fcQueuestId%>";
+			var sReturnInfo = RunJavaMethodTrans("com.ample.fundchannel.doc.action.DocListAction","requestFilePushUpdate",sParams);
+			if(sReturnInfo=='S'){
+				alert("提交成功");
+			}else{
+				alert(sReturnInfo);
+			}
 		}
 	}
 	function showPDF(filePath,name){
@@ -61,12 +66,11 @@
 		var param="fcQueuestId=<%=fcQueuestId%>&fcFlowType=<%=fcFlowType%>&fcFileCode="+fcFileCode;
 		var sUrl="/Ample/Doc/DocListInfoNew.jsp";
 		AsDialog.PopView(sUrl,param,"dialogWidth=800px;dialogHeight=500px;resizable=no;scrollbars=no;status:yes;maximize:no;help:no;",function(message){
-
+			reloadSelf();
 		},"上传附件");
-		reloadSelf();
+
 	}
 	function downloadFile(filePath,fileName){
-		debugger;
 		if(!frames["downloadTemplate"]) $("<iframe name='downloadTemplate' style='display:none;'></iframe>").appendTo("body");
 		var src = sWebRootPath+"/servlet/view/docDownloadServletByPath?CompClientID=<%=sCompClientID%>&filePath="+encodeURIComponent(encodeURIComponent(filePath))+"&fileName="+encodeURIComponent(encodeURIComponent(fileName));
 		window.open(src, "downloadTemplate");
@@ -83,7 +87,9 @@
 	function afterSearch(){
 		var isReadOnly="<%=isReadOnly%>";
 		for(var i=0;i<getRowCount(0);i++){
-			if(getObj(0,i,"operation")!=null&&getObj(0,i,"operation")!="null"){
+			var sParams="fcQueuestId=<%=fcQueuestId%>,fcFlowType=<%=fcFlowType%>,fcFileCode="+getItemValue(0,i,"FC_FILE_CODE");
+			var isAppend = RunJavaMethod("com.ample.fundchannel.doc.action.DocListAction","isFileAppendCheckByRow",sParams);
+			if(isReadOnly!="Y"&&isAppend!="Y"&&getObj(0,i,"operation")!=null&&getObj(0,i,"operation")!="null"){
 				getObj(0,i,"operation").innerHTML='<a class="box"  onclick="upload(\''+getItemValue(0,i,"FC_FILE_CODE")+'\')" style={color:#000;text-decoration:underline;}><font color="blue">上传</font></a>';
 			}
 			var filelist=getObj(0,i,"fileList").innerHTML;
@@ -94,7 +100,7 @@
 				html+='【上传时间:'+obj[file]['inputtime']+'】';
 				html+='【上传人:'+obj[file]['inputuser']+'】';
 // 			html+='【大小:'+Math.floor(obj[file]['FileSize']/1024*100)/100+'kb】<a class="btn_icon_detail" onclick="editOffice(\''+obj[file]['id']+'\',\''+obj[file]['filename']+'\',\''+sRightType+'\')">&nbsp;</a> ';
-				if(isReadOnly!="Y"){
+				if(isReadOnly!="Y"&&isAppend!="Y"){
 					html+='<a class="btn_icon btn_icon_close" onclick="deleteFile(\''+obj[file]['id']+'\');">&nbsp;</a>';
 				}
 				if(obj[file]['image']=="true"){
diff --git a/WebContent/com/tenwa/apzl/CorpusSource/FcRequestLIst.jsp b/WebContent/com/tenwa/apzl/CorpusSource/FcRequestLIst.jsp
index 886192b5b..3491322de 100644
--- a/WebContent/com/tenwa/apzl/CorpusSource/FcRequestLIst.jsp
+++ b/WebContent/com/tenwa/apzl/CorpusSource/FcRequestLIst.jsp
@@ -31,7 +31,14 @@
 		var channelNo =  getItemValue(0,getRow(0),'CHANNEL_NO');
 		var projectId =  getItemValue(0,getRow(0),'PROJECT_ID');
 		var contractId =  getItemValue(0,getRow(0),'CONTRACT_ID');
-		var sPara ='fcLoanQueuestId='+fcLoanQueuestId+'&channelNo='+channelNo+ '&projectId='+projectId+'&contractId='+contractId;
+		var supplementSTS =  getItemValue(0,getRow(0),'SUPPLEMENT_STS');
+		var isReadOnly = 'Y';
+		debugger;
+		//todo 邮储发送通知后，fcStatus标记是否有需要补充资料的
+		if(supplementSTS=='1'){
+			isReadOnly='N';
+		}
+		var sPara ='fcLoanQueuestId='+fcLoanQueuestId+'&channelNo='+channelNo+ '&projectId='+projectId+'&contractId='+contractId+'&isReadOnly='+isReadOnly;
 		if(projectId==null || fcLoanQueuestId==null ){
 			alert("参数不能为空！");
 			return ;
diff --git a/src/com/ap/CorpusSourceCheck.java b/src/com/ap/CorpusSourceCheck.java
index eeb702fb6..d9beda3a3 100644
--- a/src/com/ap/CorpusSourceCheck.java
+++ b/src/com/ap/CorpusSourceCheck.java
@@ -16,68 +16,84 @@ import java.util.List;
 public class CorpusSourceCheck {
 
     private String projectId;
+
+    /**
+     * 暂时不用，已放到接口平台执行
+     *
+     * @throws JBOException
+     */
     public void setNextCorpusChannel() throws JBOException {
         String nextCorpusChannel = getNextCorpusChannel(projectId);
         BizObjectManager bomLPI = JBOFactory.getBizObjectManager(LB_PROJECT_INFO.CLASS_NAME);
-        BizObject boLPI = bomLPI.createQuery("id=:projectId").setParameter("projectId",projectId).getSingleResult(true);
-        boLPI.setAttributeValue("CORPUS_SOURCE",nextCorpusChannel);
+        BizObject boLPI = bomLPI.createQuery("id=:projectId").setParameter("projectId", projectId).getSingleResult(true);
+        boLPI.setAttributeValue("CORPUS_SOURCE", nextCorpusChannel);
         bomLPI.saveObject(boLPI);
         BizObjectManager bomLCI = JBOFactory.getBizObjectManager(LB_CONTRACT_INFO.CLASS_NAME);
-        BizObject boLCI = bomLCI.createQuery("PROJECT_ID=:projectId").setParameter("projectId",projectId).getSingleResult(true);
-        if(boLCI!=null){
-            boLCI.setAttributeValue("CORPUS_SOURCE",nextCorpusChannel);
+        BizObject boLCI = bomLCI.createQuery("PROJECT_ID=:projectId").setParameter("projectId", projectId).getSingleResult(true);
+        if (boLCI != null) {
+            boLCI.setAttributeValue("CORPUS_SOURCE", nextCorpusChannel);
             bomLCI.saveObject(boLCI);
         }
-        ARE.getLog().debug("项目ID："+projectId+"的资金方变更为-->"+nextCorpusChannel);
+        ARE.getLog().debug("项目ID：" + projectId + "的资金方变更为-->" + nextCorpusChannel);
 
     }
+
+    /**
+     * 暂时不用，已放到接口平台执行
+     *
+     * @throws JBOException
+     */
     public String getNextCorpusChannel(String projectId) throws JBOException {
         BizObjectManager bomLPCS = JBOFactory.getBizObjectManager(LB_PRODUCT_CORPUS_SOURCE.CLASS_NAME);
         BizObjectManager bomLPI = JBOFactory.getBizObjectManager(LB_PROJECT_INFO.CLASS_NAME);
-        BizObject boLPI= bomLPI.createQuery("id=:projectId").setParameter("projectId",projectId).getSingleResult(false);
+        BizObject boLPI = bomLPI.createQuery("id=:projectId").setParameter("projectId", projectId).getSingleResult(false);
         String productId = boLPI.getAttribute("PRODUCT_ID").toString();
         String corpusSource = "AP";
-        if(boLPI.getAttribute("CORPUS_SOURCE")!=null&&!"".equals(boLPI.getAttribute("CORPUS_SOURCE"))){
+        if (boLPI.getAttribute("CORPUS_SOURCE") != null && !"".equals(boLPI.getAttribute("CORPUS_SOURCE"))) {
             corpusSource = boLPI.getAttribute("CORPUS_SOURCE").toString();
         }
-        if("AP".equals(corpusSource)){
+        if ("AP".equals(corpusSource)) {
             return "AP";
         }
-        List<BizObject> boLPCSs = bomLPCS.createQuery("product_id=:productId order by order_list").setParameter("productId",productId).getResultList(false);
+        List<BizObject> boLPCSs = bomLPCS.createQuery("product_id=:productId order by order_list").setParameter("productId", productId).getResultList(false);
         int nextIndex = -1;
-        if(boLPCSs.size()>0){
-            for(int i=0;i<boLPCSs.size();i++){
-               String corpusSourceTable =  boLPCSs.get(i).getAttribute("CORPUS_SOURCE").toString();
-               if(corpusSource.equals(corpusSourceTable)){
-                   nextIndex=i+1;
-                   break;
-               }
+        if (boLPCSs.size() > 0) {
+            for (int i = 0; i < boLPCSs.size(); i++) {
+                String corpusSourceTable = boLPCSs.get(i).getAttribute("CORPUS_SOURCE").toString();
+                if (corpusSource.equals(corpusSourceTable)) {
+                    nextIndex = i + 1;
+                    break;
+                }
             }
-            if(nextIndex>=boLPCSs.size()||nextIndex==-1){
+            if (nextIndex >= boLPCSs.size() || nextIndex == -1) {
                 return "AP";
-            }else {
+            } else {
                 return boLPCSs.get(nextIndex).getAttribute("CORPUS_SOURCE").toString();
             }
         }
         return "AP";
     }
-    public String corpusApplyCheck(){
-        String sResult = "F";
+
+    public String corpusApplyCheck() {
+        String sResult;
         Transaction Sqlca = Transaction.createTransaction("als");
         try {
-            String corpusSource = Sqlca.getString("select corpus_source from lb_project_info where id = '"+projectId+"'");
-            if(!"AP".equals(corpusSource)&&!"".equals(corpusSource)&&corpusSource!=null){
-                //TODO 具体的不同状态，不同提示信息，需要再优化
-                String fcStatus = Sqlca.getString("select FC_STATUS from fc_request where del_flag='0' and project_id = '"+projectId+"'");
-                if(Integer.parseInt(fcStatus)==1300){
+            String corpusSource = Sqlca.getString("select corpus_source from lb_project_info where id = '" + projectId + "'");
+            if ("AP".equals(corpusSource) || "".equals(corpusSource) || corpusSource == null) {
+                sResult = "S";
+            } else {
+                String fcStatus = Sqlca.getString("select FC_STATUS from fc_request where del_flag='0' and project_id = '" + projectId + "'");
+                if (Integer.parseInt(fcStatus) == 1700) {
                     sResult = "S";
+                } else {
+                    sResult = "资金方尚未审批结束，请稍后再试!";
                 }
             }
         } catch (Exception e) {
             sResult = "检验资金渠道信息出错，请联系系统管理员！";
             e.printStackTrace();
-        }finally {
-            if(Sqlca!=null) {
+        } finally {
+            if (Sqlca != null) {
                 try {
                     Sqlca.commit();
                     Sqlca.disConnect();
@@ -88,6 +104,7 @@ public class CorpusSourceCheck {
         }
         return sResult;
     }
+
     public String getProjectId() {
         return projectId;
     }
diff --git a/src_core/com/ample/fundchannel/doc/action/DocListAction.java b/src_core/com/ample/fundchannel/doc/action/DocListAction.java
index 071dfff4d..02f31aa1d 100644
--- a/src_core/com/ample/fundchannel/doc/action/DocListAction.java
+++ b/src_core/com/ample/fundchannel/doc/action/DocListAction.java
@@ -3,37 +3,90 @@ package com.ample.fundchannel.doc.action;
 import com.amarsoft.are.jbo.*;
 import com.amarsoft.are.util.StringFunction;
 import jbo.oti.FC_REQUEST_FILE;
+import jbo.oti.FC_REQUEST_FILE_PUSH;
+
+import java.util.List;
 
 public class DocListAction {
 
     private String frfId;
     private String userId;
+    private String fcFlowType;
+    private String fcFileCode;
+    private String fcQueuestId;
+    public DocListAction() {
+    }
+
+    public DocListAction(String fcQueuestId, String fcFlowType) {
+        this.fcQueuestId = fcQueuestId;
+        this.fcFlowType = fcFlowType;
+    }
 
     /**
      * 删除文件时，只添加删除标记，不进行物理删除
+     *
      * @param tx
      * @return
      * @throws JBOException
      */
-    public String deleteFileForFundChannel(JBOTransaction tx){
+    public String deleteFileForFundChannel(JBOTransaction tx) {
         String sResult = "S";
         BizObjectManager FRFbom = null;
         String updateTime = StringFunction.getTodayNow();
         try {
-            FRFbom = JBOFactory.getBizObjectManager(FC_REQUEST_FILE.CLASS_NAME,tx);
-            BizObject FRFBO = FRFbom.createQuery("id=:id").setParameter("id",frfId).getSingleResult(true);
-            FRFBO.setAttributeValue("DEL_FLAG","1");
-            FRFBO.setAttributeValue("UPDATE_TIME",updateTime);
-            FRFBO.setAttributeValue("INPUTUSER",userId);
+            FRFbom = JBOFactory.getBizObjectManager(FC_REQUEST_FILE.CLASS_NAME, tx);
+            BizObject FRFBO = FRFbom.createQuery("id=:id").setParameter("id", frfId).getSingleResult(true);
+            FRFBO.setAttributeValue("DEL_FLAG", "1");
+            FRFBO.setAttributeValue("UPDATE_TIME", updateTime);
+            FRFBO.setAttributeValue("INPUTUSER", userId);
             FRFbom.saveObject(FRFBO);
         } catch (JBOException e) {
-            sResult="error";
+            sResult = "error";
             e.printStackTrace();
         }
 
         return sResult;
     }
 
+    public String isFileAppendCheck() throws JBOException {
+        BizObjectManager FRFbom = null;
+        FRFbom = JBOFactory.getBizObjectManager(FC_REQUEST_FILE.CLASS_NAME);
+        List<BizObject> FRFBO = FRFbom.createQuery("select FC_FILE_STS from O where FC_REQUEST_ID=:fcQueuestId and FC_FLOW_TYPE=:fcFlowType group by FC_FILE_STS").setParameter("fcQueuestId", fcQueuestId).setParameter("fcFlowType", fcFlowType).getResultList(false);
+        if (FRFBO.size() == 1 && FRFBO.get(0).getAttribute("FC_FILE_STS") != null && "1".equals(FRFBO.get(0).getAttribute("FC_FILE_STS").toString())) {
+            return "Y";
+        }
+        return "N";
+    }
+
+    public String isFileAppendCheckByRow() throws JBOException {
+        BizObjectManager FRFbom = null;
+        FRFbom = JBOFactory.getBizObjectManager(FC_REQUEST_FILE.CLASS_NAME);
+        List<BizObject> FRFBO = FRFbom.createQuery("select FC_FILE_STS from O where FC_REQUEST_ID=:fcQueuestId and FC_FLOW_TYPE=:fcFlowType and FC_FILE_CODE=:fcFileCode group by FC_FILE_STS").setParameter("fcQueuestId", fcQueuestId).setParameter("fcFlowType", fcFlowType).setParameter("fcFileCode", fcFileCode).getResultList(false);
+        if (FRFBO.size() == 1 && FRFBO.get(0).getAttribute("FC_FILE_STS") != null && "1".equals(FRFBO.get(0).getAttribute("FC_FILE_STS").toString())) {
+            return "Y";
+        }
+        return "N";
+    }
+    public String requestFilePushUpdate(JBOTransaction tx) {
+        BizObjectManager FRFPbom = null;
+        BizObject FRFPBo = null;
+        try {
+            FRFPbom = JBOFactory.getBizObjectManager(FC_REQUEST_FILE_PUSH.CLASS_NAME,tx);
+            FRFPBo = FRFPbom.createQuery("FC_REQUEST_ID=:fcQueuestId and DEL_FLAG='0'").setParameter("fcQueuestId", fcQueuestId).getSingleResult(true);
+            if(FRFPBo!=null){
+                FRFPBo.setAttributeValue("PUSH_STS","1");
+                String updateTime = StringFunction.getTodayNow();
+                FRFPBo.setAttributeValue("UPDATE_TIME",updateTime);
+                FRFPbom.saveObject(FRFPBo);
+            }else{
+                return "未找到对应记录，请联系IT管理员";
+            }
+        } catch (JBOException e) {
+            e.printStackTrace();
+            return "error";
+        }
+        return "S";
+    }
     public String getFrfId() {
         return frfId;
     }
@@ -49,4 +102,29 @@ public class DocListAction {
     public void setUserId(String userId) {
         this.userId = userId;
     }
+
+    public String getFcFlowType() {
+        return fcFlowType;
+    }
+
+    public void setFcFlowType(String fcFlowType) {
+        this.fcFlowType = fcFlowType;
+    }
+
+    public String getFcFileCode() {
+        return fcFileCode;
+    }
+
+    public void setFcFileCode(String fcFileCode) {
+        this.fcFileCode = fcFileCode;
+    }
+
+    public String getFcQueuestId() {
+        return fcQueuestId;
+    }
+
+    public void setFcQueuestId(String fcQueuestId) {
+        this.fcQueuestId = fcQueuestId;
+    }
+
 }
diff --git a/src_core/com/ample/fundchannel/doc/cache/DocListCache.java b/src_core/com/ample/fundchannel/doc/cache/DocListCache.java
index beee1b2b2..5204e45d2 100644
--- a/src_core/com/ample/fundchannel/doc/cache/DocListCache.java
+++ b/src_core/com/ample/fundchannel/doc/cache/DocListCache.java
@@ -33,6 +33,7 @@ public class DocListCache {
 			boJson.put("FC_FLOW_TYPE",bo.getAttribute("FC_FLOW_TYPE").getString());
 			boJson.put("FILE_NAME",bo.getAttribute("FILE_NAME").getString());
 			boJson.put("FILE_PATH",bo.getAttribute("FILE_PATH").getString());
+			boJson.put("FC_FILE_CODE",fcFileCode);
 			boJson.put("INPUTTIME",bo.getAttribute("INPUTTIME").getString());
 			boJson.put("INPUTUSER",bo.getAttribute("INPUTUSER").getString());
 			boJsonList.add(boJson);
@@ -66,6 +67,7 @@ public class DocListCache {
 			sb.append("\"objecttype\":\""+bo.get("FC_FLOW_TYPE").toString()+"\",");
 			sb.append("\"filename\":\""+bo.get("FILE_NAME").toString()+"\",");
 			sb.append("\"filepath\":\""+bo.get("FILE_PATH").toString()+"\",");
+			sb.append("\"fcFileCode\":\""+bo.get("FC_FILE_CODE").toString()+"\",");
 			sb.append("\"inputtime\":\""+bo.get("INPUTTIME").toString()+"\",");
 			sb.append("\"inputuser\":\""+NameManager.getUserName(bo.get("INPUTUSER").toString())+"\"");
 			sb.append("},");
diff --git a/src_jbo/jbo/oti/FC_REQUEST.java b/src_jbo/jbo/oti/FC_REQUEST.java
index c7d149289..92a3516cf 100644
--- a/src_jbo/jbo/oti/FC_REQUEST.java
+++ b/src_jbo/jbo/oti/FC_REQUEST.java
@@ -77,6 +77,14 @@ public interface FC_REQUEST{
 	* 返回状态描述 STRING(32)<br>
 	*/
 	public static final String FC_REMARK = "FC_REMARK";
+	/**
+	 * 是否需要补充资料清单 STRING(32)<br>
+	 */
+	public static final String SUPPLEMENT_STS = "SUPPLEMENT_STS";
+	/**
+	 * 通知需要补充资料清单描述 STRING(32)<br>
+	 */
+	public static final String SUPPLEMENT_DESC = "SUPPLEMENT_DESC";
 	/**
 	* 创建时间 STRING(32)<br>
 	*/
diff --git a/src_jbo/jbo/oti/FC_REQUEST_FILE_PUSH.java b/src_jbo/jbo/oti/FC_REQUEST_FILE_PUSH.java
new file mode 100644
index 000000000..63f9fc409
--- /dev/null
+++ b/src_jbo/jbo/oti/FC_REQUEST_FILE_PUSH.java
@@ -0,0 +1,43 @@
+package jbo.oti;
+
+/**
+* 接口资料表 - JBO命名常量类<br><br>
+* Note: This file is generated by ADE tools, <em>dont</em> modify it.<br>
+
+*/
+public interface FC_REQUEST_FILE_PUSH {
+	/**
+	* 接口资料表<br><br>
+	* 代表本类映射的BizObjectClass
+	*/
+	public static final String CLASS_NAME = "jbo.oti.FC_REQUEST_FILE_PUSH";
+	/**
+	* 唯一标识 STRING(32)<br>
+	*/
+	public static final String ID = "ID";
+	/**
+	* 资金渠道申请ID STRING(32)<br>
+	*/
+	public static final String FC_REQUEST_ID = "FC_REQUEST_ID";
+	/**
+	* 文件状态 STRING(32)<br>
+	*/
+	public static final String FC_FILE_STS = "PUSH_STS";
+	/**
+	* 文件状态描述 STRING(32)<br>
+	*/
+	public static final String FC_FILE_STS_DESC = "PUSH_STS_DESC";
+	/**
+	* 创建时间 STRING(32)<br>
+	*/
+	public static final String CREATE_TIME = "CREATE_TIME";
+	/**
+	* 修改时间 STRING(32)<br>
+	*/
+	public static final String UPDATE_TIME = "UPDATE_TIME";
+	/**
+	* 有效标志 STRING(32)<br>
+	*/
+	public static final String DEL_FLAG = "DEL_FLAG";
+
+}
\ No newline at end of file
diff --git a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProjectIntoTempInitCarBusiness.java b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProjectIntoTempInitCarBusiness.java
index 77e3c0a71..9fe9d3b06 100644
--- a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProjectIntoTempInitCarBusiness.java
+++ b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProjectIntoTempInitCarBusiness.java
@@ -397,10 +397,14 @@ public class LBProjectIntoTempInitCarBusiness extends BaseBussiness {
 			and order_list =(select ot.order_list from lb_product_corpus_source ot where ot.product_id='H01-C01-E-CXC1-DB-3'  order by ot.order_list limit n-1,1);
 			*/
 			String sql = "select O.CORPUS_SOURCE from O where PRODUCT_ID=:PRODUCTID and O.ORDER_LIST = (select min(ot.order_list) from jbo.prd.LB_PRODUCT_CORPUS_SOURCE ot where ot.PRODUCT_ID=:PRODUCTID)";
-			BizObject boLPCS = JBOFactory.createBizObjectQuery(LB_PRODUCT_CORPUS_SOURCE.CLASS_NAME,sql).setParameter("PRODUCTID",productId).getSingleResult(false);
 			String corpusSource = "AP";
-			if(boLPCS!=null&&boLPCS.getAttribute("CORPUS_SOURCE")!=null){
-				corpusSource=boLPCS.getAttribute("CORPUS_SOURCE").toString();
+			try {
+				BizObject boLPCS = JBOFactory.createBizObjectQuery(LB_PRODUCT_CORPUS_SOURCE.CLASS_NAME, sql).setParameter("PRODUCTID", productId).getSingleResult(false);
+				if(boLPCS!=null&&boLPCS.getAttribute("CORPUS_SOURCE")!=null){
+					corpusSource=boLPCS.getAttribute("CORPUS_SOURCE").toString();
+				}
+			}catch (JBOException e1){
+				e1.printStackTrace();
 			}
 			bo.setAttributeValue("CORPUS_SOURCE",corpusSource);
 			bomLPI.saveObject(bo);

From d56af5de4b57b9b29f9af7d4b9613001cc47a587 Mon Sep 17 00:00:00 2001
From: ap007 <zhanglei@ap-leasing.com.cn>
Date: Wed, 30 Jun 2021 10:02:50 +0800
Subject: [PATCH 08/29] =?UTF-8?q?=E7=A7=9F=E5=89=8D=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BA=8C=E6=AC=A1=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WebContent/Ample/Doc/DocListInfoNew.jsp       |  4 +-
 WebContent/Ample/Doc/DocListUploadNew.jsp     |  4 +-
 WebContent/WEB-INF/etc/jbo/jbo_oti.xml        |  5 +-
 .../apzl/CorpusSource/FcRequestDocTab.jsp     |  6 +-
 .../apzl/CorpusSource/FcRequestFileList.jsp   | 20 ++--
 .../tenwa/apzl/CorpusSource/FcRequestLIst.jsp | 11 +--
 .../fundchannel/doc/action/DocListAction.java | 95 ++++++++++++++-----
 src_jbo/jbo/oti/FC_REQUEST.java               |  6 +-
 8 files changed, 100 insertions(+), 51 deletions(-)

diff --git a/WebContent/Ample/Doc/DocListInfoNew.jsp b/WebContent/Ample/Doc/DocListInfoNew.jsp
index ffa45bfc8..7d90f3938 100644
--- a/WebContent/Ample/Doc/DocListInfoNew.jsp
+++ b/WebContent/Ample/Doc/DocListInfoNew.jsp
@@ -4,7 +4,7 @@
 <%
 	//获得组件参数
 	String flowNo=CurPage.getParameter("FlowNo");
-	String fcQueuestId = CurPage.getParameter("fcQueuestId");
+	String fcRequestId = CurPage.getParameter("fcRequestId");
 	String fcFlowType = CurPage.getParameter("fcFlowType");
 	String fcFileCode = CurPage.getParameter("fcFileCode");
 
@@ -105,7 +105,7 @@
 			threads:<%=QuartzPropertiesUtil.get("fileNumLimit") %>,
 			
 			formData: {
-				fcQueuestId:'<%=fcQueuestId%>',
+				fcRequestId:'<%=fcRequestId%>',
 				fcFlowType:'<%=fcFlowType%>',
 				fcFileCode:'<%=fcFileCode%>'
 			},
diff --git a/WebContent/Ample/Doc/DocListUploadNew.jsp b/WebContent/Ample/Doc/DocListUploadNew.jsp
index e7274dbb3..57e1c3ecb 100644
--- a/WebContent/Ample/Doc/DocListUploadNew.jsp
+++ b/WebContent/Ample/Doc/DocListUploadNew.jsp
@@ -71,13 +71,13 @@
 		if(params.size()>0){
 			BizObjectManager frfBom = JBOFactory.getBizObjectManager("jbo.oti.FC_REQUEST_FILE",Sqlca);
 			BizObject frfBo = frfBom.newObject();
-			frfBo.setAttributeValue("FC_REQUEST_ID",params.get("fcQueuestId"));
+			frfBo.setAttributeValue("FC_REQUEST_ID",params.get("fcRequestId"));
 			frfBo.setAttributeValue("FC_FLOW_TYPE",params.get("fcFlowType"));
 			frfBo.setAttributeValue("FC_FILE_CODE",params.get("fcFileCode"));
 			frfBo.setAttributeValue("FC_FILE_TYPE",params.get("type"));
 			frfBo.setAttributeValue("FILE_NAME",params.get("name"));
 			frfBo.setAttributeValue("FILE_PATH",params.get("filePath"));
-			frfBo.setAttributeValue("FC_FILE_STS","");
+			frfBo.setAttributeValue("FC_FILE_STS","0");
 			frfBo.setAttributeValue("CREATE_TIME",params.get("inputTime"));
 			frfBo.setAttributeValue("UPDATE_TIME",params.get("inputTime"));
 			frfBo.setAttributeValue("DEL_FLAG","0");
diff --git a/WebContent/WEB-INF/etc/jbo/jbo_oti.xml b/WebContent/WEB-INF/etc/jbo/jbo_oti.xml
index 652f16a47..d714bd101 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_oti.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_oti.xml
@@ -303,8 +303,8 @@
 		</class>
 		<class name="FC_REQUEST" label="接口状态表" describe="邮储/九江申请状态页面" keyAttributes="ID">
 			<attributes>
-				<attribute name="ID"    label="唯一标识"     type="STRING" length="32" />
-				<attribute name="FC_LOAN_QUEUEST_ID"    label="资金渠道申请ID"    type="STRING" length="32"/>
+				<attribute name="ID"    label="资金渠道申请ID"     type="STRING" length="32" />
+				<attribute name="FC_LOAN_ID"    label="资金渠道放款申请ID"    type="STRING" length="32"/>
 				<attribute name="CHANNEL_NO"    label="资金渠道编号"    type="STRING" length="32"/>
 				<attribute name="CHANNEL_NAME"    label="资金渠道名称"    type="STRING" length="32"/>
 				<attribute name="PROJECT_ID"    label="项目ID"    type="STRING" length="32"/>
@@ -328,7 +328,6 @@
 			<manager>
 				<managerProperties>
 					<property name="table" value="FC_REQUEST"/>
-					<property name="createKey" value="true" />
 				</managerProperties>
 			</manager>
 		</class>
diff --git a/WebContent/com/tenwa/apzl/CorpusSource/FcRequestDocTab.jsp b/WebContent/com/tenwa/apzl/CorpusSource/FcRequestDocTab.jsp
index 7de490eb3..91ce0356c 100644
--- a/WebContent/com/tenwa/apzl/CorpusSource/FcRequestDocTab.jsp
+++ b/WebContent/com/tenwa/apzl/CorpusSource/FcRequestDocTab.jsp
@@ -1,12 +1,14 @@
 <%@ page contentType="text/html; charset=GBK"%>
 <%@ include file="/IncludeBegin.jsp"%>
 <%
-	String fcLoanQueuestId = CurPage.getParameter("fcLoanQueuestId");
+	String fcRequestId = CurPage.getParameter("fcRequestId");
+	//todo 提交后将消息已读并已处理
+	String messageId = CurPage.getParameter("messageid");
 	String channelNo=CurPage.getParameter("channelNo");
 	String projectId=CurPage.getParameter("projectId");
 	String contractId=CurPage.getParameter("contractId");
 	String isReadOnly = CurPage.getParameter("isReadOnly");
-	String params="fcLoanQueuestId="+fcLoanQueuestId+"&channelNo="+channelNo+"&projectId="+projectId+"&contractId="+contractId+"&isReadOnly="+isReadOnly;
+	String params="fcRequestId="+fcRequestId+"&channelNo="+channelNo+"&projectId="+projectId+"&contractId="+contractId+"&isReadOnly="+isReadOnly+"messageId"+messageId;
 
 	//参数：0.是否显示, 1.标题，2.URL，3，参数串, 4. Strip高度(默认600px)，5. 是否有关闭按钮(默认无) 6. 是否缓存(默认是)
 
diff --git a/WebContent/com/tenwa/apzl/CorpusSource/FcRequestFileList.jsp b/WebContent/com/tenwa/apzl/CorpusSource/FcRequestFileList.jsp
index 2a2213b89..08297a394 100644
--- a/WebContent/com/tenwa/apzl/CorpusSource/FcRequestFileList.jsp
+++ b/WebContent/com/tenwa/apzl/CorpusSource/FcRequestFileList.jsp
@@ -7,39 +7,39 @@
         Content: 示例详情页面
         History Log: 
     */
-	String productId=CurPage.getParameter("productId");
 	String fcFlowType=CurPage.getParameter("fcFlowType");
-	String fcQueuestId=CurPage.getParameter("fcLoanQueuestId");
+	String fcRequestId=CurPage.getParameter("fcRequestId");
 	String isReadOnly = CurPage.getParameter("isReadOnly");
+	String messageId = CurPage.getParameter("messageId");
 	String sPrevUrl = CurPage.getParameter("PrevUrl");
-	if(sPrevUrl == null) sPrevUrl = "";
+	if(sPrevUrl == null) sPrevUrl = "/com/tenwa/apzl/CorpusSource/FcRequestLIst.jsp";
 	String sTempletNo=CurPage.getParameter("TempletNo");
 	if(sTempletNo==null){
 		sTempletNo="FcRequestFileList";
 	}
 	if("N".equals(isReadOnly)){
-		isReadOnly = new DocListAction(fcQueuestId,fcFlowType).isFileAppendCheck();
+		isReadOnly = new DocListAction(fcRequestId,fcFlowType).isFileAppendCheck();
 	}
 	ASObjectModel doTemp = new ASObjectModel(sTempletNo);
 	doTemp.setLockCount(0);
 	ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request);
 	dwTemp.Style = "1";//freeform
 	//dwTemp.ReadOnly = "-2";//只读模式
-	dwTemp.genHTMLObjectWindow(fcFlowType+","+fcQueuestId);
+	dwTemp.genHTMLObjectWindow(fcFlowType+","+fcRequestId);
 
 	String sButtons[][] = {
 		{"Y".equals(isReadOnly)?"false":"true","All","Button","提交资料","修改完毕，确认提交","updateStatus()","","","",""},
-	//	{String.valueOf(!com.amarsoft.are.lang.StringX.isSpace(sPrevUrl)),"All","Button","返回","返回列表","returnList()","","","",""}
+		{"true","All","Button","返回列表","返回列表","returnList()","","","",""}
 	};
 	sButtonPosition = "north";
 %><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
 <script type="text/javascript">
 	function returnList(){
-		 AsControl.OpenView("<%=sPrevUrl%>", "","_self","");
+		parent.AsControl.OpenView("<%=sPrevUrl%>", "","_self","");
 	}
 	function updateStatus(){
 		if(confirm("确认已补充完本合同所有资料？")){
-			var sParams = "fcQueuestId=<%=fcQueuestId%>";
+			var sParams = "fcRequestId=<%=fcRequestId%>,messageId=<%=messageId%>";
 			var sReturnInfo = RunJavaMethodTrans("com.ample.fundchannel.doc.action.DocListAction","requestFilePushUpdate",sParams);
 			if(sReturnInfo=='S'){
 				alert("提交成功");
@@ -63,7 +63,7 @@
 	}
 
 	function upload(fcFileCode){
-		var param="fcQueuestId=<%=fcQueuestId%>&fcFlowType=<%=fcFlowType%>&fcFileCode="+fcFileCode;
+		var param="fcRequestId=<%=fcRequestId%>&fcFlowType=<%=fcFlowType%>&fcFileCode="+fcFileCode;
 		var sUrl="/Ample/Doc/DocListInfoNew.jsp";
 		AsDialog.PopView(sUrl,param,"dialogWidth=800px;dialogHeight=500px;resizable=no;scrollbars=no;status:yes;maximize:no;help:no;",function(message){
 			reloadSelf();
@@ -87,7 +87,7 @@
 	function afterSearch(){
 		var isReadOnly="<%=isReadOnly%>";
 		for(var i=0;i<getRowCount(0);i++){
-			var sParams="fcQueuestId=<%=fcQueuestId%>,fcFlowType=<%=fcFlowType%>,fcFileCode="+getItemValue(0,i,"FC_FILE_CODE");
+			var sParams="fcRequestId=<%=fcRequestId%>,fcFlowType=<%=fcFlowType%>,fcFileCode="+getItemValue(0,i,"FC_FILE_CODE");
 			var isAppend = RunJavaMethod("com.ample.fundchannel.doc.action.DocListAction","isFileAppendCheckByRow",sParams);
 			if(isReadOnly!="Y"&&isAppend!="Y"&&getObj(0,i,"operation")!=null&&getObj(0,i,"operation")!="null"){
 				getObj(0,i,"operation").innerHTML='<a class="box"  onclick="upload(\''+getItemValue(0,i,"FC_FILE_CODE")+'\')" style={color:#000;text-decoration:underline;}><font color="blue">上传</font></a>';
diff --git a/WebContent/com/tenwa/apzl/CorpusSource/FcRequestLIst.jsp b/WebContent/com/tenwa/apzl/CorpusSource/FcRequestLIst.jsp
index 3491322de..70b1c893e 100644
--- a/WebContent/com/tenwa/apzl/CorpusSource/FcRequestLIst.jsp
+++ b/WebContent/com/tenwa/apzl/CorpusSource/FcRequestLIst.jsp
@@ -27,19 +27,18 @@
 	}
 	function viewAndEdit(){
 		var sUrl = "/com/tenwa/apzl/CorpusSource/FcRequestDocTab.jsp";
-		var fcLoanQueuestId =  getItemValue(0,getRow(0),'FC_LOAN_QUEUEST_ID');
+		var fcRequestId =  getItemValue(0,getRow(0),'ID');
 		var channelNo =  getItemValue(0,getRow(0),'CHANNEL_NO');
 		var projectId =  getItemValue(0,getRow(0),'PROJECT_ID');
 		var contractId =  getItemValue(0,getRow(0),'CONTRACT_ID');
 		var supplementSTS =  getItemValue(0,getRow(0),'SUPPLEMENT_STS');
 		var isReadOnly = 'Y';
-		debugger;
-		//todo 邮储发送通知后，fcStatus标记是否有需要补充资料的
-		if(supplementSTS=='1'){
+
+		if(supplementSTS!='0'){
 			isReadOnly='N';
 		}
-		var sPara ='fcLoanQueuestId='+fcLoanQueuestId+'&channelNo='+channelNo+ '&projectId='+projectId+'&contractId='+contractId+'&isReadOnly='+isReadOnly;
-		if(projectId==null || fcLoanQueuestId==null ){
+		var sPara ='fcRequestId='+fcRequestId+'&channelNo='+channelNo+ '&projectId='+projectId+'&contractId='+contractId+'&isReadOnly='+isReadOnly;
+		if(projectId==null || fcRequestId==null ){
 			alert("参数不能为空！");
 			return ;
 		}
diff --git a/src_core/com/ample/fundchannel/doc/action/DocListAction.java b/src_core/com/ample/fundchannel/doc/action/DocListAction.java
index 02f31aa1d..e8c1fef44 100644
--- a/src_core/com/ample/fundchannel/doc/action/DocListAction.java
+++ b/src_core/com/ample/fundchannel/doc/action/DocListAction.java
@@ -1,7 +1,10 @@
 package com.ample.fundchannel.doc.action;
 
+import com.amarsoft.are.ARE;
 import com.amarsoft.are.jbo.*;
 import com.amarsoft.are.util.StringFunction;
+import jbo.com.tenwa.entity.comm.message.BT_BUSSINESS_MESSAGE;
+import jbo.oti.FC_REQUEST;
 import jbo.oti.FC_REQUEST_FILE;
 import jbo.oti.FC_REQUEST_FILE_PUSH;
 
@@ -13,12 +16,14 @@ public class DocListAction {
     private String userId;
     private String fcFlowType;
     private String fcFileCode;
-    private String fcQueuestId;
+    private String fcRequestId;
+    private String messageId;
+    private String currentTime;
     public DocListAction() {
     }
 
-    public DocListAction(String fcQueuestId, String fcFlowType) {
-        this.fcQueuestId = fcQueuestId;
+    public DocListAction(String fcRequestId, String fcFlowType) {
+        this.fcRequestId = fcRequestId;
         this.fcFlowType = fcFlowType;
     }
 
@@ -51,7 +56,7 @@ public class DocListAction {
     public String isFileAppendCheck() throws JBOException {
         BizObjectManager FRFbom = null;
         FRFbom = JBOFactory.getBizObjectManager(FC_REQUEST_FILE.CLASS_NAME);
-        List<BizObject> FRFBO = FRFbom.createQuery("select FC_FILE_STS from O where FC_REQUEST_ID=:fcQueuestId and FC_FLOW_TYPE=:fcFlowType group by FC_FILE_STS").setParameter("fcQueuestId", fcQueuestId).setParameter("fcFlowType", fcFlowType).getResultList(false);
+        List<BizObject> FRFBO = FRFbom.createQuery("select FC_FILE_STS from O where FC_REQUEST_ID=:fcRequestId and FC_FLOW_TYPE=:fcFlowType group by FC_FILE_STS").setParameter("fcRequestId", fcRequestId).setParameter("fcFlowType", fcFlowType).getResultList(false);
         if (FRFBO.size() == 1 && FRFBO.get(0).getAttribute("FC_FILE_STS") != null && "1".equals(FRFBO.get(0).getAttribute("FC_FILE_STS").toString())) {
             return "Y";
         }
@@ -61,32 +66,62 @@ public class DocListAction {
     public String isFileAppendCheckByRow() throws JBOException {
         BizObjectManager FRFbom = null;
         FRFbom = JBOFactory.getBizObjectManager(FC_REQUEST_FILE.CLASS_NAME);
-        List<BizObject> FRFBO = FRFbom.createQuery("select FC_FILE_STS from O where FC_REQUEST_ID=:fcQueuestId and FC_FLOW_TYPE=:fcFlowType and FC_FILE_CODE=:fcFileCode group by FC_FILE_STS").setParameter("fcQueuestId", fcQueuestId).setParameter("fcFlowType", fcFlowType).setParameter("fcFileCode", fcFileCode).getResultList(false);
-        if (FRFBO.size() == 1 && FRFBO.get(0).getAttribute("FC_FILE_STS") != null && "1".equals(FRFBO.get(0).getAttribute("FC_FILE_STS").toString())) {
+        List<BizObject> FRFBO = FRFbom.createQuery("select FC_FILE_STS from O where FC_REQUEST_ID=:fcRequestId and FC_FLOW_TYPE=:fcFlowType and FC_FILE_CODE=:fcFileCode group by FC_FILE_STS").setParameter("fcRequestId", fcRequestId).setParameter("fcFlowType", fcFlowType).setParameter("fcFileCode", fcFileCode).getResultList(false);
+        if (FRFBO.size() == 1 && FRFBO.get(0).getAttribute("FC_FILE_STS") != null && "0".equals(FRFBO.get(0).getAttribute("FC_FILE_STS").toString())) {
             return "Y";
         }
         return "N";
     }
     public String requestFilePushUpdate(JBOTransaction tx) {
-        BizObjectManager FRFPbom = null;
-        BizObject FRFPBo = null;
+        this.setCurrentTime();
         try {
-            FRFPbom = JBOFactory.getBizObjectManager(FC_REQUEST_FILE_PUSH.CLASS_NAME,tx);
-            FRFPBo = FRFPbom.createQuery("FC_REQUEST_ID=:fcQueuestId and DEL_FLAG='0'").setParameter("fcQueuestId", fcQueuestId).getSingleResult(true);
-            if(FRFPBo!=null){
-                FRFPBo.setAttributeValue("PUSH_STS","1");
-                String updateTime = StringFunction.getTodayNow();
-                FRFPBo.setAttributeValue("UPDATE_TIME",updateTime);
-                FRFPbom.saveObject(FRFPBo);
-            }else{
-                return "未找到对应记录，请联系IT管理员";
-            }
+            updateRequestFileStatus(tx);
+            setMessageRead(tx);
+            insertRequestFilePush(tx);
         } catch (JBOException e) {
             e.printStackTrace();
-            return "error";
+            return "提交出现错误";
         }
         return "S";
     }
+    public void updateRequestFileStatus(JBOTransaction tx) throws JBOException {
+        BizObjectManager FRbom = null;
+        BizObject FRBo = null;
+        FRbom = JBOFactory.getBizObjectManager(FC_REQUEST.CLASS_NAME,tx);
+        FRBo = FRbom.createQuery("ID=:id").setParameter("id",fcRequestId).getSingleResult(true);
+        String supplementSTS = FRBo.getAttribute("SUPPLEMENT_STS")==null?"":FRBo.getAttribute("SUPPLEMENT_STS").toString();
+        if("0".equals(supplementSTS)){
+            ARE.getLog().warn("邮储请求ID："+fcRequestId + "的合同无需补充资料，却显示了资料提交的按钮");
+        }else if("1".equals(supplementSTS)||"".equals(supplementSTS)){
+            FRBo.setAttributeValue("SUPPLEMENT_STS","2");
+            FRbom.saveObject(FRBo);
+        }
+    }
+    public void insertRequestFilePush(JBOTransaction tx) throws JBOException {
+        BizObjectManager FRFPbom = null;
+        BizObject FRFPBo = null;
+        FRFPbom = JBOFactory.getBizObjectManager(FC_REQUEST_FILE_PUSH.CLASS_NAME,tx);
+        FRFPBo = FRFPbom.newObject();
+        FRFPBo.setAttributeValue("FC_REQUEST_ID",fcRequestId);
+        FRFPBo.setAttributeValue("PUSH_STS","0");
+        FRFPBo.setAttributeValue("PUSH_STS_DESC","未提交");
+        FRFPBo.setAttributeValue("CREATE_TIME",currentTime);
+        FRFPBo.setAttributeValue("UPDATE_TIME",currentTime);
+        FRFPBo.setAttributeValue("DEL_FLAG","0");
+        FRFPbom.saveObject(FRFPBo);
+    }
+    public void setMessageRead(JBOTransaction tx) throws JBOException {
+        BizObjectManager BBMbom = null;
+        BizObject BBMBo = null;
+        BBMbom = JBOFactory.getBizObjectManager(BT_BUSSINESS_MESSAGE.CLASS_NAME,tx);
+        BBMBo = BBMbom.createQuery("ID=:id").setParameter("id",messageId).getSingleResult(true);
+        BBMBo.setAttributeValue("is_read","has_read");
+        BBMBo.setAttributeValue("message_status","has_process");
+        BBMBo.setAttributeValue("read_time",currentTime);
+        BBMBo.setAttributeValue("finish_time",currentTime);
+        BBMbom.saveObject(BBMBo);
+    }
+
     public String getFrfId() {
         return frfId;
     }
@@ -119,12 +154,26 @@ public class DocListAction {
         this.fcFileCode = fcFileCode;
     }
 
-    public String getFcQueuestId() {
-        return fcQueuestId;
+    public String getFcRequestId() {
+        return fcRequestId;
     }
 
-    public void setFcQueuestId(String fcQueuestId) {
-        this.fcQueuestId = fcQueuestId;
+    public void setFcRequestId(String fcRequestId) {
+        this.fcRequestId = fcRequestId;
     }
 
+    public String getMessageId() {
+        return messageId;
+    }
+
+    public void setMessageId(String messageId) {
+        this.messageId = messageId;
+    }
+    public String getCurrentTime() {
+        return currentTime;
+    }
+
+    public void setCurrentTime() {
+        this.currentTime = StringFunction.getTodayNow();
+    }
 }
diff --git a/src_jbo/jbo/oti/FC_REQUEST.java b/src_jbo/jbo/oti/FC_REQUEST.java
index 92a3516cf..0725a88b6 100644
--- a/src_jbo/jbo/oti/FC_REQUEST.java
+++ b/src_jbo/jbo/oti/FC_REQUEST.java
@@ -14,13 +14,13 @@ public interface FC_REQUEST{
 	*/
 	public static final String CLASS_NAME = "jbo.oti.FC_REQUEST";
 	/**
-	* 唯一标识 STRING(32)<br>
+	* 资金渠道申请ID STRING(32)<br>
 	*/
 	public static final String ID = "ID";
 	/**
-	* 资金渠道申请ID STRING(32)<br>
+	* 资金渠道放款申请ID STRING(32)<br>
 	*/
-	public static final String FC_LOAN_QUEUEST_ID = "FC_LOAN_QUEUEST_ID";
+	public static final String FC_LOAN_ID = "FC_LOAN_ID";
 	/**
 	* 资金渠道编号 STRING(32)<br>
 	*/

From 71bf13279937ae69b953e38ae5f92d2de017c6d2 Mon Sep 17 00:00:00 2001
From: ap007 <zhanglei@ap-leasing.com.cn>
Date: Wed, 7 Jul 2021 16:08:41 +0800
Subject: [PATCH 09/29] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AE=9A=E6=97=B6?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=EF=BC=8C=E5=B0=86=E8=BF=98=E6=AC=BE=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E4=BF=A1=E6=81=AF=E6=8B=B7=E8=B4=9D=E8=87=B3=E7=A7=9F?=
 =?UTF-8?q?=E9=87=91=E8=AE=A1=E5=88=92=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WebContent/WEB-INF/etc/jbo/jbo_oti.xml        |  43 +++-
 src_jbo/jbo/oti/FC_FILE_PUSH.java             |  64 ++++++
 src_jbo/jbo/oti/FC_REQUEST_FILE.java          |   4 +
 src_jbo/jbo/oti/FC_REQUEST_FILE_PUSH.java     |  43 ----
 src_jbo/jbo/oti/FC_YC_FILE_REPAY_PLAN.java    |  59 +++++
 .../CorpusSourceRentPlanCopy.java             | 213 ++++++++++++++++++
 6 files changed, 377 insertions(+), 49 deletions(-)
 create mode 100644 src_jbo/jbo/oti/FC_FILE_PUSH.java
 delete mode 100644 src_jbo/jbo/oti/FC_REQUEST_FILE_PUSH.java
 create mode 100644 src_jbo/jbo/oti/FC_YC_FILE_REPAY_PLAN.java
 create mode 100644 src_tenwa/com/tenwa/lease/app/quartzmession/CorpusSourceRentPlanCopy.java

diff --git a/WebContent/WEB-INF/etc/jbo/jbo_oti.xml b/WebContent/WEB-INF/etc/jbo/jbo_oti.xml
index d714bd101..5f0878302 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_oti.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_oti.xml
@@ -301,6 +301,7 @@
                 </managerProperties>
             </manager>	  	
 		</class>
+
 		<class name="FC_REQUEST" label="接口状态表" describe="邮储/九江申请状态页面" keyAttributes="ID">
 			<attributes>
 				<attribute name="ID"    label="资金渠道申请ID"     type="STRING" length="32" />
@@ -331,6 +332,7 @@
 				</managerProperties>
 			</manager>
 		</class>
+
 		<class name="FC_REQUEST_FILE" label="接口资料表" describe="邮储/九江资料页面" keyAttributes="ID">
 			<attributes>
 				<attribute name="ID"    label="唯一标识"     type="STRING" length="32" />
@@ -340,6 +342,7 @@
 				<attribute name="FC_FILE_CODE"    label="资方：文件编号"    type="STRING" length="32"/>
 				<attribute name="FC_FILE_CODE_NAME"    label="资方：文件编号名称"    type="STRING" length="32"/>
 				<attribute name="FC_FILE_TYPE"    label="资方：文件类型：JPG,PNG,FDP等"    type="STRING" length="32"/>
+				<attribute name="FILE_TYPE"    label="例如：image/jpeg等"    type="STRING" length="32"/>
 				<attribute name="FILE_NAME"    label="文件名称"    type="STRING" length="32"/>
 				<attribute name="FILE_PATH"    label="文件路径"    type="STRING" length="32"/>
 				<attribute name="FC_FILE_STS"    label="文件状态"    type="STRING" length="32"/>
@@ -357,19 +360,47 @@
 				</managerProperties>
 			</manager>
 		</class>
-		<class name="FC_REQUEST_FILE_PUSH" label="接口资料推送状态" describe="接口资料推送状态" keyAttributes="ID">
+
+		<class name="FC_FILE_PUSH" label="对账文件信息" describe="对账文件信息" keyAttributes="ID">
 			<attributes>
 				<attribute name="ID"    label="唯一标识"     type="STRING" length="32" />
-				<attribute name="FC_REQUEST_ID"    label="资金渠道申请ID"    type="STRING" length="32"/>
-				<attribute name="PUSH_STS"    label="文件状态"    type="STRING" length="32"/>
-				<attribute name="PUSH_STS_DESC"    label="文件状态描述"    type="STRING" length="32"/>
+				<attribute name="CHANNEL_NO"    label="渠道编码"    type="STRING" length="32"/>
+				<attribute name="CHANNEL_NAME"    label="渠道名称"    type="STRING" length="32"/>
+				<attribute name="FC_FILE_PUSH_NAME"    label="当前推送文件名称"    type="STRING" length="32"/>
+				<attribute name="FILE_TYPE"    label="文件类型"    type="STRING" length="32"/>
+				<attribute name="FILE_NAME"    label="文件名称"    type="STRING" length="32"/>
+				<attribute name="FILE_PATH"    label="文件路径"    type="STRING" length="32"/>
+				<attribute name="FILE_STS"    label="文件状态：0,下载失败，1、解析失败，2、解析成功，3、拷贝成功"    type="STRING" length="32"/>
+				<attribute name="FILE_STS_DESC"    label="文件状态描述"    type="STRING" length="32"/>
+				<attribute name="ORDER_COUNT"    label="文件包含订单数量"    type="STRING" length="32"/>
 				<attribute name="CREATE_TIME"    label="创建时间"    type="STRING" length="32"/>
 				<attribute name="UPDATE_TIME"    label="修改时间"    type="STRING" length="32"/>
-				<attribute name="DEL_FLAG"    label="有效标志"    type="STRING" length="32"/>
 			</attributes>
 			<manager>
 				<managerProperties>
-					<property name="table" value="fc_request_file_push"/>
+					<property name="table" value="fc_file_push"/>
+					<property name="createKey" value="true" />
+				</managerProperties>
+			</manager>
+		</class>
+
+		<class name="FC_YC_FILE_REPAY_PLAN" label="资方租金计划信息" describe="资方租金计划信息" keyAttributes="ID">
+			<attributes>
+				<attribute name="ID"    label="唯一标识"     type="STRING" length="32" />
+				<attribute name="FC_FILE_ID"    label="资金渠道申请ID"    type="STRING" length="32"/>
+				<attribute name="FC_REQUEST_ID"    label="资金渠道申请ID"    type="STRING" length="32"/>
+				<attribute name="LOAN_NO"    label="放款申请编号"    type="STRING" length="32"/>
+				<attribute name="LEND_TERM"    label="期次"    type="STRING" length="32"/>
+				<attribute name="ANS_REPAYMENT_DATE"    label="还款日期"    type="STRING" length="32"/>
+				<attribute name="ANS_PRINCIPAL"    label="本金"    type="STRING" length="32"/>
+				<attribute name="ANS_INTEREST"    label="利息"    type="STRING" length="32"/>
+				<attribute name="ANS_REPAYMENT_MONEY"    label="租金"    type="STRING" length="32"/>
+				<attribute name="CREATE_TIME"    label="创建时间"    type="STRING" length="32"/>
+				<attribute name="UPDATE_TIME"    label="修改时间"    type="STRING" length="32"/>
+			</attributes>
+			<manager>
+				<managerProperties>
+					<property name="table" value="fc_yc_file_repay_plan"/>
 					<property name="createKey" value="true" />
 				</managerProperties>
 			</manager>
diff --git a/src_jbo/jbo/oti/FC_FILE_PUSH.java b/src_jbo/jbo/oti/FC_FILE_PUSH.java
new file mode 100644
index 000000000..4291167c1
--- /dev/null
+++ b/src_jbo/jbo/oti/FC_FILE_PUSH.java
@@ -0,0 +1,64 @@
+package jbo.oti;
+
+/**
+* 接口资料表 - JBO命名常量类<br><br>
+* Note: This file is generated by ADE tools, <em>dont</em> modify it.<br>
+
+*/
+public interface FC_FILE_PUSH {
+	/**
+	* 接口资料表<br><br>
+	* 代表本类映射的BizObjectClass
+	*/
+	public static final String CLASS_NAME = "jbo.oti.FC_FILE_PUSH";
+	/**
+	* 唯一标识 STRING(32)<br>
+	*/
+	public static final String ID = "ID";
+	/**
+	* 渠道编号 STRING(32)<br>
+	*/
+	public static final String CHANNEL_NO = "CHANNEL_NO";
+	/**
+	* 渠道名称 STRING(32)<br>
+	*/
+	public static final String CHANNEL_NAME = "CHANNEL_NAME";
+	/**
+	* 当前推送文件名称 STRING(32)<br>
+	*/
+	public static final String FC_FILE_PUSH_NAME = "FC_FILE_PUSH_NAME";
+	/**
+	 * 文件类型 STRING(32)<br>
+	 */
+	public static final String FILE_TYPE = "FILE_TYPE";
+	/**
+	 * 文件名称 STRING(32)<br>
+	 */
+	public static final String FILE_NAME = "FILE_NAME";
+	/**
+	 * 文件路径 STRING(32)<br>
+	 */
+	public static final String FILE_PATH = "FILE_PATH";
+	/**
+	 * 文件状态 STRING(32)<br>
+	 */
+	public static final String FILE_STS = "FILE_STS";
+	/**
+	 * 文件状态描述 STRING(32)<br>
+	 */
+	public static final String FILE_STS_DESC = "FILE_STS_DESC";
+	/**
+	 * 包含订单数量 STRING(32)<br>
+	 */
+	public static final String ORDER_COUNT = "ORDER_COUNT";
+	/**
+	* 创建时间 STRING(32)<br>
+	*/
+	public static final String CREATE_TIME = "CREATE_TIME";
+	/**
+	* 修改时间 STRING(32)<br>
+	*/
+	public static final String UPDATE_TIME = "UPDATE_TIME";
+
+
+}
\ No newline at end of file
diff --git a/src_jbo/jbo/oti/FC_REQUEST_FILE.java b/src_jbo/jbo/oti/FC_REQUEST_FILE.java
index f738d3526..8656cc746 100644
--- a/src_jbo/jbo/oti/FC_REQUEST_FILE.java
+++ b/src_jbo/jbo/oti/FC_REQUEST_FILE.java
@@ -41,6 +41,10 @@ public interface FC_REQUEST_FILE{
 	* 资方：文件类型：JPG,PNG,FDP等 STRING(32)<br>
 	*/
 	public static final String FC_FILE_TYPE = "FC_FILE_TYPE";
+	/**
+	 * 资方：文件类型：JPG,PNG,FDP等 STRING(32)<br>
+	 */
+	public static final String FILE_TYPE = "FILE_TYPE";
 	/**
 	* 文件名称 STRING(32)<br>
 	*/
diff --git a/src_jbo/jbo/oti/FC_REQUEST_FILE_PUSH.java b/src_jbo/jbo/oti/FC_REQUEST_FILE_PUSH.java
deleted file mode 100644
index 63f9fc409..000000000
--- a/src_jbo/jbo/oti/FC_REQUEST_FILE_PUSH.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package jbo.oti;
-
-/**
-* 接口资料表 - JBO命名常量类<br><br>
-* Note: This file is generated by ADE tools, <em>dont</em> modify it.<br>
-
-*/
-public interface FC_REQUEST_FILE_PUSH {
-	/**
-	* 接口资料表<br><br>
-	* 代表本类映射的BizObjectClass
-	*/
-	public static final String CLASS_NAME = "jbo.oti.FC_REQUEST_FILE_PUSH";
-	/**
-	* 唯一标识 STRING(32)<br>
-	*/
-	public static final String ID = "ID";
-	/**
-	* 资金渠道申请ID STRING(32)<br>
-	*/
-	public static final String FC_REQUEST_ID = "FC_REQUEST_ID";
-	/**
-	* 文件状态 STRING(32)<br>
-	*/
-	public static final String FC_FILE_STS = "PUSH_STS";
-	/**
-	* 文件状态描述 STRING(32)<br>
-	*/
-	public static final String FC_FILE_STS_DESC = "PUSH_STS_DESC";
-	/**
-	* 创建时间 STRING(32)<br>
-	*/
-	public static final String CREATE_TIME = "CREATE_TIME";
-	/**
-	* 修改时间 STRING(32)<br>
-	*/
-	public static final String UPDATE_TIME = "UPDATE_TIME";
-	/**
-	* 有效标志 STRING(32)<br>
-	*/
-	public static final String DEL_FLAG = "DEL_FLAG";
-
-}
\ No newline at end of file
diff --git a/src_jbo/jbo/oti/FC_YC_FILE_REPAY_PLAN.java b/src_jbo/jbo/oti/FC_YC_FILE_REPAY_PLAN.java
new file mode 100644
index 000000000..9658ac934
--- /dev/null
+++ b/src_jbo/jbo/oti/FC_YC_FILE_REPAY_PLAN.java
@@ -0,0 +1,59 @@
+package jbo.oti;
+
+/**
+* 接口资料表 - JBO命名常量类<br><br>
+* Note: This file is generated by ADE tools, <em>dont</em> modify it.<br>
+
+*/
+public interface FC_YC_FILE_REPAY_PLAN {
+	/**
+	* 接口资料表<br><br>
+	* 代表本类映射的BizObjectClass
+	*/
+	public static final String CLASS_NAME = "jbo.oti.FC_YC_FILE_REPAY_PLAN";
+	/**
+	* 唯一标识 STRING(32)<br>
+	*/
+	public static final String ID = "ID";
+	/**
+	 * 文件ID STRING(32)<br>
+	 */
+	public static final String FC_FILE_ID = "FC_FILE_ID";
+	/**
+	* 资金渠道申请ID STRING(32)<br>
+	*/
+	public static final String FC_REQUEST_ID = "FC_REQUEST_ID";
+	/**
+	* 放款请求编号 STRING(32)<br>
+	*/
+	public static final String LOAN_NO = "LOAN_NO";
+	/**
+	* 期次 STRING(32)<br>
+	*/
+	public static final String LEND_TERM = "LEND_TERM";
+	/**
+	 * 还款日期 STRING(32)<br>
+	 */
+	public static final String ANS_REPAYMENT_DATE = "ANS_REPAYMENT_DATE";
+	/**
+	 * 本金 STRING(32)<br>
+	 */
+	public static final String ANS_PRINCIPAL = "ANS_PRINCIPAL";
+	/**
+	 * 利息 STRING(32)<br>
+	 */
+	public static final String ANS_INTEREST = "ANS_INTEREST";
+	/**
+	 * 租金 STRING(32)<br>
+	 */
+	public static final String ANS_REPAYMENT_MONEY = "ANS_REPAYMENT_MONEY";
+	/**
+	* 创建时间 STRING(32)<br>
+	*/
+	public static final String CREATE_TIME = "CREATE_TIME";
+	/**
+	* 修改时间 STRING(32)<br>
+	*/
+	public static final String UPDATE_TIME = "UPDATE_TIME";
+
+}
\ No newline at end of file
diff --git a/src_tenwa/com/tenwa/lease/app/quartzmession/CorpusSourceRentPlanCopy.java b/src_tenwa/com/tenwa/lease/app/quartzmession/CorpusSourceRentPlanCopy.java
new file mode 100644
index 000000000..7af754607
--- /dev/null
+++ b/src_tenwa/com/tenwa/lease/app/quartzmession/CorpusSourceRentPlanCopy.java
@@ -0,0 +1,213 @@
+package com.tenwa.lease.app.quartzmession;
+
+import com.amarsoft.are.jbo.*;
+import com.amarsoft.are.util.StringFunction;
+import com.amarsoft.awe.util.ASResultSet;
+import com.amarsoft.awe.util.SqlObject;
+import com.amarsoft.awe.util.Transaction;
+import com.base.util.QuartzUtil;
+import com.tenwa.reckon.executor.CreateTransactionExecutor;
+import jbo.app.tenwa.calc.LC_CALC_CONDITION;
+import jbo.app.tenwa.calc.LC_RENT_PLAN;
+import jbo.oti.FC_FILE_PUSH;
+import jbo.oti.FC_YC_FILE_REPAY_PLAN;
+import org.quartz.Job;
+import org.quartz.JobExecutionContext;
+import org.quartz.JobExecutionException;
+
+import java.math.BigDecimal;
+import java.sql.SQLException;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+
+import java.util.Date;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import static java.math.BigDecimal.ROUND_HALF_UP;
+
+/**
+ * 资方租金计划拷贝
+ */
+public class CorpusSourceRentPlanCopy implements Job {
+
+	Set<String> contractSet = null;
+	JBOTransaction tx = null;
+	Transaction Sqlca = null;
+	{
+		try {
+			tx = JBOFactory.createJBOTransaction();
+			Sqlca = Transaction.createTransaction(tx);
+		} catch (JBOException e) {
+			e.printStackTrace();
+			try {
+				if (Sqlca != null) {
+					Sqlca.rollback();
+				}
+			} catch (JBOException e1) {
+				e1.printStackTrace();
+			}
+		}
+	}
+
+
+	@Override
+	public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
+
+		String startime = StringFunction.getTodayNow();
+		Object userId = jobExecutionContext.getTrigger().getJobDataMap().get("CurUserId");
+		String curUserId = userId == null? "system" : userId.toString();
+
+		BizObjectManager ffpBom = null;
+		BizObjectManager fyfrpBom = null;
+		try {
+			ffpBom = JBOFactory.getBizObjectManager(FC_FILE_PUSH.CLASS_NAME,tx);
+			fyfrpBom = JBOFactory.getBizObjectManager(FC_YC_FILE_REPAY_PLAN.CLASS_NAME,tx);
+			//todo 添加渠道商的选择，哪些需要拷表哪些不需要
+			List<BizObject> ffpBoList = ffpBom.createQuery("select ID,FILE_STS from O where FILE_STS='2'").getResultList(true);
+			for(BizObject ffpBo : ffpBoList){
+				String fcFileId = ffpBo.getAttribute("ID").toString();
+				//更新租金计划租金信息，并获取每个文件的contract_id
+				String sql = "select fr.CONTRACT_ID,O.LEND_TERM,O.ANS_REPAYMENT_DATE,O.ANS_PRINCIPAL,O.ANS_INTEREST,ANS_REPAYMENT_MONEY from O left join jbo.oti.FC_REQUEST fr on O.FC_REQUEST_ID=fr.ID where fr.DEL_FLAG='0' and O.FC_FILE_ID=:fcFileId";
+				List<BizObject> fyfrpBoList = fyfrpBom.createQuery(sql).setParameter("fcFileId",fcFileId).getResultList(false);
+				contractSet = this.updateRentPlan(fyfrpBoList);
+				//更新租金计划剩余本金
+				updateAllRemainCorpus();
+				//更新租金计划分润信息
+				updateSplitSP();
+				ffpBo.setAttributeValue("FILE_STS","3");
+				ffpBo.setAttributeValue("FILE_STS_DESC","拷贝成功");
+				ffpBom.saveObject(ffpBo);
+			}
+
+			Sqlca.commit();
+			QuartzUtil.insertLog(startime,"com.tenwa.lease.app.quartzmession.CorpusSourceRentPlanCopy", "success", "成功", curUserId);
+		} catch (Exception e) {
+			e.printStackTrace();
+			QuartzUtil.insertLog(startime,"com.tenwa.lease.app.quartzmession.CorpusSourceRentPlanCopy", "error", "失败", curUserId);
+			try {
+				if (Sqlca != null) {
+					Sqlca.rollback();
+				}
+			} catch (JBOException e1) {
+				e1.printStackTrace();
+			}
+			throw new JobExecutionException(e);
+		}
+	}
+
+	/**
+	 * 租金计划拷贝
+	 * @param fyfrpBoList 每个回执文件包含的租金计划信息
+	 * @return 每个回执文件包含的contract_id
+	 * @throws JBOException
+	 * @throws ParseException
+	 */
+	public Set<String> updateRentPlan(List<BizObject> fyfrpBoList) throws JBOException, ParseException {
+		BizObjectManager lrpBom = null;
+		lrpBom = JBOFactory.getBizObjectManager(LC_RENT_PLAN.CLASS_NAME,tx);
+		contractSet = new HashSet<>();
+		//更新租金计划表
+		for(BizObject bo : fyfrpBoList){
+			//获取参数
+			String contractId = bo.getAttribute("CONTRACT_ID").toString();
+			String lendTerm = bo.getAttribute("LEND_TERM").toString();
+			String principal = bo.getAttribute("ANS_PRINCIPAL").toString();
+			String interest = bo.getAttribute("ANS_INTEREST").toString();
+			String repaymentMoney = bo.getAttribute("ANS_REPAYMENT_MONEY").toString();
+			String repaymentDate = bo.getAttribute("ANS_REPAYMENT_DATE").toString();
+			//转换日期格式
+			Date date = new SimpleDateFormat("yyyyMMdd").parse(repaymentDate);
+			repaymentDate = new SimpleDateFormat("yyyy/MM/dd").format(date);
+			//更新租金计划表
+			BizObject lrpBo = lrpBom.createQuery("CONTRACT_ID=:contractId and PLAN_LIST=:lendTerm").setParameter("contractId",contractId).setParameter("lendTerm",lendTerm).getSingleResult(true);
+			lrpBo.setAttributeValue("RENT",repaymentMoney);
+			lrpBo.setAttributeValue("CORPUS",principal);
+			lrpBo.setAttributeValue("INTEREST",interest);
+			lrpBo.setAttributeValue("CORPUS_BUSINESS",principal);
+			lrpBo.setAttributeValue("INTEREST_BUSINESS",interest);
+			lrpBo.setAttributeValue("PLAN_DATE",repaymentDate);
+			lrpBo.setAttributeValue("RENT",repaymentMoney);
+			lrpBom.saveObject(lrpBo);
+			//放进set去重
+			contractSet.add(contractId);
+		}
+		return contractSet;
+	}
+
+	/**
+	 * 更新剩余本金信息
+	 * @throws JBOException
+	 */
+	public void updateAllRemainCorpus() throws JBOException {
+		BizObjectManager lrpBom = null;
+		lrpBom = JBOFactory.getBizObjectManager(LC_RENT_PLAN.CLASS_NAME,tx);
+		BizObjectManager lccBom = null;
+		lccBom = JBOFactory.getBizObjectManager(LC_CALC_CONDITION.CLASS_NAME,tx);
+		//根据contractId遍历循环来更新租金计划表中剩余本金字段
+		for(String contractId : contractSet){
+			BizObject lccBo = lccBom.createQuery("select CLEAN_LEASE_MONEY from O where contract_id=:contractId").setParameter("contractId",contractId).getSingleResult(false);
+			String clean_lease_money = lccBo.getAttribute("CLEAN_LEASE_MONEY").toString();
+			BigDecimal cleanLeaseMoneyBd = new BigDecimal(clean_lease_money);
+			List<BizObject> lrpBos= lrpBom.createQuery("contract_id=:contractId order by plan_list").setParameter("contractId",contractId).getResultList(true);
+			for(BizObject bo :lrpBos){
+				String corpus = bo.getAttribute("corpus").toString();
+				BigDecimal corpusBd = new BigDecimal(corpus);
+				cleanLeaseMoneyBd = cleanLeaseMoneyBd.subtract(corpusBd).setScale(2,ROUND_HALF_UP);
+				bo.setAttributeValue("ALL_REMAIN_CORPUS",cleanLeaseMoneyBd.toString());
+				lrpBom.saveObject(bo);
+			}
+
+		}
+	}
+
+	/**
+	 * 更新分润信息
+	 * @throws Exception
+	 */
+	public void updateSplitSP() throws Exception {
+
+		for(String contractId : contractSet) {
+			String sql = "select lci.product_id,lci.distributor_id,lcc.payment_number from lb_contract_info lci left join lc_calc_condition lcc on lci.id=lcc.contract_id where lci.id='" + contractId + "'";
+			SqlObject sqlBo = null;
+			String productId = null;
+			String distributorId = null;
+			String paymentNumber = null;
+			ASResultSet rs = null;
+			try {
+				sqlBo = new SqlObject(sql);
+				rs = Sqlca.getASResultSet(sqlBo);
+				if ( rs.next() ) {
+					productId = rs.getString( "product_id" );
+					distributorId = rs.getString( "distributor_id" );
+					paymentNumber = rs.getString( "payment_number" );
+					String splitType = Sqlca.getString("select attribute5 from business_type where typeno = '" + productId + "'");
+					String splittingRatio = Sqlca.getString("select splitting_ratio from lb_splitting_ratio where distributor_id='" + distributorId + "' and product_id='" + productId + "'");
+					if (!"".equals(splittingRatio) && splittingRatio != null) {
+						CreateTransactionExecutor cre = new CreateTransactionExecutor();
+						cre.setPlannumber(paymentNumber);
+						cre.insertRentPlan_SP(splittingRatio, Sqlca, splitType);
+					}
+				}
+
+			} catch (SQLException throwables) {
+				throwables.printStackTrace();
+			}finally {
+				rs.close();
+			}
+
+		}
+	}
+
+
+	public Set<String> getContractSet() {
+		return contractSet;
+	}
+
+	public void setContractSet(Set<String> contractSet) {
+		this.contractSet = contractSet;
+	}
+
+}

From 39efcf106b94390d5af0f973f53ca9cb3dccf976 Mon Sep 17 00:00:00 2001
From: ap007 <zhanglei@ap-leasing.com.cn>
Date: Wed, 7 Jul 2021 16:12:15 +0800
Subject: [PATCH 10/29] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E8=BF=94=E5=9B=9E=E5=86=85=E5=AE=B9=E4=BA=8C?=
 =?UTF-8?q?=E6=AC=A1=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WebContent/Ample/Doc/DocListUploadNew.jsp     |  5 +++-
 .../LbProductCorpusSourceList.jsp             |  3 ---
 .../apzl/CorpusSource/FcRequestDocTab.jsp     |  5 ++--
 .../fundchannel/doc/action/DocListAction.java | 23 ++++---------------
 .../fundchannel/doc/cache/DocListCache.java   |  4 ++--
 5 files changed, 14 insertions(+), 26 deletions(-)

diff --git a/WebContent/Ample/Doc/DocListUploadNew.jsp b/WebContent/Ample/Doc/DocListUploadNew.jsp
index 57e1c3ecb..a6d69eef8 100644
--- a/WebContent/Ample/Doc/DocListUploadNew.jsp
+++ b/WebContent/Ample/Doc/DocListUploadNew.jsp
@@ -74,7 +74,10 @@
 			frfBo.setAttributeValue("FC_REQUEST_ID",params.get("fcRequestId"));
 			frfBo.setAttributeValue("FC_FLOW_TYPE",params.get("fcFlowType"));
 			frfBo.setAttributeValue("FC_FILE_CODE",params.get("fcFileCode"));
-			frfBo.setAttributeValue("FC_FILE_TYPE",params.get("type"));
+			String fileType = params.get("type");
+			String fcFileType = fileType.substring(fileType.lastIndexOf("/")+1).toLowerCase();
+			frfBo.setAttributeValue("FC_FILE_TYPE",fcFileType);
+			frfBo.setAttributeValue("FILE_TYPE",fileType);
 			frfBo.setAttributeValue("FILE_NAME",params.get("name"));
 			frfBo.setAttributeValue("FILE_PATH",params.get("filePath"));
 			frfBo.setAttributeValue("FC_FILE_STS","0");
diff --git a/WebContent/Tenwa/Apzl/productCorpus/LbProductCorpusSourceList.jsp b/WebContent/Tenwa/Apzl/productCorpus/LbProductCorpusSourceList.jsp
index 788c423a4..2b7a82e45 100644
--- a/WebContent/Tenwa/Apzl/productCorpus/LbProductCorpusSourceList.jsp
+++ b/WebContent/Tenwa/Apzl/productCorpus/LbProductCorpusSourceList.jsp
@@ -34,9 +34,6 @@
 					var sUrl = "/Tenwa/Apzl/productCorpus/LbProductCorpusUpDown.jsp";
 					AsDialog.PopView(sUrl,'productId='+productId,'dialogWidth=950px;dialogHeight=500px;resizable=no;scrollbars=no;status:yes;maximize:no;help:no;',function(){reloadSelf();},'新建');
 				},"请选择产品",'');
-		//将返回的产品ID传输到编辑的info页面，info页面只是展示作用，然后list页面新增的时候再保存。
-		//编辑按钮不采用在后面添加超连接形式，曾经有的页面采用这种方式数据量大时特别卡。采用系统封装按钮事件来实现。
-
 	}
 	function viewAndEdit(){
 		var sUrl = "/Tenwa/Apzl/productCorpus/LbProductCorpusUpDown.jsp";
diff --git a/WebContent/com/tenwa/apzl/CorpusSource/FcRequestDocTab.jsp b/WebContent/com/tenwa/apzl/CorpusSource/FcRequestDocTab.jsp
index 91ce0356c..bf041c156 100644
--- a/WebContent/com/tenwa/apzl/CorpusSource/FcRequestDocTab.jsp
+++ b/WebContent/com/tenwa/apzl/CorpusSource/FcRequestDocTab.jsp
@@ -3,12 +3,12 @@
 <%
 	String fcRequestId = CurPage.getParameter("fcRequestId");
 	//todo 提交后将消息已读并已处理
-	String messageId = CurPage.getParameter("messageid");
+	String messageId = CurPage.getParameter("messageId");
 	String channelNo=CurPage.getParameter("channelNo");
 	String projectId=CurPage.getParameter("projectId");
 	String contractId=CurPage.getParameter("contractId");
 	String isReadOnly = CurPage.getParameter("isReadOnly");
-	String params="fcRequestId="+fcRequestId+"&channelNo="+channelNo+"&projectId="+projectId+"&contractId="+contractId+"&isReadOnly="+isReadOnly+"messageId"+messageId;
+	String params="fcRequestId="+fcRequestId+"&channelNo="+channelNo+"&projectId="+projectId+"&contractId="+contractId+"&isReadOnly="+isReadOnly+"&messageId="+messageId;
 
 	//参数：0.是否显示, 1.标题，2.URL，3，参数串, 4. Strip高度(默认600px)，5. 是否有关闭按钮(默认无) 6. 是否缓存(默认是)
 
@@ -24,6 +24,7 @@
 	String sTabStrip[][] = {
 		{"true", "业务申请资料", "/com/tenwa/apzl/CorpusSource/FcRequestFileList.jsp",params+"&fcFlowType=BusinessApplyFlow", "", "", "false"},
 		{"true", "放款申请资料", "/com/tenwa/apzl/CorpusSource/FcRequestFileList.jsp",params+"&fcFlowType=FundPaymentCarFlow", "", "", "false"},
+		{"true", "贷后资料", "/com/tenwa/apzl/CorpusSource/FcRequestFileList.jsp",params+"&fcFlowType=PostLoanFlow", "", "", "false"},
 	};
 %>
 <%@ include file="/Resources/CodeParts/Tab01.jsp"%>
diff --git a/src_core/com/ample/fundchannel/doc/action/DocListAction.java b/src_core/com/ample/fundchannel/doc/action/DocListAction.java
index e8c1fef44..4af31a106 100644
--- a/src_core/com/ample/fundchannel/doc/action/DocListAction.java
+++ b/src_core/com/ample/fundchannel/doc/action/DocListAction.java
@@ -6,7 +6,6 @@ import com.amarsoft.are.util.StringFunction;
 import jbo.com.tenwa.entity.comm.message.BT_BUSSINESS_MESSAGE;
 import jbo.oti.FC_REQUEST;
 import jbo.oti.FC_REQUEST_FILE;
-import jbo.oti.FC_REQUEST_FILE_PUSH;
 
 import java.util.List;
 
@@ -67,7 +66,7 @@ public class DocListAction {
         BizObjectManager FRFbom = null;
         FRFbom = JBOFactory.getBizObjectManager(FC_REQUEST_FILE.CLASS_NAME);
         List<BizObject> FRFBO = FRFbom.createQuery("select FC_FILE_STS from O where FC_REQUEST_ID=:fcRequestId and FC_FLOW_TYPE=:fcFlowType and FC_FILE_CODE=:fcFileCode group by FC_FILE_STS").setParameter("fcRequestId", fcRequestId).setParameter("fcFlowType", fcFlowType).setParameter("fcFileCode", fcFileCode).getResultList(false);
-        if (FRFBO.size() == 1 && FRFBO.get(0).getAttribute("FC_FILE_STS") != null && "0".equals(FRFBO.get(0).getAttribute("FC_FILE_STS").toString())) {
+        if (FRFBO.size() == 1 && FRFBO.get(0).getAttribute("FC_FILE_STS") != null && "1".equals(FRFBO.get(0).getAttribute("FC_FILE_STS").toString())) {
             return "Y";
         }
         return "N";
@@ -77,14 +76,13 @@ public class DocListAction {
         try {
             updateRequestFileStatus(tx);
             setMessageRead(tx);
-            insertRequestFilePush(tx);
-        } catch (JBOException e) {
+        } catch (Exception e) {
             e.printStackTrace();
             return "提交出现错误";
         }
         return "S";
     }
-    public void updateRequestFileStatus(JBOTransaction tx) throws JBOException {
+    public void updateRequestFileStatus(JBOTransaction tx) throws Exception {
         BizObjectManager FRbom = null;
         BizObject FRBo = null;
         FRbom = JBOFactory.getBizObjectManager(FC_REQUEST.CLASS_NAME,tx);
@@ -92,24 +90,13 @@ public class DocListAction {
         String supplementSTS = FRBo.getAttribute("SUPPLEMENT_STS")==null?"":FRBo.getAttribute("SUPPLEMENT_STS").toString();
         if("0".equals(supplementSTS)){
             ARE.getLog().warn("邮储请求ID："+fcRequestId + "的合同无需补充资料，却显示了资料提交的按钮");
+            throw new Exception("提交出现错误！");
         }else if("1".equals(supplementSTS)||"".equals(supplementSTS)){
             FRBo.setAttributeValue("SUPPLEMENT_STS","2");
             FRbom.saveObject(FRBo);
         }
     }
-    public void insertRequestFilePush(JBOTransaction tx) throws JBOException {
-        BizObjectManager FRFPbom = null;
-        BizObject FRFPBo = null;
-        FRFPbom = JBOFactory.getBizObjectManager(FC_REQUEST_FILE_PUSH.CLASS_NAME,tx);
-        FRFPBo = FRFPbom.newObject();
-        FRFPBo.setAttributeValue("FC_REQUEST_ID",fcRequestId);
-        FRFPBo.setAttributeValue("PUSH_STS","0");
-        FRFPBo.setAttributeValue("PUSH_STS_DESC","未提交");
-        FRFPBo.setAttributeValue("CREATE_TIME",currentTime);
-        FRFPBo.setAttributeValue("UPDATE_TIME",currentTime);
-        FRFPBo.setAttributeValue("DEL_FLAG","0");
-        FRFPbom.saveObject(FRFPBo);
-    }
+
     public void setMessageRead(JBOTransaction tx) throws JBOException {
         BizObjectManager BBMbom = null;
         BizObject BBMBo = null;
diff --git a/src_core/com/ample/fundchannel/doc/cache/DocListCache.java b/src_core/com/ample/fundchannel/doc/cache/DocListCache.java
index 5204e45d2..ca25b128c 100644
--- a/src_core/com/ample/fundchannel/doc/cache/DocListCache.java
+++ b/src_core/com/ample/fundchannel/doc/cache/DocListCache.java
@@ -29,7 +29,7 @@ public class DocListCache {
 		for(BizObject bo : list){
 			JSONObject boJson = new JSONObject();
 			boJson.put("id",bo.getAttribute("id").getString());
-			boJson.put("FC_FILE_TYPE",bo.getAttribute("FC_FILE_TYPE").getString());
+			boJson.put("FILE_TYPE",bo.getAttribute("FILE_TYPE").getString());
 			boJson.put("FC_FLOW_TYPE",bo.getAttribute("FC_FLOW_TYPE").getString());
 			boJson.put("FILE_NAME",bo.getAttribute("FILE_NAME").getString());
 			boJson.put("FILE_PATH",bo.getAttribute("FILE_PATH").getString());
@@ -47,7 +47,7 @@ public class DocListCache {
 		for(int i=0;i<list.size();i++){
 			JSONObject bo=list.get(i);
 			sb.append("\"" +i+"\""+":{");
-			String type= bo.get("FC_FILE_TYPE").toString();
+			String type= bo.get("FILE_TYPE").toString();
 			if(type.indexOf("image")>=0){
 				sb.append("\"image\":\""+true+"\",");
 			}else{

From 2b13a3b4e6f9421a1a850c0184fdb5feafa56963 Mon Sep 17 00:00:00 2001
From: ap007 <zhanglei@ap-leasing.com.cn>
Date: Fri, 9 Jul 2021 16:38:56 +0800
Subject: [PATCH 11/29] =?UTF-8?q?=E8=B5=84=E6=96=B9=E8=B5=84=E6=96=99?=
 =?UTF-8?q?=E6=B8=85=E5=8D=95=E4=BF=A1=E6=81=AF=E4=BC=98=E5=8C=96=EF=BC=8C?=
 =?UTF-8?q?=E5=BD=93=E8=A1=A5=E4=BC=A0=E8=B5=84=E6=96=99=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E5=BD=93=E5=89=8D=E7=BB=84=E5=85=A8=E9=83=A8=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=E5=BE=85=E8=A1=A5=E4=BC=A0=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WebContent/Ample/Doc/DocListUploadNew.jsp           | 13 ++++++++++++-
 WebContent/WEB-INF/etc/jbo/jbo_oti.xml              |  1 +
 .../tenwa/apzl/CorpusSource/FcRequestFileList.jsp   |  2 ++
 src_jbo/jbo/oti/FC_REQUEST.java                     |  4 ++++
 4 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/WebContent/Ample/Doc/DocListUploadNew.jsp b/WebContent/Ample/Doc/DocListUploadNew.jsp
index a6d69eef8..e8cb04da0 100644
--- a/WebContent/Ample/Doc/DocListUploadNew.jsp
+++ b/WebContent/Ample/Doc/DocListUploadNew.jsp
@@ -70,17 +70,28 @@
 	public void fileInfoSave(Map<String,String> params,Transaction Sqlca) throws JBOException {
 		if(params.size()>0){
 			BizObjectManager frfBom = JBOFactory.getBizObjectManager("jbo.oti.FC_REQUEST_FILE",Sqlca);
+			List<BizObject> frfBoList = frfBom.createQuery("DEL_FLAG='0' and FC_REQUEST_ID=:fcRequestId and FC_FLOW_TYPE=:fcFlowType and FC_FILE_CODE=:fcFileCode")
+					.setParameter("fcRequestId",params.get("fcRequestId")).setParameter("fcFlowType",params.get("fcFlowType")).setParameter("fcFileCode",params.get("fcFileCode")).getResultList(true);
+			String fcFlowTypeName = frfBoList.get(0).getAttribute("FC_FLOW_TYPE_NAME").toString();
+			String fcFileCodeName = frfBoList.get(0).getAttribute("FC_FILE_CODE_NAME").toString();
+			for(BizObject bo : frfBoList){
+				bo.setAttributeValue("FC_FILE_STS","2");
+				bo.setAttributeValue("FC_FILE_STS_DESC","用户添加待补传");
+			}
 			BizObject frfBo = frfBom.newObject();
 			frfBo.setAttributeValue("FC_REQUEST_ID",params.get("fcRequestId"));
 			frfBo.setAttributeValue("FC_FLOW_TYPE",params.get("fcFlowType"));
+			frfBo.setAttributeValue("FC_FLOW_TYPE_NAME",fcFlowTypeName);
 			frfBo.setAttributeValue("FC_FILE_CODE",params.get("fcFileCode"));
+			frfBo.setAttributeValue("FC_FILE_CODE_NAME",fcFileCodeName);
 			String fileType = params.get("type");
 			String fcFileType = fileType.substring(fileType.lastIndexOf("/")+1).toLowerCase();
 			frfBo.setAttributeValue("FC_FILE_TYPE",fcFileType);
 			frfBo.setAttributeValue("FILE_TYPE",fileType);
 			frfBo.setAttributeValue("FILE_NAME",params.get("name"));
 			frfBo.setAttributeValue("FILE_PATH",params.get("filePath"));
-			frfBo.setAttributeValue("FC_FILE_STS","0");
+			frfBo.setAttributeValue("FC_FILE_STS","2");
+			frfBo.setAttributeValue("FC_FILE_STS_DESC","用户添加待补传");
 			frfBo.setAttributeValue("CREATE_TIME",params.get("inputTime"));
 			frfBo.setAttributeValue("UPDATE_TIME",params.get("inputTime"));
 			frfBo.setAttributeValue("DEL_FLAG","0");
diff --git a/WebContent/WEB-INF/etc/jbo/jbo_oti.xml b/WebContent/WEB-INF/etc/jbo/jbo_oti.xml
index 5f0878302..0c7006747 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_oti.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_oti.xml
@@ -322,6 +322,7 @@
 				<attribute name="FC_REMARK"    label="返回状态描述"    type="STRING" length="32"/>
 				<attribute name="SUPPLEMENT_STS"    label="是否需要补充资料清单"    type="STRING" length="32"/>
 				<attribute name="SUPPLEMENT_DESC"    label="通知需要补充资料清单描述"    type="STRING" length="32"/>
+				<attribute name="SUPPLEMENT_TIME"    label="资料补充时间"    type="STRING" length="32"/>
 				<attribute name="CREATE_TIME"    label="创建时间"    type="STRING" length="32"/>
 				<attribute name="UPDATE_TIME"    label="修改时间"    type="STRING" length="32"/>
 				<attribute name="DEL_FLAG"    label="有效标志"    type="STRING" length="32"/>
diff --git a/WebContent/com/tenwa/apzl/CorpusSource/FcRequestFileList.jsp b/WebContent/com/tenwa/apzl/CorpusSource/FcRequestFileList.jsp
index 08297a394..a5b453674 100644
--- a/WebContent/com/tenwa/apzl/CorpusSource/FcRequestFileList.jsp
+++ b/WebContent/com/tenwa/apzl/CorpusSource/FcRequestFileList.jsp
@@ -12,6 +12,7 @@
 	String isReadOnly = CurPage.getParameter("isReadOnly");
 	String messageId = CurPage.getParameter("messageId");
 	String sPrevUrl = CurPage.getParameter("PrevUrl");
+	String pageSize = CurPage.getParameter("PageSize");
 	if(sPrevUrl == null) sPrevUrl = "/com/tenwa/apzl/CorpusSource/FcRequestLIst.jsp";
 	String sTempletNo=CurPage.getParameter("TempletNo");
 	if(sTempletNo==null){
@@ -24,6 +25,7 @@
 	doTemp.setLockCount(0);
 	ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request);
 	dwTemp.Style = "1";//freeform
+	dwTemp.setPageSize(pageSize==null?5:Integer.parseInt(pageSize));
 	//dwTemp.ReadOnly = "-2";//只读模式
 	dwTemp.genHTMLObjectWindow(fcFlowType+","+fcRequestId);
 
diff --git a/src_jbo/jbo/oti/FC_REQUEST.java b/src_jbo/jbo/oti/FC_REQUEST.java
index 0725a88b6..fb67b5d28 100644
--- a/src_jbo/jbo/oti/FC_REQUEST.java
+++ b/src_jbo/jbo/oti/FC_REQUEST.java
@@ -85,6 +85,10 @@ public interface FC_REQUEST{
 	 * 通知需要补充资料清单描述 STRING(32)<br>
 	 */
 	public static final String SUPPLEMENT_DESC = "SUPPLEMENT_DESC";
+	/**
+	 * 资料补充时间 STRING(32)<br>
+	 */
+	public static final String SUPPLEMENT_TIME = "SUPPLEMENT_TIME";
 	/**
 	* 创建时间 STRING(32)<br>
 	*/

From 46e42b2f458d78fd7c0e992430d7256f91cca016 Mon Sep 17 00:00:00 2001
From: zhanglei <zhanglei@ap-leasing.com.cn>
Date: Tue, 13 Jul 2021 19:51:07 +0800
Subject: [PATCH 12/29] =?UTF-8?q?yc=E5=BE=81=E4=BF=A1=E6=8E=88=E6=9D=83?=
 =?UTF-8?q?=E7=94=B5=E5=AD=90=E7=AD=BE=E9=A1=B5=E9=9D=A2=E5=88=9D=E5=A7=8B?=
 =?UTF-8?q?=E5=8C=960713?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../person/AccountChangePersonInfo.jsp        |   4 +-
 .../alpha/creditAuth/creditAuthList2.jsp      | 235 ++++++++
 WebContent/WEB-INF/etc/jbo/jbo_customer.xml   | 143 ++---
 .../alpha/CreditAuthActionNewUtils.java       | 414 +++++++++++++++
 .../action/alpha/CreditAuthActionTwoUtil.java | 501 ++++++++++++++++++
 .../action/alpha/CreditAuthAward.java         | 171 ++++++
 .../action/alpha/CreditAuthDeleteAction.java  |  71 +++
 .../action/alpha/CreditAuthSignAction.java    | 207 ++++++++
 .../VI_LB_IDENTITY_CHECK_CREDITAUTH.java      |  43 ++
 9 files changed, 1723 insertions(+), 66 deletions(-)
 create mode 100644 WebContent/Tenwa/alpha/creditAuth/creditAuthList2.jsp
 create mode 100644 src/com/tenwa/channelportal/action/alpha/CreditAuthActionNewUtils.java
 create mode 100644 src/com/tenwa/channelportal/action/alpha/CreditAuthActionTwoUtil.java
 create mode 100644 src/com/tenwa/channelportal/action/alpha/CreditAuthAward.java
 create mode 100644 src/com/tenwa/channelportal/action/alpha/CreditAuthDeleteAction.java
 create mode 100644 src/com/tenwa/channelportal/action/alpha/CreditAuthSignAction.java
 create mode 100644 src_jbo/jbo/app/tenwa/customer/VI_LB_IDENTITY_CHECK_CREDITAUTH.java

diff --git a/WebContent/Tenwa/ChannelPortal/BusinessChangeApply/AccountChange/person/AccountChangePersonInfo.jsp b/WebContent/Tenwa/ChannelPortal/BusinessChangeApply/AccountChange/person/AccountChangePersonInfo.jsp
index 7cb215c2b..ea7ef6e75 100644
--- a/WebContent/Tenwa/ChannelPortal/BusinessChangeApply/AccountChange/person/AccountChangePersonInfo.jsp
+++ b/WebContent/Tenwa/ChannelPortal/BusinessChangeApply/AccountChange/person/AccountChangePersonInfo.jsp
@@ -132,7 +132,7 @@
 			var flag = window.confirm("已经生成过合同,是否重新制作委托扣款授权书");
 			if(flag==true){
 				//废除之前生成过的合同
-				 var resultStatus = RunJavaMethodTrans("com.tenwa.action.channelportal.businesshanding.contractaward.ContractAward","updateDocContractStatusContract","contract_id=<%=ContractId%>,CustomerType=<%=customerType%>,FlowUnid=<%=applyId%>");
+				 var resultStatus = RunJavaMethodTrans("com.tenwa.action.channelportal.businesshanding.contractaward.CreditAuthAward","updateDocContractStatusContract","contract_id=<%=ContractId%>,CustomerType=<%=customerType%>,FlowUnid=<%=applyId%>");
 				 if("error"==resultStatus){
 						AsDebug.showMessage("提示","生成合同失败！","","",true);	
 						return;
@@ -270,7 +270,7 @@
 	 	var flag = window.confirm("修改数据会作废已制作或已签约的合同,是否修改");
 		if(flag==true){
 			//废除之前生成过的合同
-			 var resultStatus = RunJavaMethodTrans("com.tenwa.action.channelportal.businesshanding.contractaward.ContractAward","updateDocContractStatusContract","contract_id=<%=ContractId%>,CustomerType=<%=customerType%>,FlowUnid=<%=applyId%>");
+			 var resultStatus = RunJavaMethodTrans("com.tenwa.action.channelportal.businesshanding.contractaward.CreditAuthAward","updateDocContractStatusContract","contract_id=<%=ContractId%>,CustomerType=<%=customerType%>,FlowUnid=<%=applyId%>");
 			 if("error"==resultStatus){
 					AsDebug.showMessage("提示","修改失败！","","",true);	
 					return;
diff --git a/WebContent/Tenwa/alpha/creditAuth/creditAuthList2.jsp b/WebContent/Tenwa/alpha/creditAuth/creditAuthList2.jsp
new file mode 100644
index 000000000..b19a10d5f
--- /dev/null
+++ b/WebContent/Tenwa/alpha/creditAuth/creditAuthList2.jsp
@@ -0,0 +1,235 @@
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><%	
+	/*
+        Author: undefined 2020-04-30
+        Content: 
+        History Log: 
+    */
+    String sFlowUnid = CurPage.getParameter("FlowUnid");//流程编号
+	String SubjectId = CurPage.getParameter("SubjectId");//主体编号
+	String userId = CurUser.getUserID();
+	String projectNo = Sqlca.getString("select PROJECT_NO from lb_project_info_temp where FLOWUNID='"+sFlowUnid+"'");
+	ASObjectModel doTemp = new ASObjectModel("creditAuthList");
+//	doTemp.setHtmlEvent("filePath","onclick","openfile");
+	ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
+	dwTemp.Style="1";      	     //--设置为Grid风格--
+	dwTemp.ReadOnly = "1";	 //只读模式
+	dwTemp.setPageSize(10);
+	dwTemp.genHTMLObjectWindow(sFlowUnid);
+
+	//0、是否展示 1、	权限控制  2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码	6、	7、	8、	9、图标，CSS层叠样式 10、风格
+	String sButtons[][] = {
+		{"true","All","Button","生成征信授权书","生成征信授权书","createCreditPdf()","","","","btn_icon_generate",""},
+		{"true","All","Button","发起电子签约","发起电子签约","signOnLine()","","","","btn_icon_generate",""},
+		{"true","All","Button","查看签约状态","查看签约状态","getStatus()","","","","btn_icon_detail",""},
+		{"true","All","Button","重发签约短信","重发签约短信","sendMessageAgain()","","","","btn_icon_refresh",""},
+	};
+%><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
+<script type="text/javascript">
+	$(document).ready(function(){
+		for(var i=0;i<getRowCount(0);i++){
+			$("#DIV_Data_myiframe0_"+i+"_4").css("color","Blue");
+		}
+	})
+
+	//在加载完表格后调用
+	function afterSearch(){
+		for(var i=0;i<getRowCount(0);i++){
+			var html="";
+			html+='<a onclick=downloadFile(\''+getItemValue(0,i,"ID")+'\')><font color="blue">'+"下载&nbsp&nbsp&nbsp&nbsp&nbsp"+'</font></a>';
+			getObj(0,i,"FILENAME").innerHTML=html+'<font >'+getObj(0,i,"FILENAME").innerHTML+'</font>';
+		}
+	}
+	function downloadFile(id){
+		if(typeof(id)==undefined || id=='') {
+			alert("请先生成征信授权书再下载！");
+			return;
+		}
+		if(!frames["downloadTemplate"]) $("<iframe name='downloadTemplate' style='display:none;'></iframe>").appendTo("body");
+		window.open(sWebRootPath+"/servlet/view/docDownloadServlet?CompClientID=<%=sCompClientID%>&sqlString=save@"+id, "downloadTemplate");
+	}
+
+	function createCreditPdf(){
+		var fullName = getItemValue(0,getRow(0),'fullName');
+		var certId = getItemValue(0,getRow(0),'certId');
+		var phone = getItemValue(0,getRow(0),'phone');
+		var flowunid = getItemValue(0,getRow(0),'flowunid');
+        var creditauth = getItemValue(0,getRow(0),'creditauth');
+        var credittype = getItemValue(0,getRow(0),'credittype');
+        var objectType = credittype;
+        var operationType = objectType;
+		var param={};
+		var tempParam={};
+		var sparam="";
+		//模板号
+		var relation = getItemValue(0,getRow(0),'relation');
+		var tempId = "65b12cbfd98611eb970e00163e0ad612";
+		/**creditauth
+         * 征信授权书_安鹏
+         征信授权书_安鹏
+         征信授权书_邮储
+         借款服务确认书_邮储
+         */
+		if("申请人"== relation && "征信授权书_邮储" == creditauth){
+			tempId = "65bd277ad98611eb970e00163e0ad612";//申请人的情况下，征信授权书_邮储
+		}else if("申请人"== relation && "借款服务确认书_邮储" == creditauth){
+			tempId = "134f3d88e2f811eb970e00163e0ad612";//申请人的情况下，借款服务确认书_邮储
+		}
+		param["templateNo"]= tempId;
+		var projectNo = "<%=projectNo%>";
+		//生成文件关联关系
+		tempParam["OBJECTTYPE"] = objectType;
+		tempParam["insurance_no"] = flowunid;
+		tempParam["contract_no"] = certId;
+		tempParam["contract_id"] = "<%=projectNo%>";
+		tempParam["project_id"] =  "<%=projectNo%>";
+		tempParam["PROJ_ID"] = "<%=projectNo%>";//注意变量名，不要改
+		tempParam["CONTRACT_ID"] =  "<%=projectNo%>";//注意变量名，不要改
+		tempParam["CUST_ID"] =  certId;//注意变量名，不要改
+		tempParam["PLAN_NUMBER"] =  phone;//注意变量名，不要改
+		tempParam["customername"] = fullName;
+		//生成模板固定参数
+		tempParam["CurUserId"]="<%=CurUser.getUserID()%>";
+		tempParam["CurOrgId"]="<%=CurUser.getOrgID()%>";
+		tempParam["fileSavePath"]="<%=CurConfig.getConfigure("FileSavePath")%>";
+
+		param["templateParam"]=JSON.stringify(tempParam).replace(/,/g,"@");//生成模板的参数据
+		for(var key in param){
+			if(sparam.length>0){sparam+=",";}
+			sparam+=key+"="+param[key];
+		}
+		var deleteresult = RunJavaMethodTrans("com.tenwa.channelportal.action.alpha.CreditAuthDeleteAction","deleteCreditAuth","certId="+certId+",projectNo="+projectNo+",objectType="+objectType);
+		var result=RunJavaMethodTrans("com.tenwa.officetempalte.action.CreateOfficeAction","createOfficeByTemplate", sparam);
+		// word转pdf
+		var id = RunJavaMethodTrans("com.tenwa.channelportal.action.alpha.CreditAuthSignAction","wordToPdfCreditAuth",
+				"projectNo="+projectNo+",operationType="+objectType
+				+",fullName="+fullName+",certId="+certId+",phone="+phone+",flowUnid="+flowunid);
+		if(typeof(id)=="undefined" || id.length <= 0 || id==""){
+			RunJavaMethodTrans("com.tenwa.channelportal.action.alpha.CreditAuthDeleteAction","deleteCreditAuth","certId="+certId+",projectNo="+projectNo+",objectType="+objectType);
+		}else {
+			alert("生成成功！！！");
+		}
+		reloadSelf();
+	}
+
+
+	/**
+	 * 发起电子签约
+	 */
+	function signOnLine(){
+		var fullName = getItemValue(0,getRow(0),'fullName');
+		var certId = getItemValue(0,getRow(0),'certId');
+		var phone = getItemValue(0,getRow(0),'phone');
+		var flowunid = getItemValue(0,getRow(0),'flowunid');
+		var projectNo = "<%=projectNo%>";
+		//模板号
+		var relation = getItemValue(0,getRow(0),'relation');
+		var attributeId = getItemValue(0,getRow(0),'ID');
+        var creditauth = getItemValue(0,getRow(0),'creditauth');
+        var credittype = getItemValue(0,getRow(0),'credittype');
+        var objectType = credittype;
+        var operationType = objectType;
+		if(typeof(attributeId)==undefined || attributeId=='') {
+			alert("请先生成征信授权书，再发起电子签约！");
+			return;
+		}
+        /**creditauth
+         * 征信授权书_安鹏
+         征信授权书_安鹏
+         征信授权书_邮储
+         借款服务确认书_邮储
+         */
+        if("申请人"== relation && "征信授权书_邮储" == creditauth){
+            tempId = "65bd277ad98611eb970e00163e0ad612";//申请人的情况下，征信授权书_邮储
+        }else if("申请人"== relation && "借款服务确认书_邮储" == creditauth){
+            tempId = "134f3d88e2f811eb970e00163e0ad612";//申请人的情况下，借款服务确认书_邮储
+        }
+		//自然人电子签约
+		var sReturn = "";
+		sReturn = RunJavaMethodTrans("com.tenwa.channelportal.action.alpha.CreditAuthActionNewUtils","signIng",
+				"attributeId="+attributeId+",projectNo="+projectNo+",operationType="+objectType +",relation="+relation
+				+",fullName="+fullName+",certId="+certId+",phone="+phone+",flowUnid="+flowunid+",creditauth="+credittype);
+
+		var sReturns = sReturn.split("@");
+		if("success"==sReturns[0]){
+			AsDebug.showMessage("提示","电子签约发起成功!","","",true,"","","",function(){
+				window.location.reload();
+			});
+		}else if(sReturns[1].indexOf("用户认证信息与合同签署方信息不匹配")!=-1){
+			var message="";
+			if("true"==sReturns[0]){
+				message = "部分合同发送成功;注意发送失败合同:";
+			}
+			AsDebug.showMessage("提示",message+sReturns[1],"","",true,"","","",function(){
+				window.location.reload();
+			});
+		}else{
+			var message="";
+			if("true"==sReturns[0]){
+				message = "部分合同发送成功;注意发送失败合同";
+			}else{
+				message = "电子签约发送失败";
+			}
+			AsDebug.showMessage("提示",message,"","",true,"","","",function(){
+				window.location.reload();
+			});
+		}
+	}
+
+	//查询电子签约状态
+	function getStatus(){
+		var fullName = getItemValue(0,getRow(0),'fullName');
+		var certId = getItemValue(0,getRow(0),'certId');
+		var phone = getItemValue(0,getRow(0),'phone');
+		var flowunid = getItemValue(0,getRow(0),'flowunid');
+		var relation = getItemValue(0,getRow(0),'relation');
+        var creditauth = getItemValue(0,getRow(0),'creditauth');
+        var credittype = getItemValue(0,getRow(0),'credittype');
+        var objectType = credittype;
+        var operationType = objectType;
+		var projectNo = "<%=projectNo%>";
+		var attributeId = getItemValue(0,getRow(0),'ID');
+		if(typeof(attributeId)==undefined || attributeId=='') {
+			alert("请先生成征信授权书，再发起电子签约！");
+			return;
+		}
+		var sReturn = "";
+		sReturn = RunJavaMethodTrans("com.tenwa.channelportal.action.alpha.CreditAuthActionNewUtils","contractSignStatus",
+				"attributeId="+attributeId+",projectNo="+projectNo+",operationType="+objectType+",relation="+relation
+				+",fullName="+fullName+",certId="+certId+",phone="+phone+",flowUnid="+flowunid);
+		AsDebug.showMessage("提示",sReturn,"","",true,'','','',function(){
+			<%-- 			var sReturns = RunJavaMethodTrans("com.tenwa.channelportal.action.ContractSignAction","downloadDoc","ProjectId=<%=projectId%>,CurUserID=<%=CurUser.getUserID()%>"); --%>
+			window.location.reload();
+		});
+	}
+
+
+	//重新发送短信
+	function sendMessageAgain(){
+		var fullName = getItemValue(0,getRow(0),'fullName');
+		var certId = getItemValue(0,getRow(0),'certId');
+		var phone = getItemValue(0,getRow(0),'phone');
+		var relation = getItemValue(0,getRow(0),'relation');
+		var flowunid = getItemValue(0,getRow(0),'flowunid');
+        var creditauth = getItemValue(0,getRow(0),'creditauth');
+        var objectType = creditauth;
+        var operationType = objectType;
+		var projectNo = "<%=projectNo%>";
+		var attributeId = getItemValue(0,getRow(0),'ID');
+		if(typeof(attributeId)==undefined || attributeId=='') {
+			alert("请先生成征信授权书，再发起电子签约！");
+			return;
+		}
+
+		var sReturn = "";
+		sReturn = RunJavaMethodTrans("com.tenwa.channelportal.action.alpha.CreditAuthActionNewUtils","sendMessageAgain",
+				"attributeId="+attributeId+",projectNo="+projectNo+",operationType="+objectType+",relation="+relation
+				+",fullName="+fullName+",certId="+certId+",phone="+phone+",flowUnid="+flowunid);
+		if("success"==sReturn){
+			AsDebug.showMessage("提示","短信发送成功！","","",true);
+		}else{
+			AsDebug.showMessage("提示","短信发送失败！["+sReturn+"]","","",true);
+		}
+	}
+</script>
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/etc/jbo/jbo_customer.xml b/WebContent/WEB-INF/etc/jbo/jbo_customer.xml
index 120c163c9..cd921e831 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_customer.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_customer.xml
@@ -2740,7 +2740,22 @@
 				</managerProperties>
 			</manager>
 		</class>
-		
+		<class name="VI_LB_IDENTITY_CHECK_CREDITAUTH" label="韬唤鏍￠獙瑙嗗浘琛�" keyAttributes="">
+			<attributes>
+				<attribute name="fullName" label="濮撳悕" type="STRING"/>
+				<attribute name="certId" label="韬唤璇佺紪鍙�" type="STRING"/>
+				<attribute name="relation" label="韬唤" type="STRING"/>
+				<attribute name="flowunid" label="娴佺▼缂栧彿" type="STRING"/>
+				<attribute name="phone" label="鐢佃瘽鍙�" type="STRING"/>
+				<attribute name="creditauth" label="鎺堟潈妯℃澘鍚嶇О" type="STRING"/>
+				<attribute name="credittype" label="鎺堟潈妯℃澘绫诲瀷" type="STRING"/>
+			</attributes>
+			<manager>
+				<managerProperties>
+					<property name="table" value="vi_lb_identity_check_creditauth" />
+				</managerProperties>
+			</manager>
+		</class>
 		<class name="LB_CAR_CREDIT_PERSONAL_INFO_TEMP" label="涓汉椋庨櫓淇℃伅琛�" keyAttributes="ID">
 			<attributes>
 				<attribute name="ID" label="鏍囪瘑缂栧彿" type="STRING" length="32"/>
@@ -3408,40 +3423,40 @@
 		</class>		
 		
 		
-		<class name="LC_OVERDUE_RENT_PLAN" label="" keyAttributes="">
-			<attributes>
-				<attribute name="ID" label="ID" type="STRING" length="96"/>
-				<attribute name="QUOT_ID" label="QUOT_ID" type="STRING" length="96"/>
-				<attribute name="CUST_ID" label="CUST_ID" type="STRING" length="96"/>
-				<attribute name="PROJECT_ID" label="PROJECT_ID" type="STRING" length="96"/>
-				<attribute name="PROJECT_PLAN_NUMBER" label="PROJECT_PLAN_NUMBER" type="STRING" length="96"/>
-				<attribute name="CONTRACT_ID" label="CONTRACT_ID" type="STRING" length="96"/>
-				<attribute name="CONTRACT_PLAN_NUMBER" label="CONTRACT_PLAN_NUMBER" type="STRING" length="96"/>
-				<attribute name="PAYMENT_NUMBER" label="PAYMENT_NUMBER" type="STRING" length="96"/>
-				<attribute name="PLAN_LIST" label="PLAN_LIST" type="STRING" length="60"/>
-				<attribute name="PLAN_DATE" label="PLAN_DATE" type="STRING" length="60"/>
-				<attribute name="RENT" label="RENT" type="STRING" length="60"/>
-				<attribute name="CORPUS" label="CORPUS" type="STRING" length="60"/>
-				<attribute name="HIRE_DATE" label="HIRE_DATE" type="STRING" length="60"/>
-				<attribute name="fact_rent" label="fact_rent" type="STRING" length="60"/>
-				<attribute name="fact_corpus" label="fact_corpus" type="STRING" length="60"/>
-				<attribute name="fact_penalty" label="fact_penalty" type="STRING" length="60"/>
-				<attribute name="overduerent" label="overduerent" type="STRING" length="60"/>
-				<attribute name="overinterest" label="overinterest" type="STRING" length="60"/>
-				<attribute name="penalty" label="penalty" type="STRING" length="60"/>
-				<attribute name="Overdue_days" label="Overdue_days" type="STRING" length="60"/>
-				<attribute name="PLAN_STATUS" label="PLAN_STATUS" type="STRING" length="60"/>
-				<attribute name="inputtime" label="inputtime" type="STRING" length="60"/>
-			</attributes>
-			<manager>
-				<managerProperties>
-					<property name="table" value="lc_overdue_rent_plan" />
-					<property name="createKey" value="true" />
-				</managerProperties>
-			</manager>
-		</class>
-		<class name="VI_CSAN" label="" keyAttributes="">
-			<attributes>
+		<class name="LC_OVERDUE_RENT_PLAN" label="" keyAttributes="">
+			<attributes>
+				<attribute name="ID" label="ID" type="STRING" length="96"/>
+				<attribute name="QUOT_ID" label="QUOT_ID" type="STRING" length="96"/>
+				<attribute name="CUST_ID" label="CUST_ID" type="STRING" length="96"/>
+				<attribute name="PROJECT_ID" label="PROJECT_ID" type="STRING" length="96"/>
+				<attribute name="PROJECT_PLAN_NUMBER" label="PROJECT_PLAN_NUMBER" type="STRING" length="96"/>
+				<attribute name="CONTRACT_ID" label="CONTRACT_ID" type="STRING" length="96"/>
+				<attribute name="CONTRACT_PLAN_NUMBER" label="CONTRACT_PLAN_NUMBER" type="STRING" length="96"/>
+				<attribute name="PAYMENT_NUMBER" label="PAYMENT_NUMBER" type="STRING" length="96"/>
+				<attribute name="PLAN_LIST" label="PLAN_LIST" type="STRING" length="60"/>
+				<attribute name="PLAN_DATE" label="PLAN_DATE" type="STRING" length="60"/>
+				<attribute name="RENT" label="RENT" type="STRING" length="60"/>
+				<attribute name="CORPUS" label="CORPUS" type="STRING" length="60"/>
+				<attribute name="HIRE_DATE" label="HIRE_DATE" type="STRING" length="60"/>
+				<attribute name="fact_rent" label="fact_rent" type="STRING" length="60"/>
+				<attribute name="fact_corpus" label="fact_corpus" type="STRING" length="60"/>
+				<attribute name="fact_penalty" label="fact_penalty" type="STRING" length="60"/>
+				<attribute name="overduerent" label="overduerent" type="STRING" length="60"/>
+				<attribute name="overinterest" label="overinterest" type="STRING" length="60"/>
+				<attribute name="penalty" label="penalty" type="STRING" length="60"/>
+				<attribute name="Overdue_days" label="Overdue_days" type="STRING" length="60"/>
+				<attribute name="PLAN_STATUS" label="PLAN_STATUS" type="STRING" length="60"/>
+				<attribute name="inputtime" label="inputtime" type="STRING" length="60"/>
+			</attributes>
+			<manager>
+				<managerProperties>
+					<property name="table" value="lc_overdue_rent_plan" />
+					<property name="createKey" value="true" />
+				</managerProperties>
+			</manager>
+		</class>
+		<class name="VI_CSAN" label="" keyAttributes="">
+			<attributes>
 				<attribute name="TYPENO" label="TYPENO" type="STRING"/>
 				<attribute name="SORTNO" label="SORTNO" type="STRING"/>
 				<attribute name="TYPENAME" label="TYPENAME" type="STRING"/>
@@ -3458,34 +3473,34 @@
 				<attribute name="modelid" label="modelid" type="STRING"/>
 				<attribute name="modelname" label="modelname" type="STRING"/>
 				<attribute name="operationType" label="operationType" type="STRING"/>
-				<attribute name="ManySubject" label="ManySubject" type="STRING"/>
-			</attributes>
-			<manager>
-				<managerProperties>
-					<property name="table" value="vi_csan" />
-					<property name="createKey" value="true" />
-				</managerProperties>
-			</manager>
-		</class>
-		<class name="BANK_CODE" label="閾惰缂栫爜" keyAttributes="id">
-			<attributes>
-				<attribute name="id" label="涓婚敭" type="STRING" length="32"/>
-				<attribute name="bank_code" label="閾惰缂栫爜" type="STRING" length="10"/>
-				<attribute name="bank_name" label="閾惰鍚嶇О" type="STRING" length="20"/>
-				<attribute name="is_use" label="鏄惁浣跨敤" type="STRING" length="1"/>
-				<attribute name="inputuserid" label="鐧昏浜�" type="STRING" length="32"/>
-				<attribute name="inputorgid" label="鐧昏閮ㄩ棬" type="STRING" length="32"/>
-				<attribute name="inputtime" label="鐧昏鏃堕棿" type="STRING" length="32"/>
-				<attribute name="updateuserid" label="鏇存柊浜�" type="STRING" length="32"/>
-				<attribute name="updateorgid" label="鏇存柊閮ㄩ棬" type="STRING" length="32"/>
-				<attribute name="updatetime" label="鏇存柊鏃堕棿" type="STRING" length="32"/>
-			</attributes>
-			<manager>
-				<managerProperties>
-					<property name="table" value="bank_code" />
-					<property name="createKey" value="true" />
-				</managerProperties>
-			</manager>
-		</class>
+				<attribute name="ManySubject" label="ManySubject" type="STRING"/>
+			</attributes>
+			<manager>
+				<managerProperties>
+					<property name="table" value="vi_csan" />
+					<property name="createKey" value="true" />
+				</managerProperties>
+			</manager>
+		</class>
+		<class name="BANK_CODE" label="閾惰缂栫爜" keyAttributes="id">
+			<attributes>
+				<attribute name="id" label="涓婚敭" type="STRING" length="32"/>
+				<attribute name="bank_code" label="閾惰缂栫爜" type="STRING" length="10"/>
+				<attribute name="bank_name" label="閾惰鍚嶇О" type="STRING" length="20"/>
+				<attribute name="is_use" label="鏄惁浣跨敤" type="STRING" length="1"/>
+				<attribute name="inputuserid" label="鐧昏浜�" type="STRING" length="32"/>
+				<attribute name="inputorgid" label="鐧昏閮ㄩ棬" type="STRING" length="32"/>
+				<attribute name="inputtime" label="鐧昏鏃堕棿" type="STRING" length="32"/>
+				<attribute name="updateuserid" label="鏇存柊浜�" type="STRING" length="32"/>
+				<attribute name="updateorgid" label="鏇存柊閮ㄩ棬" type="STRING" length="32"/>
+				<attribute name="updatetime" label="鏇存柊鏃堕棿" type="STRING" length="32"/>
+			</attributes>
+			<manager>
+				<managerProperties>
+					<property name="table" value="bank_code" />
+					<property name="createKey" value="true" />
+				</managerProperties>
+			</manager>
+		</class>
 	</package>
 </jbo>
diff --git a/src/com/tenwa/channelportal/action/alpha/CreditAuthActionNewUtils.java b/src/com/tenwa/channelportal/action/alpha/CreditAuthActionNewUtils.java
new file mode 100644
index 000000000..cb5ee8825
--- /dev/null
+++ b/src/com/tenwa/channelportal/action/alpha/CreditAuthActionNewUtils.java
@@ -0,0 +1,414 @@
+package com.tenwa.channelportal.action.alpha;
+
+import java.util.*;
+
+import com.alibaba.fastjson.JSONObject;
+import com.tenwa.app.manage.qiyuesuo.v2.ContractSignEnums;
+import com.tenwa.app.manage.qiyuesuo.v2.ContractSignVtwoUtils;
+import com.tenwa.app.manage.qiyuesuo.v2.QYSParams;
+import com.tenwa.app.manage.util.KHSQContractSignActionTwoUtil;
+import jbo.app.tenwa.customer.CUSTOMER_FAMILY_TEMP;
+import jbo.app.tenwa.doc.LB_DOC_CONTRACT_LIST;
+import jbo.com.tenwa.lease.carbrand.LB_CONTRACT_SIGN_LOG;
+import jbo.com.tenwa.lease.comm.LB_GUARANTEE_UNIT_TEMP;
+import jbo.com.tenwa.lease.comm.LB_PROJECT_INFO_TEMP;
+
+import com.amarsoft.are.jbo.BizObject;
+import com.amarsoft.are.jbo.BizObjectManager;
+import com.amarsoft.are.jbo.JBOException;
+import com.amarsoft.are.jbo.JBOFactory;
+import com.amarsoft.are.jbo.JBOTransaction;
+import com.qiyuesuo.sdk.v2.bean.Contract;
+import com.qiyuesuo.sdk.v2.response.DocumentAddResult;
+import com.qiyuesuo.sdk.v2.response.SdkResponse;
+import com.tenwa.comm.util.date.DateAssistant;
+import com.tenwa.comm.util.jboutil.DataOperatorUtil;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.log4j.Logger;
+
+/**
+ * 最新版，契约锁盖章
+ * 20210415
+ */
+public class CreditAuthActionNewUtils {
+	private static Logger logger=Logger.getLogger(CreditAuthActionNewUtils.class);
+
+	private String operationType;
+	private String creditauth;
+	private String attributeId;
+	private String projectNo;
+	private String fullName;
+	private String certId;
+	private String phone;
+	private String flowUnid;
+	private String relation;
+
+
+    /**
+     * 个人征信授权
+     * @param tx
+     * @return
+     * @throws Exception
+     */
+    public String signIng(JBOTransaction tx) throws Exception {
+        logger.info("signIng0708 个人征信授权，需要个人签约");
+        logger.info("signIng0708 个人征信授权 operationType=" + operationType + " attributeId="+ attributeId
+                + " projectNo="+ projectNo+ " fullName="+ fullName+ " certId="+ certId+ " flowUnid="+ flowUnid
+                + " phone="+ phone+ " relation="+ relation+ " creditauth="+ creditauth);
+        // TODO: 2021/7/12  判断是否申请人，
+
+        BizObjectManager pbm = JBOFactory.getBizObjectManager(LB_PROJECT_INFO_TEMP.CLASS_NAME, tx);
+        BizObjectManager contBom = JBOFactory.getBizObjectManager(LB_DOC_CONTRACT_LIST.CLASS_NAME, tx);
+        BizObject bo = null;
+        try {
+            Map<String, String> docAttrIdMap = new HashMap<String, String>();
+            if("申请人".equals(relation)){
+                // TODO: 2021/7/12 申请人，安鹏征信授权，邮储征信授权，邮储借款告知书一起签，
+                // TODO: 2021/7/12 判断，所有证书是不是生成完毕。
+                String msg = checkPerson(docAttrIdMap);
+                if(null != msg){
+                    logger.info("申请人添加合同文件失败 msg=" + msg);
+                    return "flase@" + msg;
+                }
+            }
+            BizObject pbo = pbm.createQuery("FLOWUNID=:flowUnid")
+                    .setParameter("flowUnid", flowUnid).getSingleResult(true);
+
+            // 查询lb_doc_contract_list表
+            bo = contBom.createQuery("attribute_id=:attributeId and file_flag='yes' and sendprocess='0' ")
+                    .setParameter("attributeId", attributeId).getSingleResult(true);
+            if(pbo == null || bo == null ){
+                throw new RuntimeException("请检查合同文件是否生成！");
+            } else {
+                String subjectId = pbo.getAttribute("subjectid").getString();
+                logger.info("signIng0708 个人征信授权 subjectId=" + subjectId);
+                Map<String, List<Map<String, String>>> parameter = new HashMap<String, List<Map<String, String>>>();
+//                List<Map<String, String>> companyPar = new LinkedList<Map<String, String>>();
+//                // 添加公司公章
+//                Map<String, String> param1 = new HashMap<String, String>();
+//                param1.put("type", "1");// 1标识当期发起公司公章，2标识当前公司下的子公司
+//                param1.put("mobile", "12599998888");//子公司添加接收手机号，如果不需要接收，直接填写一个虚拟不存在就行，如果需要传真实手机号
+//                companyPar.add(param1);
+//                parameter.put("COMPANY", companyPar);
+                //添加个人基本信息
+                List<Map<String, String>> personPar = new LinkedList<Map<String, String>>();
+                Map<String, String> sqPar = new HashMap<String, String>();
+                sqPar.put("name", fullName);
+                sqPar.put("type", "db");
+                if("申请人".equals(relation)){
+                    sqPar.put("type", "sq");
+                }
+                sqPar.put("mobile", phone);
+                personPar.add(sqPar);
+                parameter.put("PERSONAL", personPar);
+                CreditAuthActionTwoUtil catu = new CreditAuthActionTwoUtil();
+                //创建合同
+                SdkResponse<Contract> createContract = catu.createContract(parameter, subjectId, bo.getAttribute("filename").getString());
+                Long contractId = createContract.getResult().getId();
+                //添加本地生成的合同文件
+                String makefullPath = bo.getAttribute("FULLPATH").toString();// 获取生成文件路径
+                Long documentId = null;
+                if("申请人".equals(relation)){
+                    // TODO: 2021/7/12 申请人，安鹏征信授权，邮储征信授权，邮储借款告知书一起签，
+                    logger.info("申请人一起签");
+                    Map<String, String> docAttrMap = new HashMap<>();
+                    for(String createType : docAttrIdMap.keySet()){
+                        String attrId = docAttrIdMap.get(createType);
+                        BizObject boTemp = contBom.createQuery("attribute_id=:attributeId and file_flag='yes' and sendprocess='0' ")
+                                .setParameter("attributeId", attrId).getSingleResult(true);
+                        if(null == boTemp || null == boTemp.getAttribute("FULLPATH")){
+                            logger.info("申请人添加合同文件失败 attributeId=" + attrId);
+                            return "flase@添加合同文件失败";
+                        }
+                        docAttrMap.put(attrId, boTemp.getAttribute("FULLPATH").toString());
+                    }
+                    Map<String, Long> attrDocumentMap = catu.addDocumentByFileList(docAttrMap, subjectId, contractId);
+                    Map<String, Long> typeDocumentIdMap = new HashMap<>();
+                    for(String createType : docAttrIdMap.keySet()){
+                        logger.info("申请人添加合同文件 数据处理 createType=" + createType);
+                        String attrId = docAttrIdMap.get(createType);
+                        Long documentIdTemp = attrDocumentMap.get(attrId);
+                        typeDocumentIdMap.put(createType, documentIdTemp);
+                    }
+                    //发起合同
+                    logger.info("申请人一起签 发起合同" );
+                    catu.sendFileList(personPar, subjectId, contractId, typeDocumentIdMap);
+                    for(String createType : docAttrIdMap.keySet()){
+                        logger.info("申请人一起签 发起合同完成修改文件状态 createType=" + createType);
+                        String attrId = docAttrIdMap.get(createType);
+                        BizObject boTemp = contBom.createQuery("attribute_id=:attributeId and file_flag='yes' and sendprocess='0' ")
+                                .setParameter("attributeId", attrId).getSingleResult(true);
+                        Long documentIdTemp = attrDocumentMap.get(attrId);
+                        boTemp.setAttributeValue("DOCUMENT_ID", documentIdTemp);
+                        boTemp.setAttributeValue("SINGCONTRACT_ID", contractId);
+                        boTemp.setAttributeValue("SIGN_TYPE", "SIGNING");
+                        boTemp.setAttributeValue("SENDPROCESS", "1");
+                        contBom.saveObject(boTemp);
+                        Map<String, String> fromCondtion = new HashMap<String, String>();
+                        Map<String, String> otherProperty = new HashMap<String, String>();
+                        String contractDocId = boTemp.getAttribute("id")
+                                .toString();
+                        fromCondtion.put("id", contractDocId);
+                        otherProperty.put("SIGNPROCESS", "0");// 发起电子签约
+                        otherProperty.put("CONTRACTDOCID", contractDocId);// 发起电子签约
+                        otherProperty.put("INPUTTIME",DateAssistant.getTodayNow());
+                        // 拷表的方法
+                        DataOperatorUtil.copySingleJBO(LB_DOC_CONTRACT_LIST.CLASS_NAME, fromCondtion,LB_CONTRACT_SIGN_LOG.CLASS_NAME, null,otherProperty, tx);
+                    }
+                }else {
+                    SdkResponse<DocumentAddResult> addDocumentByFile = catu.addDocumentByFile(makefullPath, subjectId, contractId);
+                    documentId = addDocumentByFile.getResult().getDocumentId();
+                    //发起合同
+                    catu.send(personPar, subjectId, contractId, documentId);
+                    bo.setAttributeValue("DOCUMENT_ID", documentId);
+                    bo.setAttributeValue("SINGCONTRACT_ID", contractId);
+                    bo.setAttributeValue("SIGN_TYPE", "SIGNING");
+                    bo.setAttributeValue("SENDPROCESS", "1");
+                    contBom.saveObject(bo);
+                    Map<String, String> fromCondtion = new HashMap<String, String>();
+                    Map<String, String> otherProperty = new HashMap<String, String>();
+                    String contractDocId = bo.getAttribute("id")
+                            .toString();
+                    fromCondtion.put("id", contractDocId);
+                    otherProperty.put("SIGNPROCESS", "0");// 发起电子签约
+                    otherProperty.put("CONTRACTDOCID", contractDocId);// 发起电子签约
+                    otherProperty.put("INPUTTIME",DateAssistant.getTodayNow());
+                    // 拷表的方法
+                    DataOperatorUtil.copySingleJBO(LB_DOC_CONTRACT_LIST.CLASS_NAME, fromCondtion,LB_CONTRACT_SIGN_LOG.CLASS_NAME, null,otherProperty, tx);
+                }
+                return "success";
+            }
+
+        } catch (Exception e) {
+            tx.rollback();
+            e.printStackTrace();
+            System.out.println("自然人电子签约异常:" + e.getMessage());
+            return "flase@error";
+        }
+    }
+
+    private String checkPerson(Map<String, String> docAttrIdMap) throws JBOException {
+        //安鹏征信授权，邮储征信授权，邮储借款告知书。
+        Map<String, String> creditAuthMap = new HashMap<>();
+        creditAuthMap.put("99001", "安鹏征信授权");
+        creditAuthMap.put("99002", "邮储征信授权");
+        creditAuthMap.put("99003", "邮储借款告知书");
+        for(String creditAuth : creditAuthMap.keySet()){
+            BizObjectManager bom = JBOFactory.getBizObjectManager(jbo.app.tenwa.doc.LB_DOCRELATIVE.CLASS_NAME);
+            BizObject  lbDocBiz = bom.createQuery("OBJECTTYPE=:objectType  and CUST_ID=:certId and PROJ_ID=:projectNo ")
+                    .setParameter("objectType",creditAuth).setParameter("certId",certId).setParameter("projectNo",projectNo).getSingleResult(false);
+            if(null != lbDocBiz) {
+                String lbDocBizId = lbDocBiz.getAttribute("id").toString();
+                BizObjectManager bom1 = JBOFactory.getBizObjectManager(jbo.app.tenwa.doc.LB_DOCLIBRARY.CLASS_NAME);
+                String lbDocLibraryId = bom1.createQuery("relative_id=:relative_id").setParameter("relative_id", lbDocBizId).getSingleResult(false).getAttribute("id").toString();
+                BizObjectManager bom2 = JBOFactory.getBizObjectManager(jbo.app.tenwa.doc.LB_DOCATTRIBUTE.CLASS_NAME);
+                String docAttributeId = bom2.createQuery("library_id=:library_id").setParameter("library_id", lbDocLibraryId).getSingleResult(false).getAttribute("id").toString();
+                if(StringUtils.isEmpty(docAttributeId)){
+                    return "请先生成申请人【" + creditAuthMap.get(creditAuth) + "】文件。";
+                }
+                docAttrIdMap.put(creditAuth, docAttributeId);
+            }else {
+                return "请先生成申请人【" + creditAuthMap.get(creditAuth) + "】文件。";
+            }
+        }
+        return null;
+    }
+    /**
+     * 查看签约结果
+     * @param tx
+     * @return
+     * @throws Exception
+     */
+    public String contractSignStatus(JBOTransaction tx) throws Exception {
+        logger.info("contractSignStatus20210708 个人征信授权  projectNo="+ projectNo+ " fullName="+ fullName);
+        BizObjectManager pbm = JBOFactory.getBizObjectManager(LB_PROJECT_INFO_TEMP.CLASS_NAME, tx);
+        BizObjectManager contBom = JBOFactory.getBizObjectManager(LB_DOC_CONTRACT_LIST.CLASS_NAME, tx);
+        // 查询lb_doc_contract_list表
+        BizObject bo = contBom.createQuery("attribute_id=:attributeId and file_flag='yes' and sendprocess='1' ")
+                .setParameter("attributeId", attributeId).getSingleResult(true);
+        BizObject pbo = pbm.createQuery("FLOWUNID=:flowUnid").setParameter("flowUnid", flowUnid).getSingleResult(true);
+        if(null == pbo || bo == null ){
+            return "请检查合同文件是否生成！";
+        } else {
+            String subjectId = pbo.getAttribute("subjectid").getString();
+            logger.info("contractSignStatus0708 个人征信授权 subjectId=" + subjectId);
+            long signContractId = new Long(
+                    bo.getAttribute("SINGCONTRACT_ID") == null ?
+                            null : bo.getAttribute("SINGCONTRACT_ID").getString());
+            long documentId = new Long(
+                    bo.getAttribute("DOCUMENT_ID") == null ?
+                            null  : bo.getAttribute("DOCUMENT_ID").getString());
+            String makefullPath = bo.getAttribute("FULLPATH") == null ?
+                    null : bo.getAttribute("FULLPATH").getString();// 获取生成文件路径
+            CreditAuthActionTwoUtil catu = new CreditAuthActionTwoUtil();
+            String contractStatus = catu.getContractStatus(subjectId, signContractId);
+            if("success".equals(contractStatus)){
+                logger.info("contractSignStatus20210712 征信授权，不执行合同盖章。");
+                if("申请人".equals(relation)){
+                    logger.info("contractSignStatus20210712 申请人下载，所有授权信息。");
+                    Map<String, String> docAttrIdMap = new HashMap<String, String>();
+                    String msg = checkPerson(docAttrIdMap);
+                    if(null != msg){
+                        logger.info("申请人添加合同文件失败 msg=" + msg);
+                        return "flase@" + msg;
+                    }
+                    for(String createType : docAttrIdMap.keySet()){
+                        String attrId = docAttrIdMap.get(createType);
+                        BizObject boTemp = contBom.createQuery("attribute_id=:attributeId and file_flag='yes' and sendprocess='1' ")
+                                .setParameter("attributeId", attrId).getSingleResult(true);
+                        long documentIdSub = new Long(boTemp.getAttribute("DOCUMENT_ID").getString());
+                        String filePath = boTemp.getAttribute("FULLPATH") == null ?
+                                null : boTemp.getAttribute("FULLPATH").getString();// 获取生成文件路径
+                        logger.info("个人征信授权 无需执行合同盖章。 createType===" + createType);
+                        String downloadstatus = catu.contractDownload(subjectId, documentIdSub, filePath);
+                        logger.info("个人征信授权 无需执行合同盖章。 合同下载log===" + downloadstatus);
+                        boTemp.setAttributeValue("PROCESS", "6");
+                        boTemp.setAttributeValue("SIGN_TYPE", "COMPLETE");// 法人客户当盖完章改为完成状态
+                        boTemp.setAttributeValue("SENDPROCESS", "2");
+                        contBom.saveObject(boTemp);
+                    }
+                    logger.info("contractSignStatus20210712 电子签约已完成，个人征信授权 无需执行合同盖章。");
+                    return "已完成";
+                }else {
+                    // contBom.saveObject(bo);
+                    Map<String, String> fromCondtion = new HashMap<String, String>();
+                    Map<String, String> otherProperty = new HashMap<String, String>();
+                    String contractDocId = bo.getAttribute("id").toString();
+                    fromCondtion.put("id", contractDocId);
+                    otherProperty.put("SIGNPROCESS", "2");// 已完成电子签约
+                    otherProperty.put("CONTRACTDOCID", contractDocId);// 已完成电子签约
+                    otherProperty.put("INPUTTIME",DateAssistant.getTodayNow());
+                    // 拷表的方法
+                    DataOperatorUtil.copySingleJBO(LB_DOC_CONTRACT_LIST.CLASS_NAME, fromCondtion,LB_CONTRACT_SIGN_LOG.CLASS_NAME, null,otherProperty, tx);
+                    String downloadstatus = catu.contractDownload(subjectId, documentId, makefullPath);
+                    logger.info("个人征信授权 无需执行合同盖章。 合同下载log===" + downloadstatus);
+                    bo.setAttributeValue("PROCESS", "6");
+                    bo.setAttributeValue("SIGN_TYPE", "COMPLETE");// 法人客户当盖完章改为完成状态
+                    bo.setAttributeValue("SENDPROCESS", "2");
+                    contBom.saveObject(bo);
+                    logger.info("contractSignStatus20210429 电子签约已完成，个人征信授权 无需执行合同盖章。");
+                    return "已完成";
+                }
+            }else{
+                return contractStatus;
+            }
+        }
+    }
+
+    public String sendMessageAgain(JBOTransaction tx) {
+        try{
+            logger.info("sendMessageAgain20210708 个人征信授权  projectNo="+ projectNo+ " fullName="+ fullName);
+            BizObjectManager pbm = JBOFactory.getBizObjectManager(LB_PROJECT_INFO_TEMP.CLASS_NAME, tx);
+            BizObject pbo = pbm.createQuery("FLOWUNID=:flowUnid").setParameter("flowUnid", flowUnid).getSingleResult(true);
+            BizObjectManager contBom = JBOFactory.getBizObjectManager(LB_DOC_CONTRACT_LIST.CLASS_NAME, tx);
+            BizObject bo = null;
+            bo = contBom.createQuery("select singcontract_id,filename from O where attribute_id=:attributeId"
+                    +" and file_flag = 'yes' and sendprocess = '1' and sign_type = 'SIGNING'")
+                    .setParameter("attributeId", attributeId).getSingleResult(true);
+            String subjectId = pbo.getAttribute("subjectid").getString();
+            logger.info("sendMessageAgain20210708 个人征信授权 subjectId=" + subjectId);
+            if(bo == null ){
+                // 查询lb_doc_contract_list表
+                bo = contBom.createQuery("attribute_id=:attributeId and file_flag='yes' and (sendprocess='0' or sendprocess='1' ) ")
+                        .setParameter("attributeId", attributeId).getSingleResult(true);
+                if(bo == null ){
+                    logger.info("sendMessageAgain20210708 请检查合同文件是否生成");
+                    return "请检查合同文件是否生成！";
+                }
+                long signContractId =
+                        new Long(bo.getAttribute("SINGCONTRACT_ID") == null ? null : bo.getAttribute("SINGCONTRACT_ID").getString());
+                CreditAuthActionTwoUtil catu = new CreditAuthActionTwoUtil();
+                String contractStatus = catu.getContractStatus(subjectId, signContractId);
+                if("success".equals(contractStatus)){
+                    logger.info("sendMessageAgain20210708 电子签约已完成，无需再发送短信。");
+                    return "签约已完成，无需再发送短信。";
+                }
+                logger.info("sendMessageAgain20210708 请检查合同文件是否生成111");
+                return "请检查合同文件是否生成！";
+            }
+            long signContractId =new Long(bo.getAttribute("SINGCONTRACT_ID")==null ? null : bo.getAttribute("SINGCONTRACT_ID").getString());
+            KHSQContractSignActionTwoUtil catu = new KHSQContractSignActionTwoUtil();
+            return catu.messageSend(subjectId, signContractId);
+        } catch (Exception e) {
+            try {
+                tx.rollback();
+            } catch (JBOException e1) {
+                e1.printStackTrace();
+            }
+            e.printStackTrace();
+            return "error";
+        }
+    }
+
+    public String getFlowUnid() {
+        return flowUnid;
+    }
+
+    public void setFlowUnid(String flowUnid) {
+        this.flowUnid = flowUnid;
+    }
+
+    public String getOperationType() {
+        return operationType;
+    }
+
+    public void setOperationType(String operationType) {
+        this.operationType = operationType;
+    }
+
+    public String getAttributeId() {
+        return attributeId;
+    }
+
+    public void setAttributeId(String attributeId) {
+        this.attributeId = attributeId;
+    }
+
+    public String getProjectNo() {
+        return projectNo;
+    }
+
+    public void setProjectNo(String projectNo) {
+        this.projectNo = projectNo;
+    }
+
+    public String getFullName() {
+        return fullName;
+    }
+
+    public void setFullName(String fullName) {
+        this.fullName = fullName;
+    }
+
+    public String getCertId() {
+        return certId;
+    }
+
+    public void setCertId(String certId) {
+        this.certId = certId;
+    }
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+
+    public String getRelation() {
+        return relation;
+    }
+
+    public void setRelation(String relation) {
+        this.relation = relation;
+    }
+
+    public String getCreditauth() {
+        return creditauth;
+    }
+
+    public void setCreditauth(String creditauth) {
+        this.creditauth = creditauth;
+    }
+}
diff --git a/src/com/tenwa/channelportal/action/alpha/CreditAuthActionTwoUtil.java b/src/com/tenwa/channelportal/action/alpha/CreditAuthActionTwoUtil.java
new file mode 100644
index 000000000..7d7177f66
--- /dev/null
+++ b/src/com/tenwa/channelportal/action/alpha/CreditAuthActionTwoUtil.java
@@ -0,0 +1,501 @@
+package com.tenwa.channelportal.action.alpha;
+
+import com.qiyuesuo.sdk.v2.SdkClient;
+import com.qiyuesuo.sdk.v2.bean.*;
+import com.qiyuesuo.sdk.v2.http.StreamFile;
+import com.qiyuesuo.sdk.v2.json.JSONUtils;
+import com.qiyuesuo.sdk.v2.param.SignParam;
+import com.qiyuesuo.sdk.v2.request.*;
+import com.qiyuesuo.sdk.v2.response.DocumentAddResult;
+import com.qiyuesuo.sdk.v2.response.SdkResponse;
+import com.qiyuesuo.sdk.v2.utils.CollectionUtils;
+import com.qiyuesuo.sdk.v2.utils.IOUtils;
+import com.tenwa.util.MultiSubjectUtil;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.util.*;
+
+public class CreditAuthActionTwoUtil {
+	private static final Logger logger = LoggerFactory.getLogger(CreditAuthActionTwoUtil.class);
+	private static final ResourceBundle resourceBunlde = ResourceBundle.getBundle("qiyuesuo");
+	
+	
+	//深圳公司参数
+	private static final String sZ_Url = resourceBunlde.getString("SZ_Url");
+	private static final String sZ_Key = resourceBunlde.getString("SZ_Key");
+	private static final String sZ_Secret = resourceBunlde.getString("SZ_Secret");
+	private static final String sZ_OfficialSealId = resourceBunlde.getString("SZ_OfficialSealId");
+	private static final String sZ_CompanyName = resourceBunlde.getString("SZ_CompanyName");
+	
+	//天津公司参数
+	private static final String tJ_Url = resourceBunlde.getString("TJ_Url");
+	private static final String tJ_Key = resourceBunlde.getString("TJ_Key");
+	private static final String tJ_Secret = resourceBunlde.getString("TJ_Secret");
+	private static final String tJ_OfficialSealId = resourceBunlde.getString("TJ_OfficialSealId");
+	private static final String tJ_CompanyName = resourceBunlde.getString("TJ_CompanyName");
+	
+	//子公司参数（辉煌）
+	private static final String hH_CompanyName = resourceBunlde.getString("HH_CompanyName");
+	private static final String hH_OfficialSealId = resourceBunlde.getString("HH_OfficialSealId");
+
+	
+	private SdkClient getSdkClient(String subjectId){
+		if(MultiSubjectUtil.SZSUBJECTID.equals(subjectId)){
+			return new SdkClient(sZ_Url, sZ_Key, sZ_Secret);
+		}else if (MultiSubjectUtil.TJSUBJECTID.equals(subjectId)){
+			return new SdkClient(sZ_Url, sZ_Key, sZ_Secret);//应客户要求，现在都是以深圳主体发起
+			//return new SdkClient(tJ_Url, tJ_Key, tJ_Secret);
+		}
+		return null;
+	}
+	
+	private String getComPanyName(String subjectId){
+		if(MultiSubjectUtil.SZSUBJECTID.equals(subjectId)){
+			return sZ_CompanyName;
+		}else if (MultiSubjectUtil.TJSUBJECTID.equals(subjectId)){
+			return tJ_CompanyName;
+		}
+		return null;
+	}
+	//创建合同
+	public SdkResponse<Contract> createContract(Map<String, List<Map<String, String>>> parameter,String subjectId,String fileNme) throws Exception {
+		SdkClient client = this.getSdkClient(subjectId);
+		Contract draftContract = new Contract();
+		draftContract.setSubject(fileNme);
+		draftContract.setOrdinal(false);
+		List<Map<String, String>> list = parameter.get("PERSONAL");
+		if(list!=null && list.size()>0){
+			for (Map<String, String> map : list) {
+				Signatory persoanlSignatory = new Signatory();
+				persoanlSignatory.setTenantType("PERSONAL");
+				persoanlSignatory.setTenantName(map.get("name"));
+				persoanlSignatory.setReceiver(new User(map.get("type"), map.get("mobile"), "MOBILE"));
+				draftContract.addSignatory(persoanlSignatory);
+			}
+		}
+		list = parameter.get("COMPANY");
+		if(list!=null && list.size()>0){
+			for (Map<String, String> map : list) {
+				Signatory platformSignatory = new Signatory();
+				platformSignatory.setTenantType("COMPANY");
+				Action sealAction = new Action();
+				sealAction.setType("COMPANY");
+				if ("1".equals(map.get("type"))) {
+					if(MultiSubjectUtil.SZSUBJECTID.equals(subjectId)){
+						platformSignatory.setTenantName(sZ_CompanyName);
+						sealAction.setName(sZ_CompanyName);
+						sealAction.setSealId(new Long(sZ_OfficialSealId));
+					}else if (MultiSubjectUtil.TJSUBJECTID.equals(subjectId)){
+						platformSignatory.setTenantName(tJ_CompanyName);
+						sealAction.setName(tJ_CompanyName);
+						sealAction.setSealId(new Long(tJ_OfficialSealId));
+					}
+				} else {
+					platformSignatory.setTenantName(hH_CompanyName);
+					sealAction.setName(hH_CompanyName);
+					sealAction.setSealId(new Long(hH_OfficialSealId) );
+				}
+				platformSignatory.setReceiver(new User(map.get("mobile"), "MOBILE"));//子公司必须设置接收方，不管是否是子公司，都设置了一个
+				platformSignatory.addAction(sealAction);
+				draftContract.addSignatory(platformSignatory);
+			}
+		}
+		draftContract.setSend(false);
+		String response = null;
+		try {
+			response = client.service(new ContractDraftRequest(draftContract));
+		} catch (Exception e) {
+			throw new Exception("创建合同草稿请求服务/器失败，失败原因：" + e.getMessage());
+		}
+		SdkResponse<Contract> sdkResponse = JSONUtils.toQysResponse(response,
+				Contract.class);
+		if (!sdkResponse.getCode().equals(0)) {
+			throw new Exception("创建合同草稿失败，失败原因：" + sdkResponse.getMessage());
+		}
+		return sdkResponse;
+	}
+
+	/**
+	 * 添加多个文件
+	 * @param docAttrMap
+	 * @param subjectId
+	 * @param contractId
+	 * @return
+	 * @throws Exception
+	 */
+	public Map<String, Long> addDocumentByFileList(Map<String, String> docAttrMap, String subjectId, Long contractId )throws Exception {
+		logger.info("addDocumentByFile20210708 申请人征信授权多条 subjectId=【"+subjectId+"】 contractId=【"+contractId+"】");
+		SdkClient client = this.getSdkClient(subjectId);
+		Map<String, Long> attrDocumentMap = new HashMap<>();
+		for(String docArrtId : docAttrMap.keySet()){
+			String filePath = docAttrMap.get(docArrtId);
+			logger.info("addDocumentByFile20210708 申请人征信授权多条 docArrtId=【"+docArrtId+"】 filePath=【"+filePath+"】");
+			// 进入本地文件
+			StreamFile file = new StreamFile(new FileInputStream(new File(filePath)));
+			if(null == file){
+				logger.info("addDocumentByFile20210708 文件不存在 filePath=【"+filePath+"】 subjectId=【"+subjectId+"】 contractId=【"+contractId+"】");
+			}
+			String response = null;
+			try {
+				// PDF为本地文件的类型，请修改为对应的本地文件类型
+				response = client.service(new DocumentAddByFileRequest(contractId,file, "pdf", "由文件创建文档"));
+			} catch (Exception e) {
+				throw new Exception("根据文件添加文档请求服务器失败，失败原因：" + e.getMessage());
+			}
+			SdkResponse<DocumentAddResult> sdkResponse = JSONUtils.toQysResponse(
+					response, DocumentAddResult.class);
+			if (!sdkResponse.getCode().equals(0)) {
+				throw new Exception("根据文件添加文档失败，失败原因：" + sdkResponse.getMessage());
+			}
+			attrDocumentMap.put(docArrtId, sdkResponse.getResult().getDocumentId());
+		}
+		return attrDocumentMap;
+	}
+
+	/**
+	 * 添加单个文件
+	 * @param filePath
+	 * @param subjectId
+	 * @param contractId
+	 * @return
+	 * @throws Exception
+	 */
+	public SdkResponse<DocumentAddResult> addDocumentByFile(String filePath,String subjectId,Long contractId)throws Exception {
+		logger.info("addDocumentByFile20210708 filePath=【"+filePath+"】 subjectId=【"+subjectId+"】 contractId=【"+contractId+"】");
+		SdkClient client = this.getSdkClient(subjectId);
+		// 进入本地文件
+		StreamFile file = new StreamFile(new FileInputStream(new File(filePath)));
+		if(null == file){
+			logger.info("addDocumentByFile20210708 文件不存在 filePath=【"+filePath+"】 subjectId=【"+subjectId+"】 contractId=【"+contractId+"】");
+		}
+		String response = null;
+		try {
+			// PDF为本地文件的类型，请修改为对应的本地文件类型
+			response = client.service(new DocumentAddByFileRequest(contractId,file, "pdf", "由文件创建文档"));
+		} catch (Exception e) {
+			throw new Exception("根据文件添加文档请求服务器失败，失败原因：" + e.getMessage());
+		}
+		SdkResponse<DocumentAddResult> sdkResponse = JSONUtils.toQysResponse(
+				response, DocumentAddResult.class);
+		if (!sdkResponse.getCode().equals(0)) {
+			throw new Exception("根据文件添加文档失败，失败原因：" + sdkResponse.getMessage());
+		}
+		return sdkResponse;
+	}
+
+	/**
+	 * 发起合同
+	 */
+	public  SdkResponse send(List<Map<String, String>> personList,String subjectId, Long contractId,Long documentId) throws Exception {
+		SdkClient client = this.getSdkClient(subjectId);
+		Contract draft = getContract(subjectId, contractId).getResult();
+		String contractName = draft.getSubject();
+		List<Stamper> stampers = new LinkedList<Stamper>();
+		// 获取SignatoryId与ActionId，用于指定签署位置，公司签署位置需要指定ActionId,个人签署位置需要指定SignatoryId
+		Long personalSignatoryId = null;
+		for (Signatory signatory : draft.getSignatories()) {
+			// 获取个人签署方
+			if (signatory.getTenantType().equals("PERSONAL")) {
+				personalSignatoryId = signatory.getId();
+				String typeName = signatory.getTenantName();
+				String type = "";
+				if (personList != null && personList.size() > 0) {
+					for (Map<String, String> person : personList) {
+						if (person.get("name").equals(typeName)) {
+							type = person.get("type");
+							break;
+						}
+					}
+				}
+				Stamper personalStamper = new Stamper();
+				personalStamper.setPage(0);
+				personalStamper.setType("PERSONAL");
+				personalStamper.setSignatoryId(personalSignatoryId);
+				personalStamper.setDocumentId(documentId);
+				personalStamper.setKeyword("授权人签章：");
+				personalStamper.setOffsetX(-0.05);
+				//添加一个签署时间
+				Stamper personalStamperTime1 = new Stamper();
+				personalStamperTime1.setPage(0);
+				personalStamperTime1.setType("TIMESTAMP");
+				personalStamperTime1.setSignatoryId(personalSignatoryId);
+				personalStamperTime1.setDocumentId(documentId);
+				personalStamperTime1.setKeyword("授权人签章：");
+				personalStamperTime1.setOffsetX(0.025);
+				personalStamperTime1.setOffsetY(-0.0025);
+				stampers.add(personalStamperTime1);
+				if ("sq".equals(type)) {//承租人
+					//申请人添加第二个签字位置
+					Stamper personalStamper2 = new Stamper();
+					personalStamper2.setPage(0);
+					personalStamper2.setType("PERSONAL");
+					personalStamper2.setSignatoryId(personalSignatoryId);
+					personalStamper2.setDocumentId(documentId);
+					personalStamper2.setKeyword("授权人（签名）：");
+					personalStamper2.setOffsetX(-0.05);
+					stampers.add(personalStamper2);
+
+					//添加二个签署时间
+					Stamper personalStamperTime2 = new Stamper();
+					personalStamperTime2.setPage(0);
+					personalStamperTime2.setType("TIMESTAMP");
+					personalStamperTime2.setSignatoryId(personalSignatoryId);
+					personalStamperTime2.setDocumentId(documentId);
+					personalStamperTime2.setKeyword("授权日期：");
+					personalStamperTime2.setOffsetX(0.025);
+					personalStamperTime2.setOffsetY(-0.0025);
+					stampers.add(personalStamperTime2);
+				}
+				stampers.add(personalStamper);
+			}
+		}
+		String response = null;
+		try {
+			response = client.service(new ContractSendRequest(draft.getId(),stampers));
+		} catch (Exception e) {
+			throw new Exception("发起合同请求服务器失败，失败原因：" + e.getMessage());
+		}
+		SdkResponse sdkResponse = JSONUtils.toQysResponse(response);
+		if (!sdkResponse.getCode().equals(0)) {
+			throw new Exception("发起合同失败，失败原因：" + sdkResponse.getMessage());
+		}
+		return sdkResponse;
+	}
+
+	/**
+	 * 发起合同
+	 */
+	public  SdkResponse sendFileList(List<Map<String, String>> personList, String subjectId, Long contractId, Map<String, Long> typeDocumentIdMap) throws Exception {
+		SdkClient client = this.getSdkClient(subjectId);
+		Contract draft = getContract(subjectId, contractId).getResult();
+		String contractName = draft.getSubject();
+		List<Stamper> stampers = new LinkedList<Stamper>();
+		// 获取SignatoryId与ActionId，用于指定签署位置，公司签署位置需要指定ActionId,个人签署位置需要指定SignatoryId
+		Long personalSignatoryId = null;
+		for (Signatory signatory : draft.getSignatories()) {
+			// 获取个人签署方
+			if (signatory.getTenantType().equals("PERSONAL")) {
+				personalSignatoryId = signatory.getId();
+				String typeName = signatory.getTenantName();
+				for(String createType : typeDocumentIdMap.keySet()){
+					logger.info("当前合同类型：createType=" + createType);
+					Long documentId = typeDocumentIdMap.get(createType);
+					// TODO: 2021/7/12 安鹏征信授权
+					if("99001".equals(createType)){
+						Stamper personalStamper = new Stamper();
+						personalStamper.setPage(0);
+						personalStamper.setType("PERSONAL");
+						personalStamper.setSignatoryId(personalSignatoryId);
+						personalStamper.setDocumentId(documentId);
+						personalStamper.setKeyword("授权人签章：");
+						personalStamper.setOffsetX(-0.03);
+						personalStamper.setOffsetY(-0.02);
+						//添加一个签署时间
+						Stamper personalStamperTime1 = new Stamper();
+						personalStamperTime1.setPage(0);
+						personalStamperTime1.setType("TIMESTAMP");
+						personalStamperTime1.setSignatoryId(personalSignatoryId);
+						personalStamperTime1.setDocumentId(documentId);
+						personalStamperTime1.setKeyword("授权人签章：");
+						personalStamperTime1.setOffsetX(0.17);
+						personalStamperTime1.setOffsetY(-0.02);
+						stampers.add(personalStamperTime1);
+						stampers.add(personalStamper);
+					}else if("99002".equals(createType)){
+						// TODO: 2021/7/12 邮储征信授权
+						//申请人添加第二个签字位置
+						Stamper personalStamper2 = new Stamper();
+						personalStamper2.setPage(0);
+						personalStamper2.setType("PERSONAL");
+						personalStamper2.setSignatoryId(personalSignatoryId);
+						personalStamper2.setDocumentId(documentId);
+						personalStamper2.setKeyword("授权人（签名）：");
+						personalStamper2.setOffsetX(-0.03);
+						stampers.add(personalStamper2);
+
+						//添加二个签署时间
+						Stamper personalStamperTime2 = new Stamper();
+						personalStamperTime2.setPage(0);
+						personalStamperTime2.setType("TIMESTAMP");
+						personalStamperTime2.setSignatoryId(personalSignatoryId);
+						personalStamperTime2.setDocumentId(documentId);
+						personalStamperTime2.setKeyword("授权日期：");
+						personalStamperTime2.setOffsetX(0.025);
+						personalStamperTime2.setOffsetY(-0.0025);
+						stampers.add(personalStamperTime2);
+					}else if("99003".equals(createType)){
+						// TODO: 2021/7/12 邮储借款告知书
+						//申请人添加第二个签字位置
+						Stamper personalStamper2 = new Stamper();
+						personalStamper2.setPage(0);
+						personalStamper2.setType("PERSONAL");
+						personalStamper2.setSignatoryId(personalSignatoryId);
+						personalStamper2.setDocumentId(documentId);
+						personalStamper2.setKeyword("贷款申请人签字：");
+						personalStamper2.setOffsetX(-0.03);
+						personalStamper2.setOffsetY(-0.02);
+						stampers.add(personalStamper2);
+
+						//添加二个签署时间
+						Stamper personalStamperTime2 = new Stamper();
+						personalStamperTime2.setPage(0);
+						personalStamperTime2.setType("TIMESTAMP");
+						personalStamperTime2.setSignatoryId(personalSignatoryId);
+						personalStamperTime2.setDocumentId(documentId);
+						personalStamperTime2.setKeyword("日期：");
+						// TODO: 2021/7/13 太靠右了
+						personalStamperTime2.setOffsetX(-0.55);
+						personalStamperTime2.setOffsetY(-0.0025);
+						stampers.add(personalStamperTime2);
+					}
+				}
+			}
+		}
+		String response = null;
+		try {
+			response = client.service(new ContractSendRequest(draft.getId(),stampers));
+		} catch (Exception e) {
+			throw new Exception("发起合同请求服务器失败，失败原因：" + e.getMessage());
+		}
+		SdkResponse sdkResponse = JSONUtils.toQysResponse(response);
+		if (!sdkResponse.getCode().equals(0)) {
+			throw new Exception("发起合同失败，失败原因：" + sdkResponse.getMessage());
+		}
+		return sdkResponse;
+	}
+
+	public String getContractStatus(String subjectId, Long contractId) throws Exception{
+		Contract contract = this.getContract(subjectId,contractId).getResult();
+		logger.info("getContractStatus#20210422 查询合同信息 contract=" + JSONUtils.toJson(contract));
+        if("COMPLETE".equals(contract.getStatus())){
+            logger.info("getContractStatus#20210429 查询合同信息已签约完成。");
+            return "success";
+        }
+		boolean stu = true;
+		StringBuffer sb = new StringBuffer();
+		List<Signatory> signatories = contract.getSignatories();
+		if(signatories!=null && signatories.size()>0){
+			for (Signatory signatory : signatories) {
+				String tenantType = signatory.getTenantType();
+				String status = signatory.getStatus();
+				if(tenantType!=null && "PERSONAL".equals(tenantType)){
+					if(stu && status != null && (!status.equals("SIGNED")) ){
+						stu = false ;
+					}
+					String statusName = "";
+					switch (status) {
+						case "DRAFT":
+							statusName="草稿";
+							break;
+						case "RECALLED":
+							statusName="已撤回";
+							break;
+						case "SIGNING":
+							statusName="签署中";
+							break;
+						case "REJECTED":
+							statusName="已退回";
+							break;
+						case "SIGNED":
+							statusName="已完成";
+							break;
+						case "EXPIRED":
+							statusName="已过期";
+							break;
+						case "FILLING":
+							statusName="拟定中";
+							break;
+						case "WAITING":
+							statusName="待签署";
+							break;
+						case "INVALIDING":
+							statusName="作废中";
+							break;
+						case "INVALIDED":
+							statusName="已作废";
+							break;
+						default:
+							statusName="状态未匹配";
+						break;
+					}
+					sb.append(signatory.getTenantName()).append(":").append(statusName).append("；");
+				}
+			}
+		}
+		if(stu){
+			return "success";
+		}else{
+			return sb.substring(0, sb.length()-1);
+		}
+	}
+    public SdkResponse<Contract> getContract(String subjectId, Long contractId) throws Exception {
+    	SdkClient client = this.getSdkClient(subjectId);
+        ContractDetailRequest request = new ContractDetailRequest(contractId);
+        String response;
+        try {
+            response = client.service(request);
+        } catch (Exception e) {
+            throw new Exception("合同详情查询，失败原因：" + e.getMessage());
+        }
+        SdkResponse<Contract> sdkResponse = JSONUtils.toQysResponse(response, Contract.class);
+        if (!sdkResponse.getCode().equals(0)) {
+            throw new Exception("合同详情查询，失败原因：" + sdkResponse.getMessage());
+        }
+        return sdkResponse;
+    }
+    //合同下载
+    public String contractDownload(String subjectId, Long documentId, String filePath) throws Exception {
+    	SdkClient client = this.getSdkClient(subjectId);
+    	DocumentDownloadRequest request = new DocumentDownloadRequest(documentId);
+    	FileOutputStream fos = null;
+		try {
+			fos = new FileOutputStream(filePath);
+			client.download(request, fos);
+	    	IOUtils.safeClose(fos);
+		} catch (FileNotFoundException e) {
+			 throw new Exception("合同文件下载，失败原因：" + e.getMessage());
+		}finally{
+			fos.close();
+		}
+    	return "合同下载成功！";
+    }
+
+	/**
+	 * 合同催签
+	 * @param subjectId
+	 * @param signContractId
+	 * @return
+	 */
+	public String messageSend(String subjectId,Long signContractId)	throws Exception{
+		Contract contract = this.getContract(subjectId, signContractId).getResult();
+		logger.info("messageSend#20210521 查询合同信息 contract=" + JSONUtils.toJson(contract));
+		if("COMPLETE".equals(contract.getStatus())){
+			logger.info("messageSend#20210521 查询合同信息已签约完成。");
+			return "success";
+		}
+		List<Signatory> signatories = contract.getSignatories();
+		if(CollectionUtils.isNotEmpty(signatories)) {
+			SdkClient client = this.getSdkClient(subjectId);
+			for (Signatory signatory : signatories) {
+				if (StringUtils.isNotEmpty(signatory.getTenantType()) && "PERSONAL".equals(signatory.getTenantType())
+						&& StringUtils.isNotEmpty(signatory.getStatus()) && "SIGNING".equals(signatory.getStatus())) {
+					logger.info("messageSend#20210521 当前客户状态签署中，重新发送短信。signatory=" + JSONUtils.toJson(signatory));
+					ContractNoticeRequest request = new ContractNoticeRequest(signContractId);
+					request.setSigantoryId(signatory.getId());
+					String response = client.service(request);
+					SdkResponse responseObj = JSONUtils.toQysResponse(response);
+					logger.info("messageSend#20210521 重新发送短信返回。response=" + response);
+					logger.info("messageSend#20210521 重新发送短信返回。response=" + +responseObj.getCode()+":"+responseObj.getMessage());
+
+				}
+			}
+		}
+		return "success";
+    }
+}
diff --git a/src/com/tenwa/channelportal/action/alpha/CreditAuthAward.java b/src/com/tenwa/channelportal/action/alpha/CreditAuthAward.java
new file mode 100644
index 000000000..c53ff2600
--- /dev/null
+++ b/src/com/tenwa/channelportal/action/alpha/CreditAuthAward.java
@@ -0,0 +1,171 @@
+package com.tenwa.channelportal.action.alpha;
+
+import com.amarsoft.app.util.ProductParamUtil;
+import com.amarsoft.are.jbo.*;
+import com.amarsoft.are.util.StringFunction;
+import com.amarsoft.awe.Configure;
+import com.amarsoft.awe.control.model.Page;
+import com.amarsoft.awe.util.ASResultSet;
+import com.amarsoft.awe.util.SqlObject;
+import com.amarsoft.awe.util.Transaction;
+import com.amarsoft.context.ASUser;
+import com.tenwa.channelportal.action.ContractSignAction;
+import com.tenwa.comm.util.jboutil.DataOperatorUtil;
+import common.Logger;
+import jbo.app.tenwa.calc.LC_PROJ_CONDITION;
+import jbo.app.tenwa.customer.CUSTOMER_ACCOUNT;
+import jbo.app.tenwa.doc.LB_DOCATTRIBUTE;
+import jbo.app.tenwa.doc.LB_DOCLIBRARY;
+import jbo.app.tenwa.doc.LB_DOCRELATIVE;
+import jbo.app.tenwa.doc.LB_DOC_CONTRACT_LIST;
+import jbo.com.tenwa.lease.carbrand.BUSINESS_STATUS;
+import jbo.com.tenwa.lease.carbrand.VI_CONTRACTMAKEPRINTLIST;
+import jbo.com.tenwa.lease.comm.LB_CONTRACT_STATUS;
+import jbo.com.tenwa.lease.comm.LB_PROJECT_INFO;
+import jbo.com.tenwa.lease.comm.LB_PROJECT_INFO_TEMP;
+
+import java.sql.SQLException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 合同签约
+ * @author tenwa518
+ *
+ */
+public class CreditAuthAward {
+private Logger logger=Logger.getLogger(this.getClass());
+public String libraryId;
+public String project_id;
+public String contract_id;
+public String ProjectId;
+public String CustomerType;
+public String ProductId;
+public String ContractId;
+public Page CurPage;
+public Configure Curconf;
+public String CurUserID;
+public String FlowUnid;
+
+
+public String getFlowUnid() {
+	return FlowUnid;
+}
+
+public void setFlowUnid(String flowUnid) {
+	FlowUnid = flowUnid;
+}
+
+public String getCurUserID() {
+	return CurUserID;
+}
+
+public void setCurUserID(String curUserID) {
+	CurUserID = curUserID;
+}
+
+public String getContract_id() {
+	return contract_id;
+}
+
+public void setContract_id(String contract_id) {
+	this.contract_id = contract_id;
+}
+
+public Configure getCurconf() {
+	return Curconf;
+}
+
+public void setCurconf(Configure curconf) {
+	Curconf = curconf;
+}
+
+public Page getCurPage() {
+	return CurPage;
+}
+
+public void setCurPage(Page curPage) {
+	CurPage = curPage;
+}
+
+	public String getContractId() {
+	return ContractId;
+}
+
+
+public void setContractId(String contractId) {
+	ContractId = contractId;
+}
+
+
+	public String getProductId() {
+	return ProductId;
+}
+
+
+public void setProductId(String productId) {
+	ProductId = productId;
+}
+
+
+	public String getCustomerType() {
+	return CustomerType;
+}
+
+
+public void setCustomerType(String customerType) {
+	CustomerType = customerType;
+}
+
+
+	public String getProjectId() {
+	return ProjectId;
+}
+
+
+public void setProjectId(String projectId) {
+	ProjectId = projectId;
+}
+
+
+	public String getLibraryId() {
+	return libraryId;
+}
+
+
+public void setLibraryId(String libraryId) {
+	this.libraryId = libraryId;
+}
+
+
+	public String getProject_id() {
+	return project_id;
+}
+
+
+    
+    public String projectStatus(JBOTransaction tx) throws JBOException{
+    	//BizObjectManager bom = JBOFactory.getBizObjectManager(LB_PROJECT_INFO.CLASS_NAME,tx);
+    	BizObjectManager bom = JBOFactory.getBizObjectManager(LB_PROJECT_INFO_TEMP.CLASS_NAME,tx);
+    	BizObjectManager bomstatus = JBOFactory.getBizObjectManager(LB_CONTRACT_STATUS.CLASS_NAME,tx);
+    	BizObjectManager ldclBom = JBOFactory.getBizObjectManager(LB_DOC_CONTRACT_LIST.CLASS_NAME,tx);
+    	BizObjectManager vc = JBOFactory.getBizObjectManager(VI_CONTRACTMAKEPRINTLIST.CLASS_NAME,tx);
+    	Boolean flag=false;
+    	Boolean unflag=true;
+        List<BizObject> ldclBo = ldclBom.createQuery("project_id='"+project_id+"' and file_flag='yes' and sendprocess='1'").getResultList(false);
+        if(ldclBo.size()>0){
+    	  flag=true;
+    	}
+        List<BizObject> vcs = vc.createQuery("id=:projectid and flowunid=:flowunid").setParameter("projectid", project_id).setParameter("flowunid", FlowUnid).getResultList(false);
+        if(vcs.size()>0){
+        	unflag=false;
+      	}
+        //BizObject bo=bom.createQuery("id='"+project_id+"'").getSingleResult(false);
+        BizObject bo=bom.createQuery("FLOWUNID='"+FlowUnid+"'").getSingleResult(false);
+    	BizObject bostatus=bomstatus.createQuery("status_code='"+bo.getAttribute("PROJECT_STATUS").toString()+"'").getSingleResult(false);
+    	String projstatus=bostatus!=null?bostatus.getAttribute("STATUS_NAME").toString():"";
+    	return bo.getAttribute("DATA_STATE").toString()+"@"+projstatus+"@"+flag+"@"+unflag;
+    }
+	
+}
diff --git a/src/com/tenwa/channelportal/action/alpha/CreditAuthDeleteAction.java b/src/com/tenwa/channelportal/action/alpha/CreditAuthDeleteAction.java
new file mode 100644
index 000000000..3c77d778d
--- /dev/null
+++ b/src/com/tenwa/channelportal/action/alpha/CreditAuthDeleteAction.java
@@ -0,0 +1,71 @@
+package com.tenwa.channelportal.action.alpha;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import com.amarsoft.are.jbo.BizObject;
+import com.amarsoft.are.jbo.BizObjectManager;
+import com.amarsoft.are.jbo.JBOFactory;
+import com.amarsoft.are.jbo.JBOTransaction;
+import com.tenwa.comm.util.jboutil.DataOperatorUtil;
+
+/**
+ * 删除征信合同记录
+ */
+public class CreditAuthDeleteAction {
+
+	String objectType;//文件类型
+	String projectNo;//项目编号
+	String certId;//身份证号
+
+	public String getObjectType() {
+		return objectType;
+	}
+
+	public void setObjectType(String objectType) {
+		this.objectType = objectType;
+	}
+
+	public String getProjectNo() {
+		return projectNo;
+	}
+
+	public void setProjectNo(String projectNo) {
+		this.projectNo = projectNo;
+	}
+
+	public String getCertId() {
+		return certId;
+	}
+
+	public void setCertId(String certId) {
+		this.certId = certId;
+	}
+
+	/**
+	 * 删除征信授权文件
+	 * @param tx
+	 * @throws Exception
+	 */
+	public void deleteCreditAuth(JBOTransaction tx) throws Exception{
+		BizObjectManager bom = JBOFactory.getBizObjectManager(jbo.app.tenwa.doc.LB_DOCRELATIVE.CLASS_NAME);
+		BizObject  lbDocBiz = bom.createQuery("OBJECTTYPE=:objectType  and CUST_ID=:certId and PROJ_ID=:projectNo ")
+				.setParameter("objectType",objectType).setParameter("certId",certId).setParameter("projectNo",projectNo).getSingleResult(false);
+		if(null != lbDocBiz){
+			String lbDocBizId = lbDocBiz.getAttribute("id").toString();
+			BizObjectManager bom1 = JBOFactory.getBizObjectManager(jbo.app.tenwa.doc.LB_DOCLIBRARY.CLASS_NAME);
+			String lbDocLibraryId = bom1.createQuery("relative_id=:relative_id").setParameter("relative_id", lbDocBizId).getSingleResult(false).getAttribute("id").toString();
+			BizObjectManager bom2 = JBOFactory.getBizObjectManager(jbo.app.tenwa.doc.LB_DOCATTRIBUTE.CLASS_NAME);
+			String docAttributeId = bom2.createQuery("library_id=:library_id").setParameter("library_id", lbDocLibraryId).getSingleResult(false).getAttribute("id").toString();
+			Map<String,String> condtion= new HashMap<String,String>();
+			condtion.put("id", lbDocBizId);
+			DataOperatorUtil.deleteJBOByCondtion(jbo.app.tenwa.doc.LB_DOCRELATIVE.CLASS_NAME, condtion, tx);
+			condtion.clear();
+			condtion.put("id", lbDocLibraryId);
+			DataOperatorUtil.deleteJBOByCondtion(jbo.app.tenwa.doc.LB_DOCLIBRARY.CLASS_NAME, condtion, tx);
+			condtion.clear();
+			condtion.put("id", docAttributeId);
+			DataOperatorUtil.deleteJBOByCondtion(jbo.app.tenwa.doc.LB_DOCATTRIBUTE.CLASS_NAME, condtion, tx);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/com/tenwa/channelportal/action/alpha/CreditAuthSignAction.java b/src/com/tenwa/channelportal/action/alpha/CreditAuthSignAction.java
new file mode 100644
index 000000000..0edb43586
--- /dev/null
+++ b/src/com/tenwa/channelportal/action/alpha/CreditAuthSignAction.java
@@ -0,0 +1,207 @@
+package com.tenwa.channelportal.action.alpha;
+
+import com.alibaba.fastjson.JSONObject;
+import com.amarsoft.are.jbo.*;
+import com.tenwa.app.dao.ContractSignInfo;
+import com.tenwa.app.manage.qiyuesuo.v2.ContractSignEnums;
+import com.tenwa.app.manage.qiyuesuo.v2.ContractSignVtwoUtils;
+import com.tenwa.app.manage.qiyuesuo.v2.QYSParams;
+import com.tenwa.channelportal.action.generativecontract.WordToPDFUtil;
+import jbo.app.tenwa.doc.*;
+import org.apache.log4j.Logger;
+import java.io.File;
+import java.util.List;
+
+public class CreditAuthSignAction {
+
+	private static Logger logger=Logger.getLogger(CreditAuthSignAction.class);
+
+	private String attributeId;
+
+	private String phone;
+
+	private String projectNo;
+
+	private String certId;;
+
+	private String fullName;
+
+	private String tempId;
+
+	private String operationType;
+
+	public String getOperationType() {
+		return operationType;
+	}
+
+	public void setOperationType(String operationType) {
+		this.operationType = operationType;
+	}
+
+	public String getAttributeId() {
+		return attributeId;
+	}
+
+	public void setAttributeId(String attributeId) {
+		this.attributeId = attributeId;
+	}
+
+	public String getPhone() {
+		return phone;
+	}
+
+	public void setPhone(String phone) {
+		this.phone = phone;
+	}
+
+	public String getProjectNo() {
+		return projectNo;
+	}
+
+	public void setProjectNo(String projectNo) {
+		this.projectNo = projectNo;
+	}
+
+	public String getCertId() {
+		return certId;
+	}
+
+	public void setCertId(String certId) {
+		this.certId = certId;
+	}
+
+	public String getFullName() {
+		return fullName;
+	}
+
+	public void setFullName(String fullName) {
+		this.fullName = fullName;
+	}
+
+	public String getTempId() {
+		return tempId;
+	}
+
+	public void setTempId(String tempId) {
+		this.tempId = tempId;
+	}
+
+	/**
+	 * 征信授权书附件用LibreOffice实现word转换pdf
+	 * word转换pdf
+	 * @throws JBOException
+	 */
+	@SuppressWarnings({ "unchecked", "static-access" })
+	public String wordToPdfCreditAuth(JBOTransaction tx) throws JBOException {
+		BizObjectManager bom=JBOFactory.getBizObjectManager(LB_DOCRELATIVE.CLASS_NAME);
+		BizObjectManager contBom = JBOFactory.getBizObjectManager(LB_DOC_CONTRACT_LIST.CLASS_NAME, tx);
+		logger.info("word转换pdf 开始 projectNo=" + projectNo);
+		logger.info("word转换pdf 开始 fullName=" + fullName);
+		logger.info("word转换pdf 开始 certId=" + certId);
+		logger.info("word转换pdf 开始 phone=" + phone);
+		logger.info("word转换pdf 开始 operationType=" + operationType);
+		BizObject DOCRELATIVE =
+				bom.createQuery(" OBJECTTYPE=:operationType and PROJ_ID=:projectId  and CUST_ID=:certId ")
+						.setParameter("operationType", operationType).setParameter("projectId", projectNo).setParameter("certId", certId).getSingleResult(false);
+		BizObjectManager attrBom=JBOFactory.getBizObjectManager(LB_DOCATTRIBUTE.CLASS_NAME);
+		BizObject attrBo=null;
+		BizObject contBo=null;
+		WordToPDFUtil wordTopdf = new WordToPDFUtil();
+		File file = null;
+		Boolean result = null;
+		String sql = "";
+		try {
+			logger.info("word转换pdf 开始");
+			if (DOCRELATIVE != null) {
+				logger.info("word转换pdf 存在文件信息。");
+				String DOCRELATIVEid=DOCRELATIVE.getAttribute("id").toString();
+				BizObjectManager bom1=JBOFactory.getBizObjectManager(LB_DOCLIBRARY.CLASS_NAME);
+				String DOCLIBRARYid=bom1.createQuery("relative_id=:relative_id").setParameter("relative_id", DOCRELATIVEid).getSingleResult(false).getAttribute("id").toString();
+				attrBo = attrBom.createQuery("library_id=:library_id").setParameter("library_id", DOCLIBRARYid).getSingleResult(true);
+				contBo = contBom.createQuery("attribute_id=:attributeId").setParameter("attributeId", attrBo.getAttribute("id").toString()).getSingleResult(true);
+				String path =  attrBo.getAttribute("FULLPATH").toString();
+				String lastFilePath = path.replace(".docx", ".pdf");
+				File filePath = new File(path);
+				if(!filePath.exists()){
+					logger.info("word转换pdf的源文件不存在");
+				}
+				String lastFilePathpdf = filePath.getParent();
+				try {
+					result = wordTopdf.Word2Pdf(path, lastFilePathpdf);
+				} catch (Exception e) {
+					result = false;
+					e.printStackTrace();
+					logger.error("word转换pdf 报错 errorMsg=" + e.getMessage(), e);
+				}
+				if (result) {
+					file =new File(lastFilePath);
+					attrBo.setAttributeValue("FULLPATH",attrBo.getAttribute("FULLPATH").toString().replace(".docx", ".pdf"));
+					attrBo.setAttributeValue("FILENAME",attrBo.getAttribute("FILENAME").toString().replace(".docx", ".pdf"));
+					attrBo.setAttributeValue("FILEPATH",attrBo.getAttribute("FILEPATH").toString().replace(".docx", ".pdf"));
+					attrBo.setAttributeValue("FileSize",file.length());
+					attrBo.setAttributeValue("CONTENT_TYPE","application/pdf");
+					attrBom.saveObject(attrBo);
+					contBo.setAttributeValue("FILENAME",contBo.getAttribute("FILENAME").toString().replace(".docx", ".pdf"));
+					contBo.setAttributeValue("FULLPATH",contBo.getAttribute("FULLPATH").toString().replace(".docx", ".pdf"));
+					contBo.setAttributeValue("FILEPATH",contBo.getAttribute("FILEPATH").toString().replace(".docx", ".pdf"));
+					contBom.saveObject(contBo);
+				}
+			}
+
+		} catch (JBOException e) {
+			e.printStackTrace();
+			logger.error("word转换pdf 报错 errorMsg=" + e.getMessage(), e);
+		}
+		return attrBo.getAttribute("FILENAME").toString() +"@"+attrBo.getAttribute("ID").toString();
+	}
+
+
+	/**
+	 * 查看word文件是否都转为pdf
+	 * @param tx
+	 * @return
+	 * @throws JBOException
+	 */
+	public String getMakeContractProcess(JBOTransaction tx) throws JBOException{
+		BizObjectManager ldclBom=JBOFactory.getBizObjectManager(LB_DOC_CONTRACT_LIST.CLASS_NAME, tx);
+		int  wordIng=0;
+		int  pdfFalse=0;
+		int  pdfTrue=0;
+		List<BizObject> ldclBo2=ldclBom.createQuery("attribute_id='"+attributeId+"' and file_flag='yes' ").getResultList(false);
+		if(ldclBo2.size()>0){
+			for(BizObject key:ldclBo2){
+				String process = key.getAttribute("process").toString();
+				if("1".equals(process)){
+					wordIng++;
+				}else if("2".equals(process)){
+					pdfTrue++;
+				}else if("3".equals(process)){
+					pdfFalse++;
+				}
+			}
+		}else{
+			//制作合同
+			return "0";
+		}
+		if(wordIng>0 && pdfFalse>0 && pdfTrue>0){
+			//word转换PDF部分失败
+			return "1";
+		}else if(wordIng==0 && pdfFalse>0 && pdfTrue>0){
+			//word转PDF失败
+			return "2";
+		}else if(wordIng==0 && pdfFalse>0 && pdfTrue>0){
+			//word转换PDF部分失败，
+			return "3";
+		}else if(wordIng>0 && pdfFalse==0 && pdfTrue>0){
+			//word正在转换pdf
+			return "4";
+		}else if(wordIng>0 && pdfFalse==0 && pdfTrue==0){
+			//word没有转换pdf
+			return "5";
+		}else if(wordIng==0 && pdfFalse==0 && pdfTrue>0){
+			//word转换PDF成功
+			return "6";
+		}
+		return "error";
+	}
+}
\ No newline at end of file
diff --git a/src_jbo/jbo/app/tenwa/customer/VI_LB_IDENTITY_CHECK_CREDITAUTH.java b/src_jbo/jbo/app/tenwa/customer/VI_LB_IDENTITY_CHECK_CREDITAUTH.java
new file mode 100644
index 000000000..e97f7654d
--- /dev/null
+++ b/src_jbo/jbo/app/tenwa/customer/VI_LB_IDENTITY_CHECK_CREDITAUTH.java
@@ -0,0 +1,43 @@
+package jbo.app.tenwa.customer;
+
+import java.lang.String;
+
+/**
+* 身份校验视图表 - JBO命名常量类<br><br>
+* Note: This file is generated by ADE tools, <em>dont</em> modify it.<br>
+
+*/
+public interface VI_LB_IDENTITY_CHECK_CREDITAUTH {
+	/**
+	* 身份校验视图表<br><br>
+	* 代表本类映射的BizObjectClass
+	*/
+	public static final String CLASS_NAME = "jbo.app.tenwa.customer.VI_LB_IDENTITY_CHECK_CREDITAUTH";
+	/**
+	* 姓名 STRING(20)<br>
+	*/
+	public static final String fullName = "fullName";
+	/**
+	* 身份证编号 STRING(20)<br>
+	*/
+	public static final String certId = "certId";
+	/**
+	* 身份 STRING(20)<br>
+	*/
+	public static final String relation = "relation";
+	/**
+	* 流程编号 STRING(20)<br>
+	*/
+	public static final String flowunid = "flowunid";
+	/**
+	* 电话号 STRING(20)<br>
+	*/
+	public static final String phone = "phone";
+
+	/**
+	 * 电话号 STRING(20)<br>
+	 */
+	public static final String creditauth = "creditauth";
+
+	public static final String credittype = "credittype";
+}
\ No newline at end of file

From 9746c6733cdd4256bda54fccf6dcecde62fdc415 Mon Sep 17 00:00:00 2001
From: ap007 <zhanglei@ap-leasing.com.cn>
Date: Wed, 14 Jul 2021 14:47:34 +0800
Subject: [PATCH 13/29] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E9=A1=B5=E7=AD=BE=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProjectApprovalCreationInfo.jsp           |  2 ++
 .../CorpusSourceRentPlanCopy.java             |  6 ++--
 .../LBProjectIntoTempInitCarBusiness.java     | 34 +++++++++++++------
 3 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp
index 705c354e9..be90e0e96 100644
--- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp
@@ -228,6 +228,8 @@
 		sParams =sParams+",SubjectId="+SubjectId+",SubjectName="+message[1]+",ProductId="+productId+",ProductName="+productname+",CustomerType="+customerType+",carAttributes="+carAttributes+",leasehold="+leasehold+",carSystem="+carSystem+",custname="+custname+",certtype="+certtype+",certid="+certid+",CustomerId="+CustomerId+",productModel="+productModel+",carSeries="+carSeries+",versionid="+versionid+",modelid="+modelid+",businessType="+businessType+",price="+price+",liter="+liter+",geartype="+geartype+",sourcetype=web,operationType="+operationType+",newtype="+newtype;
 		sParams =sParams+",cartype="+cartype+",vehicletype="+vehicletype+",vehiclelevel="+vehiclelevel;//赋值新增的三个车型信息
 		sParams =sParams+",distributorType="+distributorType;//新增自营店信息作为显示经销商变更页签显示条件
+		var corpusSource = RunJavaMethodTrans("com.tenwa.lease.flow.project.commbusiness.LBProjectIntoTempInitCarBusiness","getCorpusSourceByProductID","productId="+productId);
+		sParams = sParams + ",corpusSource="+corpusSource;
 		//
 		// if("BAIC_MOTOR"==operationType){
 		if(checkDispalyDistributor()){
diff --git a/src_tenwa/com/tenwa/lease/app/quartzmession/CorpusSourceRentPlanCopy.java b/src_tenwa/com/tenwa/lease/app/quartzmession/CorpusSourceRentPlanCopy.java
index 7af754607..866ea24f5 100644
--- a/src_tenwa/com/tenwa/lease/app/quartzmession/CorpusSourceRentPlanCopy.java
+++ b/src_tenwa/com/tenwa/lease/app/quartzmession/CorpusSourceRentPlanCopy.java
@@ -69,13 +69,13 @@ public class CorpusSourceRentPlanCopy implements Job {
 			List<BizObject> ffpBoList = ffpBom.createQuery("select ID,FILE_STS from O where FILE_STS='2'").getResultList(true);
 			for(BizObject ffpBo : ffpBoList){
 				String fcFileId = ffpBo.getAttribute("ID").toString();
-				//更新租金计划租金信息，并获取每个文件的contract_id
+				//1.更新租金计划租金信息，并获取每个文件的contract_id
 				String sql = "select fr.CONTRACT_ID,O.LEND_TERM,O.ANS_REPAYMENT_DATE,O.ANS_PRINCIPAL,O.ANS_INTEREST,ANS_REPAYMENT_MONEY from O left join jbo.oti.FC_REQUEST fr on O.FC_REQUEST_ID=fr.ID where fr.DEL_FLAG='0' and O.FC_FILE_ID=:fcFileId";
 				List<BizObject> fyfrpBoList = fyfrpBom.createQuery(sql).setParameter("fcFileId",fcFileId).getResultList(false);
 				contractSet = this.updateRentPlan(fyfrpBoList);
-				//更新租金计划剩余本金
+				//2.更新租金计划剩余本金
 				updateAllRemainCorpus();
-				//更新租金计划分润信息
+				//3.更新租金计划分润信息
 				updateSplitSP();
 				ffpBo.setAttributeValue("FILE_STS","3");
 				ffpBo.setAttributeValue("FILE_STS_DESC","拷贝成功");
diff --git a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProjectIntoTempInitCarBusiness.java b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProjectIntoTempInitCarBusiness.java
index 64b6c39d6..34c9e3149 100644
--- a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProjectIntoTempInitCarBusiness.java
+++ b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProjectIntoTempInitCarBusiness.java
@@ -51,6 +51,7 @@ import com.tenwa.reckon.util.UUIDUtil;
 public class LBProjectIntoTempInitCarBusiness extends BaseBussiness {
 	private static final String SHIQIAO = "SHIQIAO";
 	public String serial = null;
+	private String productId = null;
 	@Override
 	public Object run(Transaction Sqlca) throws Exception {
 		    this.initBussinessParam(Sqlca);
@@ -401,16 +402,8 @@ public class LBProjectIntoTempInitCarBusiness extends BaseBussiness {
 			select o.corpus_source from lb_product_corpus_source o where o.product_id='H01-C01-E-CXC1-DB-3'
 			and order_list =(select ot.order_list from lb_product_corpus_source ot where ot.product_id='H01-C01-E-CXC1-DB-3'  order by ot.order_list limit n-1,1);
 			*/
-			String sql = "select O.CORPUS_SOURCE from O where PRODUCT_ID=:PRODUCTID and O.ORDER_LIST = (select min(ot.order_list) from jbo.prd.LB_PRODUCT_CORPUS_SOURCE ot where ot.PRODUCT_ID=:PRODUCTID)";
-			String corpusSource = "AP";
-			try {
-				BizObject boLPCS = JBOFactory.createBizObjectQuery(LB_PRODUCT_CORPUS_SOURCE.CLASS_NAME, sql).setParameter("PRODUCTID", productId).getSingleResult(false);
-				if(boLPCS!=null&&boLPCS.getAttribute("CORPUS_SOURCE")!=null){
-					corpusSource=boLPCS.getAttribute("CORPUS_SOURCE").toString();
-				}
-			}catch (JBOException e1){
-				e1.printStackTrace();
-			}
+			this.setProductId(productId);
+			String corpusSource = this.getCorpusSourceByProductID(tx);
 			bo.setAttributeValue("CORPUS_SOURCE",corpusSource);
 			bomLPI.saveObject(bo);
 		}catch (Exception e){
@@ -418,6 +411,19 @@ public class LBProjectIntoTempInitCarBusiness extends BaseBussiness {
 			e.printStackTrace();
 		}
 	}
+
+	public String getCorpusSourceByProductID(JBOTransaction tx) throws JBOException {
+		String sql = "select O.CORPUS_SOURCE from O where PRODUCT_ID=:PRODUCTID and O.ORDER_LIST = (select min(ot.order_list) from jbo.prd.LB_PRODUCT_CORPUS_SOURCE ot where ot.PRODUCT_ID=:PRODUCTID)";
+		String corpusSource = "AP";
+		BizObjectManager bomLPCS  = JBOFactory.getBizObjectManager(LB_PRODUCT_CORPUS_SOURCE.CLASS_NAME,tx);
+		BizObject boLPCS = bomLPCS.createQuery(sql).setParameter("PRODUCTID", productId).getSingleResult(false);
+		if(boLPCS!=null&&boLPCS.getAttribute("CORPUS_SOURCE")!=null){
+			corpusSource=boLPCS.getAttribute("CORPUS_SOURCE").toString();
+		}
+
+		return corpusSource;
+	}
+
 	private  void saveBusinessStatus(BizObjectManager bsbom,JBOTransaction tx ,ASUser asUser) throws Exception{
 		BizObject bsbo = bsbom.newObject();
 	try {
@@ -433,4 +439,12 @@ public class LBProjectIntoTempInitCarBusiness extends BaseBussiness {
 	 }
 	}
 
+	public String getProductId() {
+		return productId;
+	}
+
+	public void setProductId(String productId) {
+		this.productId = productId;
+	}
+
 }

From a437c080e13ef9bbbbe5982b20505f9247557d2c Mon Sep 17 00:00:00 2001
From: ap007 <zhanglei@ap-leasing.com.cn>
Date: Fri, 16 Jul 2021 14:45:33 +0800
Subject: [PATCH 14/29] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AF=B9=E5=BA=94?=
 =?UTF-8?q?=E8=B5=84=E6=96=B9=E4=BA=A7=E5=93=81=E4=BF=A1=E6=81=AF=EF=BC=9B?=
 =?UTF-8?q?=E5=8F=91=E8=B5=B7=E6=B5=81=E7=A8=8B=E5=89=8D=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E8=B5=84=E6=96=B9=E6=A0=A1=E9=AA=8C=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Apzl/productCorpus/LbCorpusSourceList.jsp | 14 +++-
 .../ContractApprovalApplyList.jsp             |  8 +-
 .../Fund/FundPayment/FundPaymentApplyList.jsp | 14 +++-
 .../BusinessChangeApplyList.jsp               |  7 +-
 WebContent/WEB-INF/etc/jbo/jbo_oti.xml        | 17 ++++
 WebContent/WEB-INF/etc/jbo/jbo_prd.xml        |  1 +
 src/com/ap/CorpusSourceCheck.java             | 79 ++++++++++++++-----
 src_jbo/jbo/oti/FC_REQUEST.java               | 16 +++-
 src_jbo/jbo/oti/LC_PROFIT_PLAN.java           | 32 ++++++++
 src_jbo/jbo/prd/LB_PRODUCT_CORPUS_SOURCE.java |  4 +
 10 files changed, 160 insertions(+), 32 deletions(-)
 create mode 100644 src_jbo/jbo/oti/LC_PROFIT_PLAN.java

diff --git a/WebContent/Tenwa/Apzl/productCorpus/LbCorpusSourceList.jsp b/WebContent/Tenwa/Apzl/productCorpus/LbCorpusSourceList.jsp
index e55d1bfe4..af1704c14 100644
--- a/WebContent/Tenwa/Apzl/productCorpus/LbCorpusSourceList.jsp
+++ b/WebContent/Tenwa/Apzl/productCorpus/LbCorpusSourceList.jsp
@@ -7,8 +7,9 @@
     */
 	String productId= CurPage.getParameter("productId");
 	ASObjectModel doTemp = new ASObjectModel("LB_PRODUCT_CORPUS_SOURCE");
+//	String coleditSource = "jbo.sys.CODE_LIBRARY,itemno,itemname,codeno='corpus_source' and isinuse='1' and attribute='"+""+"'";
+//	doTemp.setColumnAttribute("CHANNEL_PRODUCT_ID","coleditsource","AccountCodeDirection");
 	ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
-
 	dwTemp.Style="1";      	     //--设置为Grid风格--
 	dwTemp.ReadOnly = "1";	 //只读模式
 	dwTemp.setPageSize(10);
@@ -36,11 +37,17 @@
 	function checkAll(){
 		//双循环来遍历查重
 		for(var i=0;i<getRowCount(0);i++){
+			var orderList = getItemValue(0,i,'ORDER_LIST');
+			var corpusSource = getItemValue(0,i,'CORPUS_SOURCE');
+			var channelProductId = getItemValue(0,i,'CHANNEL_PRODUCT_ID');
+			if(channelProductId.indexOf(corpusSource)==-1){
+				alert('只可以选择与资方对应的产品');
+				return;
+			}
 			for(var j = i+1; j < getRowCount(0); j++){
-				var orderList = getItemValue(0,i,'ORDER_LIST');
-				var corpusSource = getItemValue(0,i,'CORPUS_SOURCE');
 				var orderListLast = getItemValue(0,j,'ORDER_LIST');
 				var corpusSourceLast = getItemValue(0,j,'CORPUS_SOURCE');
+
 				if(i==0){
 					if(orderList==null||orderList==''||corpusSource==null||corpusSourceLast==''||orderListLast==null||orderListLast==''||corpusSourceLast==null||corpusSourceLast==''){
 						alert('资金来源或排序号不能为空');
@@ -54,6 +61,7 @@
 					alert('资金来源不可以重复');
 					return;
 				}
+
 			}
 		}
 		return 's';
diff --git a/WebContent/Tenwa/Lease/Flow/Contract/ContractApproval/ContractApprovalApplyList.jsp b/WebContent/Tenwa/Lease/Flow/Contract/ContractApproval/ContractApprovalApplyList.jsp
index 3ece53f3b..4582c8f1c 100644
--- a/WebContent/Tenwa/Lease/Flow/Contract/ContractApproval/ContractApprovalApplyList.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Contract/ContractApproval/ContractApprovalApplyList.jsp
@@ -9,8 +9,7 @@
 	})
  	
 	function newApply()
- 	{  
- 		
+ 	{
  		var userid="<%=CurUser.getUserID()%>";
  		var flowno="<%=CurPage.getParameter("ApplyType")%>";
  	   var selname="";
@@ -67,8 +66,9 @@
 			//todo 通过projectid先看corpus_source字段是否是带有外资方的项目，如果时则去查找资方返回的对应的状态，
             // 如果通过则可以发起，如果暂时没有结果，则提示；如果审批失败，则按顺序转换资金方，然后重新发起业务申请后的另外一个资方的调用接口；
             // 如果都失败，最终转换为自有资金，将corpus_source字段设为AP(在接口平台实现此功能);
-            var checkParam = 'project_id='+project_id;
-            var checkResult = RunJavaMethod('com.ap.CorpusSourceCheck','corpusApplyCheck',checkParam);
+            //project_id返回的是project_no字段，不是project_id
+            var checkParam = 'projectId='+id;
+            var checkResult = RunJavaMethod('com.ap.CorpusSourceCheck','corpusContractApplyCheck',checkParam);
             if(checkResult!='S'){
                 alert(checkResult);
                 return;
diff --git a/WebContent/Tenwa/Lease/Flow/Fund/FundPayment/FundPaymentApplyList.jsp b/WebContent/Tenwa/Lease/Flow/Fund/FundPayment/FundPaymentApplyList.jsp
index b851964ca..0bd1ccbbd 100644
--- a/WebContent/Tenwa/Lease/Flow/Fund/FundPayment/FundPaymentApplyList.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Fund/FundPayment/FundPaymentApplyList.jsp
@@ -39,10 +39,20 @@
 	    		alert(checkTotal);
 	    		return ;
 	    	}
-	       var disChannelType = RunJavaMethodTrans("com.tenwa.lease.flow.project.businessapply.DisChannelTypeCheck","getDisChannelType","contractId="+contract_id);
+	        var disChannelType = RunJavaMethodTrans("com.tenwa.lease.flow.project.businessapply.DisChannelTypeCheck","getDisChannelType","contractId="+contract_id);
 	    	
 	    	var gpsVendor = RunJavaMethodTrans("com.tenwa.lease.flow.project.businessapply.GpsVendorCheck","getGpsVendor","productId="+productId);
-	    	var sParams = "ContractId="+contract_id+",FlowKey="+contract_no+",ProjectId="+proj_id+",ProductId="+productId+",contract_number="+contract_number+",ProjectName="+(contract_no+"-"+customername)+",applyType=<%=sApplyType%>,CurUserID=<%=CurUser.getUserID()%>,gpsVendor="+gpsVendor+",disChannelType="+disChannelType+",type=fundPay";
+
+            var corpusSource = RunJavaMethod("com.ap.CorpusSourceCheck","getCorpusSourceByProjectId","projectId="+proj_id);
+            //检查是否已与资方签署合同
+            if(corpusSource!='AP'){
+                var sResult = RunJavaMethod("com.ap.CorpusSourceCheck","corpusFundPaymentApplyCheck","projectId="+proj_id);
+                if(sResult!="S"){
+                    alert(sResult);
+                    return;
+                }
+            }
+	    	var sParams = "ContractId="+contract_id+",FlowKey="+contract_no+",ProjectId="+proj_id+",ProductId="+productId+",contract_number="+contract_number+",ProjectName="+(contract_no+"-"+customername)+",applyType=<%=sApplyType%>,CurUserID=<%=CurUser.getUserID()%>,gpsVendor="+gpsVendor+",disChannelType="+disChannelType+",type=fundPay,corpusSource="+corpusSource;
 	    	var sReturnInfo = RunJavaMethodTrans("com.tenwa.flow.action.comm.BaseFlowStartAction","initFLow",sParams);
 	    	var sReturnInfos=sReturnInfo.split("@");
 	    	if(sReturnInfos[0]=="success")
diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessChangeApplyList.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessChangeApplyList.jsp
index 65e62d83a..037230ef7 100644
--- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessChangeApplyList.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessChangeApplyList.jsp
@@ -26,9 +26,14 @@
 			var SubjectName = sReturn[10];
 			var channel = sReturn[11];
 			if(""== SubjectId||null == SubjectId||"undefined" == SubjectId){
-				alert("该数据没有对应的主体，请联系管理员！");
+                alert("该数据没有对应的主体，请联系管理员！");
 				return ;
 			}
+            var corpusSource = RunJavaMethod("com.ap.CorpusSourceCheck","getCorpusSourceByProjectId","projectId="+id);
+			if(corpusSource=='PSBC'){
+                alert("资金方为邮储的订单不允许变更，请联系业务经理解决！");
+                return ;
+            }
 			var sParams = "ApplyType=<%=sApplyType%>,CurUserID=<%=CurUser.getUserID()%>";
 	        sParams =sParams+",channel="+channel+",SubjectId="+SubjectId+",SubjectName="+SubjectName+",certtype="+certtype+",customertype="+CustomerType+",carAttributes="+carAttributes+",leasform="+leasehold+",operationType="+operationType+",ProjectId="+id+",ProductId="+product_id+",FlowKey="+project_id+",ProjectName="+project_name+",ApplyType=<%=sApplyType%>";
 			var sReturnInfo = RunJavaMethodTrans("com.tenwa.flow.action.comm.BaseFlowStartAction","initFLow",sParams);			
diff --git a/WebContent/WEB-INF/etc/jbo/jbo_oti.xml b/WebContent/WEB-INF/etc/jbo/jbo_oti.xml
index 0c7006747..b72a2d06b 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_oti.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_oti.xml
@@ -308,6 +308,8 @@
 				<attribute name="FC_LOAN_ID"    label="资金渠道放款申请ID"    type="STRING" length="32"/>
 				<attribute name="CHANNEL_NO"    label="资金渠道编号"    type="STRING" length="32"/>
 				<attribute name="CHANNEL_NAME"    label="资金渠道名称"    type="STRING" length="32"/>
+				<attribute name="CHANNEL_PRODUCT_ID"    label="资金渠道产品编号"    type="STRING" length="32"/>
+				<attribute name="CHANNEL_PRODUCT_DESC"    label="资金渠道产品描述"    type="STRING" length="32"/>
 				<attribute name="PROJECT_ID"    label="项目ID"    type="STRING" length="32"/>
 				<attribute name="PROJECT_NO"    label="项目编号"    type="STRING" length="32"/>
 				<attribute name="CONTRACT_ID"    label="合同ID"    type="STRING" length="32"/>
@@ -318,6 +320,7 @@
 				<attribute name="DISTRIBUTOR_NAME"    label="经销商名称"    type="STRING" length="32"/>
 				<attribute name="CUSTOMER_ID"    label="客户ID"    type="STRING" length="32"/>
 				<attribute name="CUSTOMER_NAME"    label="客户名称"    type="STRING" length="32"/>
+				<attribute name="FC_STAGE"    label="当前订单状态：0信审中，1信审通过，2合通签署成功，3放款成功"    type="STRING" length="32"/>
 				<attribute name="FC_STATUS"    label="当前状态"    type="STRING" length="32"/>
 				<attribute name="FC_REMARK"    label="返回状态描述"    type="STRING" length="32"/>
 				<attribute name="SUPPLEMENT_STS"    label="是否需要补充资料清单"    type="STRING" length="32"/>
@@ -406,5 +409,19 @@
 				</managerProperties>
 			</manager>
 		</class>
+		<class name="LC_PROFIT_PLAN" label="资方分润计划信息" describe="资方分润计划信息" keyAttributes="ID">
+			<attributes>
+				<attribute name="ID"    label="唯一标识"     type="STRING" length="32" />
+				<attribute name="RENT_PLAN_ID"    label="对应租金计划id"    type="STRING" length="32"/>
+				<attribute name="PROFIT"    label="分润金额"    type="STRING" length="32"/>
+				<attribute name="INPUTTIME"    label="创建时间"    type="STRING" length="32"/>
+			</attributes>
+			<manager>
+				<managerProperties>
+					<property name="table" value="lc_profit_plan"/>
+					<property name="createKey" value="true" />
+				</managerProperties>
+			</manager>
+		</class>
 	</package>
 </jbo>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/etc/jbo/jbo_prd.xml b/WebContent/WEB-INF/etc/jbo/jbo_prd.xml
index e6d96e58d..c0bc15474 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_prd.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_prd.xml
@@ -263,6 +263,7 @@
 			<attributes>
 				<attribute name="ID" label="ID" type="STRING" length="32"/>
 				<attribute name="PRODUCT_ID" label="产品ID" type="STRING" length="32"/>
+				<attribute name="CHANNEL_PRODUCT_ID" label="对应渠道产品" type="STRING" length="32"/>
 				<attribute name="CORPUS_SOURCE" label="资金来源" type="STRING" length="32"/>
 				<attribute name="ORDER_LIST" label="资金顺序" type="STRING" length="20"/>
 				<attribute name="INPUTTIME" label="创建时间" type="STRING" length="30"/>
diff --git a/src/com/ap/CorpusSourceCheck.java b/src/com/ap/CorpusSourceCheck.java
index d9beda3a3..cdaa30927 100644
--- a/src/com/ap/CorpusSourceCheck.java
+++ b/src/com/ap/CorpusSourceCheck.java
@@ -9,6 +9,7 @@ import com.amarsoft.awe.util.Transaction;
 import jbo.com.tenwa.entity.comm.message.BT_BUSSINESS_MESSAGE_CONFIG;
 import jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO;
 import jbo.com.tenwa.lease.comm.LB_PROJECT_INFO;
+import jbo.oti.FC_REQUEST;
 import jbo.prd.LB_PRODUCT_CORPUS_SOURCE;
 
 import java.util.List;
@@ -74,36 +75,73 @@ public class CorpusSourceCheck {
         return "AP";
     }
 
-    public String corpusApplyCheck() {
+    /**
+     * 发起合同制作时，检验资方是否信审通过
+     * @return
+     */
+    public String corpusContractApplyCheck() {
         String sResult;
-        Transaction Sqlca = Transaction.createTransaction("als");
         try {
-            String corpusSource = Sqlca.getString("select corpus_source from lb_project_info where id = '" + projectId + "'");
-            if ("AP".equals(corpusSource) || "".equals(corpusSource) || corpusSource == null) {
+            if(projectId==null){
+                sResult = "未找到对应的项目编号，请联系系统管理员";
+                return sResult;
+            }
+            String fcStage = this.getFcStageByProjectId();
+            if ("AP".equals(fcStage)||"1".equals(fcStage)) {
                 sResult = "S";
             } else {
-                String fcStatus = Sqlca.getString("select FC_STATUS from fc_request where del_flag='0' and project_id = '" + projectId + "'");
-                if (Integer.parseInt(fcStatus) == 1700) {
-                    sResult = "S";
-                } else {
-                    sResult = "资金方尚未审批结束，请稍后再试!";
-                }
+                sResult = "资金方尚未审批结束，请稍后再试!";
             }
         } catch (Exception e) {
-            sResult = "检验资金渠道信息出错，请联系系统管理员！";
             e.printStackTrace();
-        } finally {
-            if (Sqlca != null) {
-                try {
-                    Sqlca.commit();
-                    Sqlca.disConnect();
-                } catch (JBOException e) {
-                    e.printStackTrace();
-                }
-            }
+            return "检验资金渠道信息出错，请联系系统管理员！";
         }
         return sResult;
     }
+    /**
+     * 发起放款申请制作时，检验是否与资方签署合同
+     * @return
+     */
+    public String corpusFundPaymentApplyCheck(){
+        String sResult = null;
+        try {
+            String fcStage = this.getFcStageByProjectId();
+            if("2".equals(fcStage)||"AP".equals(fcStage)){
+                return "S";
+            }else{
+                sResult = "客户还未和资方签署合同";
+            }
+        } catch (JBOException e) {
+            e.printStackTrace();
+            return "检验资金渠道信息出错，请联系系统管理员！";
+        }
+        return sResult;
+    }
+
+    public String getCorpusSourceByProjectId() throws JBOException {
+        String corpusSource = "AP";
+        BizObjectManager bomLPI = JBOFactory.getBizObjectManager(LB_PROJECT_INFO.CLASS_NAME);
+        BizObject boLPI = bomLPI.createQuery("id=:projectId").setParameter("projectId", projectId).getSingleResult(false);
+        if (boLPI.getAttribute("CORPUS_SOURCE") != null) {
+            corpusSource = boLPI.getAttribute("CORPUS_SOURCE").toString();
+        }
+        return corpusSource;
+    }
+
+    public String getFcStageByProjectId() throws JBOException {
+        String fcStage = "-2" ;
+        String corpusSource = this.getCorpusSourceByProjectId();
+        if("AP".equals(corpusSource)){
+            fcStage = "AP" ;
+        }else{
+            BizObjectManager bomFR = JBOFactory.getBizObjectManager(FC_REQUEST.CLASS_NAME);
+            BizObject boFR = bomFR.createQuery("id=:projectId and del_flag='0'").setParameter("projectId", projectId).getSingleResult(false);
+            if(boFR!=null){
+                fcStage = boFR.getAttribute("FC_STAGE").toString();
+            }
+        }
+        return  fcStage;
+    }
 
     public String getProjectId() {
         return projectId;
@@ -112,4 +150,5 @@ public class CorpusSourceCheck {
     public void setProjectId(String projectId) {
         this.projectId = projectId;
     }
+
 }
diff --git a/src_jbo/jbo/oti/FC_REQUEST.java b/src_jbo/jbo/oti/FC_REQUEST.java
index fb67b5d28..cbc61e7c3 100644
--- a/src_jbo/jbo/oti/FC_REQUEST.java
+++ b/src_jbo/jbo/oti/FC_REQUEST.java
@@ -29,6 +29,14 @@ public interface FC_REQUEST{
 	* 资金渠道名称 STRING(32)<br>
 	*/
 	public static final String CHANNEL_NAME = "CHANNEL_NAME";
+	/**
+	 * 资金渠道产品ID STRING(32)<br>
+	 */
+	public static final String CHANNEL_PRODUCT_ID = "CHANNEL_PRODUCT_ID";
+	/**
+	 * 资金渠道产品名称 STRING(32)<br>
+	 */
+	public static final String CHANNEL_PRODUCT_DESC = "CHANNEL_PRODUCT_DESC";
 	/**
 	* 项目ID STRING(32)<br>
 	*/
@@ -70,10 +78,14 @@ public interface FC_REQUEST{
 	*/
 	public static final String CUSTOMER_NAME = "CUSTOMER_NAME";
 	/**
-	* 当前状态 STRING(32)<br>
-	*/
+	 * 当前状态 STRING(32)<br>
+	 */
 	public static final String FC_STATUS = "FC_STATUS";
 	/**
+	* 当前订单状态：0信审中，1信审通过，2合通签署成功，3放款成功 STRING(32)<br>
+	*/
+	public static final String FC_STAGE = "FC_STAGE";
+	/**
 	* 返回状态描述 STRING(32)<br>
 	*/
 	public static final String FC_REMARK = "FC_REMARK";
diff --git a/src_jbo/jbo/oti/LC_PROFIT_PLAN.java b/src_jbo/jbo/oti/LC_PROFIT_PLAN.java
new file mode 100644
index 000000000..d7c03c2ff
--- /dev/null
+++ b/src_jbo/jbo/oti/LC_PROFIT_PLAN.java
@@ -0,0 +1,32 @@
+package jbo.oti;
+
+/**
+* 接口资料表 - JBO命名常量类<br><br>
+* Note: This file is generated by ADE tools, <em>dont</em> modify it.<br>
+
+*/
+public interface LC_PROFIT_PLAN {
+	/**
+	* 接口资料表<br><br>
+	* 代表本类映射的BizObjectClass
+	*/
+	public static final String CLASS_NAME = "jbo.oti.LC_PROFIT_PLAN";
+	/**
+	* 唯一标识 STRING(32)<br>
+	*/
+	public static final String ID = "ID";
+	/**
+	 * 对应租金计划ID STRING(32)<br>
+	 */
+	public static final String RENT_PLAN_ID = "RENT_PLAN_ID";
+	/**
+	* 分润金额 STRING(32)<br>
+	*/
+	public static final String PROFIT = "PROFIT";
+	/**
+	* 创建时间 STRING(32)<br>
+	*/
+	public static final String INPUTTIME = "INPUTTIME";
+
+
+}
\ No newline at end of file
diff --git a/src_jbo/jbo/prd/LB_PRODUCT_CORPUS_SOURCE.java b/src_jbo/jbo/prd/LB_PRODUCT_CORPUS_SOURCE.java
index 5eceb647b..b87060eda 100644
--- a/src_jbo/jbo/prd/LB_PRODUCT_CORPUS_SOURCE.java
+++ b/src_jbo/jbo/prd/LB_PRODUCT_CORPUS_SOURCE.java
@@ -21,6 +21,10 @@ public interface LB_PRODUCT_CORPUS_SOURCE{
 	* 产品ID STRING(32)<br>
 	*/
 	public static final String PRODUCT_ID = "PRODUCT_ID";
+	/**
+	 * 对应邮储产品 STRING(32)<br>
+	 */
+	public static final String CHANNEL_PRODUCT_ID = "CHANNEL_PRODUCT_ID";
 	/**
 	* 资金来源 STRING(32)<br>
 	*/

From d05a94ce5ae3cf8e0452df1592d93091b08662e5 Mon Sep 17 00:00:00 2001
From: ap007 <zhanglei@ap-leasing.com.cn>
Date: Mon, 19 Jul 2021 09:28:58 +0800
Subject: [PATCH 15/29] =?UTF-8?q?=E8=B5=84=E6=96=B9=E8=B5=84=E6=96=99?=
 =?UTF-8?q?=E6=B8=85=E5=8D=95=E9=A1=B5=E9=9D=A2=E6=B7=BB=E5=8A=A0=E6=BB=9A?=
 =?UTF-8?q?=E5=8A=A8=E6=9D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/tenwa/apzl/CorpusSource/FcRequestFileList.jsp       | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/WebContent/com/tenwa/apzl/CorpusSource/FcRequestFileList.jsp b/WebContent/com/tenwa/apzl/CorpusSource/FcRequestFileList.jsp
index a5b453674..d5213b083 100644
--- a/WebContent/com/tenwa/apzl/CorpusSource/FcRequestFileList.jsp
+++ b/WebContent/com/tenwa/apzl/CorpusSource/FcRequestFileList.jsp
@@ -25,7 +25,7 @@
 	doTemp.setLockCount(0);
 	ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request);
 	dwTemp.Style = "1";//freeform
-	dwTemp.setPageSize(pageSize==null?5:Integer.parseInt(pageSize));
+	dwTemp.setPageSize(pageSize==null?20:Integer.parseInt(pageSize));
 	//dwTemp.ReadOnly = "-2";//只读模式
 	dwTemp.genHTMLObjectWindow(fcFlowType+","+fcRequestId);
 
@@ -36,6 +36,10 @@
 	sButtonPosition = "north";
 %><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
 <script type="text/javascript">
+	window.onload=function(){
+		$("#listvalid0").attr("style","overflow: scroll;overflow-y:auto; overflow-x:auto;height:100%;");
+	}
+
 	function returnList(){
 		parent.AsControl.OpenView("<%=sPrevUrl%>", "","_self","");
 	}

From 6d3c9ca9112f8644d67d0ae0430e0b14276e20c7 Mon Sep 17 00:00:00 2001
From: ap007 <zhanglei@ap-leasing.com.cn>
Date: Mon, 19 Jul 2021 11:02:35 +0800
Subject: [PATCH 16/29] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=82=AE=E5=82=A8?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E8=B5=84=E6=96=99=E6=B8=85=E5=8D=95=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WebContent/WEB-INF/etc/jbo/jbo_oti.xml | 1 +
 src_jbo/jbo/oti/FC_REQUEST_FILE.java   | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/WebContent/WEB-INF/etc/jbo/jbo_oti.xml b/WebContent/WEB-INF/etc/jbo/jbo_oti.xml
index b72a2d06b..077451637 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_oti.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_oti.xml
@@ -351,6 +351,7 @@
 				<attribute name="FILE_PATH"    label="文件路径"    type="STRING" length="32"/>
 				<attribute name="FC_FILE_STS"    label="文件状态"    type="STRING" length="32"/>
 				<attribute name="FC_FILE_STS_DESC"    label="文件状态描述"    type="STRING" length="32"/>
+				<attribute name="FC_RES_VALUE"    label="邮储返回状态"    type="STRING" length="32"/>
 				<attribute name="CREATE_TIME"    label="创建时间"    type="STRING" length="32"/>
 				<attribute name="UPDATE_TIME"    label="修改时间"    type="STRING" length="32"/>
 				<attribute name="DEL_FLAG"    label="有效标志"    type="STRING" length="32"/>
diff --git a/src_jbo/jbo/oti/FC_REQUEST_FILE.java b/src_jbo/jbo/oti/FC_REQUEST_FILE.java
index 8656cc746..3f7e85fc4 100644
--- a/src_jbo/jbo/oti/FC_REQUEST_FILE.java
+++ b/src_jbo/jbo/oti/FC_REQUEST_FILE.java
@@ -61,6 +61,10 @@ public interface FC_REQUEST_FILE{
 	* 文件状态描述 STRING(32)<br>
 	*/
 	public static final String FC_FILE_STS_DESC = "FC_FILE_STS_DESC";
+	/**
+	 * 邮储返回状态 STRING(32)<br>
+	 */
+	public static final String FC_RES_VALUE = "FC_RES_VALUE";
 	/**
 	* 创建时间 STRING(32)<br>
 	*/

From 2050b4b8e68c2de49f98dc6bba0c8cc38949149a Mon Sep 17 00:00:00 2001
From: zhanglei <zhanglei@ap-leasing.com.cn>
Date: Mon, 19 Jul 2021 15:21:01 +0800
Subject: [PATCH 17/29] =?UTF-8?q?yc=E5=BE=81=E4=BF=A1=E6=8E=88=E6=9D=83?=
 =?UTF-8?q?=E7=94=B5=E5=AD=90=E7=AD=BE=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=E6=89=B9=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../person/AccountChangePersonInfo.jsp        |   4 +-
 .../alpha/creditAuth/creditAuthList2.jsp      | 321 +++++++++++-------
 .../alpha/CreditAuthActionNewUtils.java       |  66 ++--
 .../action/alpha/CreditAuthDeleteAction.java  |  52 ++-
 .../action/alpha/CreditAuthTypesMap.java      |  27 ++
 .../action/alpha/DocListCreditAuth.java       | 105 ++++++
 .../commcheck/UserCreditAuthCheck.java        | 143 ++++++++
 7 files changed, 547 insertions(+), 171 deletions(-)
 create mode 100644 src/com/tenwa/channelportal/action/alpha/CreditAuthTypesMap.java
 create mode 100644 src/com/tenwa/channelportal/action/alpha/DocListCreditAuth.java
 create mode 100644 src_tenwa/com/tenwa/lease/flow/project/commcheck/UserCreditAuthCheck.java

diff --git a/WebContent/Tenwa/ChannelPortal/BusinessChangeApply/AccountChange/person/AccountChangePersonInfo.jsp b/WebContent/Tenwa/ChannelPortal/BusinessChangeApply/AccountChange/person/AccountChangePersonInfo.jsp
index ea7ef6e75..7cb215c2b 100644
--- a/WebContent/Tenwa/ChannelPortal/BusinessChangeApply/AccountChange/person/AccountChangePersonInfo.jsp
+++ b/WebContent/Tenwa/ChannelPortal/BusinessChangeApply/AccountChange/person/AccountChangePersonInfo.jsp
@@ -132,7 +132,7 @@
 			var flag = window.confirm("已经生成过合同,是否重新制作委托扣款授权书");
 			if(flag==true){
 				//废除之前生成过的合同
-				 var resultStatus = RunJavaMethodTrans("com.tenwa.action.channelportal.businesshanding.contractaward.CreditAuthAward","updateDocContractStatusContract","contract_id=<%=ContractId%>,CustomerType=<%=customerType%>,FlowUnid=<%=applyId%>");
+				 var resultStatus = RunJavaMethodTrans("com.tenwa.action.channelportal.businesshanding.contractaward.ContractAward","updateDocContractStatusContract","contract_id=<%=ContractId%>,CustomerType=<%=customerType%>,FlowUnid=<%=applyId%>");
 				 if("error"==resultStatus){
 						AsDebug.showMessage("提示","生成合同失败！","","",true);	
 						return;
@@ -270,7 +270,7 @@
 	 	var flag = window.confirm("修改数据会作废已制作或已签约的合同,是否修改");
 		if(flag==true){
 			//废除之前生成过的合同
-			 var resultStatus = RunJavaMethodTrans("com.tenwa.action.channelportal.businesshanding.contractaward.CreditAuthAward","updateDocContractStatusContract","contract_id=<%=ContractId%>,CustomerType=<%=customerType%>,FlowUnid=<%=applyId%>");
+			 var resultStatus = RunJavaMethodTrans("com.tenwa.action.channelportal.businesshanding.contractaward.ContractAward","updateDocContractStatusContract","contract_id=<%=ContractId%>,CustomerType=<%=customerType%>,FlowUnid=<%=applyId%>");
 			 if("error"==resultStatus){
 					AsDebug.showMessage("提示","修改失败！","","",true);	
 					return;
diff --git a/WebContent/Tenwa/alpha/creditAuth/creditAuthList2.jsp b/WebContent/Tenwa/alpha/creditAuth/creditAuthList2.jsp
index b19a10d5f..10ee3d88c 100644
--- a/WebContent/Tenwa/alpha/creditAuth/creditAuthList2.jsp
+++ b/WebContent/Tenwa/alpha/creditAuth/creditAuthList2.jsp
@@ -14,15 +14,19 @@
 	ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
 	dwTemp.Style="1";      	     //--设置为Grid风格--
 	dwTemp.ReadOnly = "1";	 //只读模式
+	dwTemp.MultiSelect=true; //多选
 	dwTemp.setPageSize(10);
 	dwTemp.genHTMLObjectWindow(sFlowUnid);
-
+	String flag = "false";
+	if(CurUser.hasRole("401")){
+		flag = "true";
+	}
 	//0、是否展示 1、	权限控制  2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码	6、	7、	8、	9、图标，CSS层叠样式 10、风格
 	String sButtons[][] = {
-		{"true","All","Button","生成征信授权书","生成征信授权书","createCreditPdf()","","","","btn_icon_generate",""},
-		{"true","All","Button","发起电子签约","发起电子签约","signOnLine()","","","","btn_icon_generate",""},
-		{"true","All","Button","查看签约状态","查看签约状态","getStatus()","","","","btn_icon_detail",""},
-		{"true","All","Button","重发签约短信","重发签约短信","sendMessageAgain()","","","","btn_icon_refresh",""},
+		{flag,"All","Button","生成征信授权书","生成征信授权书","createCreditPdf()","","","","btn_icon_generate",""},
+		{flag,"All","Button","发起电子签约","发起电子签约","signOnLine()","","","","btn_icon_generate",""},
+		{flag,"All","Button","查看签约状态","查看签约状态","getStatus()","","","","btn_icon_detail",""},
+		{flag,"All","Button","重发签约短信","重发签约短信","sendMessageAgain()","","","","btn_icon_refresh",""},
 	};
 %><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
 <script type="text/javascript">
@@ -31,83 +35,150 @@
 			$("#DIV_Data_myiframe0_"+i+"_4").css("color","Blue");
 		}
 	})
-
-	//在加载完表格后调用
+	function showPDF(filePath,name){
+		var sUrl="/Ample/Doc/showPDF.jsp";
+		var param="filePath="+filePath;
+		AsControl.OpenPage(sUrl,param,"",name);
+	}
+	function downloadFile(filePath,fileName){
+		if(!frames["downloadTemplate"]) $("<iframe name='downloadTemplate' style='display:none;'></iframe>").appendTo("body");
+		var src = sWebRootPath+"/servlet/view/docDownloadServletByPath?CompClientID=<%=sCompClientID%>&filePath="+encodeURIComponent(encodeURIComponent(filePath))+"&fileName="+encodeURIComponent(encodeURIComponent(fileName));
+		window.open(src, "downloadTemplate");
+	}
 	function afterSearch(){
 		for(var i=0;i<getRowCount(0);i++){
+			var filelist=getObj(0,i,"fileList").innerHTML;
+			var obj=eval('('+filelist+')');
 			var html="";
-			html+='<a onclick=downloadFile(\''+getItemValue(0,i,"ID")+'\')><font color="blue">'+"下载&nbsp&nbsp&nbsp&nbsp&nbsp"+'</font></a>';
-			getObj(0,i,"FILENAME").innerHTML=html+'<font >'+getObj(0,i,"FILENAME").innerHTML+'</font>';
+			for(var file in obj){
+				html+='<a onclick=downloadFile(\''+obj[file]['filepath']+'\',\''+obj[file]['filename']+'\')><font color="blue">'+obj[file]['filename']+'</font></a>';
+				html+='【上传时间:'+obj[file]['inputtime']+'】';
+				if(obj[file]['pdf']=="true"){
+					html+='<a class="btn_icon btn_icon_search" onclick="showPDF(\''+obj[file]['filepath']+'\',\''+obj[file]['filename']+'\');">&nbsp;</a>';
+				}
+				html+='</br>';
+			}
+			getObj(0,i,"fileList").innerHTML=html;
+			getObj(0,i,"fileList").style["white-space"]="pre-wrap";
+
 		}
 	}
-	function downloadFile(id){
-		if(typeof(id)==undefined || id=='') {
-			alert("请先生成征信授权书再下载！");
-			return;
-		}
-		if(!frames["downloadTemplate"]) $("<iframe name='downloadTemplate' style='display:none;'></iframe>").appendTo("body");
-		window.open(sWebRootPath+"/servlet/view/docDownloadServlet?CompClientID=<%=sCompClientID%>&sqlString=save@"+id, "downloadTemplate");
-	}
+
+	<%--//在加载完表格后调用--%>
+	<%--function afterSearch(){--%>
+		<%--for(var i=0;i<getRowCount(0);i++){--%>
+			<%--var html="";--%>
+			<%--html+='<a onclick=downloadFile(\''+getItemValue(0,i,"ID")+'\')><font color="blue">'+"下载&nbsp&nbsp&nbsp&nbsp&nbsp"+'</font></a>';--%>
+			<%--getObj(0,i,"FILENAME").innerHTML=html+'<font >'+getObj(0,i,"FILENAME").innerHTML+'</font>';--%>
+		<%--}--%>
+	<%--}--%>
+	<%--function downloadFile(id){--%>
+		<%--if(typeof(id)==undefined || id=='') {--%>
+			<%--alert("请先生成征信授权书再下载！");--%>
+			<%--return;--%>
+		<%--}--%>
+		<%--if(!frames["downloadTemplate"]) $("<iframe name='downloadTemplate' style='display:none;'></iframe>").appendTo("body");--%>
+		<%--window.open(sWebRootPath+"/servlet/view/docDownloadServlet?CompClientID=<%=sCompClientID%>&sqlString=save@"+id, "downloadTemplate");--%>
+	<%--}--%>
 
 	function createCreditPdf(){
-		var fullName = getItemValue(0,getRow(0),'fullName');
-		var certId = getItemValue(0,getRow(0),'certId');
-		var phone = getItemValue(0,getRow(0),'phone');
-		var flowunid = getItemValue(0,getRow(0),'flowunid');
-        var creditauth = getItemValue(0,getRow(0),'creditauth');
-        var credittype = getItemValue(0,getRow(0),'credittype');
-        var objectType = credittype;
-        var operationType = objectType;
-		var param={};
-		var tempParam={};
-		var sparam="";
-		//模板号
-		var relation = getItemValue(0,getRow(0),'relation');
-		var tempId = "65b12cbfd98611eb970e00163e0ad612";
-		/**creditauth
-         * 征信授权书_安鹏
-         征信授权书_安鹏
-         征信授权书_邮储
-         借款服务确认书_邮储
-         */
-		if("申请人"== relation && "征信授权书_邮储" == creditauth){
-			tempId = "65bd277ad98611eb970e00163e0ad612";//申请人的情况下，征信授权书_邮储
-		}else if("申请人"== relation && "借款服务确认书_邮储" == creditauth){
-			tempId = "134f3d88e2f811eb970e00163e0ad612";//申请人的情况下，借款服务确认书_邮储
-		}
-		param["templateNo"]= tempId;
+		var fullNames=getItemValueArray(0,"fullName");
+		var certIds=getItemValueArray(0,"certId");
+		var phones=getItemValueArray(0,"phone");
+		var creditauths=getItemValueArray(0,"creditauth");
+		var credittypes=getItemValueArray(0,"credittype");
+		var relations=getItemValueArray(0,"relation");
+		var signTypes=getItemValueArray(0,"sign_type");
 		var projectNo = "<%=projectNo%>";
-		//生成文件关联关系
-		tempParam["OBJECTTYPE"] = objectType;
-		tempParam["insurance_no"] = flowunid;
-		tempParam["contract_no"] = certId;
-		tempParam["contract_id"] = "<%=projectNo%>";
-		tempParam["project_id"] =  "<%=projectNo%>";
-		tempParam["PROJ_ID"] = "<%=projectNo%>";//注意变量名，不要改
-		tempParam["CONTRACT_ID"] =  "<%=projectNo%>";//注意变量名，不要改
-		tempParam["CUST_ID"] =  certId;//注意变量名，不要改
-		tempParam["PLAN_NUMBER"] =  phone;//注意变量名，不要改
-		tempParam["customername"] = fullName;
-		//生成模板固定参数
-		tempParam["CurUserId"]="<%=CurUser.getUserID()%>";
-		tempParam["CurOrgId"]="<%=CurUser.getOrgID()%>";
-		tempParam["fileSavePath"]="<%=CurConfig.getConfigure("FileSavePath")%>";
-
-		param["templateParam"]=JSON.stringify(tempParam).replace(/,/g,"@");//生成模板的参数据
-		for(var key in param){
-			if(sparam.length>0){sparam+=",";}
-			sparam+=key+"="+param[key];
+		var flowunid = "<%=sFlowUnid%>";
+		if(typeof(relations)=="undefined"||relations==null||relations==""){alert("请选择");return;}
+		var number = 0;
+		for(var i=0; i < relations.length;i++) {
+			var signType = signTypes[i];
+			alert(signType);
 		}
-		var deleteresult = RunJavaMethodTrans("com.tenwa.channelportal.action.alpha.CreditAuthDeleteAction","deleteCreditAuth","certId="+certId+",projectNo="+projectNo+",objectType="+objectType);
-		var result=RunJavaMethodTrans("com.tenwa.officetempalte.action.CreateOfficeAction","createOfficeByTemplate", sparam);
-		// word转pdf
-		var id = RunJavaMethodTrans("com.tenwa.channelportal.action.alpha.CreditAuthSignAction","wordToPdfCreditAuth",
-				"projectNo="+projectNo+",operationType="+objectType
-				+",fullName="+fullName+",certId="+certId+",phone="+phone+",flowUnid="+flowunid);
-		if(typeof(id)=="undefined" || id.length <= 0 || id==""){
-			RunJavaMethodTrans("com.tenwa.channelportal.action.alpha.CreditAuthDeleteAction","deleteCreditAuth","certId="+certId+",projectNo="+projectNo+",objectType="+objectType);
-		}else {
+		for(var i=0; i < relations.length;i++) {
+			var fullName = fullNames[i];
+			var certId = certIds[i];
+			var phone = phones[i];
+			var creditauth = creditauths[i];
+			var credittype = credittypes[i];
+			var relation = relations[i];
+			var objectType = credittype;
+			var operationType = objectType;
+			var param = {};
+			var tempParam = {};
+			var sparam = "";
+			if ("担保人" == relation) {
+				var checkCreditAuth = RunJavaMethodTrans("com.tenwa.channelportal.action.alpha.CreditAuthDeleteAction", "checkCreditAuth", "flowUnid=" + flowunid);
+				if ("" == checkCreditAuth || "Ent02" == checkCreditAuth) {
+					if(1==relations.length){
+						alert("当前担保人类型不支持线上签约！");
+						return;
+					}else {
+						number++;
+						continue;
+					}
+				}
+			}
+			//模板号 征信授权书_安鹏
+			var tempId = "65b12cbfd98611eb970e00163e0ad612";
+			/**creditauth
+			 *
+			 征信授权书_安鹏 99001
+			 征信授权书_邮储 99002
+			 借款服务确认书_邮储99003
+			 */
+			if ("申请人" == relation && "征信授权书_邮储" == creditauth) {
+				tempId = "65bd277ad98611eb970e00163e0ad612";//申请人的情况下，征信授权书_邮储
+			} else if ("申请人" == relation && "借款服务确认书_邮储" == creditauth) {
+				tempId = "134f3d88e2f811eb970e00163e0ad612";//申请人的情况下，借款服务确认书_邮储
+			}
+			param["templateNo"] = tempId;
+			//生成文件关联关系
+			tempParam["OBJECTTYPE"] = objectType;
+			tempParam["insurance_no"] = flowunid;
+			tempParam["contract_no"] = certId;
+			tempParam["contract_id"] = "<%=projectNo%>";
+			tempParam["project_id"] = "<%=projectNo%>";
+			tempParam["PROJ_ID"] = "<%=projectNo%>";//注意变量名，不要改
+			tempParam["CONTRACT_ID"] = "<%=projectNo%>";//注意变量名，不要改
+			tempParam["CUST_ID"] = certId;//注意变量名，不要改
+			tempParam["PLAN_NUMBER"] = phone;//注意变量名，不要改
+			tempParam["customername"] = fullName;
+			//生成模板固定参数
+			tempParam["CurUserId"] = "<%=CurUser.getUserID()%>";
+			tempParam["CurOrgId"] = "<%=CurUser.getOrgID()%>";
+			tempParam["fileSavePath"] = "<%=CurConfig.getConfigure("FileSavePath")%>";
+
+			param["templateParam"] = JSON.stringify(tempParam).replace(/,/g, "@");//生成模板的参数据
+			for (var key in param) {
+				if (sparam.length > 0) {
+					sparam += ",";
+				}
+				sparam += key + "=" + param[key];
+			}
+			var deleteresult = RunJavaMethodTrans("com.tenwa.channelportal.action.alpha.CreditAuthDeleteAction", "deleteCreditAuth", "certId=" + certId + ",projectNo=" + projectNo + ",objectType=" + objectType);
+			var result = RunJavaMethodTrans("com.tenwa.officetempalte.action.CreateOfficeAction", "createOfficeByTemplate", sparam);
+			// word转pdf
+			var id = RunJavaMethodTrans("com.tenwa.channelportal.action.alpha.CreditAuthSignAction", "wordToPdfCreditAuth",
+					"projectNo=" + projectNo + ",operationType=" + objectType
+					+ ",fullName=" + fullName + ",certId=" + certId + ",phone=" + phone + ",flowUnid=" + flowunid);
+			if (typeof (id) == "undefined" || id.length <= 0 || id == "") {
+				RunJavaMethodTrans("com.tenwa.channelportal.action.alpha.CreditAuthDeleteAction", "deleteCreditAuth", "certId=" + certId + ",projectNo=" + projectNo + ",objectType=" + objectType);
+			} else {
+				number++;
+			}
+		}
+		if(relations.length==0){
+			alert("请先选择数据！！！");
+			return;
+		}else if(number==0){
+			alert("生成失败！！！");
+		}else if(number==relations.length){
 			alert("生成成功！！！");
+		}else{
+			alert("部分生成成功！！！");
 		}
 		reloadSelf();
 	}
@@ -117,63 +188,63 @@
 	 * 发起电子签约
 	 */
 	function signOnLine(){
-		var fullName = getItemValue(0,getRow(0),'fullName');
-		var certId = getItemValue(0,getRow(0),'certId');
-		var phone = getItemValue(0,getRow(0),'phone');
-		var flowunid = getItemValue(0,getRow(0),'flowunid');
+		var fullNames=getItemValueArray(0,"fullName");
+		var certIds=getItemValueArray(0,"certId");
+		var phones=getItemValueArray(0,"phone");
+		var creditauths=getItemValueArray(0,"creditauth");
+		var credittypes=getItemValueArray(0,"credittype");
+		var relations=getItemValueArray(0,"relation");
+		var attributeIds=getItemValueArray(0,"ID");
 		var projectNo = "<%=projectNo%>";
-		//模板号
-		var relation = getItemValue(0,getRow(0),'relation');
-		var attributeId = getItemValue(0,getRow(0),'ID');
-        var creditauth = getItemValue(0,getRow(0),'creditauth');
-        var credittype = getItemValue(0,getRow(0),'credittype');
-        var objectType = credittype;
-        var operationType = objectType;
-		if(typeof(attributeId)==undefined || attributeId=='') {
-			alert("请先生成征信授权书，再发起电子签约！");
-			return;
-		}
-        /**creditauth
-         * 征信授权书_安鹏
-         征信授权书_安鹏
-         征信授权书_邮储
-         借款服务确认书_邮储
-         */
-        if("申请人"== relation && "征信授权书_邮储" == creditauth){
-            tempId = "65bd277ad98611eb970e00163e0ad612";//申请人的情况下，征信授权书_邮储
-        }else if("申请人"== relation && "借款服务确认书_邮储" == creditauth){
-            tempId = "134f3d88e2f811eb970e00163e0ad612";//申请人的情况下，借款服务确认书_邮储
-        }
-		//自然人电子签约
-		var sReturn = "";
-		sReturn = RunJavaMethodTrans("com.tenwa.channelportal.action.alpha.CreditAuthActionNewUtils","signIng",
-				"attributeId="+attributeId+",projectNo="+projectNo+",operationType="+objectType +",relation="+relation
-				+",fullName="+fullName+",certId="+certId+",phone="+phone+",flowUnid="+flowunid+",creditauth="+credittype);
+		var flowunid = "<%=sFlowUnid%>";
+		if(typeof(relations)=="undefined"||relations==null||relations==""){alert("请选择");return;}
+		var number = 0;
+		var applyCount = 0;
+		for(var i=0; i < relations.length;i++) {
+			var fullName = fullNames[i];
+			var certId = certIds[i];
+			var phone = phones[i];
+			var creditauth = creditauths[i];
+			var credittype = credittypes[i];
+			var relation = relations[i];
+			var attributeId = attributeIds[i];
+			var objectType = credittype;
+			var operationType = objectType;
+			if (typeof (attributeId) == undefined || attributeId == '') {
+				if (1 == relations.length) {
+					alert("请先生成pdf文件，再发起电子签约！");
+					return;
+				} else {
+					number++;
+					continue;
+				}
+			}
+			if ("申请人" == relation) {
+				applyCount++;
+				if(applyCount > 1){//申请人只需要发起一次电子签约，后台代码整合
+					continue;
+				}
+			}
+			//自然人电子签约
+			var sReturn = RunJavaMethodTrans("com.tenwa.channelportal.action.alpha.CreditAuthActionNewUtils", "signIng",
+					"attributeId=" + attributeId + ",projectNo=" + projectNo + ",operationType=" + objectType + ",relation=" + relation
+					+ ",fullName=" + fullName + ",certId=" + certId + ",phone=" + phone + ",flowUnid=" + flowunid + ",creditauth=" + credittype);
 
-		var sReturns = sReturn.split("@");
-		if("success"==sReturns[0]){
-			AsDebug.showMessage("提示","电子签约发起成功!","","",true,"","","",function(){
-				window.location.reload();
-			});
-		}else if(sReturns[1].indexOf("用户认证信息与合同签署方信息不匹配")!=-1){
-			var message="";
-			if("true"==sReturns[0]){
-				message = "部分合同发送成功;注意发送失败合同:";
+			if("success" == sReturn) {
+				number++;
 			}
-			AsDebug.showMessage("提示",message+sReturns[1],"","",true,"","","",function(){
-				window.location.reload();
-			});
-		}else{
-			var message="";
-			if("true"==sReturns[0]){
-				message = "部分合同发送成功;注意发送失败合同";
-			}else{
-				message = "电子签约发送失败";
-			}
-			AsDebug.showMessage("提示",message,"","",true,"","","",function(){
-				window.location.reload();
-			});
 		}
+		if(relations.length==0){
+			alert("请先选择数据！！！");
+			return;
+		}else if(number==0){
+			alert("发起电子签约失败！！！");
+		}else if(number==relations.length){
+			alert("发起电子签约成功！！！");
+		}else{
+			alert("部分发起电子签约成功！！！");
+		}
+		location.reload();
 	}
 
 	//查询电子签约状态
diff --git a/src/com/tenwa/channelportal/action/alpha/CreditAuthActionNewUtils.java b/src/com/tenwa/channelportal/action/alpha/CreditAuthActionNewUtils.java
index cb5ee8825..a2207e16a 100644
--- a/src/com/tenwa/channelportal/action/alpha/CreditAuthActionNewUtils.java
+++ b/src/com/tenwa/channelportal/action/alpha/CreditAuthActionNewUtils.java
@@ -83,13 +83,6 @@ public class CreditAuthActionNewUtils {
                 String subjectId = pbo.getAttribute("subjectid").getString();
                 logger.info("signIng0708 个人征信授权 subjectId=" + subjectId);
                 Map<String, List<Map<String, String>>> parameter = new HashMap<String, List<Map<String, String>>>();
-//                List<Map<String, String>> companyPar = new LinkedList<Map<String, String>>();
-//                // 添加公司公章
-//                Map<String, String> param1 = new HashMap<String, String>();
-//                param1.put("type", "1");// 1标识当期发起公司公章，2标识当前公司下的子公司
-//                param1.put("mobile", "12599998888");//子公司添加接收手机号，如果不需要接收，直接填写一个虚拟不存在就行，如果需要传真实手机号
-//                companyPar.add(param1);
-//                parameter.put("COMPANY", companyPar);
                 //添加个人基本信息
                 List<Map<String, String>> personPar = new LinkedList<Map<String, String>>();
                 Map<String, String> sqPar = new HashMap<String, String>();
@@ -109,7 +102,7 @@ public class CreditAuthActionNewUtils {
                 String makefullPath = bo.getAttribute("FULLPATH").toString();// 获取生成文件路径
                 Long documentId = null;
                 if("申请人".equals(relation)){
-                    // TODO: 2021/7/12 申请人，安鹏征信授权，邮储征信授权，邮储借款告知书一起签，
+                    // : 2021/7/12 申请人，安鹏征信授权，邮储征信授权，邮储借款告知书一起签，
                     logger.info("申请人一起签");
                     Map<String, String> docAttrMap = new HashMap<>();
                     for(String createType : docAttrIdMap.keySet()){
@@ -149,7 +142,7 @@ public class CreditAuthActionNewUtils {
                         String contractDocId = boTemp.getAttribute("id")
                                 .toString();
                         fromCondtion.put("id", contractDocId);
-                        otherProperty.put("SIGNPROCESS", "0");// 发起电子签约
+                        otherProperty.put("SIGNPROCESS", "1");// 发起电子签约
                         otherProperty.put("CONTRACTDOCID", contractDocId);// 发起电子签约
                         otherProperty.put("INPUTTIME",DateAssistant.getTodayNow());
                         // 拷表的方法
@@ -170,7 +163,7 @@ public class CreditAuthActionNewUtils {
                     String contractDocId = bo.getAttribute("id")
                             .toString();
                     fromCondtion.put("id", contractDocId);
-                    otherProperty.put("SIGNPROCESS", "0");// 发起电子签约
+                    otherProperty.put("SIGNPROCESS", "1");// 发起电子签约
                     otherProperty.put("CONTRACTDOCID", contractDocId);// 发起电子签约
                     otherProperty.put("INPUTTIME",DateAssistant.getTodayNow());
                     // 拷表的方法
@@ -182,7 +175,7 @@ public class CreditAuthActionNewUtils {
         } catch (Exception e) {
             tx.rollback();
             e.printStackTrace();
-            System.out.println("自然人电子签约异常:" + e.getMessage());
+            logger.error("征信授权 电子签约异常:" + e.getMessage(), e);
             return "flase@error";
         }
     }
@@ -213,6 +206,7 @@ public class CreditAuthActionNewUtils {
         }
         return null;
     }
+
     /**
      * 查看签约结果
      * @param tx
@@ -228,8 +222,12 @@ public class CreditAuthActionNewUtils {
                 .setParameter("attributeId", attributeId).getSingleResult(true);
         BizObject pbo = pbm.createQuery("FLOWUNID=:flowUnid").setParameter("flowUnid", flowUnid).getSingleResult(true);
         if(null == pbo || bo == null ){
-            return "请检查合同文件是否生成！";
+            return "请检查是否已发起签约，或者文件是否生成！";
         } else {
+            String signSts = bo.getAttribute("SIGN_TYPE").toString();
+            if("COMPLETE".equals(signSts)){
+                return "已完成";
+            }
             String subjectId = pbo.getAttribute("subjectid").getString();
             logger.info("contractSignStatus0708 个人征信授权 subjectId=" + subjectId);
             long signContractId = new Long(
@@ -264,7 +262,6 @@ public class CreditAuthActionNewUtils {
                         logger.info("个人征信授权 无需执行合同盖章。 合同下载log===" + downloadstatus);
                         boTemp.setAttributeValue("PROCESS", "6");
                         boTemp.setAttributeValue("SIGN_TYPE", "COMPLETE");// 法人客户当盖完章改为完成状态
-                        boTemp.setAttributeValue("SENDPROCESS", "2");
                         contBom.saveObject(boTemp);
                     }
                     logger.info("contractSignStatus20210712 电子签约已完成，个人征信授权 无需执行合同盖章。");
@@ -275,7 +272,6 @@ public class CreditAuthActionNewUtils {
                     Map<String, String> otherProperty = new HashMap<String, String>();
                     String contractDocId = bo.getAttribute("id").toString();
                     fromCondtion.put("id", contractDocId);
-                    otherProperty.put("SIGNPROCESS", "2");// 已完成电子签约
                     otherProperty.put("CONTRACTDOCID", contractDocId);// 已完成电子签约
                     otherProperty.put("INPUTTIME",DateAssistant.getTodayNow());
                     // 拷表的方法
@@ -284,7 +280,6 @@ public class CreditAuthActionNewUtils {
                     logger.info("个人征信授权 无需执行合同盖章。 合同下载log===" + downloadstatus);
                     bo.setAttributeValue("PROCESS", "6");
                     bo.setAttributeValue("SIGN_TYPE", "COMPLETE");// 法人客户当盖完章改为完成状态
-                    bo.setAttributeValue("SENDPROCESS", "2");
                     contBom.saveObject(bo);
                     logger.info("contractSignStatus20210429 电子签约已完成，个人征信授权 无需执行合同盖章。");
                     return "已完成";
@@ -295,40 +290,41 @@ public class CreditAuthActionNewUtils {
         }
     }
 
+    /**
+     * 重发签约短信
+     * @param tx
+     * @return
+     */
     public String sendMessageAgain(JBOTransaction tx) {
         try{
             logger.info("sendMessageAgain20210708 个人征信授权  projectNo="+ projectNo+ " fullName="+ fullName);
-            BizObjectManager pbm = JBOFactory.getBizObjectManager(LB_PROJECT_INFO_TEMP.CLASS_NAME, tx);
-            BizObject pbo = pbm.createQuery("FLOWUNID=:flowUnid").setParameter("flowUnid", flowUnid).getSingleResult(true);
             BizObjectManager contBom = JBOFactory.getBizObjectManager(LB_DOC_CONTRACT_LIST.CLASS_NAME, tx);
             BizObject bo = null;
             bo = contBom.createQuery("select singcontract_id,filename from O where attribute_id=:attributeId"
-                    +" and file_flag = 'yes' and sendprocess = '1' and sign_type = 'SIGNING'")
+                    +" and file_flag = 'yes' and sendprocess = '1'")
                     .setParameter("attributeId", attributeId).getSingleResult(true);
-            String subjectId = pbo.getAttribute("subjectid").getString();
-            logger.info("sendMessageAgain20210708 个人征信授权 subjectId=" + subjectId);
-            if(bo == null ){
+            if(bo == null ) {
                 // 查询lb_doc_contract_list表
                 bo = contBom.createQuery("attribute_id=:attributeId and file_flag='yes' and (sendprocess='0' or sendprocess='1' ) ")
                         .setParameter("attributeId", attributeId).getSingleResult(true);
-                if(bo == null ){
+                if (bo == null) {
                     logger.info("sendMessageAgain20210708 请检查合同文件是否生成");
                     return "请检查合同文件是否生成！";
                 }
-                long signContractId =
-                        new Long(bo.getAttribute("SINGCONTRACT_ID") == null ? null : bo.getAttribute("SINGCONTRACT_ID").getString());
-                CreditAuthActionTwoUtil catu = new CreditAuthActionTwoUtil();
-                String contractStatus = catu.getContractStatus(subjectId, signContractId);
-                if("success".equals(contractStatus)){
-                    logger.info("sendMessageAgain20210708 电子签约已完成，无需再发送短信。");
-                    return "签约已完成，无需再发送短信。";
-                }
-                logger.info("sendMessageAgain20210708 请检查合同文件是否生成111");
-                return "请检查合同文件是否生成！";
             }
-            long signContractId =new Long(bo.getAttribute("SINGCONTRACT_ID")==null ? null : bo.getAttribute("SINGCONTRACT_ID").getString());
-            KHSQContractSignActionTwoUtil catu = new KHSQContractSignActionTwoUtil();
-            return catu.messageSend(subjectId, signContractId);
+            String signSts = bo.getAttribute("SIGN_TYPE").toString();
+            if("COMPLETE".equals(signSts)){
+                return "success";
+            }
+            if("SIGNING".equals(signSts)){
+                BizObjectManager pbm = JBOFactory.getBizObjectManager(LB_PROJECT_INFO_TEMP.CLASS_NAME, tx);
+                BizObject pbo = pbm.createQuery("FLOWUNID=:flowUnid").setParameter("flowUnid", flowUnid).getSingleResult(true);
+                String subjectId = pbo.getAttribute("subjectid").getString();
+                long signContractId =new Long(bo.getAttribute("SINGCONTRACT_ID")==null ? null : bo.getAttribute("SINGCONTRACT_ID").getString());
+                KHSQContractSignActionTwoUtil catu = new KHSQContractSignActionTwoUtil();
+                return catu.messageSend(subjectId, signContractId);
+            }
+            return "success";
         } catch (Exception e) {
             try {
                 tx.rollback();
diff --git a/src/com/tenwa/channelportal/action/alpha/CreditAuthDeleteAction.java b/src/com/tenwa/channelportal/action/alpha/CreditAuthDeleteAction.java
index 3c77d778d..b4c22d43a 100644
--- a/src/com/tenwa/channelportal/action/alpha/CreditAuthDeleteAction.java
+++ b/src/com/tenwa/channelportal/action/alpha/CreditAuthDeleteAction.java
@@ -8,6 +8,9 @@ import com.amarsoft.are.jbo.BizObjectManager;
 import com.amarsoft.are.jbo.JBOFactory;
 import com.amarsoft.are.jbo.JBOTransaction;
 import com.tenwa.comm.util.jboutil.DataOperatorUtil;
+import jbo.app.tenwa.doc.LB_DOC_CONTRACT_LIST;
+import jbo.com.tenwa.lease.comm.LB_GUARANTEE_UNIT_TEMP;
+import jbo.com.tenwa.lease.comm.LB_PROJECT_INFO_TEMP;
 
 /**
  * 删除征信合同记录
@@ -17,6 +20,16 @@ public class CreditAuthDeleteAction {
 	String objectType;//文件类型
 	String projectNo;//项目编号
 	String certId;//身份证号
+	String flowUnid;;//流程编号
+
+
+	public String getFlowUnid() {
+		return flowUnid;
+	}
+
+	public void setFlowUnid(String flowUnid) {
+		this.flowUnid = flowUnid;
+	}
 
 	public String getObjectType() {
 		return objectType;
@@ -57,15 +70,36 @@ public class CreditAuthDeleteAction {
 			String lbDocLibraryId = bom1.createQuery("relative_id=:relative_id").setParameter("relative_id", lbDocBizId).getSingleResult(false).getAttribute("id").toString();
 			BizObjectManager bom2 = JBOFactory.getBizObjectManager(jbo.app.tenwa.doc.LB_DOCATTRIBUTE.CLASS_NAME);
 			String docAttributeId = bom2.createQuery("library_id=:library_id").setParameter("library_id", lbDocLibraryId).getSingleResult(false).getAttribute("id").toString();
-			Map<String,String> condtion= new HashMap<String,String>();
-			condtion.put("id", lbDocBizId);
-			DataOperatorUtil.deleteJBOByCondtion(jbo.app.tenwa.doc.LB_DOCRELATIVE.CLASS_NAME, condtion, tx);
-			condtion.clear();
-			condtion.put("id", lbDocLibraryId);
-			DataOperatorUtil.deleteJBOByCondtion(jbo.app.tenwa.doc.LB_DOCLIBRARY.CLASS_NAME, condtion, tx);
-			condtion.clear();
-			condtion.put("id", docAttributeId);
-			DataOperatorUtil.deleteJBOByCondtion(jbo.app.tenwa.doc.LB_DOCATTRIBUTE.CLASS_NAME, condtion, tx);
+			BizObjectManager contBom = JBOFactory.getBizObjectManager(LB_DOC_CONTRACT_LIST.CLASS_NAME, tx);
+			// 查询lb_doc_contract_list表
+			BizObject bo = contBom.createQuery("attribute_id=:attributeId and file_flag='yes' and sendprocess='1' ")
+					.setParameter("attributeId", docAttributeId).getSingleResult(true);
+			if(null == bo){
+				Map<String,String> condtion= new HashMap<String,String>();
+				condtion.put("id", lbDocBizId);
+				DataOperatorUtil.deleteJBOByCondtion(jbo.app.tenwa.doc.LB_DOCRELATIVE.CLASS_NAME, condtion, tx);
+				condtion.clear();
+				condtion.put("id", lbDocLibraryId);
+				DataOperatorUtil.deleteJBOByCondtion(jbo.app.tenwa.doc.LB_DOCLIBRARY.CLASS_NAME, condtion, tx);
+				condtion.clear();
+				condtion.put("id", docAttributeId);
+				DataOperatorUtil.deleteJBOByCondtion(jbo.app.tenwa.doc.LB_DOCATTRIBUTE.CLASS_NAME, condtion, tx);
+			}
 		}
 	}
+
+	/**
+	 * 判断担保人是否为法人
+	 * @param tx
+	 * @throws Exception
+	 */
+	public String checkCreditAuth(JBOTransaction tx) throws Exception{
+		BizObjectManager pbm = JBOFactory.getBizObjectManager(LB_GUARANTEE_UNIT_TEMP.CLASS_NAME, tx);
+		BizObject pbo = pbm.createQuery("FLOWUNID=:flowUnid")
+				.setParameter("flowUnid", flowUnid).getSingleResult(true);
+		if(null == pbo){
+			return "";
+		}
+		return pbo.getAttribute("CERTTYPE").toString();
+	}
 }
\ No newline at end of file
diff --git a/src/com/tenwa/channelportal/action/alpha/CreditAuthTypesMap.java b/src/com/tenwa/channelportal/action/alpha/CreditAuthTypesMap.java
new file mode 100644
index 000000000..df1c7468c
--- /dev/null
+++ b/src/com/tenwa/channelportal/action/alpha/CreditAuthTypesMap.java
@@ -0,0 +1,27 @@
+package com.tenwa.channelportal.action.alpha;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class CreditAuthTypesMap {
+
+
+    /**
+     * 如果是申请人的话，则需要签3份 99001 99002 99003
+     * @return
+     */
+    public static Map<String, String> initApplicant(){
+        Map<String, String> creditAuthMap = new HashMap<>();
+        creditAuthMap.put("99001", "安鹏征信授权");
+        creditAuthMap.put("99002", "邮储征信授权");
+        creditAuthMap.put("99003", "邮储借款告知书");
+        return creditAuthMap;
+    }
+
+    public static Map<String, String> initOther(){
+        Map<String, String> creditAuthMap = new HashMap<>();
+        creditAuthMap.put("99001", "安鹏征信授权");
+        return creditAuthMap;
+    }
+
+}
diff --git a/src/com/tenwa/channelportal/action/alpha/DocListCreditAuth.java b/src/com/tenwa/channelportal/action/alpha/DocListCreditAuth.java
new file mode 100644
index 000000000..d7f62ab88
--- /dev/null
+++ b/src/com/tenwa/channelportal/action/alpha/DocListCreditAuth.java
@@ -0,0 +1,105 @@
+package com.tenwa.channelportal.action.alpha;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import com.alibaba.fastjson.JSONObject;
+import com.amarsoft.are.jbo.BizObject;
+import com.amarsoft.are.jbo.BizObjectManager;
+import com.amarsoft.are.jbo.JBOFactory;
+import com.amarsoft.dict.als.manage.NameManager;
+import com.tenwa.channelportal.action.alpha.CreditAuthTypesMap;
+import jbo.app.tenwa.doc.LB_DOC_CONTRACT_LIST;
+import jbo.com.tenwa.lease.comm.LB_PROJECT_INFO_TEMP;
+
+
+public class DocListCreditAuth {
+
+
+	/**
+	 * 征信授权文件查询
+	 * @param certId
+	 * @param relation
+	 * @param flowunid
+	 * @return
+	 * @throws Exception
+	 */
+	public static String findFileListByUser(String certId, String relation, String flowunid) throws Exception {
+
+		// TODO: 2021/7/19 查询文件信息
+		BizObjectManager pbm = JBOFactory.getBizObjectManager(LB_PROJECT_INFO_TEMP.CLASS_NAME);
+		BizObject pbo = pbm.createQuery("FLOWUNID=:flowUnid").setParameter("flowUnid", flowunid).getSingleResult(true);
+		String projectNo = pbo.getAttribute("PROJECT_NO").toString();
+		Map<String, String> creditAuthTypesMap = CreditAuthTypesMap.initOther();
+		if("申请人".equals(relation)){
+			creditAuthTypesMap = CreditAuthTypesMap.initApplicant();
+		}
+		List<JSONObject> boJsonList = new ArrayList<JSONObject>();
+		for(String objectType : creditAuthTypesMap.keySet()){
+			BizObjectManager bom = JBOFactory.getBizObjectManager(jbo.app.tenwa.doc.LB_DOCRELATIVE.CLASS_NAME);
+			BizObject  lbDocBiz = bom.createQuery("OBJECTTYPE=:objectType  and CUST_ID=:certId and PROJ_ID=:projectNo ")
+					.setParameter("objectType", objectType).setParameter("certId",certId).setParameter("projectNo",projectNo).getSingleResult(false);
+			if(null == lbDocBiz){
+				continue;
+			}
+			String lbDocBizId = lbDocBiz.getAttribute("id").toString();
+			BizObjectManager bom1 = JBOFactory.getBizObjectManager(jbo.app.tenwa.doc.LB_DOCLIBRARY.CLASS_NAME);
+			String lbDocLibraryId = bom1.createQuery("relative_id=:relative_id").setParameter("relative_id", lbDocBizId).getSingleResult(false).getAttribute("id").toString();
+			BizObjectManager bom2 = JBOFactory.getBizObjectManager(jbo.app.tenwa.doc.LB_DOCATTRIBUTE.CLASS_NAME);
+			BizObject  fileBizObj = bom2.createQuery("library_id=:library_id").setParameter("library_id", lbDocLibraryId).getSingleResult(false);
+			if(null == fileBizObj){
+				continue;
+			}
+
+			JSONObject boJson = new JSONObject();
+			boJson.put("id", fileBizObj.getAttribute("id").getString());
+			boJson.put("fileType",fileBizObj.getAttribute("CONTENT_TYPE").getString());
+			boJson.put("objecttype", objectType);
+			boJson.put("FILE_NAME",fileBizObj.getAttribute("FILENAME").getString());
+			boJson.put("FILE_PATH",fileBizObj.getAttribute("FULLPATH").getString());
+			boJson.put("INPUTTIME",fileBizObj.getAttribute("INPUTTIME").getString());
+			boJsonList.add(boJson);
+		}
+		if(boJsonList.size()==0){
+			return "0";
+		}
+		String FileHtml = getFileHtml(boJsonList);
+		return FileHtml;
+	}
+	public static String getFileHtml(List<JSONObject> list) throws Exception {
+		StringBuffer sb=new StringBuffer();
+		sb.append("{");
+		for(int i=0;i<list.size();i++){
+			JSONObject bo=list.get(i);
+			sb.append("\"" +i+"\""+":{");
+			String type= bo.get("fileType").toString();
+			if(type.indexOf("application/msword")>=0||type.indexOf("application/vnd.openxmlformats-officedocument.wordprocessingml.document")>=0
+					||type.indexOf("application/vnd.ms-excel")>=0||type.indexOf("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet")>=0){
+				sb.append("\"word\":\""+true+"\",");
+			}else{
+				sb.append("\"word\":\""+false+"\",");
+			}
+			if(type.indexOf("application/pdf")>=0){
+				sb.append("\"pdf\":\""+true+"\",");
+			}else{
+				sb.append("\"pdf\":\""+false+"\",");
+			}
+			sb.append("\"id\":\""+bo.get("id").toString()+"\",");
+			sb.append("\"objecttype\":\""+bo.get("objecttype").toString()+"\",");
+			sb.append("\"filename\":\""+bo.get("FILE_NAME").toString()+"\",");
+			sb.append("\"filepath\":\""+bo.get("FILE_PATH").toString()+"\",");
+			sb.append("\"inputtime\":\""+bo.get("INPUTTIME").toString()+"\",");
+			sb.append("},");
+		}
+		//删除最后一个逗号
+		if(sb.length()>1){
+			sb.deleteCharAt(sb.length() - 1);
+		}
+		sb.append("}");
+
+		return sb.toString();
+	}
+
+
+}
diff --git a/src_tenwa/com/tenwa/lease/flow/project/commcheck/UserCreditAuthCheck.java b/src_tenwa/com/tenwa/lease/flow/project/commcheck/UserCreditAuthCheck.java
new file mode 100644
index 000000000..24d0806c2
--- /dev/null
+++ b/src_tenwa/com/tenwa/lease/flow/project/commcheck/UserCreditAuthCheck.java
@@ -0,0 +1,143 @@
+/**
+ * 
+ */
+package com.tenwa.lease.flow.project.commcheck;
+
+import com.tenwa.app.manage.qiyuesuo.v2.ContractSignVtwoUtils;
+import jbo.app.tenwa.customer.CUSTOMER_FAMILY_TEMP;
+import jbo.app.tenwa.customer.CUSTOMER_PERSON_TEMP;
+import jbo.app.tenwa.doc.LB_DOC_CONTRACT_LIST;
+import jbo.com.tenwa.lease.comm.LB_EQUIPMENT_CAR_TEMP;
+import jbo.com.tenwa.lease.comm.LB_GUARANTEE_UNIT_TEMP;
+import jbo.com.tenwa.lease.comm.LB_PROJECT_INFO_TEMP;
+
+import com.amarsoft.are.jbo.BizObject;
+import com.amarsoft.are.jbo.BizObjectManager;
+import com.amarsoft.are.jbo.JBOFactory;
+import com.amarsoft.awe.util.Transaction;
+import com.tenwa.template.check.DefaultBussinessCheck;
+import jbo.com.tenwa.lease.comm.LB_UNION_LESSEE_TEMP;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 订单中所有用户征信授权电子版是否已签署
+ *		
+ */
+public class UserCreditAuthCheck extends DefaultBussinessCheck  {
+	private static final Logger logger = LoggerFactory.getLogger(UserCreditAuthCheck.class);
+	@Override
+	public Object run(Transaction transaction) throws Exception {
+		StringBuffer Message = new StringBuffer();
+		Message.append("未填写：");
+		String flowunid=this.getAttribute("ObjectNo").toString();
+		BizObjectManager lpitMange = JBOFactory.getBizObjectManager(LB_PROJECT_INFO_TEMP.CLASS_NAME, transaction);
+		BizObject lpit = lpitMange.createQuery("FLOWUNID=:flowunid").setParameter("FLOWUNID", flowunid).getSingleResult(false);
+		String projectNo = lpit.getAttribute("CAR_TYPE").getString();
+		// : 2021/7/15 查询申请人
+		BizObjectManager lult = JBOFactory.getBizObjectManager(LB_UNION_LESSEE_TEMP.CLASS_NAME);
+		BizObject lults = lult.createQuery("flowunid=:flowUnid").setParameter("flowUnid", flowunid).getSingleResult(false);
+		BizObjectManager customer = JBOFactory.getBizObjectManager(CUSTOMER_PERSON_TEMP.CLASS_NAME);
+		BizObject cust = customer.createQuery("flowunid=:flowUnid  and customerid=:customerid").setParameter("flowUnid", flowunid).setParameter("customerid", lults.getAttribute("customer_id").toString()).getSingleResult(false);
+		Map<String, String> creditAuthMap = initApplicant();
+		boolean checkCredit = checkCreditAuth(projectNo, cust.getAttribute("CERTID").toString(), creditAuthMap, transaction);
+		if(checkCredit){
+			//申请人未完成征信授权书签约
+			putMsg("申请人未完成征信授权书签约");
+			setPass(false);
+			return null;
+		}
+		creditAuthMap = initOther();
+		BizObjectManager lgutManager = JBOFactory.getBizObjectManager(LB_GUARANTEE_UNIT_TEMP.CLASS_NAME, transaction);
+		List<BizObject> lgutList = lgutManager.createQuery("FLOWUNID=:flowunid").setParameter("FLOWUNID", flowunid).getResultList(false);
+		// : 2021/7/15 担保人
+		for(BizObject lgut : lgutList){
+			String certid = lgut.getAttribute("CERTID").getString();
+			String certType = lgut.getAttribute("CERTTYPE").getString();
+			logger.info("UserCreditAuthCheck 当前担保人certType=" + certType);
+			if("Ent02".equals(certType)){
+				logger.info("UserCreditAuthCheck 当前担保人是法人【Ent02】，不参与签约校验！");
+				continue;
+			}
+			checkCredit = checkCreditAuth(projectNo, certid, creditAuthMap, transaction);
+			if(checkCredit){
+				//担保人未完成征信授权书签约
+				putMsg("担保人未完成征信授权书签约");
+				setPass(false);
+				return null;
+			}
+		}
+		// : 2021/7/15 共同申请人
+		BizObjectManager cftManager = JBOFactory.getBizObjectManager(CUSTOMER_FAMILY_TEMP.CLASS_NAME, transaction);
+		BizObject cft = cftManager.createQuery("flowunid=:flowUnid  and Partner_='Y' ").setParameter("flowUnid", flowunid).getSingleResult(false);
+		String certid = cft.getAttribute("certid").getString();
+		checkCredit = checkCreditAuth(projectNo, certid, creditAuthMap, transaction);
+		if(checkCredit){
+			//共同申请人未完成征信授权书签约
+			putMsg("共同申请人未完成征信授权书签约");
+			setPass(false);
+			return null;
+		}
+		putMsg("征信授权委托书已全部完成数字签约！");
+		setPass(true);
+		return null;
+	}
+
+	/**
+	 * 判断当前用户是否已签署：
+	 *         creditAuthMap.put("99001", "安鹏征信授权");
+	 *         creditAuthMap.put("99002", "邮储征信授权");
+	 *         creditAuthMap.put("99003", "邮储借款告知书");
+	 * @param projectNo
+	 * @param certId
+	 * @param creditAuthMap
+	 * @return
+	 */
+	private boolean checkCreditAuth(String projectNo, String certId, Map<String, String> creditAuthMap, Transaction transaction) throws Exception {
+		// : 2021/7/15 如果是申请人的话，则需要签3份 99001 99002 99003
+		for(String objectType : creditAuthMap.keySet()){
+			BizObjectManager bom = JBOFactory.getBizObjectManager(jbo.app.tenwa.doc.LB_DOCRELATIVE.CLASS_NAME);
+			BizObject  lbDocBiz = bom.createQuery("OBJECTTYPE=:objectType  and CUST_ID=:certId and PROJ_ID=:projectNo ")
+					.setParameter("objectType",objectType).setParameter("certId",certId).setParameter("projectNo",projectNo).getSingleResult(false);
+			if(null == lbDocBiz){
+				return true;
+			}
+			String lbDocBizId = lbDocBiz.getAttribute("id").toString();
+			BizObjectManager bom1 = JBOFactory.getBizObjectManager(jbo.app.tenwa.doc.LB_DOCLIBRARY.CLASS_NAME);
+			String lbDocLibraryId = bom1.createQuery("relative_id=:relative_id").setParameter("relative_id", lbDocBizId).getSingleResult(false).getAttribute("id").toString();
+			BizObjectManager bom2 = JBOFactory.getBizObjectManager(jbo.app.tenwa.doc.LB_DOCATTRIBUTE.CLASS_NAME);
+			String docAttributeId = bom2.createQuery("library_id=:library_id").setParameter("library_id", lbDocLibraryId).getSingleResult(false).getAttribute("id").toString();
+			BizObjectManager contBom = JBOFactory.getBizObjectManager(LB_DOC_CONTRACT_LIST.CLASS_NAME, transaction);
+			BizObject bo = contBom.createQuery("select singcontract_id,filename from O " +
+					" where attribute_id=:attributeId  and file_flag = 'yes' and sendprocess = '2' and sign_type = 'COMPLETE'").setParameter("attributeId", docAttributeId).getSingleResult(true);
+			if(null == bo){
+				return true;
+			}
+		}
+		return false;
+	}
+
+
+	/**
+	 * 如果是申请人的话，则需要签3份 99001 99002 99003
+	 * @return
+	 */
+	private Map<String, String> initApplicant(){
+		Map<String, String> creditAuthMap = new HashMap<>();
+		creditAuthMap.put("99001", "安鹏征信授权");
+		creditAuthMap.put("99002", "邮储征信授权");
+		creditAuthMap.put("99003", "邮储借款告知书");
+		return creditAuthMap;
+	}
+
+	private Map<String, String> initOther(){
+		Map<String, String> creditAuthMap = new HashMap<>();
+		creditAuthMap.put("99001", "安鹏征信授权");
+		return creditAuthMap;
+	}
+}
\ No newline at end of file

From 2f020b4d4a07e641e780448fa87e1efb65e6c486 Mon Sep 17 00:00:00 2001
From: ap007 <zhanglei@ap-leasing.com.cn>
Date: Tue, 20 Jul 2021 10:52:48 +0800
Subject: [PATCH 18/29] =?UTF-8?q?=E9=87=8D=E6=9E=84=E7=A7=9F=E9=87=91?=
 =?UTF-8?q?=E8=AE=A1=E5=88=92=E6=8B=B7=E8=B4=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/FileMailingMessage.java        |   2 +-
 .../comm/util/jboutil/DataOperatorUtil.java   |  11 +-
 .../tenwa/doc/action/DocListInitAction.java   |   6 +-
 .../CorpusSourceRentPlanCopy.java             | 219 +++++++++++-------
 4 files changed, 152 insertions(+), 86 deletions(-)

diff --git a/src_core/com/tenwa/comm/message/controller/FileMailingMessage.java b/src_core/com/tenwa/comm/message/controller/FileMailingMessage.java
index b10dc423e..774e594d3 100644
--- a/src_core/com/tenwa/comm/message/controller/FileMailingMessage.java
+++ b/src_core/com/tenwa/comm/message/controller/FileMailingMessage.java
@@ -25,7 +25,7 @@ public class FileMailingMessage extends BaseBussinessMessage {
     	messageManager.createQuery(" delete from O  where message_content='邮寄档案归档' ").executeUpdate();
 		
 		String sql = "SELECT COUNT(O.PROJECT_MANAGE) number,O.PROJECT_MANAGE PROJECT_MANAGE FROM LB_CONTRACT_INFO O LEFT JOIN LB_FILE_MAILARCHIVING_INFO lfi ON lfi.contract_id = O.id LEFT JOIN ORG_INFO oi ON oi.orgid = O.PROJECT_DEPT LEFT JOIN LC_CALC_CONDITION lcc ON lcc.contract_id = O.id WHERE (lfi.ALLHANDOVERSTATUS IS NULL  OR lfi.ALLHANDOVERSTATUS = 'part' OR lfi.ALLHANDOVERSTATUS = 'none') AND NOT EXISTS (SELECT 1 FROM LB_FILE_MAILARCHIVING_INFO_TEMP lfmit WHERE lfmit.contract_id = O.id AND lfmit.is_flowing = '0') AND EXISTS (SELECT 1 FROM LB_FILE_ARCHIVING_INFO lfai WHERE lfai.contract_id = O.id) GROUP BY O.PROJECT_MANAGE";
-		List<Map<String,String>> lciList=DataOperatorUtil.getDataBySql(sql, null);
+		List<Map<String,String>> lciList=DataOperatorUtil.getDataBySql(sql);
 
 		for(Map<String,String> lci : lciList){
 			Map<String,String>message=new HashMap<String,String>(); 
diff --git a/src_core/com/tenwa/comm/util/jboutil/DataOperatorUtil.java b/src_core/com/tenwa/comm/util/jboutil/DataOperatorUtil.java
index 91bef246a..b8fb2312f 100644
--- a/src_core/com/tenwa/comm/util/jboutil/DataOperatorUtil.java
+++ b/src_core/com/tenwa/comm/util/jboutil/DataOperatorUtil.java
@@ -563,7 +563,16 @@ public class DataOperatorUtil {
 	public static List<Map<String,String>> getDataBySql( String sql, Map<String,String> params ) throws Exception {
 		return getDataBySql( null, sql, params );
 	}
-
+	/**
+	 * 重构一个简便调用
+	 * @param sql
+	 * @param tx
+	 * @return
+	 * @throws Exception
+	 */
+	public static List<Map<String,String>> getDataBySql(String sql , JBOTransaction tx) throws Exception {
+		return getDataBySql( tx, sql, null );
+	}
 	/**
 	 * 再重构一个更简便调用
 	 * @param sql
diff --git a/src_core/com/tenwa/doc/action/DocListInitAction.java b/src_core/com/tenwa/doc/action/DocListInitAction.java
index 7790924bd..29985a290 100644
--- a/src_core/com/tenwa/doc/action/DocListInitAction.java
+++ b/src_core/com/tenwa/doc/action/DocListInitAction.java
@@ -461,7 +461,7 @@ public class DocListInitAction {
 		}
 		String sql = "SELECT FLOWNO FROM flow_catalog WHERE flowname='"
 				+ flowName + "'";
-		List<Map<String, String>> ds = DataOperatorUtil.getDataBySql( sql, null);
+		List<Map<String, String>> ds = DataOperatorUtil.getDataBySql( sql);
 		String flowno = GetValueByKey("docpreview.properties",
 				ds.get(0).get("FLOWNO"));
 		// 根据要求拖车申请是
@@ -584,7 +584,7 @@ public class DocListInitAction {
 	public static List<String> nextImageForMailDoc(String contract_id) throws Exception{
 		List<String> list = new ArrayList<String>();
 		String sql = "select lda.id attrid from lb_docrelative ldr left join lb_doclibrary ldl on ldl.RELATIVE_ID = ldr.id left join lb_docattribute lda on lda.LIBRARY_ID = ldl.ID where ldr.OBJECTTYPE = 'MortgageFileMailFlow' and contract_id = '"+contract_id+"' and lda.id is not null";
-		List<Map<String, String>> ds = DataOperatorUtil.getDataBySql( sql, null );
+		List<Map<String, String>> ds = DataOperatorUtil.getDataBySql( sql );
 		for(Map<String, String> map:ds){
 			list.add(map.get("attrid"));
 		}
@@ -593,7 +593,7 @@ public class DocListInitAction {
 	public static List<String> nextImageForMailHisDoc(String contract_id) throws Exception{
 		List<String> list = new ArrayList<String>();
 		String sql = "select lda.id attrid from lb_docrelative ldr left join lb_doclibrary ldl on ldl.RELATIVE_ID = ldr.id left join lb_docattribute lda on lda.LIBRARY_ID = ldl.ID where ldr.OBJECTTYPE IN ('BusinessApplyFlow','FundPaymentCarFlow','MortgageFileFlow') and proj_id = '"+contract_id+"' and lda.id is not null";
-		List<Map<String, String>> ds = DataOperatorUtil.getDataBySql( sql, null );
+		List<Map<String, String>> ds = DataOperatorUtil.getDataBySql( sql );
 		for(Map<String, String> map:ds){
 			list.add(map.get("attrid"));
 		}
diff --git a/src_tenwa/com/tenwa/lease/app/quartzmession/CorpusSourceRentPlanCopy.java b/src_tenwa/com/tenwa/lease/app/quartzmession/CorpusSourceRentPlanCopy.java
index 866ea24f5..ea2085575 100644
--- a/src_tenwa/com/tenwa/lease/app/quartzmession/CorpusSourceRentPlanCopy.java
+++ b/src_tenwa/com/tenwa/lease/app/quartzmession/CorpusSourceRentPlanCopy.java
@@ -2,29 +2,23 @@ package com.tenwa.lease.app.quartzmession;
 
 import com.amarsoft.are.jbo.*;
 import com.amarsoft.are.util.StringFunction;
-import com.amarsoft.awe.util.ASResultSet;
-import com.amarsoft.awe.util.SqlObject;
 import com.amarsoft.awe.util.Transaction;
 import com.base.util.QuartzUtil;
+import com.tenwa.comm.util.jboutil.DataOperatorUtil;
 import com.tenwa.reckon.executor.CreateTransactionExecutor;
 import jbo.app.tenwa.calc.LC_CALC_CONDITION;
 import jbo.app.tenwa.calc.LC_RENT_PLAN;
 import jbo.oti.FC_FILE_PUSH;
 import jbo.oti.FC_YC_FILE_REPAY_PLAN;
+import jbo.oti.LC_PROFIT_PLAN;
 import org.quartz.Job;
 import org.quartz.JobExecutionContext;
 import org.quartz.JobExecutionException;
 
 import java.math.BigDecimal;
-import java.sql.SQLException;
-
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-
-import java.util.Date;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 
 import static java.math.BigDecimal.ROUND_HALF_UP;
 
@@ -33,25 +27,7 @@ import static java.math.BigDecimal.ROUND_HALF_UP;
  */
 public class CorpusSourceRentPlanCopy implements Job {
 
-	Set<String> contractSet = null;
-	JBOTransaction tx = null;
-	Transaction Sqlca = null;
-	{
-		try {
-			tx = JBOFactory.createJBOTransaction();
-			Sqlca = Transaction.createTransaction(tx);
-		} catch (JBOException e) {
-			e.printStackTrace();
-			try {
-				if (Sqlca != null) {
-					Sqlca.rollback();
-				}
-			} catch (JBOException e1) {
-				e1.printStackTrace();
-			}
-		}
-	}
-
+	private String contractId;
 
 	@Override
 	public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
@@ -62,7 +38,13 @@ public class CorpusSourceRentPlanCopy implements Job {
 
 		BizObjectManager ffpBom = null;
 		BizObjectManager fyfrpBom = null;
+
+		JBOTransaction tx = null;
+		Transaction Sqlca = null;
+
 		try {
+			tx = JBOFactory.createJBOTransaction();
+			Sqlca = Transaction.createTransaction(tx);
 			ffpBom = JBOFactory.getBizObjectManager(FC_FILE_PUSH.CLASS_NAME,tx);
 			fyfrpBom = JBOFactory.getBizObjectManager(FC_YC_FILE_REPAY_PLAN.CLASS_NAME,tx);
 			//todo 添加渠道商的选择，哪些需要拷表哪些不需要
@@ -72,11 +54,17 @@ public class CorpusSourceRentPlanCopy implements Job {
 				//1.更新租金计划租金信息，并获取每个文件的contract_id
 				String sql = "select fr.CONTRACT_ID,O.LEND_TERM,O.ANS_REPAYMENT_DATE,O.ANS_PRINCIPAL,O.ANS_INTEREST,ANS_REPAYMENT_MONEY from O left join jbo.oti.FC_REQUEST fr on O.FC_REQUEST_ID=fr.ID where fr.DEL_FLAG='0' and O.FC_FILE_ID=:fcFileId";
 				List<BizObject> fyfrpBoList = fyfrpBom.createQuery(sql).setParameter("fcFileId",fcFileId).getResultList(false);
-				contractSet = this.updateRentPlan(fyfrpBoList);
-				//2.更新租金计划剩余本金
-				updateAllRemainCorpus();
-				//3.更新租金计划分润信息
-				updateSplitSP();
+
+				Set<String> contractSet = this.updateRentPlan(fyfrpBoList,tx);
+				for(String contractId : contractSet){
+					Map<String,String> param= this.getParamByContractId(contractId,tx);
+					//2.更新租金计划剩余本金
+					this.updateAllRemainCorpus(contractId,tx);
+					//3.更新租金计划分润信息
+					this.updateSplitSP(param,Sqlca);
+					//4.插入分润计划
+					this.insertProfitPlan(param,tx);
+				}
 				ffpBo.setAttributeValue("FILE_STS","3");
 				ffpBo.setAttributeValue("FILE_STS_DESC","拷贝成功");
 				ffpBom.saveObject(ffpBo);
@@ -105,10 +93,10 @@ public class CorpusSourceRentPlanCopy implements Job {
 	 * @throws JBOException
 	 * @throws ParseException
 	 */
-	public Set<String> updateRentPlan(List<BizObject> fyfrpBoList) throws JBOException, ParseException {
+	public Set<String> updateRentPlan(List<BizObject> fyfrpBoList,JBOTransaction tx) throws JBOException, ParseException {
 		BizObjectManager lrpBom = null;
 		lrpBom = JBOFactory.getBizObjectManager(LC_RENT_PLAN.CLASS_NAME,tx);
-		contractSet = new HashSet<>();
+		Set<String> contractSet = new HashSet<>();
 		//更新租金计划表
 		for(BizObject bo : fyfrpBoList){
 			//获取参数
@@ -141,73 +129,142 @@ public class CorpusSourceRentPlanCopy implements Job {
 	 * 更新剩余本金信息
 	 * @throws JBOException
 	 */
-	public void updateAllRemainCorpus() throws JBOException {
+	public void updateAllRemainCorpus(String contractId,JBOTransaction tx) throws JBOException {
 		BizObjectManager lrpBom = null;
 		lrpBom = JBOFactory.getBizObjectManager(LC_RENT_PLAN.CLASS_NAME,tx);
 		BizObjectManager lccBom = null;
 		lccBom = JBOFactory.getBizObjectManager(LC_CALC_CONDITION.CLASS_NAME,tx);
-		//根据contractId遍历循环来更新租金计划表中剩余本金字段
-		for(String contractId : contractSet){
-			BizObject lccBo = lccBom.createQuery("select CLEAN_LEASE_MONEY from O where contract_id=:contractId").setParameter("contractId",contractId).getSingleResult(false);
-			String clean_lease_money = lccBo.getAttribute("CLEAN_LEASE_MONEY").toString();
-			BigDecimal cleanLeaseMoneyBd = new BigDecimal(clean_lease_money);
-			List<BizObject> lrpBos= lrpBom.createQuery("contract_id=:contractId order by plan_list").setParameter("contractId",contractId).getResultList(true);
-			for(BizObject bo :lrpBos){
-				String corpus = bo.getAttribute("corpus").toString();
-				BigDecimal corpusBd = new BigDecimal(corpus);
-				cleanLeaseMoneyBd = cleanLeaseMoneyBd.subtract(corpusBd).setScale(2,ROUND_HALF_UP);
-				bo.setAttributeValue("ALL_REMAIN_CORPUS",cleanLeaseMoneyBd.toString());
-				lrpBom.saveObject(bo);
-			}
 
+		BizObject lccBo = lccBom.createQuery("select CLEAN_LEASE_MONEY from O where contract_id=:contractId").setParameter("contractId",contractId).getSingleResult(false);
+		String clean_lease_money = lccBo.getAttribute("CLEAN_LEASE_MONEY").toString();
+		BigDecimal cleanLeaseMoneyBd = new BigDecimal(clean_lease_money);
+		List<BizObject> lrpBos= lrpBom.createQuery("contract_id=:contractId order by plan_list").setParameter("contractId",contractId).getResultList(true);
+		for(BizObject bo :lrpBos){
+			String corpus = bo.getAttribute("corpus").toString();
+			BigDecimal corpusBd = new BigDecimal(corpus);
+			cleanLeaseMoneyBd = cleanLeaseMoneyBd.subtract(corpusBd).setScale(2,ROUND_HALF_UP);
+			bo.setAttributeValue("ALL_REMAIN_CORPUS",cleanLeaseMoneyBd.toString());
+			lrpBom.saveObject(bo);
 		}
 	}
 
+	/**
+	 * 更新剩余本金信息
+	 * @throws JBOException
+	 */
+	public void updateAllRemainCorpus(JBOTransaction tx) throws JBOException {
+		this.updateAllRemainCorpus(contractId,tx);
+	}
+
 	/**
 	 * 更新分润信息
 	 * @throws Exception
 	 */
-	public void updateSplitSP() throws Exception {
+	public void updateSplitSP(Map<String,String> param,Transaction Sqlca) throws Exception {
 
-		for(String contractId : contractSet) {
-			String sql = "select lci.product_id,lci.distributor_id,lcc.payment_number from lb_contract_info lci left join lc_calc_condition lcc on lci.id=lcc.contract_id where lci.id='" + contractId + "'";
-			SqlObject sqlBo = null;
-			String productId = null;
-			String distributorId = null;
-			String paymentNumber = null;
-			ASResultSet rs = null;
+		String splittingRatio = param.get("splittingRatio");
+		//必须的判断条件（配置了灵活分润的产品可能没有配置分润）
+		// 判断顺序，是否分润--》是否灵活分润
+		//是否灵活分润在insertRentPlan_SP（）方法中判断
+		if (!"".equals(splittingRatio) && splittingRatio != null) {
+			String paymentNumber = param.get("paymentNumber");
+			String splitType = param.get("splitType");
+			CreateTransactionExecutor cre = new CreateTransactionExecutor();
+			cre.setPlannumber(paymentNumber);
+			cre.insertRentPlan_SP(splittingRatio, Sqlca, splitType);
+		}
+
+	}
+
+	/**
+	 * 更新分润信息
+	 * @throws Exception
+	 */
+	public void updateSplitSP(JBOTransaction tx)  {
+		Transaction Sqlca = null;
+		try {
+			Sqlca = Transaction.createTransaction(tx);
+			Map<String,String> param = this.getParamByContractId(contractId,tx);
+			this.updateSplitSP(param,Sqlca);
+		} catch (JBOException e) {
+			e.printStackTrace();
+		} catch (Exception e) {
+			e.printStackTrace();
+		}finally {
 			try {
-				sqlBo = new SqlObject(sql);
-				rs = Sqlca.getASResultSet(sqlBo);
-				if ( rs.next() ) {
-					productId = rs.getString( "product_id" );
-					distributorId = rs.getString( "distributor_id" );
-					paymentNumber = rs.getString( "payment_number" );
-					String splitType = Sqlca.getString("select attribute5 from business_type where typeno = '" + productId + "'");
-					String splittingRatio = Sqlca.getString("select splitting_ratio from lb_splitting_ratio where distributor_id='" + distributorId + "' and product_id='" + productId + "'");
-					if (!"".equals(splittingRatio) && splittingRatio != null) {
-						CreateTransactionExecutor cre = new CreateTransactionExecutor();
-						cre.setPlannumber(paymentNumber);
-						cre.insertRentPlan_SP(splittingRatio, Sqlca, splitType);
-					}
+				if (Sqlca != null) {
+					Sqlca.rollback();
 				}
-
-			} catch (SQLException throwables) {
-				throwables.printStackTrace();
-			}finally {
-				rs.close();
+			} catch (JBOException e1) {
+				e1.printStackTrace();
 			}
-
 		}
 	}
 
-
-	public Set<String> getContractSet() {
-		return contractSet;
+	/**
+	 * 获取每个合同的参数
+	 * @return
+	 * @throws Exception
+	 */
+	public Map<String,String> getParamByContractId(String contractId,JBOTransaction tx) throws Exception {
+		String sql = "select * from vi_corpus_source_param where contractId='" + contractId + "'";
+		List<Map<String,String>> data = DataOperatorUtil.getDataBySql(sql,tx);
+		return data.get(0);
 	}
 
-	public void setContractSet(Set<String> contractSet) {
-		this.contractSet = contractSet;
+	/**
+	 * 获取每个合同的参数
+	 * @return
+	 * @throws Exception
+	 */
+	public Map<String,String> getParamByContractId(JBOTransaction tx) throws Exception {
+		return this.getParamByContractId(contractId,tx);
+	}
+
+	/**
+	 * 插入分润计划
+	 * @param param
+	 * @throws JBOException
+	 */
+	public void insertProfitPlan(Map<String,String> param,JBOTransaction tx) throws JBOException {
+		BizObjectManager lppBom = null;
+		lppBom = JBOFactory.getBizObjectManager(LC_PROFIT_PLAN.CLASS_NAME,tx);
+		BizObjectManager lrpBom = null;
+		lrpBom = JBOFactory.getBizObjectManager(LC_RENT_PLAN.CLASS_NAME,tx);
+		BizObject lppBo = null;
+		String paymentNumber = param.get("paymentNumber");
+		List<BizObject> lrpBos = lrpBom.createQuery("PAYMENT_NUMBER=:paymentNumber order by plan_list").setParameter("paymentNumber",paymentNumber).getResultList(false);
+		for(BizObject bo :lrpBos){
+			String rentPlanId = bo.getAttribute("ID").toString();
+			String interest = bo.getAttribute("INTEREST").toString();
+			String yearRate = bo.getAttribute("YEAR_RATE").toString();
+			String corpusSourceRate = param.get("corpusSourceRate");
+			String profit = new BigDecimal(yearRate).subtract(new BigDecimal(corpusSourceRate)).divide(new BigDecimal(yearRate),6,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(interest)).setScale(2,BigDecimal.ROUND_HALF_UP).toString();
+			lppBo = lppBom.newObject();
+			lppBo.setAttributeValue("rent_plan_id",rentPlanId);
+			lppBo.setAttributeValue("profit",profit);
+			lppBo.setAttributeValue("inputtime",StringFunction.getTodayNow());
+			lppBom.saveObject(lppBo);
+		}
+
+	}
+
+	/**
+	 * 插入分润计划
+	 * @param tx
+	 * @throws JBOException
+	 */
+	public void insertProfitPlan(JBOTransaction tx) throws Exception {
+		Map<String,String> param = this.getParamByContractId(contractId,tx);
+		this.insertProfitPlan(param,tx);
+	}
+
+	public String getContractId() {
+		return contractId;
+	}
+
+	public void setContractId(String contractId) {
+		this.contractId = contractId;
 	}
 
 }

From dd84040679e203d323cad0f67e540835e9d922de Mon Sep 17 00:00:00 2001
From: zhanglei <zhanglei@ap-leasing.com.cn>
Date: Tue, 20 Jul 2021 16:11:12 +0800
Subject: [PATCH 19/29] =?UTF-8?q?yc=E5=BE=81=E4=BF=A1=E6=8E=88=E6=9D=83?=
 =?UTF-8?q?=E7=94=B5=E5=AD=90=E7=AD=BE=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=E6=89=B9=E9=87=8F-=E9=80=BB=E8=BE=91=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Tenwa/alpha/creditAuth/creditAuthList.jsp | 423 ++++++++++++++++++
 WebContent/WEB-INF/etc/jbo/jbo_customer.xml   |  16 +
 .../alpha/CreditAuthActionNewUtils.java       |  16 +-
 .../action/alpha/DocListCreditAuth.java       |  16 +-
 .../VI_LB_IDENTITY_CHECK_CREDITAUTH_LOAN.java |  43 ++
 5 files changed, 504 insertions(+), 10 deletions(-)
 create mode 100644 WebContent/Tenwa/alpha/creditAuth/creditAuthList.jsp
 create mode 100644 src_jbo/jbo/app/tenwa/customer/VI_LB_IDENTITY_CHECK_CREDITAUTH_LOAN.java

diff --git a/WebContent/Tenwa/alpha/creditAuth/creditAuthList.jsp b/WebContent/Tenwa/alpha/creditAuth/creditAuthList.jsp
new file mode 100644
index 000000000..687d10182
--- /dev/null
+++ b/WebContent/Tenwa/alpha/creditAuth/creditAuthList.jsp
@@ -0,0 +1,423 @@
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_simplelist.jspf"%><%
+	/*
+        Author: undefined 2020-04-30
+        Content: 
+        History Log: 
+    */
+    String sFlowUnid = CurPage.getParameter("FlowUnid");//流程编号
+	String SubjectId = CurPage.getParameter("SubjectId");//主体编号
+	String userId = CurUser.getUserID();
+	String projectNo = Sqlca.getString("select PROJECT_NO from lb_project_info_temp where FLOWUNID='"+sFlowUnid+"'");
+    System.out.println("征信授权书 projectNo=" + projectNo);
+    String flowno = Sqlca.getString("select flowno from flow_object where objectno='"+sFlowUnid+"'");
+
+    System.out.println("征信授权书 flowno=" + flowno);
+    String flag = "false";
+    String sTempletNo= "creditAuthList";
+    String projectId = null;
+    if("BusinessApplyFlow".equals(flowno)){//业务申请BusinessApplyFlow
+        System.out.println("征信授权书 业务申请 flowno=" + flowno);
+    }else {
+        System.out.println("征信授权书 非业务申请 flowno=" + flowno);
+        if(null == projectNo || "".equals(projectNo)){
+            projectId = Sqlca.getString("select proj_id from flow_bussiness_object where flow_unid='"+sFlowUnid+"'");
+        }else {
+            projectId = Sqlca.getString("select ID from lb_project_info where PROJECT_NO='"+projectNo+"'");
+        }
+        System.out.println("征信授权书 非业务申请 projectId=" + projectId);
+        sTempletNo= "creditAuthListLoan";
+    }
+    ASObjectModel doTemp = new ASObjectModel(sTempletNo);
+    ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
+    dwTemp.Style="1";      	     //--设置为Grid风格--
+    dwTemp.ReadOnly = "1";	 //只读模式
+    dwTemp.MultiSelect=true; //多选
+    dwTemp.setPageSize(10);
+    if("BusinessApplyFlow".equals(flowno)){//业务申请BusinessApplyFlow
+        dwTemp.genHTMLObjectWindow(sFlowUnid);
+        System.out.println("征信授权书 业务申请 flowno=" + flowno);
+        dwTemp.MultiSelect=true; //多选
+        if(CurUser.hasRole("401")){
+            flag = "true";
+        }
+    }else {
+        dwTemp.genHTMLObjectWindow(projectId);
+    }
+	//0、是否展示 1、	权限控制  2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码	6、	7、	8、	9、图标，CSS层叠样式 10、风格
+	String sButtons[][] = {
+		{flag,"All","Button","生成征信授权书","生成征信授权书","createCreditPdf()","","","","btn_icon_generate",""},
+		{flag,"All","Button","发起电子签约","发起电子签约","signOnLine()","","","","btn_icon_generate",""},
+		{flag,"All","Button","查看签约状态","查看签约状态","getStatus()","","","","btn_icon_detail",""},
+		{flag,"All","Button","重发签约短信","重发签约短信","sendMessageAgain()","","","","btn_icon_refresh",""},
+	};
+%><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
+<script type="text/javascript">
+	$(document).ready(function(){
+		for(var i=0;i<getRowCount(0);i++){
+			$("#DIV_Data_myiframe0_"+i+"_4").css("color","Blue");
+		}
+	})
+	function showPDF(filePath,name){
+		var sUrl="/Ample/Doc/showPDF.jsp";
+		var param="filePath="+filePath;
+		AsControl.OpenPage(sUrl,param,"",name);
+	}
+	function downloadFile(filePath,fileName){
+		if(!frames["downloadTemplate"]) $("<iframe name='downloadTemplate' style='display:none;'></iframe>").appendTo("body");
+		var src = sWebRootPath+"/servlet/view/docDownloadServletByPath?CompClientID=<%=sCompClientID%>&filePath="+encodeURIComponent(encodeURIComponent(filePath))+"&fileName="+encodeURIComponent(encodeURIComponent(fileName));
+		window.open(src, "downloadTemplate");
+	}
+	function afterSearch(){
+		for(var i=0;i<getRowCount(0);i++){
+			var filelist=getObj(0,i,"fileList").innerHTML;
+			var obj=eval('('+filelist+')');
+			var html="";
+			for(var file in obj){
+				html+='<a onclick=downloadFile(\''+obj[file]['filepath']+'\',\''+obj[file]['filename']+'\')><font color="blue">'+obj[file]['filename']+'</font></a>';
+				html+='【上传时间:'+obj[file]['inputtime']+'】';
+				// if(obj[file]['pdf']=="true"){
+				// 	html+='<a class="btn_icon btn_icon_search" onclick="showPDF(\''+obj[file]['filepath']+'\',\''+obj[file]['filename']+'\');">&nbsp;</a>';
+				// }
+				html+='</br>';
+			}
+			getObj(0,i,"fileList").innerHTML=html;
+			getObj(0,i,"fileList").style["white-space"]="pre-wrap";
+
+		}
+	}
+
+	<%--//在加载完表格后调用--%>
+	<%--function afterSearch(){--%>
+		<%--for(var i=0;i<getRowCount(0);i++){--%>
+			<%--var html="";--%>
+			<%--html+='<a onclick=downloadFile(\''+getItemValue(0,i,"ID")+'\')><font color="blue">'+"下载&nbsp&nbsp&nbsp&nbsp&nbsp"+'</font></a>';--%>
+			<%--getObj(0,i,"FILENAME").innerHTML=html+'<font >'+getObj(0,i,"FILENAME").innerHTML+'</font>';--%>
+		<%--}--%>
+	<%--}--%>
+	<%--function downloadFile(id){--%>
+		<%--if(typeof(id)==undefined || id=='') {--%>
+			<%--alert("请先生成征信授权书再下载！");--%>
+			<%--return;--%>
+		<%--}--%>
+		<%--if(!frames["downloadTemplate"]) $("<iframe name='downloadTemplate' style='display:none;'></iframe>").appendTo("body");--%>
+		<%--window.open(sWebRootPath+"/servlet/view/docDownloadServlet?CompClientID=<%=sCompClientID%>&sqlString=save@"+id, "downloadTemplate");--%>
+	<%--}--%>
+
+	function createCreditPdf(){
+		var fullNames=getItemValueArray(0,"fullName");
+		var certIds=getItemValueArray(0,"certId");
+		var phones=getItemValueArray(0,"phone");
+		var creditauths=getItemValueArray(0,"creditauth");
+		var credittypes=getItemValueArray(0,"credittype");
+		var relations=getItemValueArray(0,"relation");
+        var signTypes=getItemValueArray(0,"sign_type");
+        var sendProcessList=getItemValueArray(0,"sendprocess");
+		var projectNo = "<%=projectNo%>";
+		var flowunid = "<%=sFlowUnid%>";
+		if(typeof(relations)=="undefined"||relations==null||relations==""){alert("请选择");return;}
+		var number = 0;
+		for(var i=0; i < relations.length;i++) {
+			var signType = signTypes[i];
+			var sendProcess = sendProcessList[i];
+			//什么情况下，可以生成合同文件，
+            if("SIGNING" == signType || "COMPLETE" == signType || "1" == sendProcess){
+                alert(relation+": " + fullName + " 对应签约状态和发送状态，不符合生成征信授权pdf文件要求。");
+                return;
+            }
+		}
+		for(var i=0; i < relations.length;i++) {
+			var fullName = fullNames[i];
+			var certId = certIds[i];
+			var phone = phones[i];
+			var creditauth = creditauths[i];
+			var credittype = credittypes[i];
+			var relation = relations[i];
+			var objectType = credittype;
+			var param = {};
+			var tempParam = {};
+			var sparam = "";
+			if ("担保人" == relation) {
+				var checkCreditAuth = RunJavaMethodTrans("com.tenwa.channelportal.action.alpha.CreditAuthDeleteAction", "checkCreditAuth", "flowUnid=" + flowunid);
+				if ("" == checkCreditAuth || "Ent02" == checkCreditAuth) {
+					if(1==relations.length){
+						alert("当前担保人类型不支持线上签约！");
+						return;
+					}else {
+						number++;
+						continue;
+					}
+				}
+			}
+			//模板号 征信授权书_安鹏
+			var tempId = "65b12cbfd98611eb970e00163e0ad612";
+			/**creditauth
+			 *
+			 征信授权书_安鹏 99001
+			 征信授权书_邮储 99002
+			 借款服务确认书_邮储99003
+			 */
+			if ("申请人" == relation && "征信授权书_邮储" == creditauth) {
+				tempId = "65bd277ad98611eb970e00163e0ad612";//申请人的情况下，征信授权书_邮储
+			} else if ("申请人" == relation && "借款服务确认书_邮储" == creditauth) {
+				tempId = "134f3d88e2f811eb970e00163e0ad612";//申请人的情况下，借款服务确认书_邮储
+			}
+			//生成文件关联关系
+			param["templateNo"] = tempId;//申请人多个模板时，需修改模板信息
+			tempParam["OBJECTTYPE"] = objectType;//申请人多个模板时，需修改模板信息
+			tempParam["insurance_no"] = flowunid;
+			tempParam["contract_no"] = certId;
+			tempParam["contract_id"] = "<%=projectNo%>";
+			tempParam["project_id"] = "<%=projectNo%>";
+			tempParam["PROJ_ID"] = "<%=projectNo%>";//注意变量名，不要改
+			tempParam["CONTRACT_ID"] = "<%=projectNo%>";//注意变量名，不要改
+			tempParam["CUST_ID"] = certId;//注意变量名，不要改
+			tempParam["PLAN_NUMBER"] = phone;//注意变量名，不要改
+			tempParam["customername"] = fullName;
+			//生成模板固定参数
+			tempParam["CurUserId"] = "<%=CurUser.getUserID()%>";
+			tempParam["CurOrgId"] = "<%=CurUser.getOrgID()%>";
+			tempParam["fileSavePath"] = "<%=CurConfig.getConfigure("FileSavePath")%>";
+
+			/**
+			 征信授权书_安鹏 99001
+			 征信授权书_邮储 99002
+			 借款服务确认书_邮储99003
+			 */
+			if("申请人" == relation){
+				//目前征信授权，算上邮储一共3个模板
+				var relationApplyCount = 3;
+				for(var i=0; i < relationApplyCount; i++ ){
+					if(i == 1){
+						//征信授权书_邮储 99002
+						objectType="99002";
+						tempId = "65bd277ad98611eb970e00163e0ad612";//申请人的情况下，征信授权书_邮储
+						param["templateNo"] = tempId;
+						tempParam["OBJECTTYPE"] = objectType;
+					}else if(i == 2){
+						//借款服务确认书_邮储 99003
+						objectType="99003";
+						tempId = "134f3d88e2f811eb970e00163e0ad612";//申请人的情况下，借款服务确认书_邮储
+						param["templateNo"] = tempId;
+						tempParam["OBJECTTYPE"] = objectType;
+					}
+					param["templateParam"] = JSON.stringify(tempParam).replace(/,/g, "@");//生成模板的参数据
+					for (var key in param) {
+						if (sparam.length > 0) {
+							sparam += ",";
+						}
+						sparam += key + "=" + param[key];
+					}
+					var deleteresult = RunJavaMethodTrans("com.tenwa.channelportal.action.alpha.CreditAuthDeleteAction", "deleteCreditAuth", "certId=" + certId + ",projectNo=" + projectNo + ",objectType=" + objectType);
+					var result = RunJavaMethodTrans("com.tenwa.officetempalte.action.CreateOfficeAction", "createOfficeByTemplate", sparam);
+					// word转pdf
+					var id = RunJavaMethodTrans("com.tenwa.channelportal.action.alpha.CreditAuthSignAction", "wordToPdfCreditAuth",
+							"projectNo=" + projectNo + ",operationType=" + objectType
+							+ ",fullName=" + fullName + ",certId=" + certId + ",phone=" + phone + ",flowUnid=" + flowunid);
+					if (typeof (id) == "undefined" || id.length <= 0 || id == "") {
+						RunJavaMethodTrans("com.tenwa.channelportal.action.alpha.CreditAuthDeleteAction", "deleteCreditAuth", "certId=" + certId + ",projectNo=" + projectNo + ",objectType=" + objectType);
+						alert("征信授权文件生成失败！！！");
+						return;
+					}
+					if(i == 0){
+						if (typeof (id) == "undefined" || id.length <= 0 || id == "") {
+							RunJavaMethodTrans("com.tenwa.channelportal.action.alpha.CreditAuthDeleteAction", "deleteCreditAuth", "certId=" + certId + ",projectNo=" + projectNo + ",objectType=" + objectType);
+						}else {
+							number++;
+						}
+					}
+				}
+			}else {
+				param["templateParam"] = JSON.stringify(tempParam).replace(/,/g, "@");//生成模板的参数据
+				for (var key in param) {
+					if (sparam.length > 0) {
+						sparam += ",";
+					}
+					sparam += key + "=" + param[key];
+				}
+				var deleteresult = RunJavaMethodTrans("com.tenwa.channelportal.action.alpha.CreditAuthDeleteAction", "deleteCreditAuth", "certId=" + certId + ",projectNo=" + projectNo + ",objectType=" + objectType);
+				var result = RunJavaMethodTrans("com.tenwa.officetempalte.action.CreateOfficeAction", "createOfficeByTemplate", sparam);
+				// word转pdf
+				var id = RunJavaMethodTrans("com.tenwa.channelportal.action.alpha.CreditAuthSignAction", "wordToPdfCreditAuth",
+						"projectNo=" + projectNo + ",operationType=" + objectType
+						+ ",fullName=" + fullName + ",certId=" + certId + ",phone=" + phone + ",flowUnid=" + flowunid);
+				if (typeof (id) == "undefined" || id.length <= 0 || id == "") {
+					RunJavaMethodTrans("com.tenwa.channelportal.action.alpha.CreditAuthDeleteAction", "deleteCreditAuth", "certId=" + certId + ",projectNo=" + projectNo + ",objectType=" + objectType);
+				} else {
+					number++;
+				}
+			}
+		}
+		if(relations.length==0){
+			alert("请先选择数据！！！");
+			return;
+		}else if(number==0){
+			alert("生成失败！！！");
+		}else if(number==relations.length){
+			alert("生成成功！！！");
+		}else{
+			alert("部分生成成功！！！");
+		}
+		reloadSelf();
+	}
+
+
+	/**
+	 * 发起电子签约
+	 */
+	function signOnLine(){
+		var fullNames=getItemValueArray(0,"fullName");
+		var certIds=getItemValueArray(0,"certId");
+		var phones=getItemValueArray(0,"phone");
+		var creditauths=getItemValueArray(0,"creditauth");
+		var credittypes=getItemValueArray(0,"credittype");
+		var relations=getItemValueArray(0,"relation");
+		var signTypes=getItemValueArray(0,"sign_type");
+		var sendProcessList=getItemValueArray(0,"sendprocess");
+		var attributeIds=getItemValueArray(0,"ID");
+		var projectNo = "<%=projectNo%>";
+		var flowunid = "<%=sFlowUnid%>";
+		if(typeof(relations)=="undefined"||relations==null||relations==""){alert("请选择");return;}
+		for(var i=0; i < relations.length;i++) {
+			var relation = relations[i];
+			var fullName = fullNames[i];
+			var signType = signTypes[i];
+			var sendProcess = sendProcessList[i];
+			//只有签约状态为：草稿，发送状态为：未发送，才可以发起电子签约。
+			if("DRAFT" != signType || "0" != sendProcess){
+				alert(relation+": " + fullName + " 对应签约状态和发送状态，不符合发起电子签约要求。");
+				return;
+			}
+		}
+		var number = 0;
+		for(var i=0; i < relations.length;i++) {
+			var fullName = fullNames[i];
+			var signType = signTypes[i];
+			var certId = certIds[i];
+			var phone = phones[i];
+			var creditauth = creditauths[i];
+			var credittype = credittypes[i];
+			var relation = relations[i];
+			var attributeId = attributeIds[i];
+			var objectType = credittype;
+			var operationType = objectType;
+			//自然人电子签约
+			var sReturn = RunJavaMethodTrans("com.tenwa.channelportal.action.alpha.CreditAuthActionNewUtils", "signIng",
+					"attributeId=" + attributeId + ",projectNo=" + projectNo + ",operationType=" + objectType + ",relation=" + relation
+					+ ",fullName=" + fullName + ",certId=" + certId + ",phone=" + phone + ",flowUnid=" + flowunid + ",creditauth=" + credittype);
+
+			if("success" == sReturn) {
+				number++;
+			}
+		}
+		if(relations.length==0){
+			alert("请先选择数据！！！");
+			return;
+		}else if(number==0){
+			alert("发起电子签约失败！！！");
+		}else if(number==relations.length){
+			alert("发起电子签约成功！！！");
+		}else{
+			alert("部分发起电子签约成功！！！");
+		}
+		location.reload();
+	}
+
+	//查询电子签约状态
+	function getStatus(){
+		var fullNames=getItemValueArray(0,"fullName");
+		var certIds=getItemValueArray(0,"certId");
+		var phones=getItemValueArray(0,"phone");
+		var creditauths=getItemValueArray(0,"creditauth");
+		var credittypes=getItemValueArray(0,"credittype");
+		var relations=getItemValueArray(0,"relation");
+		var signTypes=getItemValueArray(0,"sign_type");
+		var sendProcessList=getItemValueArray(0,"sendprocess");
+		var attributeIds=getItemValueArray(0,"ID");
+		var projectNo = "<%=projectNo%>";
+		var flowunid = "<%=sFlowUnid%>";
+		if(typeof(relations)=="undefined"||relations==null||relations==""){alert("请选择");return;}
+		for(var i=0; i < relations.length;i++) {
+			var relation = relations[i];
+			var fullName = fullNames[i];
+			var signType = signTypes[i];
+			var sendProcess = sendProcessList[i];
+			//只有签约状态为：草稿，发送状态为：未发送，才可以发起电子签约。
+			if("SIGNING" != signType || "1" != sendProcess){
+				alert(relation+": " + fullName + " 请先发起电子签约。");
+				return;
+			}
+		}
+		var number = 0;
+		var resMsg = "";
+		for(var i=0; i < relations.length;i++) {
+			var fullName = fullNames[i];
+			var signType = signTypes[i];
+			var certId = certIds[i];
+			var phone = phones[i];
+			var creditauth = creditauths[i];
+			var credittype = credittypes[i];
+			var relation = relations[i];
+			var attributeId = attributeIds[i];
+			var objectType = credittype;
+			var operationType = objectType;
+			var sReturn = RunJavaMethodTrans("com.tenwa.channelportal.action.alpha.CreditAuthActionNewUtils", "contractSignStatus",
+					"attributeId=" + attributeId + ",projectNo=" + projectNo + ",operationType=" + objectType + ",relation=" + relation
+					+ ",fullName=" + fullName + ",certId=" + certId + ",phone=" + phone + ",flowUnid=" + flowunid);
+			resMsg += relation + "：" + fullName +  "：" + sReturn + "；";
+		}
+		AsDebug.showMessage("提示",resMsg,"","",true,'','','',function(){
+			window.location.reload();
+		});
+	}
+
+
+	//重新发送短信
+	function sendMessageAgain(){
+		var fullNames=getItemValueArray(0,"fullName");
+		var certIds=getItemValueArray(0,"certId");
+		var phones=getItemValueArray(0,"phone");
+		var creditauths=getItemValueArray(0,"creditauth");
+		var credittypes=getItemValueArray(0,"credittype");
+		var relations=getItemValueArray(0,"relation");
+		var signTypes=getItemValueArray(0,"sign_type");
+		var sendProcessList=getItemValueArray(0,"sendprocess");
+		var attributeIds=getItemValueArray(0,"ID");
+		var projectNo = "<%=projectNo%>";
+		var flowunid = "<%=sFlowUnid%>";
+		if(typeof(relations)=="undefined"||relations==null||relations==""){alert("请选择");return;}
+		for(var i=0; i < relations.length;i++) {
+			var relation = relations[i];
+			var fullName = fullNames[i];
+			var signType = signTypes[i];
+			var sendProcess = sendProcessList[i];
+			//只有签约状态为：草稿，发送状态为：未发送，才可以发起电子签约。
+			if("SIGNING" != signType || "1" != sendProcess){
+				alert(relation+": " + fullName + " 请先发起电子签约。");
+				return;
+			}
+		}
+		var number = 0;
+		var resMsg = "";
+		for(var i=0; i < relations.length;i++) {
+			var fullName = fullNames[i];
+			var signType = signTypes[i];
+			var certId = certIds[i];
+			var phone = phones[i];
+			var creditauth = creditauths[i];
+			var credittype = credittypes[i];
+			var relation = relations[i];
+			var attributeId = attributeIds[i];
+			var objectType = credittype;
+			var operationType = objectType;
+			var sReturn = RunJavaMethodTrans("com.tenwa.channelportal.action.alpha.CreditAuthActionNewUtils", "sendMessageAgain",
+					"attributeId=" + attributeId + ",projectNo=" + projectNo + ",operationType=" + objectType + ",relation=" + relation
+					+ ",fullName=" + fullName + ",certId=" + certId + ",phone=" + phone + ",flowUnid=" + flowunid);
+			resMsg += relation + "：" + fullName +  "：" + sReturn + "；";
+		}
+		AsDebug.showMessage("提示",resMsg,"","",true,'','','',function(){
+			window.location.reload();
+		});
+	}
+</script>
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/etc/jbo/jbo_customer.xml b/WebContent/WEB-INF/etc/jbo/jbo_customer.xml
index cd921e831..e0f7fa634 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_customer.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_customer.xml
@@ -2756,6 +2756,22 @@
 				</managerProperties>
 			</manager>
 		</class>
+		<class name="VI_LB_IDENTITY_CHECK_CREDITAUTH_LOAN" label="韬唤鏍￠獙瑙嗗浘琛�" keyAttributes="">
+			<attributes>
+				<attribute name="fullName" label="濮撳悕" type="STRING"/>
+				<attribute name="certId" label="韬唤璇佺紪鍙�" type="STRING"/>
+				<attribute name="relation" label="韬唤" type="STRING"/>
+				<attribute name="flowunid" label="娴佺▼缂栧彿" type="STRING"/>
+				<attribute name="phone" label="鐢佃瘽鍙�" type="STRING"/>
+				<attribute name="creditauth" label="鎺堟潈妯℃澘鍚嶇О" type="STRING"/>
+				<attribute name="credittype" label="鎺堟潈妯℃澘绫诲瀷" type="STRING"/>
+			</attributes>
+			<manager>
+				<managerProperties>
+					<property name="table" value="vi_lb_identity_check_creditauth_loan" />
+				</managerProperties>
+			</manager>
+		</class>
 		<class name="LB_CAR_CREDIT_PERSONAL_INFO_TEMP" label="涓汉椋庨櫓淇℃伅琛�" keyAttributes="ID">
 			<attributes>
 				<attribute name="ID" label="鏍囪瘑缂栧彿" type="STRING" length="32"/>
diff --git a/src/com/tenwa/channelportal/action/alpha/CreditAuthActionNewUtils.java b/src/com/tenwa/channelportal/action/alpha/CreditAuthActionNewUtils.java
index a2207e16a..57463eecb 100644
--- a/src/com/tenwa/channelportal/action/alpha/CreditAuthActionNewUtils.java
+++ b/src/com/tenwa/channelportal/action/alpha/CreditAuthActionNewUtils.java
@@ -248,7 +248,7 @@ public class CreditAuthActionNewUtils {
                     String msg = checkPerson(docAttrIdMap);
                     if(null != msg){
                         logger.info("申请人添加合同文件失败 msg=" + msg);
-                        return "flase@" + msg;
+                        return "false@" + msg;
                     }
                     for(String createType : docAttrIdMap.keySet()){
                         String attrId = docAttrIdMap.get(createType);
@@ -300,23 +300,26 @@ public class CreditAuthActionNewUtils {
             logger.info("sendMessageAgain20210708 个人征信授权  projectNo="+ projectNo+ " fullName="+ fullName);
             BizObjectManager contBom = JBOFactory.getBizObjectManager(LB_DOC_CONTRACT_LIST.CLASS_NAME, tx);
             BizObject bo = null;
-            bo = contBom.createQuery("select singcontract_id,filename from O where attribute_id=:attributeId"
-                    +" and file_flag = 'yes' and sendprocess = '1'")
+            bo = contBom.createQuery("attribute_id=:attributeId and file_flag='yes' and sendprocess='1' ")
                     .setParameter("attributeId", attributeId).getSingleResult(true);
             if(bo == null ) {
                 // 查询lb_doc_contract_list表
-                bo = contBom.createQuery("attribute_id=:attributeId and file_flag='yes' and (sendprocess='0' or sendprocess='1' ) ")
+                bo = contBom.createQuery("attribute_id=:attributeId and file_flag='yes' and sendprocess='0' ")
                         .setParameter("attributeId", attributeId).getSingleResult(true);
                 if (bo == null) {
-                    logger.info("sendMessageAgain20210708 请检查合同文件是否生成");
+                    logger.info("sendMessageAgain20210708 请检查合同文件是否生成  projectNo="+ projectNo+ " fullName="+ fullName);
                     return "请检查合同文件是否生成！";
                 }
+                logger.info("sendMessageAgain20210708 请先发起电子签约  projectNo="+ projectNo+ " fullName="+ fullName);
+                return "请先发起电子签约！！！";
             }
-            String signSts = bo.getAttribute("SIGN_TYPE").toString();
+            String signSts = bo.getAttribute("sign_type").toString();
             if("COMPLETE".equals(signSts)){
+                logger.info("sendMessageAgain20210708 该订单合同已生成  projectNo="+ projectNo+ " fullName="+ fullName);
                 return "success";
             }
             if("SIGNING".equals(signSts)){
+                logger.info("sendMessageAgain20210708 重发短信开始  projectNo="+ projectNo+ " fullName="+ fullName);
                 BizObjectManager pbm = JBOFactory.getBizObjectManager(LB_PROJECT_INFO_TEMP.CLASS_NAME, tx);
                 BizObject pbo = pbm.createQuery("FLOWUNID=:flowUnid").setParameter("flowUnid", flowUnid).getSingleResult(true);
                 String subjectId = pbo.getAttribute("subjectid").getString();
@@ -324,6 +327,7 @@ public class CreditAuthActionNewUtils {
                 KHSQContractSignActionTwoUtil catu = new KHSQContractSignActionTwoUtil();
                 return catu.messageSend(subjectId, signContractId);
             }
+            logger.info("sendMessageAgain20210708 个人征信授权  projectNo="+ projectNo+ " fullName="+ fullName + " signSts="+ signSts);
             return "success";
         } catch (Exception e) {
             try {
diff --git a/src/com/tenwa/channelportal/action/alpha/DocListCreditAuth.java b/src/com/tenwa/channelportal/action/alpha/DocListCreditAuth.java
index d7f62ab88..dfb206db2 100644
--- a/src/com/tenwa/channelportal/action/alpha/DocListCreditAuth.java
+++ b/src/com/tenwa/channelportal/action/alpha/DocListCreditAuth.java
@@ -11,6 +11,7 @@ import com.amarsoft.are.jbo.JBOFactory;
 import com.amarsoft.dict.als.manage.NameManager;
 import com.tenwa.channelportal.action.alpha.CreditAuthTypesMap;
 import jbo.app.tenwa.doc.LB_DOC_CONTRACT_LIST;
+import jbo.com.tenwa.lease.comm.LB_PROJECT_INFO;
 import jbo.com.tenwa.lease.comm.LB_PROJECT_INFO_TEMP;
 
 
@@ -26,11 +27,18 @@ public class DocListCreditAuth {
 	 * @throws Exception
 	 */
 	public static String findFileListByUser(String certId, String relation, String flowunid) throws Exception {
+		// : 2021/7/19 查询文件信息
+		String projectNo = null;
+		if(flowunid.startsWith("FBO")){
+			BizObjectManager pbm = JBOFactory.getBizObjectManager(LB_PROJECT_INFO_TEMP.CLASS_NAME);
+			BizObject pbo = pbm.createQuery("FLOWUNID=:flowUnid").setParameter("flowUnid", flowunid).getSingleResult(true);
+			projectNo = pbo.getAttribute("PROJECT_NO").toString();
+		}else {
+			BizObjectManager pbm = JBOFactory.getBizObjectManager(LB_PROJECT_INFO.CLASS_NAME);
+			BizObject pbo = pbm.createQuery("ID=:ID").setParameter("ID", flowunid).getSingleResult(true);
+			projectNo = pbo.getAttribute("PROJECT_NO").toString();
+		}
 
-		// TODO: 2021/7/19 查询文件信息
-		BizObjectManager pbm = JBOFactory.getBizObjectManager(LB_PROJECT_INFO_TEMP.CLASS_NAME);
-		BizObject pbo = pbm.createQuery("FLOWUNID=:flowUnid").setParameter("flowUnid", flowunid).getSingleResult(true);
-		String projectNo = pbo.getAttribute("PROJECT_NO").toString();
 		Map<String, String> creditAuthTypesMap = CreditAuthTypesMap.initOther();
 		if("申请人".equals(relation)){
 			creditAuthTypesMap = CreditAuthTypesMap.initApplicant();
diff --git a/src_jbo/jbo/app/tenwa/customer/VI_LB_IDENTITY_CHECK_CREDITAUTH_LOAN.java b/src_jbo/jbo/app/tenwa/customer/VI_LB_IDENTITY_CHECK_CREDITAUTH_LOAN.java
new file mode 100644
index 000000000..41c5219d0
--- /dev/null
+++ b/src_jbo/jbo/app/tenwa/customer/VI_LB_IDENTITY_CHECK_CREDITAUTH_LOAN.java
@@ -0,0 +1,43 @@
+package jbo.app.tenwa.customer;
+
+import java.lang.String;
+
+/**
+* 身份校验视图表 - JBO命名常量类<br><br>
+* Note: This file is generated by ADE tools, <em>dont</em> modify it.<br>
+
+*/
+public interface VI_LB_IDENTITY_CHECK_CREDITAUTH_LOAN {
+	/**
+	* 身份校验视图表<br><br>
+	* 代表本类映射的BizObjectClass
+	*/
+	public static final String CLASS_NAME = "jbo.app.tenwa.customer.VI_LB_IDENTITY_CHECK_CREDITAUTH_LOAN";
+	/**
+	* 姓名 STRING(20)<br>
+	*/
+	public static final String fullName = "fullName";
+	/**
+	* 身份证编号 STRING(20)<br>
+	*/
+	public static final String certId = "certId";
+	/**
+	* 身份 STRING(20)<br>
+	*/
+	public static final String relation = "relation";
+	/**
+	* 流程编号 STRING(20)<br>
+	*/
+	public static final String flowunid = "flowunid";
+	/**
+	* 电话号 STRING(20)<br>
+	*/
+	public static final String phone = "phone";
+
+	/**
+	 * 电话号 STRING(20)<br>
+	 */
+	public static final String creditauth = "creditauth";
+
+	public static final String credittype = "credittype";
+}
\ No newline at end of file

From 0363925a9f754adf3a30411bfd4444dae677798b Mon Sep 17 00:00:00 2001
From: ap007 <zhanglei@ap-leasing.com.cn>
Date: Wed, 21 Jul 2021 09:37:54 +0800
Subject: [PATCH 20/29] =?UTF-8?q?=E4=BF=AE=E5=A4=8DNPE=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/com/ap/CorpusSourceCheck.java              | 10 ++++++++--
 .../fundchannel/doc/action/DocListAction.java  | 18 ++++++++++++------
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/src/com/ap/CorpusSourceCheck.java b/src/com/ap/CorpusSourceCheck.java
index cdaa30927..0e48faa77 100644
--- a/src/com/ap/CorpusSourceCheck.java
+++ b/src/com/ap/CorpusSourceCheck.java
@@ -87,6 +87,9 @@ public class CorpusSourceCheck {
                 return sResult;
             }
             String fcStage = this.getFcStageByProjectId();
+            if("-2".equals(fcStage)){
+                return "获取状态信息出现错误，请联系系统管理员！";
+            }
             if ("AP".equals(fcStage)||"1".equals(fcStage)) {
                 sResult = "S";
             } else {
@@ -106,9 +109,12 @@ public class CorpusSourceCheck {
         String sResult = null;
         try {
             String fcStage = this.getFcStageByProjectId();
+            if("-2".equals(fcStage)){
+                return "获取状态信息出现错误，请联系系统管理员！";
+            }
             if("2".equals(fcStage)||"AP".equals(fcStage)){
                 return "S";
-            }else{
+            } else {
                 sResult = "客户还未和资方签署合同";
             }
         } catch (JBOException e) {
@@ -135,7 +141,7 @@ public class CorpusSourceCheck {
             fcStage = "AP" ;
         }else{
             BizObjectManager bomFR = JBOFactory.getBizObjectManager(FC_REQUEST.CLASS_NAME);
-            BizObject boFR = bomFR.createQuery("id=:projectId and del_flag='0'").setParameter("projectId", projectId).getSingleResult(false);
+            BizObject boFR = bomFR.createQuery("PROJECT_ID=:projectId and del_flag='0'").setParameter("projectId", projectId).getSingleResult(false);
             if(boFR!=null){
                 fcStage = boFR.getAttribute("FC_STAGE").toString();
             }
diff --git a/src_core/com/ample/fundchannel/doc/action/DocListAction.java b/src_core/com/ample/fundchannel/doc/action/DocListAction.java
index 4af31a106..fa1a5ab20 100644
--- a/src_core/com/ample/fundchannel/doc/action/DocListAction.java
+++ b/src_core/com/ample/fundchannel/doc/action/DocListAction.java
@@ -101,12 +101,18 @@ public class DocListAction {
         BizObjectManager BBMbom = null;
         BizObject BBMBo = null;
         BBMbom = JBOFactory.getBizObjectManager(BT_BUSSINESS_MESSAGE.CLASS_NAME,tx);
-        BBMBo = BBMbom.createQuery("ID=:id").setParameter("id",messageId).getSingleResult(true);
-        BBMBo.setAttributeValue("is_read","has_read");
-        BBMBo.setAttributeValue("message_status","has_process");
-        BBMBo.setAttributeValue("read_time",currentTime);
-        BBMBo.setAttributeValue("finish_time",currentTime);
-        BBMbom.saveObject(BBMBo);
+        if(messageId!=null&&!"".equals(messageId)){
+            BBMBo = BBMbom.createQuery("ID=:id").setParameter("id",messageId).getSingleResult(true);
+        }else {
+            BBMBo = BBMbom.createQuery("cparam like '%fcRequestId="+fcRequestId+"%'").getSingleResult(true);
+        }
+        if(BBMBo!=null){
+            BBMBo.setAttributeValue("is_read","has_read");
+            BBMBo.setAttributeValue("message_status","has_process");
+            BBMBo.setAttributeValue("read_time",currentTime);
+            BBMBo.setAttributeValue("finish_time",currentTime);
+            BBMbom.saveObject(BBMBo);
+        }
     }
 
     public String getFrfId() {

From b02379162879d88a3f436a686de6bbd20105eca0 Mon Sep 17 00:00:00 2001
From: ap007 <zhanglei@ap-leasing.com.cn>
Date: Wed, 21 Jul 2021 17:08:07 +0800
Subject: [PATCH 21/29] =?UTF-8?q?=E8=B5=84=E6=96=B9=E6=8B=B7=E8=A1=A8?=
 =?UTF-8?q?=E5=89=8D=EF=BC=8C=E5=85=88=E5=B0=86=E5=8E=9F=E7=A7=9F=E9=87=91?=
 =?UTF-8?q?=E8=AE=A1=E5=88=92=E6=8B=B7=E5=85=A5=E5=8E=86=E5=8F=B2=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CorpusSourceRentPlanCopy.java             | 58 ++++++++++++++++---
 1 file changed, 49 insertions(+), 9 deletions(-)

diff --git a/src_tenwa/com/tenwa/lease/app/quartzmession/CorpusSourceRentPlanCopy.java b/src_tenwa/com/tenwa/lease/app/quartzmession/CorpusSourceRentPlanCopy.java
index ea2085575..7dc9b3ecc 100644
--- a/src_tenwa/com/tenwa/lease/app/quartzmession/CorpusSourceRentPlanCopy.java
+++ b/src_tenwa/com/tenwa/lease/app/quartzmession/CorpusSourceRentPlanCopy.java
@@ -1,5 +1,6 @@
 package com.tenwa.lease.app.quartzmession;
 
+import com.amarsoft.are.ARE;
 import com.amarsoft.are.jbo.*;
 import com.amarsoft.are.util.StringFunction;
 import com.amarsoft.awe.util.Transaction;
@@ -8,6 +9,7 @@ import com.tenwa.comm.util.jboutil.DataOperatorUtil;
 import com.tenwa.reckon.executor.CreateTransactionExecutor;
 import jbo.app.tenwa.calc.LC_CALC_CONDITION;
 import jbo.app.tenwa.calc.LC_RENT_PLAN;
+import jbo.app.tenwa.calc.LC_RENT_PLAN_HIS;
 import jbo.oti.FC_FILE_PUSH;
 import jbo.oti.FC_YC_FILE_REPAY_PLAN;
 import jbo.oti.LC_PROFIT_PLAN;
@@ -49,14 +51,41 @@ public class CorpusSourceRentPlanCopy implements Job {
 			fyfrpBom = JBOFactory.getBizObjectManager(FC_YC_FILE_REPAY_PLAN.CLASS_NAME,tx);
 			//todo 添加渠道商的选择，哪些需要拷表哪些不需要
 			List<BizObject> ffpBoList = ffpBom.createQuery("select ID,FILE_STS from O where FILE_STS='2'").getResultList(true);
+			if(ffpBoList.size()==0){
+				ARE.getLog().info("暂时没有需要拷表的资方文件");
+				return;
+			}
+			//遍历每个文件
 			for(BizObject ffpBo : ffpBoList){
 				String fcFileId = ffpBo.getAttribute("ID").toString();
-				//1.更新租金计划租金信息，并获取每个文件的contract_id
-				String sql = "select fr.CONTRACT_ID,O.LEND_TERM,O.ANS_REPAYMENT_DATE,O.ANS_PRINCIPAL,O.ANS_INTEREST,ANS_REPAYMENT_MONEY from O left join jbo.oti.FC_REQUEST fr on O.FC_REQUEST_ID=fr.ID where fr.DEL_FLAG='0' and O.FC_FILE_ID=:fcFileId";
+				String sql = "select fr.CONTRACT_ID,O.FC_REQUEST_ID,O.LEND_TERM,O.ANS_REPAYMENT_DATE,O.ANS_PRINCIPAL,O.ANS_INTEREST,ANS_REPAYMENT_MONEY from O left join jbo.oti.FC_REQUEST fr on O.FC_REQUEST_ID=fr.ID where fr.DEL_FLAG='0' and O.FC_FILE_ID=:fcFileId";
 				List<BizObject> fyfrpBoList = fyfrpBom.createQuery(sql).setParameter("fcFileId",fcFileId).getResultList(false);
+				if(fyfrpBoList.size()==0){
+					ARE.getLog().error("未找到FC_REQUEST_ID: "+fcFileId+" 对应的资方还款计划");
+					throw new Exception("未找到FC_REQUEST_ID: "+fcFileId+" 对应的资方还款计划");
+				}
+				//获取对应的合同
+				Map<String,String> contractMap = this.getContractIdMap(fyfrpBoList);
+				if(contractMap.size()==0){
+					ARE.getLog().error("未找到FC_REQUEST_ID: "+fcFileId+" 对应的合同ID");
+					throw new Exception("未找到FC_REQUEST_ID: "+fcFileId+" 对应的合同ID");
+				}
+				//0.租金计划正式表考入历史表
+				for(Map.Entry<String,String> entry: contractMap.entrySet()){
+					Map<String,String> fromCondtion=new HashMap<String,String>();
+					fromCondtion.put("CONTRACT_ID",entry.getKey());
 
-				Set<String> contractSet = this.updateRentPlan(fyfrpBoList,tx);
-				for(String contractId : contractSet){
+					Map<String,String> otherProperty=new HashMap<String,String>();
+					otherProperty.put("MEMO", "安鹏原正式租金计划");
+					otherProperty.put("FLOWUNID", entry.getValue());
+
+					DataOperatorUtil.copyJBOSet(LC_RENT_PLAN.CLASS_NAME, fromCondtion, LC_RENT_PLAN_HIS.CLASS_NAME,null, otherProperty, null, Sqlca);
+				}
+				//1.更新租金计划（直接文件每条信息更新，不需要遍历）
+				this.updateRentPlan(fyfrpBoList,tx);
+
+				for(Map.Entry<String,String> entry: contractMap.entrySet()){
+					String contractId = entry.getKey();
 					Map<String,String> param= this.getParamByContractId(contractId,tx);
 					//2.更新租金计划剩余本金
 					this.updateAllRemainCorpus(contractId,tx);
@@ -86,6 +115,21 @@ public class CorpusSourceRentPlanCopy implements Job {
 		}
 	}
 
+	/**
+	 * 获取对应的合同ID
+	 * @param fyfrpBoList
+	 * @return
+	 * @throws JBOException
+	 */
+	public Map<String,String> getContractIdMap(List<BizObject> fyfrpBoList) throws JBOException {
+		Map<String,String> contractMap = new HashMap<>();
+		for(BizObject bo : fyfrpBoList){
+			String contractId = bo.getAttribute("CONTRACT_ID").toString();
+			String fcRequestId = bo.getAttribute("FC_REQUEST_ID").toString();
+			contractMap.put(contractId,fcRequestId);
+		}
+		return contractMap;
+	}
 	/**
 	 * 租金计划拷贝
 	 * @param fyfrpBoList 每个回执文件包含的租金计划信息
@@ -93,10 +137,9 @@ public class CorpusSourceRentPlanCopy implements Job {
 	 * @throws JBOException
 	 * @throws ParseException
 	 */
-	public Set<String> updateRentPlan(List<BizObject> fyfrpBoList,JBOTransaction tx) throws JBOException, ParseException {
+	public void updateRentPlan(List<BizObject> fyfrpBoList,JBOTransaction tx) throws JBOException, ParseException {
 		BizObjectManager lrpBom = null;
 		lrpBom = JBOFactory.getBizObjectManager(LC_RENT_PLAN.CLASS_NAME,tx);
-		Set<String> contractSet = new HashSet<>();
 		//更新租金计划表
 		for(BizObject bo : fyfrpBoList){
 			//获取参数
@@ -119,10 +162,7 @@ public class CorpusSourceRentPlanCopy implements Job {
 			lrpBo.setAttributeValue("PLAN_DATE",repaymentDate);
 			lrpBo.setAttributeValue("RENT",repaymentMoney);
 			lrpBom.saveObject(lrpBo);
-			//放进set去重
-			contractSet.add(contractId);
 		}
-		return contractSet;
 	}
 
 	/**

From c8ab5172562d1b45dd725bc7e12e1119e0d3c3d9 Mon Sep 17 00:00:00 2001
From: ap007 <zhanglei@ap-leasing.com.cn>
Date: Fri, 23 Jul 2021 19:05:08 +0800
Subject: [PATCH 22/29] =?UTF-8?q?=E8=B5=84=E6=96=B9=E6=94=BE=E6=AC=BE-?=
 =?UTF-8?q?=E5=87=AD=E8=AF=81=E8=8D=89=E7=A8=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../voucher/service/VoucherInfoService.java   |   5 +
 .../FundIncomeVoucherInfoServiceImpl.java     | 130 ++++++++++++++++++
 ...orpusSourceFundIncomeCreateVoucherJob.java |  40 ++++++
 3 files changed, 175 insertions(+)
 create mode 100644 src_core/com/tenwa/voucher/service/VoucherInfoService.java
 create mode 100644 src_core/com/tenwa/voucher/serviceImp/FundIncomeVoucherInfoServiceImpl.java
 create mode 100644 src_tenwa/com/tenwa/lease/app/quartzmession/CorpusSourceFundIncomeCreateVoucherJob.java

diff --git a/src_core/com/tenwa/voucher/service/VoucherInfoService.java b/src_core/com/tenwa/voucher/service/VoucherInfoService.java
new file mode 100644
index 000000000..65e0fef9e
--- /dev/null
+++ b/src_core/com/tenwa/voucher/service/VoucherInfoService.java
@@ -0,0 +1,5 @@
+package com.tenwa.voucher.service;
+
+public interface VoucherInfoService {
+	void run() throws Exception;
+}
diff --git a/src_core/com/tenwa/voucher/serviceImp/FundIncomeVoucherInfoServiceImpl.java b/src_core/com/tenwa/voucher/serviceImp/FundIncomeVoucherInfoServiceImpl.java
new file mode 100644
index 000000000..d2c786a16
--- /dev/null
+++ b/src_core/com/tenwa/voucher/serviceImp/FundIncomeVoucherInfoServiceImpl.java
@@ -0,0 +1,130 @@
+package com.tenwa.voucher.serviceImp;
+
+import com.amarsoft.are.jbo.*;
+import com.amarsoft.dict.als.manage.NameManager;
+import com.tenwa.comm.util.jboutil.DataOperatorUtil;
+import com.tenwa.flow.util.FlowUtil;
+import com.tenwa.reckon.util.DateUtil;
+import com.tenwa.voucher.service.VoucherInfoService;
+import jbo.app.VOUCHER_V8;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class FundIncomeVoucherInfoServiceImpl implements VoucherInfoService {
+    //todo 这个字段是自增的，更新生产时，先在生产配置，然后根据生产的编号再更改
+    private static final String VOUCHER_CONFIGNO = "PZ2021072100000020";//凭证号
+    private static final String EVIDENCE_MESSAGE = "凭证输出";//查看凭证表，发现只有这一个值，目前先设置为固定值
+    private static final String EAS_FLAG  = "0";//导入财务系统状态 默认0 (同上，只有这一个值)
+    public void run() {
+        JBOTransaction tx = null;
+        try {
+            tx = JBOFactory.createJBOTransaction();
+            //凭证编号
+            String voucherNo ="k" + FlowUtil.getVoucher_Number(tx);
+            System.out.println(voucherNo+"======");
+        } catch (JBOException e) {
+            e.printStackTrace();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }finally {
+            try {
+                tx.commit();
+            } catch (JBOException e) {
+                e.printStackTrace();
+            }
+        }
+
+
+    }
+
+    public void createVoucher(List<Map<String, String>> list, JBOTransaction tx) throws Exception {
+        BizObjectManager bomV8 = JBOFactory.getBizObjectManager(VOUCHER_V8.CLASS_NAME,tx);
+        List<Map<String,String>> loanInfoList = this.getHasLoanContract(tx);
+        for(Map<String,String> loanInfo : loanInfoList){
+            loanInfo =  this.getCommonParam(loanInfo,tx);
+            List<Map<String,String>> paramList = getParamOfVoucher(tx);
+            for(Map<String,String> param : paramList){
+                param.putAll(loanInfo);
+                BizObject boV8 = bomV8.newObject();
+                boV8.setAttributesValue(this.getFinalParam(param));
+                bomV8.saveObject(boV8);
+            }
+        }
+    }
+    public List<Map<String,String>> getHasLoanContract(JBOTransaction tx) throws Exception {
+        //todo 目前为邮储，九江的时候将where条件更改参数
+        String sql = "select frl.loan_no,frl.customer_name,frl.loan_date,frl.loan_amt,frl.business_rate,frl.TRANS_AMT,fr.CONTRACT_ID,fr.CONTRACT_NO " +
+                     "from fc_request_loan  frl " +
+                     "left join fc_request fr on frl.LOAN_NO = fr.FC_LOAN_ID " +
+                     "where frl.del_flag='0' and fr.DEL_FLAG='0' and voucher_status='0' and fr.CHANNEL_NO='PSBC' ";
+        return DataOperatorUtil.getDataBySql(sql,tx);
+    }
+    public Map<String,String> getCommonParam(Map<String,String> loanInfo,JBOTransaction tx) throws Exception {
+
+        String contractId = loanInfo.get("CONTRACT_ID");
+        String voucherNo ="k" + FlowUtil.getVoucher_Number(tx);
+        loanInfo.put("voucherNo",voucherNo);
+        String userId = "administrator";//操作人
+        String userName = NameManager.getUserName(userId);
+        loanInfo.put("userId",userId);
+        loanInfo.put("userName",userName);
+        //日期
+        String loanDate = loanInfo.get("loan_date").substring(0,8);
+        String periodYear = loanDate.substring(0,4);
+        String periodMonth = loanDate.substring(4,6);
+        Date date = new SimpleDateFormat("yyyyMMdd").parse(loanDate);
+        loanDate = new SimpleDateFormat("yyyy/MM/dd").format(date);
+        loanInfo.put("periodYear",periodYear);
+        loanInfo.put("periodMonth",periodMonth);
+        loanInfo.put("accountingDate",loanDate);
+        loanInfo.put("generate_date", DateUtil.getSystemDateDetailTime());
+
+        return loanInfo;
+    }
+    public List<Map<String,String>> getParamOfVoucher(JBOTransaction tx) throws Exception {
+        String sql = "select lvl.SORT_NUMBER as sortNumber,lvl.LOAN_SUBJECT as loanSubject,CASE WHEN lvl.loan_direction = '1' THEN '1' ELSE '-1' END as entrydc,lvl.VALUE_ABSTRACT as valueAbstract,lsc.SUBJECTS_CODE as subjectsCode,lsc.SUBJECTS_NAME as subjectsName " +
+                "from lv_voucher_loan lvl " +
+                "left join LV_STACTS_CONFIG lsc on lvl.LOAN_SUBJECT=lsc.id " +
+                "left join lv_voucher_config lvc on lvl.VOUCHER_ID=lvc.id " +
+                "where lvc.VOUCHER_NO='"+VOUCHER_CONFIGNO+"'";
+        return DataOperatorUtil.getDataBySql(sql,tx);
+    }
+    public Map<String,String> getFinalParam(Map<String,String> param){
+        Map<String,String> finalParam = new HashMap<>();
+        finalParam.put("evidence_message",EVIDENCE_MESSAGE);//固定值：凭证输出
+        finalParam.put("periodyear",param.get("periodYear")); //年
+        finalParam.put("f1",param.get("accountingDate"));//会计日期
+        finalParam.put("f2",param.get("subjectsCode"));//科目编码
+        finalParam.put("f3",param.get("voucherNo"));//凭证编号
+        finalParam.put("f5",param.get("valueAbstract"));//摘要
+        finalParam.put("f6",param.get("loanSubject"));//科目表id
+        finalParam.put("f7",param.get("periodYear"));//借方金额
+        finalParam.put("f8",param.get("periodYear"));//贷方金额
+        finalParam.put("f12",param.get("userName"));//操作人
+        finalParam.put("f15",param.get("accountingDate"));//日期(与会计日期相同)
+        finalParam.put("f47",param.get("CONTRACT_NO"));//业务合同编号
+        finalParam.put("f48",param.get("periodYear"));//本方信息No
+        finalParam.put("f49",param.get("periodYear"));//所属公司ID（注意：实际此字段存的是code_library表中codeno='ManySubject' 的 itemno 字段）
+        finalParam.put("f50",param.get("periodYear"));//所属公司名称
+        finalParam.put("f51",param.get("periodYear"));//会计期间-年（与上面 ‘年’ 相同）
+        finalParam.put("f52",param.get("periodMonth"));//会计期间-月
+        finalParam.put("f59",param.get("sortNumber"));//凭证配置中排序号
+        finalParam.put("f60",param.get("CONTRACT_NO"));//业务合同号，与f47相同（尚不明为何重复）
+        finalParam.put("f61",param.get("customer_name"));//客户名称
+        finalParam.put("f62",param.get("loanSubject"));//科目表id，与f6相同（尚不明为何重复）
+        finalParam.put("f65",VOUCHER_CONFIGNO);//凭证配置编号
+        finalParam.put("v8_status","已完整");//凭证状态 ： 已完整；未完整
+        finalParam.put("generate_date",param.get("generate_date"));//创建时间
+        finalParam.put("v8_flag",EAS_FLAG);//导入财务系统状态 默认0（尚不知有何逻辑，目前整个表中全部为0）
+        finalParam.put("module_name",param.get("subjectsName"));//凭证名称
+        finalParam.put("entrydc",param.get("entrydc"));//借贷：1，借；-1，贷
+        finalParam.put("inputuserid",param.get("userId"));//操作人id
+
+        return finalParam;
+    }
+
+}
diff --git a/src_tenwa/com/tenwa/lease/app/quartzmession/CorpusSourceFundIncomeCreateVoucherJob.java b/src_tenwa/com/tenwa/lease/app/quartzmession/CorpusSourceFundIncomeCreateVoucherJob.java
new file mode 100644
index 000000000..fcfdb2a57
--- /dev/null
+++ b/src_tenwa/com/tenwa/lease/app/quartzmession/CorpusSourceFundIncomeCreateVoucherJob.java
@@ -0,0 +1,40 @@
+package com.tenwa.lease.app.quartzmession;
+
+import com.amarsoft.are.jbo.JBOFactory;
+import com.amarsoft.are.jbo.JBOTransaction;
+import com.amarsoft.are.util.StringFunction;
+import com.base.util.QuartzUtil;
+import com.tenwa.voucher.CreateVoucherProcess.InsertVoucherRentCompensatory;
+import com.tenwa.voucher.CreateVoucherProcess.InsertVoucherRentIncome;
+import com.tenwa.voucher.service.VoucherInfoService;
+import com.tenwa.voucher.serviceImp.FundIncomeVoucherInfoServiceImpl;
+import org.quartz.Job;
+import org.quartz.JobExecutionContext;
+import org.quartz.JobExecutionException;
+
+/**
+ * 生成外资方放款凭证-定时任务
+ * @author
+ */
+public class CorpusSourceFundIncomeCreateVoucherJob implements Job {
+
+	@Override
+	public void execute(JobExecutionContext arg0) throws JobExecutionException {
+		String startime = StringFunction.getTodayNow();
+		
+		Object userId = arg0.getTrigger().getJobDataMap().get("CurUserId");
+		String curUserId = userId == null? "system" : userId.toString();
+		JBOTransaction tx = null;
+		try{
+			tx = JBOFactory.createJBOTransaction();
+			//
+			VoucherInfoService voucher = new FundIncomeVoucherInfoServiceImpl();
+			voucher.run();
+			
+			QuartzUtil.insertLog(startime,"com.tenwa.comm.message.controller.BusinessCancelJob", "success", "成功", curUserId);
+		} catch (Exception e) {
+			QuartzUtil.insertLog(startime,"com.tenwa.comm.message.controller.BusinessCancelJob", "error", "失败", curUserId);
+		}
+	}
+
+}

From fa598bbf35702f1baa812619b6a249aeb4cf70d5 Mon Sep 17 00:00:00 2001
From: ap007 <zhanglei@ap-leasing.com.cn>
Date: Mon, 26 Jul 2021 15:18:55 +0800
Subject: [PATCH 23/29] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=99=A8=E4=B8=BAtomca?=
 =?UTF-8?q?t7=EF=BC=8C=E7=BC=96=E8=AF=91JSP=E6=96=87=E4=BB=B6=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E4=B8=8D=E6=94=AF=E6=8C=81=E6=B3=9B=E5=9E=8B=E7=9C=81?=
 =?UTF-8?q?=E7=95=A5=EF=BC=8C=E7=89=B9=E6=AD=A4=E6=94=B9=E6=AD=A3=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WebContent/Ample/Doc/DocListUploadNew.jsp | 2 +-
 src/com/ap/CorpusSourceCheck.java         | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/WebContent/Ample/Doc/DocListUploadNew.jsp b/WebContent/Ample/Doc/DocListUploadNew.jsp
index e8cb04da0..cbb14b3fa 100644
--- a/WebContent/Ample/Doc/DocListUploadNew.jsp
+++ b/WebContent/Ample/Doc/DocListUploadNew.jsp
@@ -28,7 +28,7 @@
 
 		InputStream is = null;
 		//当一次传多个图片时，会多次执行这个页面，下面for循环，只是将参数读取出来，将普通数据封装为map，然后将map传给写入数据库的方法。
-		Map<String,String> params = new HashMap<>();
+		Map<String,String> params = new HashMap<String,String>();
         for (FileItem fileItem : items) {
             if (fileItem.isFormField()) { // >> 普通数据
                 String fieldValue = fileItem.getString("utf-8");
diff --git a/src/com/ap/CorpusSourceCheck.java b/src/com/ap/CorpusSourceCheck.java
index 0e48faa77..d1dd65b0f 100644
--- a/src/com/ap/CorpusSourceCheck.java
+++ b/src/com/ap/CorpusSourceCheck.java
@@ -90,7 +90,8 @@ public class CorpusSourceCheck {
             if("-2".equals(fcStage)){
                 return "获取状态信息出现错误，请联系系统管理员！";
             }
-            if ("AP".equals(fcStage)||"1".equals(fcStage)) {
+            //1是终审成功，2是合同签署。两个可能并行，故都可以通过
+            if ("AP".equals(fcStage)||"1".equals(fcStage)||"2".equals(fcStage)) {
                 sResult = "S";
             } else {
                 sResult = "资金方尚未审批结束，请稍后再试!";

From 03077e76434a177071a633e0e6cd6759cc05816a Mon Sep 17 00:00:00 2001
From: zhanglei <zhanglei@ap-leasing.com.cn>
Date: Mon, 26 Jul 2021 18:52:38 +0800
Subject: [PATCH 24/29] =?UTF-8?q?yc=E5=BE=81=E4=BF=A1=E6=8E=88=E6=9D=83?=
 =?UTF-8?q?=E7=94=B5=E5=AD=90=E7=AD=BE=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=E6=89=B9=E9=87=8F-=E9=80=BB=E8=BE=91=E8=B0=83?=
 =?UTF-8?q?=E6=95=B42?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Tenwa/alpha/creditAuth/creditAuthList.jsp |   4 +-
 .../alpha/creditAuth/creditAuthList2.jsp      | 306 ------------------
 .../alpha/CreditAuthActionNewUtils.java       |   1 +
 .../action/alpha/CreditAuthActionTwoUtil.java |  39 +--
 .../action/alpha/CreditAuthAward.java         | 171 ----------
 .../commcheck/UserCreditAuthCheck.java        |  52 +--
 6 files changed, 37 insertions(+), 536 deletions(-)
 delete mode 100644 WebContent/Tenwa/alpha/creditAuth/creditAuthList2.jsp
 delete mode 100644 src/com/tenwa/channelportal/action/alpha/CreditAuthAward.java

diff --git a/WebContent/Tenwa/alpha/creditAuth/creditAuthList.jsp b/WebContent/Tenwa/alpha/creditAuth/creditAuthList.jsp
index 687d10182..31c89e6ec 100644
--- a/WebContent/Tenwa/alpha/creditAuth/creditAuthList.jsp
+++ b/WebContent/Tenwa/alpha/creditAuth/creditAuthList.jsp
@@ -342,8 +342,8 @@
 			var fullName = fullNames[i];
 			var signType = signTypes[i];
 			var sendProcess = sendProcessList[i];
-			//只有签约状态为：草稿，发送状态为：未发送，才可以发起电子签约。
-			if("SIGNING" != signType || "1" != sendProcess){
+			//没有发起过电子签约的，不能查看订单状态
+			if("1" != sendProcess){
 				alert(relation+": " + fullName + " 请先发起电子签约。");
 				return;
 			}
diff --git a/WebContent/Tenwa/alpha/creditAuth/creditAuthList2.jsp b/WebContent/Tenwa/alpha/creditAuth/creditAuthList2.jsp
deleted file mode 100644
index 10ee3d88c..000000000
--- a/WebContent/Tenwa/alpha/creditAuth/creditAuthList2.jsp
+++ /dev/null
@@ -1,306 +0,0 @@
-<%@ page contentType="text/html; charset=GBK"%>
-<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><%	
-	/*
-        Author: undefined 2020-04-30
-        Content: 
-        History Log: 
-    */
-    String sFlowUnid = CurPage.getParameter("FlowUnid");//流程编号
-	String SubjectId = CurPage.getParameter("SubjectId");//主体编号
-	String userId = CurUser.getUserID();
-	String projectNo = Sqlca.getString("select PROJECT_NO from lb_project_info_temp where FLOWUNID='"+sFlowUnid+"'");
-	ASObjectModel doTemp = new ASObjectModel("creditAuthList");
-//	doTemp.setHtmlEvent("filePath","onclick","openfile");
-	ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
-	dwTemp.Style="1";      	     //--设置为Grid风格--
-	dwTemp.ReadOnly = "1";	 //只读模式
-	dwTemp.MultiSelect=true; //多选
-	dwTemp.setPageSize(10);
-	dwTemp.genHTMLObjectWindow(sFlowUnid);
-	String flag = "false";
-	if(CurUser.hasRole("401")){
-		flag = "true";
-	}
-	//0、是否展示 1、	权限控制  2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码	6、	7、	8、	9、图标，CSS层叠样式 10、风格
-	String sButtons[][] = {
-		{flag,"All","Button","生成征信授权书","生成征信授权书","createCreditPdf()","","","","btn_icon_generate",""},
-		{flag,"All","Button","发起电子签约","发起电子签约","signOnLine()","","","","btn_icon_generate",""},
-		{flag,"All","Button","查看签约状态","查看签约状态","getStatus()","","","","btn_icon_detail",""},
-		{flag,"All","Button","重发签约短信","重发签约短信","sendMessageAgain()","","","","btn_icon_refresh",""},
-	};
-%><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
-<script type="text/javascript">
-	$(document).ready(function(){
-		for(var i=0;i<getRowCount(0);i++){
-			$("#DIV_Data_myiframe0_"+i+"_4").css("color","Blue");
-		}
-	})
-	function showPDF(filePath,name){
-		var sUrl="/Ample/Doc/showPDF.jsp";
-		var param="filePath="+filePath;
-		AsControl.OpenPage(sUrl,param,"",name);
-	}
-	function downloadFile(filePath,fileName){
-		if(!frames["downloadTemplate"]) $("<iframe name='downloadTemplate' style='display:none;'></iframe>").appendTo("body");
-		var src = sWebRootPath+"/servlet/view/docDownloadServletByPath?CompClientID=<%=sCompClientID%>&filePath="+encodeURIComponent(encodeURIComponent(filePath))+"&fileName="+encodeURIComponent(encodeURIComponent(fileName));
-		window.open(src, "downloadTemplate");
-	}
-	function afterSearch(){
-		for(var i=0;i<getRowCount(0);i++){
-			var filelist=getObj(0,i,"fileList").innerHTML;
-			var obj=eval('('+filelist+')');
-			var html="";
-			for(var file in obj){
-				html+='<a onclick=downloadFile(\''+obj[file]['filepath']+'\',\''+obj[file]['filename']+'\')><font color="blue">'+obj[file]['filename']+'</font></a>';
-				html+='【上传时间:'+obj[file]['inputtime']+'】';
-				if(obj[file]['pdf']=="true"){
-					html+='<a class="btn_icon btn_icon_search" onclick="showPDF(\''+obj[file]['filepath']+'\',\''+obj[file]['filename']+'\');">&nbsp;</a>';
-				}
-				html+='</br>';
-			}
-			getObj(0,i,"fileList").innerHTML=html;
-			getObj(0,i,"fileList").style["white-space"]="pre-wrap";
-
-		}
-	}
-
-	<%--//在加载完表格后调用--%>
-	<%--function afterSearch(){--%>
-		<%--for(var i=0;i<getRowCount(0);i++){--%>
-			<%--var html="";--%>
-			<%--html+='<a onclick=downloadFile(\''+getItemValue(0,i,"ID")+'\')><font color="blue">'+"下载&nbsp&nbsp&nbsp&nbsp&nbsp"+'</font></a>';--%>
-			<%--getObj(0,i,"FILENAME").innerHTML=html+'<font >'+getObj(0,i,"FILENAME").innerHTML+'</font>';--%>
-		<%--}--%>
-	<%--}--%>
-	<%--function downloadFile(id){--%>
-		<%--if(typeof(id)==undefined || id=='') {--%>
-			<%--alert("请先生成征信授权书再下载！");--%>
-			<%--return;--%>
-		<%--}--%>
-		<%--if(!frames["downloadTemplate"]) $("<iframe name='downloadTemplate' style='display:none;'></iframe>").appendTo("body");--%>
-		<%--window.open(sWebRootPath+"/servlet/view/docDownloadServlet?CompClientID=<%=sCompClientID%>&sqlString=save@"+id, "downloadTemplate");--%>
-	<%--}--%>
-
-	function createCreditPdf(){
-		var fullNames=getItemValueArray(0,"fullName");
-		var certIds=getItemValueArray(0,"certId");
-		var phones=getItemValueArray(0,"phone");
-		var creditauths=getItemValueArray(0,"creditauth");
-		var credittypes=getItemValueArray(0,"credittype");
-		var relations=getItemValueArray(0,"relation");
-		var signTypes=getItemValueArray(0,"sign_type");
-		var projectNo = "<%=projectNo%>";
-		var flowunid = "<%=sFlowUnid%>";
-		if(typeof(relations)=="undefined"||relations==null||relations==""){alert("请选择");return;}
-		var number = 0;
-		for(var i=0; i < relations.length;i++) {
-			var signType = signTypes[i];
-			alert(signType);
-		}
-		for(var i=0; i < relations.length;i++) {
-			var fullName = fullNames[i];
-			var certId = certIds[i];
-			var phone = phones[i];
-			var creditauth = creditauths[i];
-			var credittype = credittypes[i];
-			var relation = relations[i];
-			var objectType = credittype;
-			var operationType = objectType;
-			var param = {};
-			var tempParam = {};
-			var sparam = "";
-			if ("担保人" == relation) {
-				var checkCreditAuth = RunJavaMethodTrans("com.tenwa.channelportal.action.alpha.CreditAuthDeleteAction", "checkCreditAuth", "flowUnid=" + flowunid);
-				if ("" == checkCreditAuth || "Ent02" == checkCreditAuth) {
-					if(1==relations.length){
-						alert("当前担保人类型不支持线上签约！");
-						return;
-					}else {
-						number++;
-						continue;
-					}
-				}
-			}
-			//模板号 征信授权书_安鹏
-			var tempId = "65b12cbfd98611eb970e00163e0ad612";
-			/**creditauth
-			 *
-			 征信授权书_安鹏 99001
-			 征信授权书_邮储 99002
-			 借款服务确认书_邮储99003
-			 */
-			if ("申请人" == relation && "征信授权书_邮储" == creditauth) {
-				tempId = "65bd277ad98611eb970e00163e0ad612";//申请人的情况下，征信授权书_邮储
-			} else if ("申请人" == relation && "借款服务确认书_邮储" == creditauth) {
-				tempId = "134f3d88e2f811eb970e00163e0ad612";//申请人的情况下，借款服务确认书_邮储
-			}
-			param["templateNo"] = tempId;
-			//生成文件关联关系
-			tempParam["OBJECTTYPE"] = objectType;
-			tempParam["insurance_no"] = flowunid;
-			tempParam["contract_no"] = certId;
-			tempParam["contract_id"] = "<%=projectNo%>";
-			tempParam["project_id"] = "<%=projectNo%>";
-			tempParam["PROJ_ID"] = "<%=projectNo%>";//注意变量名，不要改
-			tempParam["CONTRACT_ID"] = "<%=projectNo%>";//注意变量名，不要改
-			tempParam["CUST_ID"] = certId;//注意变量名，不要改
-			tempParam["PLAN_NUMBER"] = phone;//注意变量名，不要改
-			tempParam["customername"] = fullName;
-			//生成模板固定参数
-			tempParam["CurUserId"] = "<%=CurUser.getUserID()%>";
-			tempParam["CurOrgId"] = "<%=CurUser.getOrgID()%>";
-			tempParam["fileSavePath"] = "<%=CurConfig.getConfigure("FileSavePath")%>";
-
-			param["templateParam"] = JSON.stringify(tempParam).replace(/,/g, "@");//生成模板的参数据
-			for (var key in param) {
-				if (sparam.length > 0) {
-					sparam += ",";
-				}
-				sparam += key + "=" + param[key];
-			}
-			var deleteresult = RunJavaMethodTrans("com.tenwa.channelportal.action.alpha.CreditAuthDeleteAction", "deleteCreditAuth", "certId=" + certId + ",projectNo=" + projectNo + ",objectType=" + objectType);
-			var result = RunJavaMethodTrans("com.tenwa.officetempalte.action.CreateOfficeAction", "createOfficeByTemplate", sparam);
-			// word转pdf
-			var id = RunJavaMethodTrans("com.tenwa.channelportal.action.alpha.CreditAuthSignAction", "wordToPdfCreditAuth",
-					"projectNo=" + projectNo + ",operationType=" + objectType
-					+ ",fullName=" + fullName + ",certId=" + certId + ",phone=" + phone + ",flowUnid=" + flowunid);
-			if (typeof (id) == "undefined" || id.length <= 0 || id == "") {
-				RunJavaMethodTrans("com.tenwa.channelportal.action.alpha.CreditAuthDeleteAction", "deleteCreditAuth", "certId=" + certId + ",projectNo=" + projectNo + ",objectType=" + objectType);
-			} else {
-				number++;
-			}
-		}
-		if(relations.length==0){
-			alert("请先选择数据！！！");
-			return;
-		}else if(number==0){
-			alert("生成失败！！！");
-		}else if(number==relations.length){
-			alert("生成成功！！！");
-		}else{
-			alert("部分生成成功！！！");
-		}
-		reloadSelf();
-	}
-
-
-	/**
-	 * 发起电子签约
-	 */
-	function signOnLine(){
-		var fullNames=getItemValueArray(0,"fullName");
-		var certIds=getItemValueArray(0,"certId");
-		var phones=getItemValueArray(0,"phone");
-		var creditauths=getItemValueArray(0,"creditauth");
-		var credittypes=getItemValueArray(0,"credittype");
-		var relations=getItemValueArray(0,"relation");
-		var attributeIds=getItemValueArray(0,"ID");
-		var projectNo = "<%=projectNo%>";
-		var flowunid = "<%=sFlowUnid%>";
-		if(typeof(relations)=="undefined"||relations==null||relations==""){alert("请选择");return;}
-		var number = 0;
-		var applyCount = 0;
-		for(var i=0; i < relations.length;i++) {
-			var fullName = fullNames[i];
-			var certId = certIds[i];
-			var phone = phones[i];
-			var creditauth = creditauths[i];
-			var credittype = credittypes[i];
-			var relation = relations[i];
-			var attributeId = attributeIds[i];
-			var objectType = credittype;
-			var operationType = objectType;
-			if (typeof (attributeId) == undefined || attributeId == '') {
-				if (1 == relations.length) {
-					alert("请先生成pdf文件，再发起电子签约！");
-					return;
-				} else {
-					number++;
-					continue;
-				}
-			}
-			if ("申请人" == relation) {
-				applyCount++;
-				if(applyCount > 1){//申请人只需要发起一次电子签约，后台代码整合
-					continue;
-				}
-			}
-			//自然人电子签约
-			var sReturn = RunJavaMethodTrans("com.tenwa.channelportal.action.alpha.CreditAuthActionNewUtils", "signIng",
-					"attributeId=" + attributeId + ",projectNo=" + projectNo + ",operationType=" + objectType + ",relation=" + relation
-					+ ",fullName=" + fullName + ",certId=" + certId + ",phone=" + phone + ",flowUnid=" + flowunid + ",creditauth=" + credittype);
-
-			if("success" == sReturn) {
-				number++;
-			}
-		}
-		if(relations.length==0){
-			alert("请先选择数据！！！");
-			return;
-		}else if(number==0){
-			alert("发起电子签约失败！！！");
-		}else if(number==relations.length){
-			alert("发起电子签约成功！！！");
-		}else{
-			alert("部分发起电子签约成功！！！");
-		}
-		location.reload();
-	}
-
-	//查询电子签约状态
-	function getStatus(){
-		var fullName = getItemValue(0,getRow(0),'fullName');
-		var certId = getItemValue(0,getRow(0),'certId');
-		var phone = getItemValue(0,getRow(0),'phone');
-		var flowunid = getItemValue(0,getRow(0),'flowunid');
-		var relation = getItemValue(0,getRow(0),'relation');
-        var creditauth = getItemValue(0,getRow(0),'creditauth');
-        var credittype = getItemValue(0,getRow(0),'credittype');
-        var objectType = credittype;
-        var operationType = objectType;
-		var projectNo = "<%=projectNo%>";
-		var attributeId = getItemValue(0,getRow(0),'ID');
-		if(typeof(attributeId)==undefined || attributeId=='') {
-			alert("请先生成征信授权书，再发起电子签约！");
-			return;
-		}
-		var sReturn = "";
-		sReturn = RunJavaMethodTrans("com.tenwa.channelportal.action.alpha.CreditAuthActionNewUtils","contractSignStatus",
-				"attributeId="+attributeId+",projectNo="+projectNo+",operationType="+objectType+",relation="+relation
-				+",fullName="+fullName+",certId="+certId+",phone="+phone+",flowUnid="+flowunid);
-		AsDebug.showMessage("提示",sReturn,"","",true,'','','',function(){
-			<%-- 			var sReturns = RunJavaMethodTrans("com.tenwa.channelportal.action.ContractSignAction","downloadDoc","ProjectId=<%=projectId%>,CurUserID=<%=CurUser.getUserID()%>"); --%>
-			window.location.reload();
-		});
-	}
-
-
-	//重新发送短信
-	function sendMessageAgain(){
-		var fullName = getItemValue(0,getRow(0),'fullName');
-		var certId = getItemValue(0,getRow(0),'certId');
-		var phone = getItemValue(0,getRow(0),'phone');
-		var relation = getItemValue(0,getRow(0),'relation');
-		var flowunid = getItemValue(0,getRow(0),'flowunid');
-        var creditauth = getItemValue(0,getRow(0),'creditauth');
-        var objectType = creditauth;
-        var operationType = objectType;
-		var projectNo = "<%=projectNo%>";
-		var attributeId = getItemValue(0,getRow(0),'ID');
-		if(typeof(attributeId)==undefined || attributeId=='') {
-			alert("请先生成征信授权书，再发起电子签约！");
-			return;
-		}
-
-		var sReturn = "";
-		sReturn = RunJavaMethodTrans("com.tenwa.channelportal.action.alpha.CreditAuthActionNewUtils","sendMessageAgain",
-				"attributeId="+attributeId+",projectNo="+projectNo+",operationType="+objectType+",relation="+relation
-				+",fullName="+fullName+",certId="+certId+",phone="+phone+",flowUnid="+flowunid);
-		if("success"==sReturn){
-			AsDebug.showMessage("提示","短信发送成功！","","",true);
-		}else{
-			AsDebug.showMessage("提示","短信发送失败！["+sReturn+"]","","",true);
-		}
-	}
-</script>
-<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/src/com/tenwa/channelportal/action/alpha/CreditAuthActionNewUtils.java b/src/com/tenwa/channelportal/action/alpha/CreditAuthActionNewUtils.java
index 57463eecb..4d3514896 100644
--- a/src/com/tenwa/channelportal/action/alpha/CreditAuthActionNewUtils.java
+++ b/src/com/tenwa/channelportal/action/alpha/CreditAuthActionNewUtils.java
@@ -149,6 +149,7 @@ public class CreditAuthActionNewUtils {
                         DataOperatorUtil.copySingleJBO(LB_DOC_CONTRACT_LIST.CLASS_NAME, fromCondtion,LB_CONTRACT_SIGN_LOG.CLASS_NAME, null,otherProperty, tx);
                     }
                 }else {
+                    logger.info(relation + " 发起征信授权电子签约 fullName=" + fullName);
                     SdkResponse<DocumentAddResult> addDocumentByFile = catu.addDocumentByFile(makefullPath, subjectId, contractId);
                     documentId = addDocumentByFile.getResult().getDocumentId();
                     //发起合同
diff --git a/src/com/tenwa/channelportal/action/alpha/CreditAuthActionTwoUtil.java b/src/com/tenwa/channelportal/action/alpha/CreditAuthActionTwoUtil.java
index 7d7177f66..b02d759e2 100644
--- a/src/com/tenwa/channelportal/action/alpha/CreditAuthActionTwoUtil.java
+++ b/src/com/tenwa/channelportal/action/alpha/CreditAuthActionTwoUtil.java
@@ -202,24 +202,17 @@ public class CreditAuthActionTwoUtil {
 		for (Signatory signatory : draft.getSignatories()) {
 			// 获取个人签署方
 			if (signatory.getTenantType().equals("PERSONAL")) {
+				logger.info("征信授权，非申请人，开始发起电子签约20210723。");
 				personalSignatoryId = signatory.getId();
 				String typeName = signatory.getTenantName();
-				String type = "";
-				if (personList != null && personList.size() > 0) {
-					for (Map<String, String> person : personList) {
-						if (person.get("name").equals(typeName)) {
-							type = person.get("type");
-							break;
-						}
-					}
-				}
 				Stamper personalStamper = new Stamper();
 				personalStamper.setPage(0);
 				personalStamper.setType("PERSONAL");
 				personalStamper.setSignatoryId(personalSignatoryId);
 				personalStamper.setDocumentId(documentId);
 				personalStamper.setKeyword("授权人签章：");
-				personalStamper.setOffsetX(-0.05);
+				personalStamper.setOffsetX(-0.03);
+				personalStamper.setOffsetY(-0.02);
 				//添加一个签署时间
 				Stamper personalStamperTime1 = new Stamper();
 				personalStamperTime1.setPage(0);
@@ -227,31 +220,9 @@ public class CreditAuthActionTwoUtil {
 				personalStamperTime1.setSignatoryId(personalSignatoryId);
 				personalStamperTime1.setDocumentId(documentId);
 				personalStamperTime1.setKeyword("授权人签章：");
-				personalStamperTime1.setOffsetX(0.025);
-				personalStamperTime1.setOffsetY(-0.0025);
+				personalStamperTime1.setOffsetX(0.17);
+				personalStamperTime1.setOffsetY(-0.02);
 				stampers.add(personalStamperTime1);
-				if ("sq".equals(type)) {//承租人
-					//申请人添加第二个签字位置
-					Stamper personalStamper2 = new Stamper();
-					personalStamper2.setPage(0);
-					personalStamper2.setType("PERSONAL");
-					personalStamper2.setSignatoryId(personalSignatoryId);
-					personalStamper2.setDocumentId(documentId);
-					personalStamper2.setKeyword("授权人（签名）：");
-					personalStamper2.setOffsetX(-0.05);
-					stampers.add(personalStamper2);
-
-					//添加二个签署时间
-					Stamper personalStamperTime2 = new Stamper();
-					personalStamperTime2.setPage(0);
-					personalStamperTime2.setType("TIMESTAMP");
-					personalStamperTime2.setSignatoryId(personalSignatoryId);
-					personalStamperTime2.setDocumentId(documentId);
-					personalStamperTime2.setKeyword("授权日期：");
-					personalStamperTime2.setOffsetX(0.025);
-					personalStamperTime2.setOffsetY(-0.0025);
-					stampers.add(personalStamperTime2);
-				}
 				stampers.add(personalStamper);
 			}
 		}
diff --git a/src/com/tenwa/channelportal/action/alpha/CreditAuthAward.java b/src/com/tenwa/channelportal/action/alpha/CreditAuthAward.java
deleted file mode 100644
index c53ff2600..000000000
--- a/src/com/tenwa/channelportal/action/alpha/CreditAuthAward.java
+++ /dev/null
@@ -1,171 +0,0 @@
-package com.tenwa.channelportal.action.alpha;
-
-import com.amarsoft.app.util.ProductParamUtil;
-import com.amarsoft.are.jbo.*;
-import com.amarsoft.are.util.StringFunction;
-import com.amarsoft.awe.Configure;
-import com.amarsoft.awe.control.model.Page;
-import com.amarsoft.awe.util.ASResultSet;
-import com.amarsoft.awe.util.SqlObject;
-import com.amarsoft.awe.util.Transaction;
-import com.amarsoft.context.ASUser;
-import com.tenwa.channelportal.action.ContractSignAction;
-import com.tenwa.comm.util.jboutil.DataOperatorUtil;
-import common.Logger;
-import jbo.app.tenwa.calc.LC_PROJ_CONDITION;
-import jbo.app.tenwa.customer.CUSTOMER_ACCOUNT;
-import jbo.app.tenwa.doc.LB_DOCATTRIBUTE;
-import jbo.app.tenwa.doc.LB_DOCLIBRARY;
-import jbo.app.tenwa.doc.LB_DOCRELATIVE;
-import jbo.app.tenwa.doc.LB_DOC_CONTRACT_LIST;
-import jbo.com.tenwa.lease.carbrand.BUSINESS_STATUS;
-import jbo.com.tenwa.lease.carbrand.VI_CONTRACTMAKEPRINTLIST;
-import jbo.com.tenwa.lease.comm.LB_CONTRACT_STATUS;
-import jbo.com.tenwa.lease.comm.LB_PROJECT_INFO;
-import jbo.com.tenwa.lease.comm.LB_PROJECT_INFO_TEMP;
-
-import java.sql.SQLException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 合同签约
- * @author tenwa518
- *
- */
-public class CreditAuthAward {
-private Logger logger=Logger.getLogger(this.getClass());
-public String libraryId;
-public String project_id;
-public String contract_id;
-public String ProjectId;
-public String CustomerType;
-public String ProductId;
-public String ContractId;
-public Page CurPage;
-public Configure Curconf;
-public String CurUserID;
-public String FlowUnid;
-
-
-public String getFlowUnid() {
-	return FlowUnid;
-}
-
-public void setFlowUnid(String flowUnid) {
-	FlowUnid = flowUnid;
-}
-
-public String getCurUserID() {
-	return CurUserID;
-}
-
-public void setCurUserID(String curUserID) {
-	CurUserID = curUserID;
-}
-
-public String getContract_id() {
-	return contract_id;
-}
-
-public void setContract_id(String contract_id) {
-	this.contract_id = contract_id;
-}
-
-public Configure getCurconf() {
-	return Curconf;
-}
-
-public void setCurconf(Configure curconf) {
-	Curconf = curconf;
-}
-
-public Page getCurPage() {
-	return CurPage;
-}
-
-public void setCurPage(Page curPage) {
-	CurPage = curPage;
-}
-
-	public String getContractId() {
-	return ContractId;
-}
-
-
-public void setContractId(String contractId) {
-	ContractId = contractId;
-}
-
-
-	public String getProductId() {
-	return ProductId;
-}
-
-
-public void setProductId(String productId) {
-	ProductId = productId;
-}
-
-
-	public String getCustomerType() {
-	return CustomerType;
-}
-
-
-public void setCustomerType(String customerType) {
-	CustomerType = customerType;
-}
-
-
-	public String getProjectId() {
-	return ProjectId;
-}
-
-
-public void setProjectId(String projectId) {
-	ProjectId = projectId;
-}
-
-
-	public String getLibraryId() {
-	return libraryId;
-}
-
-
-public void setLibraryId(String libraryId) {
-	this.libraryId = libraryId;
-}
-
-
-	public String getProject_id() {
-	return project_id;
-}
-
-
-    
-    public String projectStatus(JBOTransaction tx) throws JBOException{
-    	//BizObjectManager bom = JBOFactory.getBizObjectManager(LB_PROJECT_INFO.CLASS_NAME,tx);
-    	BizObjectManager bom = JBOFactory.getBizObjectManager(LB_PROJECT_INFO_TEMP.CLASS_NAME,tx);
-    	BizObjectManager bomstatus = JBOFactory.getBizObjectManager(LB_CONTRACT_STATUS.CLASS_NAME,tx);
-    	BizObjectManager ldclBom = JBOFactory.getBizObjectManager(LB_DOC_CONTRACT_LIST.CLASS_NAME,tx);
-    	BizObjectManager vc = JBOFactory.getBizObjectManager(VI_CONTRACTMAKEPRINTLIST.CLASS_NAME,tx);
-    	Boolean flag=false;
-    	Boolean unflag=true;
-        List<BizObject> ldclBo = ldclBom.createQuery("project_id='"+project_id+"' and file_flag='yes' and sendprocess='1'").getResultList(false);
-        if(ldclBo.size()>0){
-    	  flag=true;
-    	}
-        List<BizObject> vcs = vc.createQuery("id=:projectid and flowunid=:flowunid").setParameter("projectid", project_id).setParameter("flowunid", FlowUnid).getResultList(false);
-        if(vcs.size()>0){
-        	unflag=false;
-      	}
-        //BizObject bo=bom.createQuery("id='"+project_id+"'").getSingleResult(false);
-        BizObject bo=bom.createQuery("FLOWUNID='"+FlowUnid+"'").getSingleResult(false);
-    	BizObject bostatus=bomstatus.createQuery("status_code='"+bo.getAttribute("PROJECT_STATUS").toString()+"'").getSingleResult(false);
-    	String projstatus=bostatus!=null?bostatus.getAttribute("STATUS_NAME").toString():"";
-    	return bo.getAttribute("DATA_STATE").toString()+"@"+projstatus+"@"+flag+"@"+unflag;
-    }
-	
-}
diff --git a/src_tenwa/com/tenwa/lease/flow/project/commcheck/UserCreditAuthCheck.java b/src_tenwa/com/tenwa/lease/flow/project/commcheck/UserCreditAuthCheck.java
index 24d0806c2..33d434bea 100644
--- a/src_tenwa/com/tenwa/lease/flow/project/commcheck/UserCreditAuthCheck.java
+++ b/src_tenwa/com/tenwa/lease/flow/project/commcheck/UserCreditAuthCheck.java
@@ -17,6 +17,7 @@ import com.amarsoft.are.jbo.JBOFactory;
 import com.amarsoft.awe.util.Transaction;
 import com.tenwa.template.check.DefaultBussinessCheck;
 import jbo.com.tenwa.lease.comm.LB_UNION_LESSEE_TEMP;
+import org.apache.commons.collections.CollectionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -33,12 +34,13 @@ public class UserCreditAuthCheck extends DefaultBussinessCheck  {
 	private static final Logger logger = LoggerFactory.getLogger(UserCreditAuthCheck.class);
 	@Override
 	public Object run(Transaction transaction) throws Exception {
+		logger.info("订单中所有用户征信授权电子版是否已签署");
 		StringBuffer Message = new StringBuffer();
 		Message.append("未填写：");
 		String flowunid=this.getAttribute("ObjectNo").toString();
 		BizObjectManager lpitMange = JBOFactory.getBizObjectManager(LB_PROJECT_INFO_TEMP.CLASS_NAME, transaction);
 		BizObject lpit = lpitMange.createQuery("FLOWUNID=:flowunid").setParameter("FLOWUNID", flowunid).getSingleResult(false);
-		String projectNo = lpit.getAttribute("CAR_TYPE").getString();
+		String projectNo = lpit.getAttribute("PROJECT_NO").getString();
 		// : 2021/7/15 查询申请人
 		BizObjectManager lult = JBOFactory.getBizObjectManager(LB_UNION_LESSEE_TEMP.CLASS_NAME);
 		BizObject lults = lult.createQuery("flowunid=:flowUnid").setParameter("flowUnid", flowunid).getSingleResult(false);
@@ -56,32 +58,36 @@ public class UserCreditAuthCheck extends DefaultBussinessCheck  {
 		BizObjectManager lgutManager = JBOFactory.getBizObjectManager(LB_GUARANTEE_UNIT_TEMP.CLASS_NAME, transaction);
 		List<BizObject> lgutList = lgutManager.createQuery("FLOWUNID=:flowunid").setParameter("FLOWUNID", flowunid).getResultList(false);
 		// : 2021/7/15 担保人
-		for(BizObject lgut : lgutList){
-			String certid = lgut.getAttribute("CERTID").getString();
-			String certType = lgut.getAttribute("CERTTYPE").getString();
-			logger.info("UserCreditAuthCheck 当前担保人certType=" + certType);
-			if("Ent02".equals(certType)){
-				logger.info("UserCreditAuthCheck 当前担保人是法人【Ent02】，不参与签约校验！");
-				continue;
-			}
-			checkCredit = checkCreditAuth(projectNo, certid, creditAuthMap, transaction);
-			if(checkCredit){
-				//担保人未完成征信授权书签约
-				putMsg("担保人未完成征信授权书签约");
-				setPass(false);
-				return null;
+		if(CollectionUtils.isNotEmpty(lgutList)){
+			for(BizObject lgut : lgutList){
+				String certid = lgut.getAttribute("CERTID").getString();
+				String certType = lgut.getAttribute("CERTTYPE").getString();
+				logger.info("UserCreditAuthCheck 当前担保人certType=" + certType);
+				if("Ent02".equals(certType)){
+					logger.info("UserCreditAuthCheck 当前担保人是法人【Ent02】，不参与签约校验！");
+					continue;
+				}
+				checkCredit = checkCreditAuth(projectNo, certid, creditAuthMap, transaction);
+				if(checkCredit){
+					//担保人未完成征信授权书签约
+					putMsg("担保人未完成征信授权书签约");
+					setPass(false);
+					return null;
+				}
 			}
 		}
 		// : 2021/7/15 共同申请人
 		BizObjectManager cftManager = JBOFactory.getBizObjectManager(CUSTOMER_FAMILY_TEMP.CLASS_NAME, transaction);
 		BizObject cft = cftManager.createQuery("flowunid=:flowUnid  and Partner_='Y' ").setParameter("flowUnid", flowunid).getSingleResult(false);
-		String certid = cft.getAttribute("certid").getString();
-		checkCredit = checkCreditAuth(projectNo, certid, creditAuthMap, transaction);
-		if(checkCredit){
-			//共同申请人未完成征信授权书签约
-			putMsg("共同申请人未完成征信授权书签约");
-			setPass(false);
-			return null;
+		if(null != cft){
+			String certid = cft.getAttribute("certid").getString();
+			checkCredit = checkCreditAuth(projectNo, certid, creditAuthMap, transaction);
+			if(checkCredit){
+				//共同申请人未完成征信授权书签约
+				putMsg("共同申请人未完成征信授权书签约");
+				setPass(false);
+				return null;
+			}
 		}
 		putMsg("征信授权委托书已全部完成数字签约！");
 		setPass(true);
@@ -114,7 +120,7 @@ public class UserCreditAuthCheck extends DefaultBussinessCheck  {
 			String docAttributeId = bom2.createQuery("library_id=:library_id").setParameter("library_id", lbDocLibraryId).getSingleResult(false).getAttribute("id").toString();
 			BizObjectManager contBom = JBOFactory.getBizObjectManager(LB_DOC_CONTRACT_LIST.CLASS_NAME, transaction);
 			BizObject bo = contBom.createQuery("select singcontract_id,filename from O " +
-					" where attribute_id=:attributeId  and file_flag = 'yes' and sendprocess = '2' and sign_type = 'COMPLETE'").setParameter("attributeId", docAttributeId).getSingleResult(true);
+					" where attribute_id=:attributeId  and file_flag = 'yes' and sendprocess = '1' and sign_type = 'COMPLETE'").setParameter("attributeId", docAttributeId).getSingleResult(true);
 			if(null == bo){
 				return true;
 			}

From 9a92efde0d39d01386d33bf6aa1ab00c6f2ffaa1 Mon Sep 17 00:00:00 2001
From: ap007 <zhanglei@ap-leasing.com.cn>
Date: Mon, 26 Jul 2021 19:04:15 +0800
Subject: [PATCH 25/29] =?UTF-8?q?=E9=82=AE=E5=82=A8=E6=94=BE=E6=AC=BE--?=
 =?UTF-8?q?=E5=87=AD=E8=AF=81=EF=BC=88=E5=88=9D=E7=89=88=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FundIncomeVoucherInfoServiceImpl.java     | 244 ++++++++++++++----
 .../serviceImp/FundIncomeVoucherPSBC.java     | 113 ++++++++
 ...orpusSourceFundIncomeCreateVoucherJob.java |   3 +-
 3 files changed, 310 insertions(+), 50 deletions(-)
 create mode 100644 src_core/com/tenwa/voucher/serviceImp/FundIncomeVoucherPSBC.java

diff --git a/src_core/com/tenwa/voucher/serviceImp/FundIncomeVoucherInfoServiceImpl.java b/src_core/com/tenwa/voucher/serviceImp/FundIncomeVoucherInfoServiceImpl.java
index d2c786a16..fb61af94a 100644
--- a/src_core/com/tenwa/voucher/serviceImp/FundIncomeVoucherInfoServiceImpl.java
+++ b/src_core/com/tenwa/voucher/serviceImp/FundIncomeVoucherInfoServiceImpl.java
@@ -1,13 +1,19 @@
 package com.tenwa.voucher.serviceImp;
 
 import com.amarsoft.are.jbo.*;
+import com.amarsoft.awe.util.SqlObject;
+import com.amarsoft.awe.util.Transaction;
 import com.amarsoft.dict.als.manage.NameManager;
 import com.tenwa.comm.util.jboutil.DataOperatorUtil;
 import com.tenwa.flow.util.FlowUtil;
 import com.tenwa.reckon.util.DateUtil;
 import com.tenwa.voucher.service.VoucherInfoService;
 import jbo.app.VOUCHER_V8;
+import jbo.app.tenwa.customer.CUSTOMER_LIST;
+import jbo.com.tenwa.entity.comm.own.OWN_INFO;
+import jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO;
 
+import java.sql.SQLException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
@@ -15,17 +21,27 @@ import java.util.List;
 import java.util.Map;
 
 public class FundIncomeVoucherInfoServiceImpl implements VoucherInfoService {
-    //todo 这个字段是自增的，更新生产时，先在生产配置，然后根据生产的编号再更改
-    private static final String VOUCHER_CONFIGNO = "PZ2021072100000020";//凭证号
-    private static final String EVIDENCE_MESSAGE = "凭证输出";//查看凭证表，发现只有这一个值，目前先设置为固定值
-    private static final String EAS_FLAG  = "0";//导入财务系统状态 默认0 (同上，只有这一个值)
-    public void run() {
+    private final String voucherConfigNo = "PZ2021072600000003";
+    public void run() throws JBOException {
         JBOTransaction tx = null;
+        Transaction Sqlca =null;
         try {
             tx = JBOFactory.createJBOTransaction();
-            //凭证编号
-            String voucherNo ="k" + FlowUtil.getVoucher_Number(tx);
-            System.out.println(voucherNo+"======");
+            Sqlca =  Transaction.createTransaction(tx);
+            List<Map<String,String>> loanInfoList = this.getHasLoanContract("PSBC");
+            for(Map<String,String> loanInfo : loanInfoList){
+                String voucherNo ="k" + FlowUtil.getVoucher_Number(tx);
+                loanInfo.put("voucherNo",voucherNo);
+                String customerNo = this.getCustomerNoByContractId(loanInfo.get("contractId"),Sqlca);
+                loanInfo.put("customerNo",customerNo);
+                //获取最终参数
+                List<Map<String,String>> paramList = this.getFinalParam(loanInfo,tx);
+                //生成凭证
+                this.createVoucher(paramList,tx);
+                //更新凭证信息状态
+                updateVoucherStatus(loanInfo.get("loan_no"),Sqlca);
+            }
+            System.out.println("=============凭证生成完毕============");
         } catch (JBOException e) {
             e.printStackTrace();
         } catch (Exception e) {
@@ -33,45 +49,112 @@ public class FundIncomeVoucherInfoServiceImpl implements VoucherInfoService {
         }finally {
             try {
                 tx.commit();
+                if(Sqlca!=null){
+                    Sqlca.disConnect();
+                    Sqlca = null;
+                }
             } catch (JBOException e) {
                 e.printStackTrace();
+                tx.rollback();
             }
         }
 
 
     }
 
-    public void createVoucher(List<Map<String, String>> list, JBOTransaction tx) throws Exception {
+    /**
+     * 生成每个合同的凭证
+     * @param paramList
+     * @param tx
+     * @throws Exception
+     */
+    public void createVoucher(List<Map<String, String>> paramList, JBOTransaction tx) throws Exception {
         BizObjectManager bomV8 = JBOFactory.getBizObjectManager(VOUCHER_V8.CLASS_NAME,tx);
-        List<Map<String,String>> loanInfoList = this.getHasLoanContract(tx);
-        for(Map<String,String> loanInfo : loanInfoList){
-            loanInfo =  this.getCommonParam(loanInfo,tx);
-            List<Map<String,String>> paramList = getParamOfVoucher(tx);
-            for(Map<String,String> param : paramList){
-                param.putAll(loanInfo);
-                BizObject boV8 = bomV8.newObject();
-                boV8.setAttributesValue(this.getFinalParam(param));
-                bomV8.saveObject(boV8);
-            }
+        for(Map<String, String> param :paramList){
+            BizObject boV8 = bomV8.newObject();
+            boV8.setAttributesValue(param);
+            bomV8.saveObject(boV8);
         }
     }
-    public List<Map<String,String>> getHasLoanContract(JBOTransaction tx) throws Exception {
-        //todo 目前为邮储，九江的时候将where条件更改参数
-        String sql = "select frl.loan_no,frl.customer_name,frl.loan_date,frl.loan_amt,frl.business_rate,frl.TRANS_AMT,fr.CONTRACT_ID,fr.CONTRACT_NO " +
+
+    /**
+     * 获取最终的参数
+     * @param loanInfo
+     * @param tx
+     * @return
+     * @throws Exception
+     */
+    public List<Map<String,String>> getFinalParam(Map<String,String> loanInfo ,JBOTransaction tx) throws Exception {
+            List<Map<String,String>> paramList = getParamOfVoucher(voucherConfigNo);
+            for(Map<String,String> param : paramList){
+                //将公共参数放到凭证配置的每个凭证信息中
+                param.putAll(this.getCommonParam(loanInfo));
+                //将定制参数放入
+                String money = "";
+                //邮政储蓄银行
+                if("100219".equals(param.get("subjectsCode"))){
+                    money=param.get("TRANS_AMT");
+                    param.put("contractNo","");
+                    param.put("customerNo","");
+                    param.put("customerName","");
+                    //应财务要求邮储放款填固定值
+                    param.put("cashFlow","11213");
+                }
+                //长期应收款\回租\汽车\本金
+                if("1531020101".equals(param.get("subjectsCode"))){
+                    money=param.get("TRANS_AMT");
+                }
+                //未实现融资收益\回租\汽车 或 长期应收款\回租\汽车\利息
+                if("15320201".equals(param.get("subjectsCode"))||"1531020102".equals(param.get("subjectsCode"))){
+                    money=this.getInterestTotalByContractId(param.get("contractId"));
+                }
+                //debit:借；credit:贷
+                if("1".equals(param.get("entrydc"))) {
+                    param.put("debitMoney",money);
+                    param.put("creditMoney","0.00");
+                }else{
+                    param.put("debitMoney","0.00");
+                    param.put("creditMoney",money);
+                }
+                //转译的凭证信息
+                param.putAll(this.getConvertParam(param));
+            }
+
+        return paramList;
+    }
+
+    /**
+     * 获取需要生成凭证的合同以及对应信息
+     * @return
+     * @throws Exception
+     */
+    public List<Map<String,String>> getHasLoanContract(String channelNo) throws Exception {
+        String sql = "select frl.loan_no,frl.customer_name as customerName,frl.loan_date,frl.business_rate,frl.TRANS_AMT,fr.CONTRACT_ID as contractId,fr.CONTRACT_NO as contractNo " +
                      "from fc_request_loan  frl " +
                      "left join fc_request fr on frl.LOAN_NO = fr.FC_LOAN_ID " +
-                     "where frl.del_flag='0' and fr.DEL_FLAG='0' and voucher_status='0' and fr.CHANNEL_NO='PSBC' ";
-        return DataOperatorUtil.getDataBySql(sql,tx);
+                     "where frl.del_flag='0' and fr.DEL_FLAG='0' and voucher_status='0' and fr.CHANNEL_NO='"+channelNo+"' ";
+        return DataOperatorUtil.getDataBySql(sql);
     }
-    public Map<String,String> getCommonParam(Map<String,String> loanInfo,JBOTransaction tx) throws Exception {
 
-        String contractId = loanInfo.get("CONTRACT_ID");
-        String voucherNo ="k" + FlowUtil.getVoucher_Number(tx);
-        loanInfo.put("voucherNo",voucherNo);
+    /**
+     * 获取生成凭证所需的公共参数(每个合同为单位)
+     * 在传来值的基础上增添
+     * @param loanInfo
+     * @return
+     * @throws Exception
+     */
+    public Map<String,String> getCommonParam(Map<String,String> loanInfo) throws Exception {
+
+        //固定值部分
+        String evidenceMessage = "凭证输出";//查看凭证表，发现只有这一个值，目前先设置为固定值
+        String easFlag  = "0";//导入财务系统状态 默认0 (同上，只有这一个值)
         String userId = "administrator";//操作人
         String userName = NameManager.getUserName(userId);
+        loanInfo.put("evidenceMessage",evidenceMessage);
+        loanInfo.put("easFlag",easFlag);
         loanInfo.put("userId",userId);
         loanInfo.put("userName",userName);
+
         //日期
         String loanDate = loanInfo.get("loan_date").substring(0,8);
         String periodYear = loanDate.substring(0,4);
@@ -81,50 +164,113 @@ public class FundIncomeVoucherInfoServiceImpl implements VoucherInfoService {
         loanInfo.put("periodYear",periodYear);
         loanInfo.put("periodMonth",periodMonth);
         loanInfo.put("accountingDate",loanDate);
-        loanInfo.put("generate_date", DateUtil.getSystemDateDetailTime());
+        loanInfo.put("generateDate", DateUtil.getSystemDateDetailTime());
 
+        //主体信息
+        String contractId = loanInfo.get("contractId");
+        loanInfo.putAll(this.getSubjectInfoByContractId(contractId));
         return loanInfo;
     }
-    public List<Map<String,String>> getParamOfVoucher(JBOTransaction tx) throws Exception {
-        String sql = "select lvl.SORT_NUMBER as sortNumber,lvl.LOAN_SUBJECT as loanSubject,CASE WHEN lvl.loan_direction = '1' THEN '1' ELSE '-1' END as entrydc,lvl.VALUE_ABSTRACT as valueAbstract,lsc.SUBJECTS_CODE as subjectsCode,lsc.SUBJECTS_NAME as subjectsName " +
+
+    /**
+     * 根据contractId获取对应的利息总和。
+     * （放款流程结束时生成的利息凭证计算逻辑用的是lc_pay_rent_plan表，邮储放款时生成利息凭证要和此相同）
+     * @param contractId
+     * @return
+     * @throws Exception
+     */
+    public String getInterestTotalByContractId(String contractId) throws Exception {
+        String interestTotal = "select sum(interest) as interestTotal from lc_pay_rent_plan where contract_id='"+contractId+"'";
+        return DataOperatorUtil.getDataBySql(interestTotal).get(0).get("interestTotal");
+    }
+
+    /**
+     * 根据contractId获取主体信息
+     * @param contractId
+     * @return
+     * @throws JBOException
+     */
+    public Map<String,String> getSubjectInfoByContractId(String contractId) throws JBOException {
+        Map<String,String> subject = new HashMap<>();
+        BizObjectManager bomLCI = JBOFactory.getBizObjectManager(LB_CONTRACT_INFO.CLASS_NAME);
+        BizObject boLCI = bomLCI.createQuery("id=:id").setParameter("id",contractId).getSingleResult(false);
+        String subjectId = boLCI.getAttribute("SUBJECTID").toString();
+        String subjectName = boLCI.getAttribute("SUBJECTNAME").toString();
+        BizObjectManager bomOI = JBOFactory.getBizObjectManager(OWN_INFO.CLASS_NAME);
+        BizObject boOI = bomOI.createQuery("OWN_NAME=:subjectName").setParameter("subjectName",subjectName).getSingleResult(false);
+        String ownNumber = boOI.getAttribute("OWN_NUMBER").toString();
+        subject.put("subjectId",subjectId);
+        subject.put("subjectName",subjectName);
+        subject.put("ownNumber",ownNumber);
+
+        return subject;
+    }
+
+    /**
+     * 根据凭证配置编号获取对应的每条凭证参数
+     * @return
+     * @throws Exception
+     */
+    public List<Map<String,String>> getParamOfVoucher(String voucherConfigNo) throws Exception {
+        String sql = "select lvl.SORT_NUMBER as sortNumber,lvl.LOAN_SUBJECT as loanSubject,CASE WHEN lvl.loan_direction = '1' THEN '1' ELSE '-1' END as entrydc,lvl.VALUE_ABSTRACT as valueAbstract,lsc.SUBJECTS_CODE as subjectsCode,lsc.SUBJECTS_NAME as subjectsName,lvc.MODULAR_NUMBER as modularName " +
                 "from lv_voucher_loan lvl " +
                 "left join LV_STACTS_CONFIG lsc on lvl.LOAN_SUBJECT=lsc.id " +
                 "left join lv_voucher_config lvc on lvl.VOUCHER_ID=lvc.id " +
-                "where lvc.VOUCHER_NO='"+VOUCHER_CONFIGNO+"'";
-        return DataOperatorUtil.getDataBySql(sql,tx);
+                "where lvc.VOUCHER_NO='"+voucherConfigNo+"'";
+        return DataOperatorUtil.getDataBySql(sql);
     }
-    public Map<String,String> getFinalParam(Map<String,String> param){
+
+    /**
+     * 将最终获取的参数转换为凭证表voucher_v8对应的字段
+     * 注意：新增时注意param中字段不可修改
+     * @param param
+     * @return
+     */
+    public Map<String,String> getConvertParam(Map<String,String> param){
         Map<String,String> finalParam = new HashMap<>();
-        finalParam.put("evidence_message",EVIDENCE_MESSAGE);//固定值：凭证输出
+        finalParam.put("evidence_message",param.get("evidenceMessage"));//固定值：凭证输出
         finalParam.put("periodyear",param.get("periodYear")); //年
         finalParam.put("f1",param.get("accountingDate"));//会计日期
         finalParam.put("f2",param.get("subjectsCode"));//科目编码
         finalParam.put("f3",param.get("voucherNo"));//凭证编号
         finalParam.put("f5",param.get("valueAbstract"));//摘要
         finalParam.put("f6",param.get("loanSubject"));//科目表id
-        finalParam.put("f7",param.get("periodYear"));//借方金额
-        finalParam.put("f8",param.get("periodYear"));//贷方金额
+        finalParam.put("f7",param.get("debitMoney"));//借方金额
+        finalParam.put("f8",param.get("creditMoney"));//贷方金额
         finalParam.put("f12",param.get("userName"));//操作人
         finalParam.put("f15",param.get("accountingDate"));//日期(与会计日期相同)
-        finalParam.put("f47",param.get("CONTRACT_NO"));//业务合同编号
-        finalParam.put("f48",param.get("periodYear"));//本方信息No
-        finalParam.put("f49",param.get("periodYear"));//所属公司ID（注意：实际此字段存的是code_library表中codeno='ManySubject' 的 itemno 字段）
-        finalParam.put("f50",param.get("periodYear"));//所属公司名称
+        finalParam.put("f47",param.get("contractNo"));//业务合同编号
+        finalParam.put("f48",param.get("ownNumber"));//本方信息No
+        finalParam.put("f49",param.get("subjectId"));//所属公司ID（注意：实际此字段存的是code_library表中codeno='ManySubject' 的 itemno 字段）
+        finalParam.put("f50",param.get("subjectName"));//所属公司名称
         finalParam.put("f51",param.get("periodYear"));//会计期间-年（与上面 ‘年’ 相同）
         finalParam.put("f52",param.get("periodMonth"));//会计期间-月
         finalParam.put("f59",param.get("sortNumber"));//凭证配置中排序号
-        finalParam.put("f60",param.get("CONTRACT_NO"));//业务合同号，与f47相同（尚不明为何重复）
-        finalParam.put("f61",param.get("customer_name"));//客户名称
+        finalParam.put("f60",param.get("contractNo"));//业务合同号，与f47相同（尚不明为何重复）
+        finalParam.put("f61",param.get("customerName"));//客户名称
         finalParam.put("f62",param.get("loanSubject"));//科目表id，与f6相同（尚不明为何重复）
-        finalParam.put("f65",VOUCHER_CONFIGNO);//凭证配置编号
+        finalParam.put("f65",param.get("customerNo"));//客商编号（取值customer_info表中customer_num字段）
+        finalParam.put("f74",param.get("cashFlow"));//客商编号（取值customer_info表中customer_num字段）
         finalParam.put("v8_status","已完整");//凭证状态 ： 已完整；未完整
-        finalParam.put("generate_date",param.get("generate_date"));//创建时间
-        finalParam.put("v8_flag",EAS_FLAG);//导入财务系统状态 默认0（尚不知有何逻辑，目前整个表中全部为0）
-        finalParam.put("module_name",param.get("subjectsName"));//凭证名称
+        finalParam.put("generate_date",param.get("generateDate"));//创建时间
+        finalParam.put("v8_flag",param.get("easFlag"));//导入财务系统状态 默认0（尚不知有何逻辑，目前整个表中全部为0）
+        finalParam.put("module_name",param.get("modularName"));//凭证模型名称
         finalParam.put("entrydc",param.get("entrydc"));//借贷：1，借；-1，贷
         finalParam.put("inputuserid",param.get("userId"));//操作人id
-
         return finalParam;
     }
-
+    public void updateVoucherStatus(String loanNo ,Transaction Sqlca) throws Exception {
+        String sql = "update fc_request_loan set voucher_status = '1' where loan_no = '"+loanNo+"'";
+        SqlObject sqlObject = new SqlObject(sql);
+        Sqlca.executeSQL(sqlObject);
+    }
+    public String getCustomerNoByContractId(String contractId,Transaction Sqlca) throws Exception {
+        String sql = "select ci.customer_num from customer_info ci left join lb_union_lessee lul on lul.CUSTOMER_ID=ci.customerid and lul.IS_MAIN='Y' where lul.CONTRACT_ID='"+contractId+"'";
+        String customerNo = Sqlca.getString(sql);
+        return customerNo;
+    }
+    public int getCashFlowProjectNoByCustId(String custId) throws JBOException {
+        int custCount =JBOFactory.createBizObjectQuery(CUSTOMER_LIST.CLASS_NAME, "CUST_ID='"+custId+"'").getTotalCount();
+        return custCount;
+    }
 }
diff --git a/src_core/com/tenwa/voucher/serviceImp/FundIncomeVoucherPSBC.java b/src_core/com/tenwa/voucher/serviceImp/FundIncomeVoucherPSBC.java
new file mode 100644
index 000000000..37c41c8b1
--- /dev/null
+++ b/src_core/com/tenwa/voucher/serviceImp/FundIncomeVoucherPSBC.java
@@ -0,0 +1,113 @@
+package com.tenwa.voucher.serviceImp;
+
+import com.amarsoft.are.jbo.*;
+import com.amarsoft.awe.util.SqlObject;
+import com.amarsoft.awe.util.Transaction;
+import com.amarsoft.dict.als.manage.NameManager;
+import com.tenwa.comm.util.jboutil.DataOperatorUtil;
+import com.tenwa.flow.util.FlowUtil;
+import com.tenwa.reckon.util.DateUtil;
+import com.tenwa.voucher.service.VoucherInfoService;
+import jbo.app.VOUCHER_V8;
+import jbo.app.tenwa.customer.CUSTOMER_LIST;
+import jbo.com.tenwa.entity.comm.own.OWN_INFO;
+import jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class FundIncomeVoucherPSBC extends FundIncomeVoucherInfoServiceImpl {
+    private final String voucherConfigNo = "PZ2021072600000003";
+    @Override
+    public void run() throws JBOException {
+        JBOTransaction tx = null;
+        Transaction Sqlca =null;
+        try {
+            tx = JBOFactory.createJBOTransaction();
+            Sqlca =  Transaction.createTransaction(tx);
+            List<Map<String,String>> loanInfoList = getHasLoanContract("PSBC");
+            for(Map<String,String> loanInfo : loanInfoList){
+                String voucherNo ="k" + FlowUtil.getVoucher_Number(tx);
+                loanInfo.put("voucherNo",voucherNo);
+                String customerNo = getCustomerNoByContractId(loanInfo.get("contractId"),Sqlca);
+                loanInfo.put("customerNo",customerNo);
+                //获取最终参数
+                List<Map<String,String>> paramList = getFinalParam(loanInfo,tx);
+                //生成凭证
+                createVoucher(paramList,tx);
+                //更新凭证信息状态
+                updateVoucherStatus(loanInfo.get("loan_no"),Sqlca);
+            }
+            System.out.println("=============邮储放款凭证生成完毕============");
+        } catch (JBOException e) {
+            e.printStackTrace();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }finally {
+            try {
+                tx.commit();
+                if(Sqlca!=null){
+                    Sqlca.disConnect();
+                    Sqlca = null;
+                }
+            } catch (JBOException e) {
+                e.printStackTrace();
+                tx.rollback();
+            }
+        }
+
+
+    }
+
+    /**
+     * 获取最终的参数
+     * @param loanInfo
+     * @param tx
+     * @return
+     * @throws Exception
+     */
+    @Override
+    public List<Map<String,String>> getFinalParam(Map<String,String> loanInfo ,JBOTransaction tx) throws Exception {
+            List<Map<String,String>> paramList = getParamOfVoucher(this.voucherConfigNo);
+            for(Map<String,String> param : paramList){
+                //将公共参数放到凭证配置的每个凭证信息中
+                param.putAll(this.getCommonParam(loanInfo));
+                //将定制参数放入
+                String money = "";
+                //邮政储蓄银行
+                if("100219".equals(param.get("subjectsCode"))){
+                    money=param.get("TRANS_AMT");
+                    param.put("contractNo","");
+                    param.put("customerNo","");
+                    param.put("customerName","");
+                    //应财务要求邮储放款填固定值
+                    param.put("cashFlow","11213");
+                }
+                //长期应收款\回租\汽车\本金
+                if("1531020101".equals(param.get("subjectsCode"))){
+                    money=param.get("TRANS_AMT");
+                }
+                //未实现融资收益\回租\汽车 或 长期应收款\回租\汽车\利息
+                if("15320201".equals(param.get("subjectsCode"))||"1531020102".equals(param.get("subjectsCode"))){
+                    money=this.getInterestTotalByContractId(param.get("contractId"));
+                }
+                //debit:借；credit:贷
+                if("1".equals(param.get("entrydc"))) {
+                    param.put("debitMoney",money);
+                    param.put("creditMoney","0.00");
+                }else{
+                    param.put("debitMoney","0.00");
+                    param.put("creditMoney",money);
+                }
+                //转译的凭证信息
+                param.putAll(getConvertParam(param));
+            }
+
+        return paramList;
+    }
+
+
+}
diff --git a/src_tenwa/com/tenwa/lease/app/quartzmession/CorpusSourceFundIncomeCreateVoucherJob.java b/src_tenwa/com/tenwa/lease/app/quartzmession/CorpusSourceFundIncomeCreateVoucherJob.java
index fcfdb2a57..b19420d53 100644
--- a/src_tenwa/com/tenwa/lease/app/quartzmession/CorpusSourceFundIncomeCreateVoucherJob.java
+++ b/src_tenwa/com/tenwa/lease/app/quartzmession/CorpusSourceFundIncomeCreateVoucherJob.java
@@ -8,6 +8,7 @@ import com.tenwa.voucher.CreateVoucherProcess.InsertVoucherRentCompensatory;
 import com.tenwa.voucher.CreateVoucherProcess.InsertVoucherRentIncome;
 import com.tenwa.voucher.service.VoucherInfoService;
 import com.tenwa.voucher.serviceImp.FundIncomeVoucherInfoServiceImpl;
+import com.tenwa.voucher.serviceImp.FundIncomeVoucherPSBC;
 import org.quartz.Job;
 import org.quartz.JobExecutionContext;
 import org.quartz.JobExecutionException;
@@ -28,7 +29,7 @@ public class CorpusSourceFundIncomeCreateVoucherJob implements Job {
 		try{
 			tx = JBOFactory.createJBOTransaction();
 			//
-			VoucherInfoService voucher = new FundIncomeVoucherInfoServiceImpl();
+			VoucherInfoService voucher = new FundIncomeVoucherPSBC();
 			voucher.run();
 			
 			QuartzUtil.insertLog(startime,"com.tenwa.comm.message.controller.BusinessCancelJob", "success", "成功", curUserId);

From 8f654f396c4b59d88a6b64976b83fab0412c4a7e Mon Sep 17 00:00:00 2001
From: ap007 <zhanglei@ap-leasing.com.cn>
Date: Mon, 26 Jul 2021 19:05:46 +0800
Subject: [PATCH 26/29] =?UTF-8?q?=E5=B0=8Fbug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WebContent/Ample/Doc/DocListUploadNew.jsp                     | 2 ++
 WebContent/WEB-INF/etc/jbo/jbo_oti.xml                        | 1 +
 src_jbo/jbo/oti/LC_PROFIT_PLAN.java                           | 4 ++++
 .../lease/app/quartzmession/CorpusSourceRentPlanCopy.java     | 3 ++-
 4 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/WebContent/Ample/Doc/DocListUploadNew.jsp b/WebContent/Ample/Doc/DocListUploadNew.jsp
index cbb14b3fa..9065653b2 100644
--- a/WebContent/Ample/Doc/DocListUploadNew.jsp
+++ b/WebContent/Ample/Doc/DocListUploadNew.jsp
@@ -74,6 +74,7 @@
 					.setParameter("fcRequestId",params.get("fcRequestId")).setParameter("fcFlowType",params.get("fcFlowType")).setParameter("fcFileCode",params.get("fcFileCode")).getResultList(true);
 			String fcFlowTypeName = frfBoList.get(0).getAttribute("FC_FLOW_TYPE_NAME").toString();
 			String fcFileCodeName = frfBoList.get(0).getAttribute("FC_FILE_CODE_NAME").toString();
+			String fcResValue = frfBoList.get(0).getAttribute("FC_RES_VALUE").toString();
 			for(BizObject bo : frfBoList){
 				bo.setAttributeValue("FC_FILE_STS","2");
 				bo.setAttributeValue("FC_FILE_STS_DESC","用户添加待补传");
@@ -92,6 +93,7 @@
 			frfBo.setAttributeValue("FILE_PATH",params.get("filePath"));
 			frfBo.setAttributeValue("FC_FILE_STS","2");
 			frfBo.setAttributeValue("FC_FILE_STS_DESC","用户添加待补传");
+			frfBo.setAttributeValue("FC_RES_VALUE",fcResValue);
 			frfBo.setAttributeValue("CREATE_TIME",params.get("inputTime"));
 			frfBo.setAttributeValue("UPDATE_TIME",params.get("inputTime"));
 			frfBo.setAttributeValue("DEL_FLAG","0");
diff --git a/WebContent/WEB-INF/etc/jbo/jbo_oti.xml b/WebContent/WEB-INF/etc/jbo/jbo_oti.xml
index 077451637..d7190b017 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_oti.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_oti.xml
@@ -414,6 +414,7 @@
 			<attributes>
 				<attribute name="ID"    label="唯一标识"     type="STRING" length="32" />
 				<attribute name="RENT_PLAN_ID"    label="对应租金计划id"    type="STRING" length="32"/>
+				<attribute name="CORPUS_RATE"    label="资方利率"    type="STRING" length="32"/>
 				<attribute name="PROFIT"    label="分润金额"    type="STRING" length="32"/>
 				<attribute name="INPUTTIME"    label="创建时间"    type="STRING" length="32"/>
 			</attributes>
diff --git a/src_jbo/jbo/oti/LC_PROFIT_PLAN.java b/src_jbo/jbo/oti/LC_PROFIT_PLAN.java
index d7c03c2ff..afb276500 100644
--- a/src_jbo/jbo/oti/LC_PROFIT_PLAN.java
+++ b/src_jbo/jbo/oti/LC_PROFIT_PLAN.java
@@ -19,6 +19,10 @@ public interface LC_PROFIT_PLAN {
 	 * 对应租金计划ID STRING(32)<br>
 	 */
 	public static final String RENT_PLAN_ID = "RENT_PLAN_ID";
+	/**
+	 * 资方利率 STRING(32)<br>
+	 */
+	public static final String CORPUS_RATE = "CORPUS_RATE";
 	/**
 	* 分润金额 STRING(32)<br>
 	*/
diff --git a/src_tenwa/com/tenwa/lease/app/quartzmession/CorpusSourceRentPlanCopy.java b/src_tenwa/com/tenwa/lease/app/quartzmession/CorpusSourceRentPlanCopy.java
index 7dc9b3ecc..ad229dfe5 100644
--- a/src_tenwa/com/tenwa/lease/app/quartzmession/CorpusSourceRentPlanCopy.java
+++ b/src_tenwa/com/tenwa/lease/app/quartzmession/CorpusSourceRentPlanCopy.java
@@ -273,15 +273,16 @@ public class CorpusSourceRentPlanCopy implements Job {
 		lrpBom = JBOFactory.getBizObjectManager(LC_RENT_PLAN.CLASS_NAME,tx);
 		BizObject lppBo = null;
 		String paymentNumber = param.get("paymentNumber");
+		String corpusSourceRate = param.get("corpusSourceRate");
 		List<BizObject> lrpBos = lrpBom.createQuery("PAYMENT_NUMBER=:paymentNumber order by plan_list").setParameter("paymentNumber",paymentNumber).getResultList(false);
 		for(BizObject bo :lrpBos){
 			String rentPlanId = bo.getAttribute("ID").toString();
 			String interest = bo.getAttribute("INTEREST").toString();
 			String yearRate = bo.getAttribute("YEAR_RATE").toString();
-			String corpusSourceRate = param.get("corpusSourceRate");
 			String profit = new BigDecimal(yearRate).subtract(new BigDecimal(corpusSourceRate)).divide(new BigDecimal(yearRate),6,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(interest)).setScale(2,BigDecimal.ROUND_HALF_UP).toString();
 			lppBo = lppBom.newObject();
 			lppBo.setAttributeValue("rent_plan_id",rentPlanId);
+			lppBo.setAttributeValue("CORPUS_RATE",corpusSourceRate);
 			lppBo.setAttributeValue("profit",profit);
 			lppBo.setAttributeValue("inputtime",StringFunction.getTodayNow());
 			lppBom.saveObject(lppBo);

From bcf96ede27ff05a679b4e4cce19146f4bbcee112 Mon Sep 17 00:00:00 2001
From: ap007 <zhanglei@ap-leasing.com.cn>
Date: Wed, 28 Jul 2021 16:17:07 +0800
Subject: [PATCH 27/29] =?UTF-8?q?=E9=82=AE=E5=82=A8=E6=94=BE=E6=AC=BE--?=
 =?UTF-8?q?=E5=87=AD=E8=AF=81=EF=BC=88=E4=BC=98=E5=8C=96=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/com/ap/CorpusSourceCheck.java             |   2 +-
 .../FundIncomeVoucherInfoServiceImpl.java     | 187 +++++++++++-------
 .../serviceImp/FundIncomeVoucherPSBC.java     | 104 ++++------
 ...orpusSourceFundIncomeCreateVoucherJob.java |  12 +-
 4 files changed, 159 insertions(+), 146 deletions(-)

diff --git a/src/com/ap/CorpusSourceCheck.java b/src/com/ap/CorpusSourceCheck.java
index d1dd65b0f..41fd4339b 100644
--- a/src/com/ap/CorpusSourceCheck.java
+++ b/src/com/ap/CorpusSourceCheck.java
@@ -129,7 +129,7 @@ public class CorpusSourceCheck {
         String corpusSource = "AP";
         BizObjectManager bomLPI = JBOFactory.getBizObjectManager(LB_PROJECT_INFO.CLASS_NAME);
         BizObject boLPI = bomLPI.createQuery("id=:projectId").setParameter("projectId", projectId).getSingleResult(false);
-        if (boLPI.getAttribute("CORPUS_SOURCE") != null) {
+        if (boLPI.getAttribute("CORPUS_SOURCE") != null||!"".equals(boLPI.getAttribute("CORPUS_SOURCE").toString())) {
             corpusSource = boLPI.getAttribute("CORPUS_SOURCE").toString();
         }
         return corpusSource;
diff --git a/src_core/com/tenwa/voucher/serviceImp/FundIncomeVoucherInfoServiceImpl.java b/src_core/com/tenwa/voucher/serviceImp/FundIncomeVoucherInfoServiceImpl.java
index fb61af94a..bc9d95cf6 100644
--- a/src_core/com/tenwa/voucher/serviceImp/FundIncomeVoucherInfoServiceImpl.java
+++ b/src_core/com/tenwa/voucher/serviceImp/FundIncomeVoucherInfoServiceImpl.java
@@ -1,8 +1,10 @@
 package com.tenwa.voucher.serviceImp;
 
+import com.amarsoft.are.ARE;
 import com.amarsoft.are.jbo.*;
 import com.amarsoft.awe.util.SqlObject;
 import com.amarsoft.awe.util.Transaction;
+import com.amarsoft.dict.als.cache.CacheLoaderFactory;
 import com.amarsoft.dict.als.manage.NameManager;
 import com.tenwa.comm.util.jboutil.DataOperatorUtil;
 import com.tenwa.flow.util.FlowUtil;
@@ -21,26 +23,13 @@ import java.util.List;
 import java.util.Map;
 
 public class FundIncomeVoucherInfoServiceImpl implements VoucherInfoService {
-    private final String voucherConfigNo = "PZ2021072600000003";
-    public void run() throws JBOException {
-        JBOTransaction tx = null;
+    private String corpusChannelNo ;
+    private String voucherConfigNo ;
+    public void run()  {
         Transaction Sqlca =null;
         try {
-            tx = JBOFactory.createJBOTransaction();
-            Sqlca =  Transaction.createTransaction(tx);
-            List<Map<String,String>> loanInfoList = this.getHasLoanContract("PSBC");
-            for(Map<String,String> loanInfo : loanInfoList){
-                String voucherNo ="k" + FlowUtil.getVoucher_Number(tx);
-                loanInfo.put("voucherNo",voucherNo);
-                String customerNo = this.getCustomerNoByContractId(loanInfo.get("contractId"),Sqlca);
-                loanInfo.put("customerNo",customerNo);
-                //获取最终参数
-                List<Map<String,String>> paramList = this.getFinalParam(loanInfo,tx);
-                //生成凭证
-                this.createVoucher(paramList,tx);
-                //更新凭证信息状态
-                updateVoucherStatus(loanInfo.get("loan_no"),Sqlca);
-            }
+            Sqlca =  Transaction.createTransaction(CacheLoaderFactory.getDataSource());
+            generateVoucher(Sqlca);
             System.out.println("=============凭证生成完毕============");
         } catch (JBOException e) {
             e.printStackTrace();
@@ -48,14 +37,17 @@ public class FundIncomeVoucherInfoServiceImpl implements VoucherInfoService {
             e.printStackTrace();
         }finally {
             try {
-                tx.commit();
                 if(Sqlca!=null){
                     Sqlca.disConnect();
                     Sqlca = null;
                 }
             } catch (JBOException e) {
                 e.printStackTrace();
-                tx.rollback();
+                try {
+                    Sqlca.rollback();
+                } catch (JBOException jboException) {
+                    jboException.printStackTrace();
+                }
             }
         }
 
@@ -63,7 +55,30 @@ public class FundIncomeVoucherInfoServiceImpl implements VoucherInfoService {
     }
 
     /**
-     * 生成每个合同的凭证
+     * 生成所有凭证
+     * @param Sqlca
+     * @throws Exception
+     */
+    public void generateVoucher( Transaction Sqlca) throws Exception {
+        Sqlca.getConnection();
+        JBOTransaction tx =  Sqlca.getTransaction();
+        //获取所有需要生成凭证的合同
+        List<Map<String,String>> loanInfoList = this.getHasLoanContract(corpusChannelNo);
+        for(Map<String,String> loanInfo : loanInfoList){
+            String voucherNo ="k" + FlowUtil.getVoucher_Number(tx);loanInfo.put("voucherNo",voucherNo);
+            String customerNo = this.getCustomerNoByContractId(loanInfo.get("contractId"),Sqlca);
+            loanInfo.put("customerNo",customerNo);
+            //获取最终参数
+            List<Map<String,String>> paramList = this.getFinalParam(loanInfo);
+            //生成凭证
+            this.createVoucher(paramList,tx);
+            //更新凭证信息状态
+            updateVoucherStatus(loanInfo.get("loan_no"),Sqlca);
+            ARE.getLog().info("定时任务 ============="+corpusChannelNo+":合同编号为"+loanInfo.get("contractNo")+"的放款凭证生成完毕============");
+        }
+    }
+    /**
+     * 创建凭证
      * @param paramList
      * @param tx
      * @throws Exception
@@ -80,45 +95,19 @@ public class FundIncomeVoucherInfoServiceImpl implements VoucherInfoService {
     /**
      * 获取最终的参数
      * @param loanInfo
-     * @param tx
      * @return
      * @throws Exception
      */
-    public List<Map<String,String>> getFinalParam(Map<String,String> loanInfo ,JBOTransaction tx) throws Exception {
-            List<Map<String,String>> paramList = getParamOfVoucher(voucherConfigNo);
-            for(Map<String,String> param : paramList){
-                //将公共参数放到凭证配置的每个凭证信息中
-                param.putAll(this.getCommonParam(loanInfo));
-                //将定制参数放入
-                String money = "";
-                //邮政储蓄银行
-                if("100219".equals(param.get("subjectsCode"))){
-                    money=param.get("TRANS_AMT");
-                    param.put("contractNo","");
-                    param.put("customerNo","");
-                    param.put("customerName","");
-                    //应财务要求邮储放款填固定值
-                    param.put("cashFlow","11213");
-                }
-                //长期应收款\回租\汽车\本金
-                if("1531020101".equals(param.get("subjectsCode"))){
-                    money=param.get("TRANS_AMT");
-                }
-                //未实现融资收益\回租\汽车 或 长期应收款\回租\汽车\利息
-                if("15320201".equals(param.get("subjectsCode"))||"1531020102".equals(param.get("subjectsCode"))){
-                    money=this.getInterestTotalByContractId(param.get("contractId"));
-                }
-                //debit:借；credit:贷
-                if("1".equals(param.get("entrydc"))) {
-                    param.put("debitMoney",money);
-                    param.put("creditMoney","0.00");
-                }else{
-                    param.put("debitMoney","0.00");
-                    param.put("creditMoney",money);
-                }
-                //转译的凭证信息
-                param.putAll(this.getConvertParam(param));
-            }
+    public List<Map<String,String>> getFinalParam(Map<String,String> loanInfo) throws Exception {
+        List<Map<String,String>> paramList = getParamOfVoucher(voucherConfigNo);
+        for(Map<String,String> param : paramList){
+            //将公共参数放到凭证配置参数里
+            param.putAll(this.getCommonParam(loanInfo));
+            //将差别参数放进去
+            addRespectiveParam(param);
+            //转译的凭证信息
+            param.putAll(this.getConvertParam(param));
+        }
 
         return paramList;
     }
@@ -172,6 +161,59 @@ public class FundIncomeVoucherInfoServiceImpl implements VoucherInfoService {
         return loanInfo;
     }
 
+    /**
+     * 根据凭证配置编号获取对应的每条凭证参数
+     * @return
+     * @throws Exception
+     */
+    public List<Map<String,String>> getParamOfVoucher(String voucherConfigNo) throws Exception {
+        String sql = "select lvl.SORT_NUMBER as sortNumber,lvl.LOAN_SUBJECT as loanSubject,CASE WHEN lvl.loan_direction = '1' THEN '1' ELSE '-1' END as entrydc,lvl.VALUE_ABSTRACT as valueAbstract,lsc.SUBJECTS_CODE as subjectsCode,lsc.SUBJECTS_NAME as subjectsName,lvc.MODULAR_NUMBER as modularName " +
+                "from lv_voucher_loan lvl " +
+                "left join LV_STACTS_CONFIG lsc on lvl.LOAN_SUBJECT=lsc.id " +
+                "left join lv_voucher_config lvc on lvl.VOUCHER_ID=lvc.id " +
+                "where lvc.VOUCHER_NO='"+voucherConfigNo+"'";
+        List<Map<String,String>> paramList = DataOperatorUtil.getDataBySql(sql);
+        if(paramList.size()==0){
+            ARE.getLog().warn("通过凭证配置编号未找到对应配置信息");
+            throw new Exception("通过凭证配置编号未找到对应配置信息");
+        }
+        return paramList;
+    }
+
+    /**
+     * 每条凭证各自差异数据放到参数List
+     * @param param
+     * @throws Exception
+     */
+    public void addRespectiveParam(Map<String,String> param) throws Exception {
+        String money = "";
+        //邮政储蓄银行
+        if("1002190".equals(param.get("subjectsCode"))){
+            money=param.get("TRANS_AMT");
+            param.put("contractNo","");
+            param.put("customerNo","");
+            param.put("customerName","");
+            //应财务要求邮储放款填固定值
+            param.put("cashFlow","11213");
+        }
+        //长期应收款\回租\汽车\本金
+        if("15310201010".equals(param.get("subjectsCode"))){
+            money=param.get("TRANS_AMT");
+        }
+        //未实现融资收益\回租\汽车 或 长期应收款\回租\汽车\利息
+        if("15320201".equals(param.get("subjectsCode"))||"1531020102".equals(param.get("subjectsCode"))){
+            money=this.getInterestTotalByContractId(param.get("contractId"));
+        }
+        //debit:借；credit:贷
+        if("1".equals(param.get("entrydc"))) {
+            param.put("debitMoney",money);
+            param.put("creditMoney","0.00");
+        }else{
+            param.put("debitMoney","0.00");
+            param.put("creditMoney",money);
+        }
+    }
+
     /**
      * 根据contractId获取对应的利息总和。
      * （放款流程结束时生成的利息凭证计算逻辑用的是lc_pay_rent_plan表，邮储放款时生成利息凭证要和此相同）
@@ -206,20 +248,6 @@ public class FundIncomeVoucherInfoServiceImpl implements VoucherInfoService {
         return subject;
     }
 
-    /**
-     * 根据凭证配置编号获取对应的每条凭证参数
-     * @return
-     * @throws Exception
-     */
-    public List<Map<String,String>> getParamOfVoucher(String voucherConfigNo) throws Exception {
-        String sql = "select lvl.SORT_NUMBER as sortNumber,lvl.LOAN_SUBJECT as loanSubject,CASE WHEN lvl.loan_direction = '1' THEN '1' ELSE '-1' END as entrydc,lvl.VALUE_ABSTRACT as valueAbstract,lsc.SUBJECTS_CODE as subjectsCode,lsc.SUBJECTS_NAME as subjectsName,lvc.MODULAR_NUMBER as modularName " +
-                "from lv_voucher_loan lvl " +
-                "left join LV_STACTS_CONFIG lsc on lvl.LOAN_SUBJECT=lsc.id " +
-                "left join lv_voucher_config lvc on lvl.VOUCHER_ID=lvc.id " +
-                "where lvc.VOUCHER_NO='"+voucherConfigNo+"'";
-        return DataOperatorUtil.getDataBySql(sql);
-    }
-
     /**
      * 将最终获取的参数转换为凭证表voucher_v8对应的字段
      * 注意：新增时注意param中字段不可修改
@@ -273,4 +301,21 @@ public class FundIncomeVoucherInfoServiceImpl implements VoucherInfoService {
         int custCount =JBOFactory.createBizObjectQuery(CUSTOMER_LIST.CLASS_NAME, "CUST_ID='"+custId+"'").getTotalCount();
         return custCount;
     }
+
+    public String getCorpusChannelNo() {
+        return corpusChannelNo;
+    }
+
+    public void setCorpusChannelNo(String corpusChannelNo) {
+        this.corpusChannelNo = corpusChannelNo;
+    }
+
+    public String getVoucherConfigNo() {
+        return voucherConfigNo;
+    }
+
+    public void setVoucherConfigNo(String voucherConfigNo) {
+        this.voucherConfigNo = voucherConfigNo;
+    }
+
 }
diff --git a/src_core/com/tenwa/voucher/serviceImp/FundIncomeVoucherPSBC.java b/src_core/com/tenwa/voucher/serviceImp/FundIncomeVoucherPSBC.java
index 37c41c8b1..5a70a3dfa 100644
--- a/src_core/com/tenwa/voucher/serviceImp/FundIncomeVoucherPSBC.java
+++ b/src_core/com/tenwa/voucher/serviceImp/FundIncomeVoucherPSBC.java
@@ -3,6 +3,7 @@ package com.tenwa.voucher.serviceImp;
 import com.amarsoft.are.jbo.*;
 import com.amarsoft.awe.util.SqlObject;
 import com.amarsoft.awe.util.Transaction;
+import com.amarsoft.dict.als.cache.CacheLoaderFactory;
 import com.amarsoft.dict.als.manage.NameManager;
 import com.tenwa.comm.util.jboutil.DataOperatorUtil;
 import com.tenwa.flow.util.FlowUtil;
@@ -20,93 +21,68 @@ import java.util.List;
 import java.util.Map;
 
 public class FundIncomeVoucherPSBC extends FundIncomeVoucherInfoServiceImpl {
-    private final String voucherConfigNo = "PZ2021072600000003";
     @Override
-    public void run() throws JBOException {
-        JBOTransaction tx = null;
+    public void run() {
         Transaction Sqlca =null;
         try {
-            tx = JBOFactory.createJBOTransaction();
-            Sqlca =  Transaction.createTransaction(tx);
-            List<Map<String,String>> loanInfoList = getHasLoanContract("PSBC");
-            for(Map<String,String> loanInfo : loanInfoList){
-                String voucherNo ="k" + FlowUtil.getVoucher_Number(tx);
-                loanInfo.put("voucherNo",voucherNo);
-                String customerNo = getCustomerNoByContractId(loanInfo.get("contractId"),Sqlca);
-                loanInfo.put("customerNo",customerNo);
-                //获取最终参数
-                List<Map<String,String>> paramList = getFinalParam(loanInfo,tx);
-                //生成凭证
-                createVoucher(paramList,tx);
-                //更新凭证信息状态
-                updateVoucherStatus(loanInfo.get("loan_no"),Sqlca);
-            }
-            System.out.println("=============邮储放款凭证生成完毕============");
+            Sqlca =  Transaction.createTransaction(CacheLoaderFactory.getDataSource());
+            setVoucherConfigNo("PZ2021072600000003");
+            setCorpusChannelNo("PSBC");
+            generateVoucher(Sqlca);
         } catch (JBOException e) {
             e.printStackTrace();
         } catch (Exception e) {
             e.printStackTrace();
         }finally {
             try {
-                tx.commit();
                 if(Sqlca!=null){
                     Sqlca.disConnect();
                     Sqlca = null;
                 }
             } catch (JBOException e) {
                 e.printStackTrace();
-                tx.rollback();
+                try {
+                    Sqlca.rollback();
+                } catch (JBOException jboException) {
+                    jboException.printStackTrace();
+                }
             }
         }
-
-
     }
 
     /**
-     * 获取最终的参数
-     * @param loanInfo
-     * @param tx
-     * @return
+     * 每条凭证各自差异数据放到参数List
+     * @param param
      * @throws Exception
      */
     @Override
-    public List<Map<String,String>> getFinalParam(Map<String,String> loanInfo ,JBOTransaction tx) throws Exception {
-            List<Map<String,String>> paramList = getParamOfVoucher(this.voucherConfigNo);
-            for(Map<String,String> param : paramList){
-                //将公共参数放到凭证配置的每个凭证信息中
-                param.putAll(this.getCommonParam(loanInfo));
-                //将定制参数放入
-                String money = "";
-                //邮政储蓄银行
-                if("100219".equals(param.get("subjectsCode"))){
-                    money=param.get("TRANS_AMT");
-                    param.put("contractNo","");
-                    param.put("customerNo","");
-                    param.put("customerName","");
-                    //应财务要求邮储放款填固定值
-                    param.put("cashFlow","11213");
-                }
-                //长期应收款\回租\汽车\本金
-                if("1531020101".equals(param.get("subjectsCode"))){
-                    money=param.get("TRANS_AMT");
-                }
-                //未实现融资收益\回租\汽车 或 长期应收款\回租\汽车\利息
-                if("15320201".equals(param.get("subjectsCode"))||"1531020102".equals(param.get("subjectsCode"))){
-                    money=this.getInterestTotalByContractId(param.get("contractId"));
-                }
-                //debit:借；credit:贷
-                if("1".equals(param.get("entrydc"))) {
-                    param.put("debitMoney",money);
-                    param.put("creditMoney","0.00");
-                }else{
-                    param.put("debitMoney","0.00");
-                    param.put("creditMoney",money);
-                }
-                //转译的凭证信息
-                param.putAll(getConvertParam(param));
-            }
-
-        return paramList;
+    public void addRespectiveParam(Map<String,String> param) throws Exception {
+        String money = "";
+        //邮政储蓄银行
+        if("100219".equals(param.get("subjectsCode"))){
+            money=param.get("TRANS_AMT");
+            param.put("contractNo","");
+            param.put("customerNo","");
+            param.put("customerName","");
+            //应财务要求邮储放款填固定值
+            param.put("cashFlow","11213");
+        }
+        //长期应收款\回租\汽车\本金
+        if("1531020101".equals(param.get("subjectsCode"))){
+            money=param.get("TRANS_AMT");
+        }
+        //未实现融资收益\回租\汽车 或 长期应收款\回租\汽车\利息
+        if("15320201".equals(param.get("subjectsCode"))||"1531020102".equals(param.get("subjectsCode"))){
+            money=this.getInterestTotalByContractId(param.get("contractId"));
+        }
+        //debit:借；credit:贷
+        if("1".equals(param.get("entrydc"))) {
+            param.put("debitMoney",money);
+            param.put("creditMoney","0.00");
+        }else{
+            param.put("debitMoney","0.00");
+            param.put("creditMoney",money);
+        }
     }
 
 
diff --git a/src_tenwa/com/tenwa/lease/app/quartzmession/CorpusSourceFundIncomeCreateVoucherJob.java b/src_tenwa/com/tenwa/lease/app/quartzmession/CorpusSourceFundIncomeCreateVoucherJob.java
index b19420d53..72bbf2465 100644
--- a/src_tenwa/com/tenwa/lease/app/quartzmession/CorpusSourceFundIncomeCreateVoucherJob.java
+++ b/src_tenwa/com/tenwa/lease/app/quartzmession/CorpusSourceFundIncomeCreateVoucherJob.java
@@ -1,13 +1,7 @@
 package com.tenwa.lease.app.quartzmession;
-
-import com.amarsoft.are.jbo.JBOFactory;
-import com.amarsoft.are.jbo.JBOTransaction;
 import com.amarsoft.are.util.StringFunction;
 import com.base.util.QuartzUtil;
-import com.tenwa.voucher.CreateVoucherProcess.InsertVoucherRentCompensatory;
-import com.tenwa.voucher.CreateVoucherProcess.InsertVoucherRentIncome;
 import com.tenwa.voucher.service.VoucherInfoService;
-import com.tenwa.voucher.serviceImp.FundIncomeVoucherInfoServiceImpl;
 import com.tenwa.voucher.serviceImp.FundIncomeVoucherPSBC;
 import org.quartz.Job;
 import org.quartz.JobExecutionContext;
@@ -22,13 +16,11 @@ public class CorpusSourceFundIncomeCreateVoucherJob implements Job {
 	@Override
 	public void execute(JobExecutionContext arg0) throws JobExecutionException {
 		String startime = StringFunction.getTodayNow();
-		
 		Object userId = arg0.getTrigger().getJobDataMap().get("CurUserId");
 		String curUserId = userId == null? "system" : userId.toString();
-		JBOTransaction tx = null;
+
 		try{
-			tx = JBOFactory.createJBOTransaction();
-			//
+
 			VoucherInfoService voucher = new FundIncomeVoucherPSBC();
 			voucher.run();
 			

From 61005e1856332c675b5fea36a2873e6fda45e16b Mon Sep 17 00:00:00 2001
From: zhanglei <zhanglei@ap-leasing.com.cn>
Date: Wed, 28 Jul 2021 16:26:42 +0800
Subject: [PATCH 28/29] =?UTF-8?q?=E5=BE=81=E4=BF=A1=E6=8E=88=E6=9D=83?=
 =?UTF-8?q?=E7=94=B5=E5=AD=90=E7=89=88=E6=A0=A1=E9=AA=8C=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lease/flow/project/commcheck/UserCreditAuthCheck.java   | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src_tenwa/com/tenwa/lease/flow/project/commcheck/UserCreditAuthCheck.java b/src_tenwa/com/tenwa/lease/flow/project/commcheck/UserCreditAuthCheck.java
index 33d434bea..919d4c0af 100644
--- a/src_tenwa/com/tenwa/lease/flow/project/commcheck/UserCreditAuthCheck.java
+++ b/src_tenwa/com/tenwa/lease/flow/project/commcheck/UserCreditAuthCheck.java
@@ -41,6 +41,12 @@ public class UserCreditAuthCheck extends DefaultBussinessCheck  {
 		BizObjectManager lpitMange = JBOFactory.getBizObjectManager(LB_PROJECT_INFO_TEMP.CLASS_NAME, transaction);
 		BizObject lpit = lpitMange.createQuery("FLOWUNID=:flowunid").setParameter("FLOWUNID", flowunid).getSingleResult(false);
 		String projectNo = lpit.getAttribute("PROJECT_NO").getString();
+		String corpusSource = lpit.getAttribute("CORPUS_SOURCE").getString();
+		if(!"PSBC".equals(corpusSource)){
+            putMsg("非邮储资方：征信授权委托书线下签约！");
+            setPass(true);
+            return null;
+        }
 		// : 2021/7/15 查询申请人
 		BizObjectManager lult = JBOFactory.getBizObjectManager(LB_UNION_LESSEE_TEMP.CLASS_NAME);
 		BizObject lults = lult.createQuery("flowunid=:flowUnid").setParameter("flowUnid", flowunid).getSingleResult(false);

From 33d6fbb58e045de96f0521340b0e7a2fb84c7741 Mon Sep 17 00:00:00 2001
From: zhanglei <zhanglei@ap-leasing.com.cn>
Date: Wed, 28 Jul 2021 16:47:51 +0800
Subject: [PATCH 29/29] =?UTF-8?q?=E4=B8=8A=E7=BA=BFsql=E6=95=B4=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src_sql/鎶曚骇SQL/dailyfix/zhanglei20210728.sql | 540 ++++++++++++++++++
 1 file changed, 540 insertions(+)
 create mode 100644 src_sql/鎶曚骇SQL/dailyfix/zhanglei20210728.sql

diff --git a/src_sql/鎶曚骇SQL/dailyfix/zhanglei20210728.sql b/src_sql/鎶曚骇SQL/dailyfix/zhanglei20210728.sql
new file mode 100644
index 000000000..9535e2231
--- /dev/null
+++ b/src_sql/鎶曚骇SQL/dailyfix/zhanglei20210728.sql
@@ -0,0 +1,540 @@
+-- 核心服务
+
+CREATE TABLE `fc_file_config` (
+  `ID` int(11) NOT NULL COMMENT '唯一标识',
+  `CHANNEL_NO` varchar(32) DEFAULT NULL COMMENT '资金渠道编号',
+  `CHANNEL_NAME` varchar(255) DEFAULT NULL COMMENT '资金渠道名称',
+  `FC_FLOW_TYPE` varchar(32) DEFAULT NULL COMMENT '资金方：流程编号',
+  `FC_FLOW_TYPE_NAME` varchar(255) DEFAULT NULL COMMENT '资金方：流程编号描述：预审，终审，放款，贷后',
+  `FC_FILE_CODE` varchar(32) DEFAULT NULL COMMENT '资金方：文件编号',
+  `FC_FILE_CODE_NAME` varchar(32) DEFAULT NULL COMMENT '资金方：文件编号名称',
+  `FC_FILE_TYPE` varchar(255) DEFAULT NULL COMMENT '资金方：文件类型:JPG,PNG等以逗号分隔',
+  `PRD_FILE_CODE` varchar(32) DEFAULT NULL COMMENT '文件编号[主节点]',
+  `PRD_FILE_NUM` varchar(32) DEFAULT NULL COMMENT '文件编号[子节点]',
+  `PRD_FILE_CODE_NAME` varchar(32) DEFAULT NULL COMMENT '文件类型名称',
+  `CREATE_TIME` varchar(32) DEFAULT NULL,
+  `UPDATE_TIME` varchar(32) DEFAULT NULL,
+  `del_flag` int(11) DEFAULT NULL,
+  PRIMARY KEY (`ID`),
+  KEY `I_CHANNEL_NO` (`CHANNEL_NO`),
+  KEY `I_CHANNEL_NAME` (`CHANNEL_NAME`)
+) ENGINE=InnoDB DEFAULT CHARSET=gbk COMMENT='资金方产品文件关联信息表';
+
+CREATE TABLE `fc_file_push` (
+  `ID` varchar(32) NOT NULL COMMENT '唯一标识',
+  `CHANNEL_NO` varchar(32) DEFAULT NULL COMMENT '资金渠道编号',
+  `CHANNEL_NAME` varchar(255) DEFAULT NULL COMMENT '资金渠道名称',
+  `FC_FILE_PUSH_NAME` varchar(255) DEFAULT NULL COMMENT '当前推送文件名称：银行每日将T-1逾期文件推给第三方',
+  `FILE_TYPE` varchar(32) DEFAULT NULL COMMENT '文件类型：TraAcctdetail',
+  `FILE_NAME` varchar(255) DEFAULT NULL COMMENT '文件名称：111.txt',
+  `FILE_PATH` varchar(255) DEFAULT NULL COMMENT '文件路径：/upload/111.txt',
+  `FILE_STS` varchar(32) DEFAULT NULL COMMENT '文件状态：0,下载失败，1、解析失败，2、解析成功，3、拷贝成功',
+  `FILE_STS_DESC` varchar(32) DEFAULT NULL COMMENT '文件状态解释说明或者失败原因',
+  `ORDER_COUNT` varchar(32) DEFAULT NULL COMMENT '文件包含订单数量',
+  `CREATE_TIME` varchar(32) DEFAULT NULL,
+  `UPDATE_TIME` varchar(32) DEFAULT NULL,
+  PRIMARY KEY (`ID`),
+  KEY `I_CHANNEL_NO` (`CHANNEL_NO`),
+  KEY `I_CHANNEL_NAME` (`CHANNEL_NAME`),
+  KEY `I_FILE_TYPE` (`FILE_TYPE`),
+  KEY `I_FILE_NAME` (`FILE_NAME`)
+) ENGINE=InnoDB DEFAULT CHARSET=gbk COMMENT='资方推送文件解析信息表';
+
+
+CREATE TABLE `fc_notice_log` (
+  `ID` varchar(32) NOT NULL COMMENT '唯一标识',
+  `FC_REQUEST_ID` varchar(32) DEFAULT NULL COMMENT '资金渠道申请ID',
+  `FC_LOAN_QUEUEST_ID` varchar(32) DEFAULT NULL COMMENT '资金渠道放款申请ID',
+  `CHANNEL_NO` varchar(32) DEFAULT NULL COMMENT '资金渠道编号',
+  `CHANNEL_NAME` varchar(255) DEFAULT NULL COMMENT '资金渠道名称',
+  `PROJECT_ID` varchar(32) DEFAULT NULL COMMENT '申请ID',
+  `PROJECT_NO` varchar(32) DEFAULT NULL COMMENT '申请号',
+  `CONTRACT_ID` varchar(32) DEFAULT NULL COMMENT '合同ID',
+  `CONTRACT_NO` varchar(32) DEFAULT NULL COMMENT '合同号',
+  `PRODUCT_ID` varchar(32) DEFAULT NULL COMMENT '产品ID',
+  `PRODUCT_NAME` varchar(255) DEFAULT NULL COMMENT '产品名称',
+  `DISTRIBUTOR_ID` varchar(32) DEFAULT NULL COMMENT '经销商ID',
+  `DISTRIBUTOR_NAME` varchar(255) DEFAULT NULL COMMENT '经销商名称',
+  `CUSTOMER_ID` varchar(32) DEFAULT NULL COMMENT '承租人ID',
+  `CUSTOMER_NAME` varchar(32) DEFAULT NULL COMMENT '承租人姓名',
+  `NOTICE_NAME` varchar(255) DEFAULT NULL COMMENT '推送接口名称',
+  `NOTICE_CONTENT` longtext COMMENT '推送内容',
+  `RESPONSE_CONTENT` varchar(255) DEFAULT NULL COMMENT '返回内容',
+  `RESPONSE_STATUS` varchar(32) DEFAULT NULL COMMENT '当前推送接收状态',
+  `RESPONSE_REMARK` varchar(255) DEFAULT NULL COMMENT '当前推送接收状态描述',
+  `CREATE_TIME` datetime DEFAULT NULL,
+  `UPDATE_TIME` datetime DEFAULT NULL,
+  PRIMARY KEY (`ID`),
+  KEY `I_FC_REQUEST_ID` (`FC_REQUEST_ID`),
+  KEY `I_FC_LOAN_QUEUEST_ID` (`FC_LOAN_QUEUEST_ID`),
+  KEY `I_CHANNEL_NO` (`CHANNEL_NO`),
+  KEY `I_CHANNEL_NAME` (`CHANNEL_NAME`),
+  KEY `I_PROJECT_ID` (`PROJECT_ID`),
+  KEY `I_PROJECT_NO` (`PROJECT_NO`),
+  KEY `I_CONTRACT_ID` (`CONTRACT_ID`),
+  KEY `I_CONTRACT_NO` (`CONTRACT_NO`),
+  KEY `I_PRODUCT_ID` (`PRODUCT_ID`),
+  KEY `I_PRODUCT_NAME` (`PRODUCT_NAME`),
+  KEY `I_DISTRIBUTOR_ID` (`DISTRIBUTOR_ID`),
+  KEY `I_DISTRIBUTOR_NAME` (`DISTRIBUTOR_NAME`),
+  KEY `I_CUSTOMER_ID` (`CUSTOMER_ID`),
+  KEY `I_CUSTOMER_NAME` (`CUSTOMER_NAME`),
+  KEY `I_RESPONSE_STATUS` (`RESPONSE_STATUS`),
+  KEY `I_RESPONSE_REMARK` (`RESPONSE_REMARK`),
+  KEY `I_NOTICE_NAME` (`NOTICE_NAME`)
+) ENGINE=InnoDB DEFAULT CHARSET=gbk COMMENT='资金方通知推送信息表';
+
+
+CREATE TABLE `fc_request` (
+  `ID` varchar(32) NOT NULL COMMENT '唯一标识:资金渠道申请ID',
+  `FC_LOAN_ID` varchar(32) DEFAULT NULL COMMENT '资金渠道放款申请ID',
+  `CHANNEL_NO` varchar(32) DEFAULT NULL COMMENT '资金渠道编号',
+  `CHANNEL_NAME` varchar(255) DEFAULT NULL COMMENT '资金渠道名称',
+  `CHANNEL_PRODUCT_ID` varchar(32) DEFAULT NULL COMMENT '渠道产品',
+  `CHANNEL_PRODUCT_DESC` varchar(32) DEFAULT NULL COMMENT '渠道产品描述',
+  `PROJECT_ID` varchar(32) DEFAULT NULL COMMENT '申请ID',
+  `PROJECT_NO` varchar(32) DEFAULT NULL COMMENT '申请号',
+  `CONTRACT_ID` varchar(32) DEFAULT NULL COMMENT '合同ID',
+  `CONTRACT_NO` varchar(32) DEFAULT NULL COMMENT '合同号',
+  `PRODUCT_ID` varchar(32) DEFAULT NULL COMMENT '产品ID',
+  `PRODUCT_NAME` varchar(255) DEFAULT NULL COMMENT '产品名称',
+  `DISTRIBUTOR_ID` varchar(32) DEFAULT NULL COMMENT '经销商ID',
+  `DISTRIBUTOR_NAME` varchar(255) DEFAULT NULL COMMENT '经销商名称',
+  `CUSTOMER_ID` varchar(32) DEFAULT NULL COMMENT '承租人ID',
+  `CUSTOMER_NAME` varchar(32) DEFAULT NULL COMMENT '承租人姓名',
+  `FC_STAGE` int(4) DEFAULT '0' COMMENT '当前订单阶段:0信审中，1信审通过，2合同签署成功，3放款成功',
+  `FC_STAGE_TIME` varchar(32) DEFAULT NULL COMMENT '阶段变更时间',
+  `FC_STATUS` varchar(32) DEFAULT NULL COMMENT '当前状态：具体状态参照code_library中fc_request_sts',
+  `FC_REMARK` varchar(255) DEFAULT NULL COMMENT '返回状态描述',
+  `NOTICE_LOG_ID` varchar(32) DEFAULT NULL COMMENT '文件补传关联日志id',
+  `SUPPLEMENT_STS` varchar(32) DEFAULT NULL COMMENT '是否需要补充资料：0-无需补充资料，1-需补充资料',
+  `SUPPLEMENT_DESC` varchar(255) DEFAULT NULL COMMENT '通知需要补充资料描述',
+  `SUPPLEMENT_TIME` varchar(32) DEFAULT NULL COMMENT '补传通知更新时间',
+  `LOAN_TIME` varchar(32) DEFAULT NULL COMMENT '邮储放款成功时间',
+  `DEL_FLAG` char(4) DEFAULT NULL COMMENT '是否有效：0-有效数据，1-无效数据',
+  `CREATE_TIME` varchar(32) DEFAULT NULL,
+  `UPDATE_TIME` varchar(32) DEFAULT NULL,
+  PRIMARY KEY (`ID`),
+  KEY `I_CHANNEL_NO` (`CHANNEL_NO`),
+  KEY `I_CHANNEL_NAME` (`CHANNEL_NAME`),
+  KEY `I_PROJECT_ID` (`PROJECT_ID`),
+  KEY `I_PROJECT_NO` (`PROJECT_NO`),
+  KEY `I_CONTRACT_ID` (`CONTRACT_ID`),
+  KEY `I_CONTRACT_NO` (`CONTRACT_NO`),
+  KEY `I_PRODUCT_ID` (`PRODUCT_ID`),
+  KEY `I_PRODUCT_NAME` (`PRODUCT_NAME`),
+  KEY `I_DISTRIBUTOR_ID` (`DISTRIBUTOR_ID`),
+  KEY `I_DISTRIBUTOR_NAME` (`DISTRIBUTOR_NAME`),
+  KEY `I_CUSTOMER_ID` (`CUSTOMER_ID`),
+  KEY `I_CUSTOMER_NAME` (`CUSTOMER_NAME`),
+  KEY `I_FC_STATUS` (`FC_STATUS`),
+  KEY `I_FC_LOAN_QUEUEST_ID` (`FC_LOAN_ID`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=gbk COMMENT='资金方订单信息表';
+
+
+
+CREATE TABLE `fc_request_file` (
+  `ID` varchar(32) NOT NULL COMMENT '唯一标识',
+  `FC_REQUEST_ID` varchar(32) DEFAULT NULL COMMENT '资金渠道申请ID',
+  `FC_FLOW_TYPE` varchar(32) DEFAULT NULL COMMENT '流程类型',
+  `FC_FLOW_TYPE_NAME` varchar(32) DEFAULT NULL COMMENT '流程类型名称',
+  `FC_FILE_CODE` varchar(32) DEFAULT NULL COMMENT '资金方：文件编号',
+  `FC_FILE_CODE_NAME` varchar(32) DEFAULT NULL COMMENT '资金方：文件编号名称',
+  `FC_FILE_TYPE` varchar(255) DEFAULT NULL COMMENT '资金方：文件类型:JPG,PNG等',
+  `FILE_NAME` varchar(255) DEFAULT NULL COMMENT '文件名称',
+  `FILE_PATH` varchar(1000) DEFAULT NULL COMMENT '文件路径',
+  `FC_FILE_STS` varchar(32) DEFAULT NULL COMMENT '文件状态：未提交，未通过，不清晰',
+  `FC_FILE_STS_DESC` varchar(32) DEFAULT NULL COMMENT '文件状态描述',
+  `FC_RES_VALUE` varchar(32) DEFAULT NULL COMMENT '补传原因：缺失、不清晰',
+  `CREATE_TIME` varchar(32) DEFAULT NULL,
+  `UPDATE_TIME` varchar(32) DEFAULT NULL,
+  `DEL_FLAG` int(11) DEFAULT NULL COMMENT '有效标志',
+  `INPUTTIME` varchar(32) DEFAULT NULL,
+  `INPUTUSER` varchar(32) DEFAULT NULL,
+  `FILE_TYPE` varchar(32) DEFAULT NULL COMMENT '当前文件类型，例如：image/jpeg',
+  PRIMARY KEY (`ID`),
+  KEY `I_FC_REQUEST_ID` (`FC_REQUEST_ID`),
+  KEY `I_FC_FIOW_TYPE` (`FC_FLOW_TYPE`),
+  KEY `I_FC_FIOW_TYPE_NAME` (`FC_FLOW_TYPE_NAME`),
+  KEY `I_FC_FILE_CODE` (`FC_FILE_CODE`),
+  KEY `I_FC_FILE_STS` (`FC_FILE_STS`),
+  KEY `I_FC_FILE_STS_DESC` (`FC_FILE_STS_DESC`)
+) ENGINE=InnoDB DEFAULT CHARSET=gbk COMMENT='资金方文件请求信息表';
+
+
+CREATE TABLE `fc_request_loan` (
+  `ID` varchar(32) NOT NULL COMMENT '唯一标识:资金渠道申请ID',
+  `FC_REQUEST_ID` varchar(32) DEFAULT NULL COMMENT '资金渠道申请ID',
+  `QUD_LAY` varchar(32) DEFAULT NULL COMMENT '合作渠道',
+  `LOAN_NO` varchar(32) DEFAULT NULL COMMENT '借据号',
+  `CUSTOMER_NAME` varchar(32) DEFAULT NULL COMMENT '客户姓名',
+  `CONTRACT_NO` varchar(32) DEFAULT NULL COMMENT '借款合同号',
+  `LOAN_DATE` varchar(32) DEFAULT NULL COMMENT '放款时间',
+  `LOAN_AMT` varchar(32) DEFAULT NULL COMMENT '放款金额',
+  `BUSINESS_RATE` varchar(32) DEFAULT NULL COMMENT '执行利率',
+  `TRANS_AMT` varchar(32) DEFAULT NULL COMMENT '转账金额',
+  `DEL_FLAG` char(4) DEFAULT NULL COMMENT '是否有效：0-有效数据，1-无效数据',
+  `CREATE_TIME` varchar(32) DEFAULT NULL,
+  `UPDATE_TIME` varchar(32) DEFAULT NULL,
+  `voucher_status` int(11) DEFAULT '0' COMMENT '凭证状态：0，未生成；1，已生成',
+  PRIMARY KEY (`ID`),
+  KEY `I_FC_REQUEST_ID` (`FC_REQUEST_ID`) USING BTREE,
+  KEY `I_CUSTOMER_NAME` (`CUSTOMER_NAME`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=gbk COMMENT='资金方放款信息表';
+
+
+CREATE TABLE `fc_request_sts_log` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '唯一标识',
+  `fc_request_id` varchar(32) DEFAULT NULL COMMENT '资金渠道申请ID',
+  `pre_fc_sts` varchar(32) DEFAULT NULL COMMENT '当前状态：具体状态参照code_library中fc_request_sts',
+  `pre_fc_sts_desc` varchar(255) DEFAULT NULL COMMENT '返回状态描述',
+  `fc_sts` varchar(32) DEFAULT NULL COMMENT '当前状态：具体状态参照code_library中fc_request_sts',
+  `fc_sts_desc` varchar(255) DEFAULT NULL COMMENT '返回状态描述',
+  `remark` varchar(255) DEFAULT NULL COMMENT '状态修改操作描述',
+  `createtime` varchar(32) DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `i_fc_request_id` (`fc_request_id`),
+  KEY `i_fc_sts` (`fc_sts`)
+) ENGINE=InnoDB AUTO_INCREMENT=13 DEFAULT CHARSET=gbk COMMENT='资金方订单状态信息记录表';
+
+
+CREATE TABLE `fc_yc_file_repay_plan` (
+  `ID` varchar(32) NOT NULL COMMENT '唯一标识',
+  `FC_FILE_ID` varchar(32) NOT NULL COMMENT '文件id',
+  `FC_REQUEST_ID` varchar(32) DEFAULT NULL COMMENT 'fc_request主键',
+  `LOAN_NO` varchar(32) DEFAULT NULL COMMENT '借据号',
+  `LEND_TERM` int(11) DEFAULT NULL COMMENT '贷款期限',
+  `ANS_REPAYMENT_DATE` varchar(32) DEFAULT NULL COMMENT '应还日期',
+  `ANS_PRINCIPAL` varchar(32) DEFAULT NULL COMMENT '贷款止期',
+  `ANS_INTEREST` varchar(32) DEFAULT NULL COMMENT '应还利息',
+  `ANS_REPAYMENT_MONEY` varchar(32) DEFAULT NULL COMMENT '应还合计金额',
+  `CREATE_TIME` varchar(32) DEFAULT NULL,
+  `UPDATE_TIME` varchar(32) DEFAULT NULL,
+  PRIMARY KEY (`ID`),
+  KEY `I_FC_FILE_ID` (`FC_FILE_ID`),
+  KEY `I_FC_LOAN_NO` (`LOAN_NO`),
+  KEY `I_LEND_TERM` (`LEND_TERM`)
+) ENGINE=InnoDB DEFAULT CHARSET=gbk COMMENT='邮储资方银行每天同步还款计划文件临时表';
+
+
+INSERT INTO `apzl`.`awe_do_catalog` (`dono`, `doname`, `dodescribe`, `dotype`, `doclass`, `isinuse`, `colcount`, `modeid`, `jboclass`, `jbofrom`, `jbowhere`, `jbogroup`, `jboorder`, `businessprocess`, `exportflag`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `remark`, `isvalidate`, `parent`) VALUES ('creditAuthListLoan', '征信授权信息列表-非业务申请阶段', NULL, '30', NULL, '1', '1', 'default', 'jbo.app.tenwa.customer.VI_LB_IDENTITY_CHECK_CREDITAUTH_LOAN', 'O LEFT JOIN  jbo.com.tenwa.lease.comm.LB_PROJECT_INFO lbi ON O.flowunid=lbi.ID LEFT JOIN jbo.app.tenwa.doc.LB_DOCRELATIVE ldr ON ldr.PROJ_ID=lbi.PROJECT_NO AND ldr.CUST_ID=O.certId   AND  ldr.OBJECTTYPE=O.credittype  LEFT JOIN jbo.app.tenwa.doc.LB_DOCLIBRARY ldl ON ldl.relative_id=ldr.id LEFT JOIN jbo.app.tenwa.doc.LB_DOCATTRIBUTE lda ON lda.library_id=ldl.id LEFT JOIN jbo.app.tenwa.doc.LB_DOC_CONTRACT_LIST ldcl ON ldcl.attribute_id=lda.id', 'O.FLOWUNID=:projectId', NULL, NULL, NULL, NULL, 'SYS_Designer', '2018/07/12 09:38:36', 'SYS_Designer', '2018/07/12 09:38:36', NULL, '1', NULL);
+
+INSERT INTO `apzl`.`awe_do_catalog` (`dono`, `doname`, `dodescribe`, `dotype`, `doclass`, `isinuse`, `colcount`, `modeid`, `jboclass`, `jbofrom`, `jbowhere`, `jbogroup`, `jboorder`, `businessprocess`, `exportflag`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `remark`, `isvalidate`, `parent`) VALUES ('creditAuthList', '征信授权信息列表', NULL, '30', NULL, '1', '1', 'default', 'jbo.app.tenwa.customer.VI_LB_IDENTITY_CHECK_CREDITAUTH', 'O LEFT JOIN  jbo.com.tenwa.lease.comm.LB_PROJECT_INFO_TEMP lbit ON O.flowunid=lbit.FLOWUNID LEFT JOIN jbo.app.tenwa.doc.LB_DOCRELATIVE ldr ON ldr.PROJ_ID=lbit.PROJECT_NO AND ldr.CUST_ID=O.certId   AND  ldr.OBJECTTYPE=O.credittype  LEFT JOIN jbo.app.tenwa.doc.LB_DOCLIBRARY ldl ON ldl.relative_id=ldr.id LEFT JOIN jbo.app.tenwa.doc.LB_DOCATTRIBUTE lda ON lda.library_id=ldl.id LEFT JOIN jbo.app.tenwa.doc.LB_DOC_CONTRACT_LIST ldcl ON ldcl.attribute_id=lda.id', 'O.FLOWUNID=:FlowUnid', NULL, NULL, NULL, NULL, 'SYS_Designer', '2018/07/12 09:38:36', 'SYS_Designer', '2018/07/12 09:38:36', NULL, '1', NULL);
+
+
+INSERT INTO `apzl`.`awe_do_library` (`dono`, `colindex`, `sortno`, `isinuse`, `coltablename`, `colactualname`, `colname`, `coltype`, `coldefaultvalue`, `colheader`, `colunit`, `colcolumntype`, `coleditstyle`, `colcheckformat`, `colalign`, `coleditsourcetype`, `coleditsource`, `colhtmlstyle`, `collimit`, `colvisible`, `colreadonly`, `colrequired`, `colsortable`, `isfilter`, `colspan`, `isautocomplete`, `groupid`, `colfilterrefid`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `isaudit`, `colfilterattrs`, `isupdate`, `parentcolindex`, `tips`, `colinnerbtevent`, `colfilteroptions`) VALUES ('creditAuthListLoan', '1000', '1000', '1', 'O', 'fullName', 'fullName', 'String', '', '姓名', '', '1', 'Text', '1', '1', '', '', 'style={width:50px;}', '20', '1', '0', '0', '1', '1', '1', '0', '', '', 'SYS_DESIGNER', '2018/07/12 09:38:36', 'admin', '2021/07/19 15:39:01', '0', '', '1', '', '', '', NULL);
+INSERT INTO `apzl`.`awe_do_library` (`dono`, `colindex`, `sortno`, `isinuse`, `coltablename`, `colactualname`, `colname`, `coltype`, `coldefaultvalue`, `colheader`, `colunit`, `colcolumntype`, `coleditstyle`, `colcheckformat`, `colalign`, `coleditsourcetype`, `coleditsource`, `colhtmlstyle`, `collimit`, `colvisible`, `colreadonly`, `colrequired`, `colsortable`, `isfilter`, `colspan`, `isautocomplete`, `groupid`, `colfilterrefid`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `isaudit`, `colfilterattrs`, `isupdate`, `parentcolindex`, `tips`, `colinnerbtevent`, `colfilteroptions`) VALUES ('creditAuthListLoan', '1010', '1010', '1', 'O', 'certId', 'certId', 'String', '', '身份证编号', '', '1', 'Text', '1', '1', '', '', 'style={width:150px;}', '20', '1', '0', '0', '1', '1', '1', '0', '', '', 'SYS_DESIGNER', '2018/07/12 09:38:36', 'admin', '2021/07/19 15:39:01', '0', '', '1', '', '', '', NULL);
+INSERT INTO `apzl`.`awe_do_library` (`dono`, `colindex`, `sortno`, `isinuse`, `coltablename`, `colactualname`, `colname`, `coltype`, `coldefaultvalue`, `colheader`, `colunit`, `colcolumntype`, `coleditstyle`, `colcheckformat`, `colalign`, `coleditsourcetype`, `coleditsource`, `colhtmlstyle`, `collimit`, `colvisible`, `colreadonly`, `colrequired`, `colsortable`, `isfilter`, `colspan`, `isautocomplete`, `groupid`, `colfilterrefid`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `isaudit`, `colfilterattrs`, `isupdate`, `parentcolindex`, `tips`, `colinnerbtevent`, `colfilteroptions`) VALUES ('creditAuthListLoan', '1020', '1020', '1', 'O', 'relation', 'relation', 'String', '', '身份', '', '1', 'Text', '1', '1', '', '', 'style={width:50px;}', '20', '1', '0', '0', '1', '1', '1', '0', '', '', 'SYS_DESIGNER', '2018/07/12 09:38:36', 'admin', '2021/07/19 15:39:01', '0', '', '1', '', '', '', NULL);
+INSERT INTO `apzl`.`awe_do_library` (`dono`, `colindex`, `sortno`, `isinuse`, `coltablename`, `colactualname`, `colname`, `coltype`, `coldefaultvalue`, `colheader`, `colunit`, `colcolumntype`, `coleditstyle`, `colcheckformat`, `colalign`, `coleditsourcetype`, `coleditsource`, `colhtmlstyle`, `collimit`, `colvisible`, `colreadonly`, `colrequired`, `colsortable`, `isfilter`, `colspan`, `isautocomplete`, `groupid`, `colfilterrefid`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `isaudit`, `colfilterattrs`, `isupdate`, `parentcolindex`, `tips`, `colinnerbtevent`, `colfilteroptions`) VALUES ('creditAuthListLoan', '1030', '1030', '1', 'O', 'flowunid', 'flowunid', 'String', NULL, '流程编号', NULL, '1', 'Text', '1', '1', NULL, NULL, NULL, '20', '0', '0', '0', '1', '1', '1', '0', NULL, NULL, 'SYS_DESIGNER', '2018/07/12 09:38:36', 'admin', '2021/07/19 15:39:01', '0', NULL, '1', NULL, NULL, NULL, NULL);
+INSERT INTO `apzl`.`awe_do_library` (`dono`, `colindex`, `sortno`, `isinuse`, `coltablename`, `colactualname`, `colname`, `coltype`, `coldefaultvalue`, `colheader`, `colunit`, `colcolumntype`, `coleditstyle`, `colcheckformat`, `colalign`, `coleditsourcetype`, `coleditsource`, `colhtmlstyle`, `collimit`, `colvisible`, `colreadonly`, `colrequired`, `colsortable`, `isfilter`, `colspan`, `isautocomplete`, `groupid`, `colfilterrefid`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `isaudit`, `colfilterattrs`, `isupdate`, `parentcolindex`, `tips`, `colinnerbtevent`, `colfilteroptions`) VALUES ('creditAuthListLoan', '1040', '1040', '1', 'O', 'phone', 'phone', 'String', '', '电话号', '', '1', 'Text', '1', '1', '', '', 'style={width:90px;}', '20', '1', '0', '0', '1', '0', '0', '', '', '', 'SYS_Designer', '2019/06/17 11:27:30', 'admin', '2021/07/19 15:39:01', '0', '', '1', '', '', '', '');
+INSERT INTO `apzl`.`awe_do_library` (`dono`, `colindex`, `sortno`, `isinuse`, `coltablename`, `colactualname`, `colname`, `coltype`, `coldefaultvalue`, `colheader`, `colunit`, `colcolumntype`, `coleditstyle`, `colcheckformat`, `colalign`, `coleditsourcetype`, `coleditsource`, `colhtmlstyle`, `collimit`, `colvisible`, `colreadonly`, `colrequired`, `colsortable`, `isfilter`, `colspan`, `isautocomplete`, `groupid`, `colfilterrefid`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `isaudit`, `colfilterattrs`, `isupdate`, `parentcolindex`, `tips`, `colinnerbtevent`, `colfilteroptions`) VALUES ('creditAuthListLoan', '1041', '1041', '1', 'O', 'creditauth', 'creditauth', 'String', '', '授权模板', '', '1', 'Text', '1', '1', '', '', '', '20', '0', '0', '0', '1', '0', '0', '', '', '', 'SYS_Designer', '2019/06/17 11:27:30', 'admin', '2021/07/19 15:39:01', '0', '', '1', '', '', '', '');
+INSERT INTO `apzl`.`awe_do_library` (`dono`, `colindex`, `sortno`, `isinuse`, `coltablename`, `colactualname`, `colname`, `coltype`, `coldefaultvalue`, `colheader`, `colunit`, `colcolumntype`, `coleditstyle`, `colcheckformat`, `colalign`, `coleditsourcetype`, `coleditsource`, `colhtmlstyle`, `collimit`, `colvisible`, `colreadonly`, `colrequired`, `colsortable`, `isfilter`, `colspan`, `isautocomplete`, `groupid`, `colfilterrefid`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `isaudit`, `colfilterattrs`, `isupdate`, `parentcolindex`, `tips`, `colinnerbtevent`, `colfilteroptions`) VALUES ('creditAuthListLoan', '1042', '1042', '1', 'O', 'credittype', 'credittype', 'String', '', '授权模板类型', '', '1', 'Text', '1', '1', '', '', '', '20', '0', '0', '0', '1', '0', '0', '', '', '', 'SYS_Designer', '2019/06/17 11:27:30', 'admin', '2021/07/19 15:39:01', '0', '', '1', '', '', '', '');
+INSERT INTO `apzl`.`awe_do_library` (`dono`, `colindex`, `sortno`, `isinuse`, `coltablename`, `colactualname`, `colname`, `coltype`, `coldefaultvalue`, `colheader`, `colunit`, `colcolumntype`, `coleditstyle`, `colcheckformat`, `colalign`, `coleditsourcetype`, `coleditsource`, `colhtmlstyle`, `collimit`, `colvisible`, `colreadonly`, `colrequired`, `colsortable`, `isfilter`, `colspan`, `isautocomplete`, `groupid`, `colfilterrefid`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `isaudit`, `colfilterattrs`, `isupdate`, `parentcolindex`, `tips`, `colinnerbtevent`, `colfilteroptions`) VALUES ('creditAuthListLoan', '1060', '1060', '1', 'lda', 'ID', 'ID', 'String', '', '文件id', '', '1', 'Text', '1', '1', '', '', '', '20', '0', '0', '0', '1', '0', '0', NULL, '', '', 'SYS_Designer', '2018/07/26 18:17:01', '8006U00000001', '2021/07/13 14:04:10', '0', '', '1', '', '', '', NULL);
+INSERT INTO `apzl`.`awe_do_library` (`dono`, `colindex`, `sortno`, `isinuse`, `coltablename`, `colactualname`, `colname`, `coltype`, `coldefaultvalue`, `colheader`, `colunit`, `colcolumntype`, `coleditstyle`, `colcheckformat`, `colalign`, `coleditsourcetype`, `coleditsource`, `colhtmlstyle`, `collimit`, `colvisible`, `colreadonly`, `colrequired`, `colsortable`, `isfilter`, `colspan`, `isautocomplete`, `groupid`, `colfilterrefid`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `isaudit`, `colfilterattrs`, `isupdate`, `parentcolindex`, `tips`, `colinnerbtevent`, `colfilteroptions`) VALUES ('creditAuthListLoan', '1070', '1070', '1', 'ldcl', 'sign_type', 'sign_type', 'String', NULL, '签约状态', NULL, '1', 'FlatSelect', '1', '1', 'Code', 'contract_sign_status', 'style={width:50px;}', '20', '1', '0', '0', '1', '0', '1', '0', NULL, NULL, 'SYS_DESIGNER', '2018/06/04 19:47:42', 'admin', '2021/07/19 15:39:01', '0', NULL, '1', NULL, NULL, NULL, NULL);
+INSERT INTO `apzl`.`awe_do_library` (`dono`, `colindex`, `sortno`, `isinuse`, `coltablename`, `colactualname`, `colname`, `coltype`, `coldefaultvalue`, `colheader`, `colunit`, `colcolumntype`, `coleditstyle`, `colcheckformat`, `colalign`, `coleditsourcetype`, `coleditsource`, `colhtmlstyle`, `collimit`, `colvisible`, `colreadonly`, `colrequired`, `colsortable`, `isfilter`, `colspan`, `isautocomplete`, `groupid`, `colfilterrefid`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `isaudit`, `colfilterattrs`, `isupdate`, `parentcolindex`, `tips`, `colinnerbtevent`, `colfilteroptions`) VALUES ('creditAuthListLoan', '1080', '1080', '1', 'ldcl', 'sendprocess', 'sendprocess', 'String', NULL, '发送状态', NULL, '1', 'FlatSelect', '1', '1', 'Code', 'sendprocess', 'style={width:50px;}', '20', '1', '0', '0', '1', '0', '1', '0', NULL, NULL, 'SYS_DESIGNER', '2018/06/04 19:47:42', 'admin', '2021/07/19 15:39:01', '0', NULL, '1', NULL, NULL, NULL, NULL);
+INSERT INTO `apzl`.`awe_do_library` (`dono`, `colindex`, `sortno`, `isinuse`, `coltablename`, `colactualname`, `colname`, `coltype`, `coldefaultvalue`, `colheader`, `colunit`, `colcolumntype`, `coleditstyle`, `colcheckformat`, `colalign`, `coleditsourcetype`, `coleditsource`, `colhtmlstyle`, `collimit`, `colvisible`, `colreadonly`, `colrequired`, `colsortable`, `isfilter`, `colspan`, `isautocomplete`, `groupid`, `colfilterrefid`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `isaudit`, `colfilterattrs`, `isupdate`, `parentcolindex`, `tips`, `colinnerbtevent`, `colfilteroptions`) VALUES ('creditAuthListLoan', '1090', '1090', '1', '', 'com.tenwa.channelportal.action.alpha.DocListCreditAuth.findFileListByUser(certId,relation,flowunid)', 'fileList', 'String', '', '附件清单', '', '1', 'Text', '1', '1', '', '', 'style={width:600px;word-break:break-all;}', NULL, '1', '0', '0', '1', '0', '0', '', '', '', 'SYS_Designer', '2021/06/29 11:47:56', 'admin', '2021/07/19 15:39:01', '', '', '1', '', '', '', '');
+
+
+INSERT INTO `apzl`.`awe_do_library` (`dono`, `colindex`, `sortno`, `isinuse`, `coltablename`, `colactualname`, `colname`, `coltype`, `coldefaultvalue`, `colheader`, `colunit`, `colcolumntype`, `coleditstyle`, `colcheckformat`, `colalign`, `coleditsourcetype`, `coleditsource`, `colhtmlstyle`, `collimit`, `colvisible`, `colreadonly`, `colrequired`, `colsortable`, `isfilter`, `colspan`, `isautocomplete`, `groupid`, `colfilterrefid`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `isaudit`, `colfilterattrs`, `isupdate`, `parentcolindex`, `tips`, `colinnerbtevent`, `colfilteroptions`) VALUES ('creditAuthList', '1000', '1000', '1', 'O', 'fullName', 'fullName', 'String', '', '姓名', '', '1', 'Text', '1', '1', '', '', 'style={width:50px;}', '20', '1', '0', '0', '1', '1', '1', '0', '', '', 'SYS_DESIGNER', '2018/07/12 09:38:36', 'admin', '2021/07/19 15:39:01', '0', '', '1', '', '', '', NULL);
+INSERT INTO `apzl`.`awe_do_library` (`dono`, `colindex`, `sortno`, `isinuse`, `coltablename`, `colactualname`, `colname`, `coltype`, `coldefaultvalue`, `colheader`, `colunit`, `colcolumntype`, `coleditstyle`, `colcheckformat`, `colalign`, `coleditsourcetype`, `coleditsource`, `colhtmlstyle`, `collimit`, `colvisible`, `colreadonly`, `colrequired`, `colsortable`, `isfilter`, `colspan`, `isautocomplete`, `groupid`, `colfilterrefid`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `isaudit`, `colfilterattrs`, `isupdate`, `parentcolindex`, `tips`, `colinnerbtevent`, `colfilteroptions`) VALUES ('creditAuthList', '1010', '1010', '1', 'O', 'certId', 'certId', 'String', '', '身份证编号', '', '1', 'Text', '1', '1', '', '', 'style={width:150px;}', '20', '1', '0', '0', '1', '1', '1', '0', '', '', 'SYS_DESIGNER', '2018/07/12 09:38:36', 'admin', '2021/07/19 15:39:01', '0', '', '1', '', '', '', NULL);
+INSERT INTO `apzl`.`awe_do_library` (`dono`, `colindex`, `sortno`, `isinuse`, `coltablename`, `colactualname`, `colname`, `coltype`, `coldefaultvalue`, `colheader`, `colunit`, `colcolumntype`, `coleditstyle`, `colcheckformat`, `colalign`, `coleditsourcetype`, `coleditsource`, `colhtmlstyle`, `collimit`, `colvisible`, `colreadonly`, `colrequired`, `colsortable`, `isfilter`, `colspan`, `isautocomplete`, `groupid`, `colfilterrefid`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `isaudit`, `colfilterattrs`, `isupdate`, `parentcolindex`, `tips`, `colinnerbtevent`, `colfilteroptions`) VALUES ('creditAuthList', '1020', '1020', '1', 'O', 'relation', 'relation', 'String', '', '身份', '', '1', 'Text', '1', '1', '', '', 'style={width:50px;}', '20', '1', '0', '0', '1', '1', '1', '0', '', '', 'SYS_DESIGNER', '2018/07/12 09:38:36', 'admin', '2021/07/19 15:39:01', '0', '', '1', '', '', '', NULL);
+INSERT INTO `apzl`.`awe_do_library` (`dono`, `colindex`, `sortno`, `isinuse`, `coltablename`, `colactualname`, `colname`, `coltype`, `coldefaultvalue`, `colheader`, `colunit`, `colcolumntype`, `coleditstyle`, `colcheckformat`, `colalign`, `coleditsourcetype`, `coleditsource`, `colhtmlstyle`, `collimit`, `colvisible`, `colreadonly`, `colrequired`, `colsortable`, `isfilter`, `colspan`, `isautocomplete`, `groupid`, `colfilterrefid`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `isaudit`, `colfilterattrs`, `isupdate`, `parentcolindex`, `tips`, `colinnerbtevent`, `colfilteroptions`) VALUES ('creditAuthList', '1030', '1030', '1', 'O', 'flowunid', 'flowunid', 'String', NULL, '流程编号', NULL, '1', 'Text', '1', '1', NULL, NULL, NULL, '20', '0', '0', '0', '1', '1', '1', '0', NULL, NULL, 'SYS_DESIGNER', '2018/07/12 09:38:36', 'admin', '2021/07/19 15:39:01', '0', NULL, '1', NULL, NULL, NULL, NULL);
+INSERT INTO `apzl`.`awe_do_library` (`dono`, `colindex`, `sortno`, `isinuse`, `coltablename`, `colactualname`, `colname`, `coltype`, `coldefaultvalue`, `colheader`, `colunit`, `colcolumntype`, `coleditstyle`, `colcheckformat`, `colalign`, `coleditsourcetype`, `coleditsource`, `colhtmlstyle`, `collimit`, `colvisible`, `colreadonly`, `colrequired`, `colsortable`, `isfilter`, `colspan`, `isautocomplete`, `groupid`, `colfilterrefid`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `isaudit`, `colfilterattrs`, `isupdate`, `parentcolindex`, `tips`, `colinnerbtevent`, `colfilteroptions`) VALUES ('creditAuthList', '1040', '1040', '1', 'O', 'phone', 'phone', 'String', '', '电话号', '', '1', 'Text', '1', '1', '', '', 'style={width:90px;}', '20', '1', '0', '0', '1', '0', '0', '', '', '', 'SYS_Designer', '2019/06/17 11:27:30', 'admin', '2021/07/19 15:39:01', '0', '', '1', '', '', '', '');
+INSERT INTO `apzl`.`awe_do_library` (`dono`, `colindex`, `sortno`, `isinuse`, `coltablename`, `colactualname`, `colname`, `coltype`, `coldefaultvalue`, `colheader`, `colunit`, `colcolumntype`, `coleditstyle`, `colcheckformat`, `colalign`, `coleditsourcetype`, `coleditsource`, `colhtmlstyle`, `collimit`, `colvisible`, `colreadonly`, `colrequired`, `colsortable`, `isfilter`, `colspan`, `isautocomplete`, `groupid`, `colfilterrefid`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `isaudit`, `colfilterattrs`, `isupdate`, `parentcolindex`, `tips`, `colinnerbtevent`, `colfilteroptions`) VALUES ('creditAuthList', '1041', '1041', '1', 'O', 'creditauth', 'creditauth', 'String', '', '授权模板', '', '1', 'Text', '1', '1', '', '', '', '20', '0', '0', '0', '1', '0', '0', '', '', '', 'SYS_Designer', '2019/06/17 11:27:30', 'admin', '2021/07/19 15:39:01', '0', '', '1', '', '', '', '');
+INSERT INTO `apzl`.`awe_do_library` (`dono`, `colindex`, `sortno`, `isinuse`, `coltablename`, `colactualname`, `colname`, `coltype`, `coldefaultvalue`, `colheader`, `colunit`, `colcolumntype`, `coleditstyle`, `colcheckformat`, `colalign`, `coleditsourcetype`, `coleditsource`, `colhtmlstyle`, `collimit`, `colvisible`, `colreadonly`, `colrequired`, `colsortable`, `isfilter`, `colspan`, `isautocomplete`, `groupid`, `colfilterrefid`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `isaudit`, `colfilterattrs`, `isupdate`, `parentcolindex`, `tips`, `colinnerbtevent`, `colfilteroptions`) VALUES ('creditAuthList', '1042', '1042', '1', 'O', 'credittype', 'credittype', 'String', '', '授权模板类型', '', '1', 'Text', '1', '1', '', '', '', '20', '0', '0', '0', '1', '0', '0', '', '', '', 'SYS_Designer', '2019/06/17 11:27:30', 'admin', '2021/07/19 15:39:01', '0', '', '1', '', '', '', '');
+INSERT INTO `apzl`.`awe_do_library` (`dono`, `colindex`, `sortno`, `isinuse`, `coltablename`, `colactualname`, `colname`, `coltype`, `coldefaultvalue`, `colheader`, `colunit`, `colcolumntype`, `coleditstyle`, `colcheckformat`, `colalign`, `coleditsourcetype`, `coleditsource`, `colhtmlstyle`, `collimit`, `colvisible`, `colreadonly`, `colrequired`, `colsortable`, `isfilter`, `colspan`, `isautocomplete`, `groupid`, `colfilterrefid`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `isaudit`, `colfilterattrs`, `isupdate`, `parentcolindex`, `tips`, `colinnerbtevent`, `colfilteroptions`) VALUES ('creditAuthList', '1060', '1060', '1', 'lda', 'ID', 'ID', 'String', '', '文件id', '', '1', 'Text', '1', '1', '', '', '', '20', '0', '0', '0', '1', '0', '0', NULL, '', '', 'SYS_Designer', '2018/07/26 18:17:01', '8006U00000001', '2021/07/13 14:04:10', '0', '', '1', '', '', '', NULL);
+INSERT INTO `apzl`.`awe_do_library` (`dono`, `colindex`, `sortno`, `isinuse`, `coltablename`, `colactualname`, `colname`, `coltype`, `coldefaultvalue`, `colheader`, `colunit`, `colcolumntype`, `coleditstyle`, `colcheckformat`, `colalign`, `coleditsourcetype`, `coleditsource`, `colhtmlstyle`, `collimit`, `colvisible`, `colreadonly`, `colrequired`, `colsortable`, `isfilter`, `colspan`, `isautocomplete`, `groupid`, `colfilterrefid`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `isaudit`, `colfilterattrs`, `isupdate`, `parentcolindex`, `tips`, `colinnerbtevent`, `colfilteroptions`) VALUES ('creditAuthList', '1070', '1070', '1', 'ldcl', 'sign_type', 'sign_type', 'String', NULL, '签约状态', NULL, '1', 'FlatSelect', '1', '1', 'Code', 'contract_sign_status', 'style={width:50px;}', '20', '1', '0', '0', '1', '0', '1', '0', NULL, NULL, 'SYS_DESIGNER', '2018/06/04 19:47:42', 'admin', '2021/07/19 15:39:01', '0', NULL, '1', NULL, NULL, NULL, NULL);
+INSERT INTO `apzl`.`awe_do_library` (`dono`, `colindex`, `sortno`, `isinuse`, `coltablename`, `colactualname`, `colname`, `coltype`, `coldefaultvalue`, `colheader`, `colunit`, `colcolumntype`, `coleditstyle`, `colcheckformat`, `colalign`, `coleditsourcetype`, `coleditsource`, `colhtmlstyle`, `collimit`, `colvisible`, `colreadonly`, `colrequired`, `colsortable`, `isfilter`, `colspan`, `isautocomplete`, `groupid`, `colfilterrefid`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `isaudit`, `colfilterattrs`, `isupdate`, `parentcolindex`, `tips`, `colinnerbtevent`, `colfilteroptions`) VALUES ('creditAuthList', '1080', '1080', '1', 'ldcl', 'sendprocess', 'sendprocess', 'String', NULL, '发送状态', NULL, '1', 'FlatSelect', '1', '1', 'Code', 'sendprocess', 'style={width:50px;}', '20', '1', '0', '0', '1', '0', '1', '0', NULL, NULL, 'SYS_DESIGNER', '2018/06/04 19:47:42', 'admin', '2021/07/19 15:39:01', '0', NULL, '1', NULL, NULL, NULL, NULL);
+INSERT INTO `apzl`.`awe_do_library` (`dono`, `colindex`, `sortno`, `isinuse`, `coltablename`, `colactualname`, `colname`, `coltype`, `coldefaultvalue`, `colheader`, `colunit`, `colcolumntype`, `coleditstyle`, `colcheckformat`, `colalign`, `coleditsourcetype`, `coleditsource`, `colhtmlstyle`, `collimit`, `colvisible`, `colreadonly`, `colrequired`, `colsortable`, `isfilter`, `colspan`, `isautocomplete`, `groupid`, `colfilterrefid`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `isaudit`, `colfilterattrs`, `isupdate`, `parentcolindex`, `tips`, `colinnerbtevent`, `colfilteroptions`) VALUES ('creditAuthList', '1090', '1090', '1', '', 'com.tenwa.channelportal.action.alpha.DocListCreditAuth.findFileListByUser(certId,relation,flowunid)', 'fileList', 'String', '', '附件清单', '', '1', 'Text', '1', '1', '', '', 'style={width:600px;word-break:break-all;}', NULL, '1', '0', '0', '1', '0', '0', '', '', '', 'SYS_Designer', '2021/06/29 11:47:56', 'admin', '2021/07/19 15:39:01', '', '', '1', '', '', '', '');
+
+
+INSERT INTO `apzl`.`fc_file_config` (`ID`, `CHANNEL_NO`, `CHANNEL_NAME`, `FC_FLOW_TYPE`, `FC_FLOW_TYPE_NAME`, `FC_FILE_CODE`, `FC_FILE_CODE_NAME`, `FC_FILE_TYPE`, `PRD_FILE_CODE`, `PRD_FILE_NUM`, `PRD_FILE_CODE_NAME`, `CREATE_TIME`, `UPDATE_TIME`, `del_flag`) VALUES ('1', 'PSBC', '邮储助贷', 'BusinessApplyFlow', '信审', '01', '身份证-正面', 'jpg,jpeg,png,pdf', '073003', '1', '申请阶段-身份证', '2021/06/28 09:30:01', '2021/06/28 09:30:01', '0');
+INSERT INTO `apzl`.`fc_file_config` (`ID`, `CHANNEL_NO`, `CHANNEL_NAME`, `FC_FLOW_TYPE`, `FC_FLOW_TYPE_NAME`, `FC_FILE_CODE`, `FC_FILE_CODE_NAME`, `FC_FILE_TYPE`, `PRD_FILE_CODE`, `PRD_FILE_NUM`, `PRD_FILE_CODE_NAME`, `CREATE_TIME`, `UPDATE_TIME`, `del_flag`) VALUES ('2', 'PSBC', '邮储助贷', 'BusinessApplyFlow', '信审', '02', '身份证-反面', 'jpg,jpeg,png,pdf', '073003', '1', '申请阶段-身份证', '2021/06/28 09:30:01', '2021/06/28 09:30:01', '0');
+INSERT INTO `apzl`.`fc_file_config` (`ID`, `CHANNEL_NO`, `CHANNEL_NAME`, `FC_FLOW_TYPE`, `FC_FLOW_TYPE_NAME`, `FC_FILE_CODE`, `FC_FILE_CODE_NAME`, `FC_FILE_TYPE`, `PRD_FILE_CODE`, `PRD_FILE_NUM`, `PRD_FILE_CODE_NAME`, `CREATE_TIME`, `UPDATE_TIME`, `del_flag`) VALUES ('3', 'PSBC', '邮储助贷', 'BusinessApplyFlow', '信审', '08', '征信授权书', 'jpg,jpeg,png,pdf', '99002', '1', '征信授权书-邮储', '2021/06/28 09:30:01', '2021/06/28 09:30:01', '0');
+INSERT INTO `apzl`.`fc_file_config` (`ID`, `CHANNEL_NO`, `CHANNEL_NAME`, `FC_FLOW_TYPE`, `FC_FLOW_TYPE_NAME`, `FC_FILE_CODE`, `FC_FILE_CODE_NAME`, `FC_FILE_TYPE`, `PRD_FILE_CODE`, `PRD_FILE_NUM`, `PRD_FILE_CODE_NAME`, `CREATE_TIME`, `UPDATE_TIME`, `del_flag`) VALUES ('4', 'PSBC', '邮储助贷', 'BusinessApplyFlow', '信审', '09', '借款服务确认书', 'jpg,jpeg,png,pdf', '99003', '1', '借款服务确认书-邮储', '2021/06/28 09:30:01', '2021/06/28 09:30:01', '0');
+INSERT INTO `apzl`.`fc_file_config` (`ID`, `CHANNEL_NO`, `CHANNEL_NAME`, `FC_FLOW_TYPE`, `FC_FLOW_TYPE_NAME`, `FC_FILE_CODE`, `FC_FILE_CODE_NAME`, `FC_FILE_TYPE`, `PRD_FILE_CODE`, `PRD_FILE_NUM`, `PRD_FILE_CODE_NAME`, `CREATE_TIME`, `UPDATE_TIME`, `del_flag`) VALUES ('5', 'PSBC', '邮储助贷', 'FundPaymentCarFlow', '放款', 'idcard', '身份证', 'jpg,jpeg,png,pdf', '073003', '1', '申请阶段-身份证', '2021/06/28 09:30:01', '2021/06/28 09:30:01', '0');
+INSERT INTO `apzl`.`fc_file_config` (`ID`, `CHANNEL_NO`, `CHANNEL_NAME`, `FC_FLOW_TYPE`, `FC_FLOW_TYPE_NAME`, `FC_FILE_CODE`, `FC_FILE_CODE_NAME`, `FC_FILE_TYPE`, `PRD_FILE_CODE`, `PRD_FILE_NUM`, `PRD_FILE_CODE_NAME`, `CREATE_TIME`, `UPDATE_TIME`, `del_flag`) VALUES ('6', 'PSBC', '邮储助贷', 'FundPaymentCarFlow', '放款', 'spouseIdcard', '配偶身份证原件', 'jpg,jpeg,png,pdf', '073003', '1', '申请阶段-身份证', '2021/06/28 09:30:01', '2021/06/28 09:30:01', '0');
+INSERT INTO `apzl`.`fc_file_config` (`ID`, `CHANNEL_NO`, `CHANNEL_NAME`, `FC_FLOW_TYPE`, `FC_FLOW_TYPE_NAME`, `FC_FILE_CODE`, `FC_FILE_CODE_NAME`, `FC_FILE_TYPE`, `PRD_FILE_CODE`, `PRD_FILE_NUM`, `PRD_FILE_CODE_NAME`, `CREATE_TIME`, `UPDATE_TIME`, `del_flag`) VALUES ('7', 'PSBC', '邮储助贷', 'FundPaymentCarFlow', '放款', 'relationship', '借款人单身声明/结婚证/离婚证', 'jpg,jpeg,png,pdf', '073003', '1', '身份证-测试', '2021/06/28 09:30:01', '2021/06/28 09:30:01', '0');
+INSERT INTO `apzl`.`fc_file_config` (`ID`, `CHANNEL_NO`, `CHANNEL_NAME`, `FC_FLOW_TYPE`, `FC_FLOW_TYPE_NAME`, `FC_FILE_CODE`, `FC_FILE_CODE_NAME`, `FC_FILE_TYPE`, `PRD_FILE_CODE`, `PRD_FILE_NUM`, `PRD_FILE_CODE_NAME`, `CREATE_TIME`, `UPDATE_TIME`, `del_flag`) VALUES ('8', 'PSBC', '邮储助贷', 'FundPaymentCarFlow', '放款', 'vehicleTrade', '购车协议', 'jpg,jpeg,png,pdf', '074001', '1', '放款阶段-购车合同', '2021/06/28 09:30:01', '2021/06/28 09:30:01', '0');
+INSERT INTO `apzl`.`fc_file_config` (`ID`, `CHANNEL_NO`, `CHANNEL_NAME`, `FC_FLOW_TYPE`, `FC_FLOW_TYPE_NAME`, `FC_FILE_CODE`, `FC_FILE_CODE_NAME`, `FC_FILE_TYPE`, `PRD_FILE_CODE`, `PRD_FILE_NUM`, `PRD_FILE_CODE_NAME`, `CREATE_TIME`, `UPDATE_TIME`, `del_flag`) VALUES ('9', 'PSBC', '邮储助贷', 'FundPaymentCarFlow', '放款', 'certificate', '车辆合格证', 'jpg,jpeg,png,pdf', '074007', '1', '放款阶段-车辆合格证', '2021/06/28 09:30:01', '2021/06/28 09:30:01', '0');
+INSERT INTO `apzl`.`fc_file_config` (`ID`, `CHANNEL_NO`, `CHANNEL_NAME`, `FC_FLOW_TYPE`, `FC_FLOW_TYPE_NAME`, `FC_FILE_CODE`, `FC_FILE_CODE_NAME`, `FC_FILE_TYPE`, `PRD_FILE_CODE`, `PRD_FILE_NUM`, `PRD_FILE_CODE_NAME`, `CREATE_TIME`, `UPDATE_TIME`, `del_flag`) VALUES ('10', 'PSBC', '邮储助贷', 'FundPaymentCarFlow', '放款', 'purchaseInvoice', '车辆发票', 'jpg,jpeg,png,pdf', '074008', '1', '放款阶段-车辆销售发票', '2021/06/28 09:30:01', '2021/06/28 09:30:01', '0');
+INSERT INTO `apzl`.`fc_file_config` (`ID`, `CHANNEL_NO`, `CHANNEL_NAME`, `FC_FLOW_TYPE`, `FC_FLOW_TYPE_NAME`, `FC_FILE_CODE`, `FC_FILE_CODE_NAME`, `FC_FILE_TYPE`, `PRD_FILE_CODE`, `PRD_FILE_NUM`, `PRD_FILE_CODE_NAME`, `CREATE_TIME`, `UPDATE_TIME`, `del_flag`) VALUES ('11', 'PSBC', '邮储助贷', 'FundPaymentCarFlow', '放款', 'purchasePartProof', '配件凭证', 'jpg,jpeg,png,pdf', '074017', '1', '放款阶段-加装费支付凭证', '2021/06/28 09:30:01', '2021/06/28 09:30:01', '0');
+INSERT INTO `apzl`.`fc_file_config` (`ID`, `CHANNEL_NO`, `CHANNEL_NAME`, `FC_FLOW_TYPE`, `FC_FLOW_TYPE_NAME`, `FC_FILE_CODE`, `FC_FILE_CODE_NAME`, `FC_FILE_TYPE`, `PRD_FILE_CODE`, `PRD_FILE_NUM`, `PRD_FILE_CODE_NAME`, `CREATE_TIME`, `UPDATE_TIME`, `del_flag`) VALUES ('12', 'PSBC', '邮储助贷', 'FundPaymentCarFlow', '放款', 'essentialInsurance', '保单-交强险', 'jpg,jpeg,png,pdf', '074010', '1', '放款阶段-保险单', '2021/06/28 09:30:01', '2021/06/28 09:30:01', '0');
+INSERT INTO `apzl`.`fc_file_config` (`ID`, `CHANNEL_NO`, `CHANNEL_NAME`, `FC_FLOW_TYPE`, `FC_FLOW_TYPE_NAME`, `FC_FILE_CODE`, `FC_FILE_CODE_NAME`, `FC_FILE_TYPE`, `PRD_FILE_CODE`, `PRD_FILE_NUM`, `PRD_FILE_CODE_NAME`, `CREATE_TIME`, `UPDATE_TIME`, `del_flag`) VALUES ('13', 'PSBC', '邮储助贷', 'FundPaymentCarFlow', '放款', 'insurancePolicy', '保单-商业险', 'jpg,jpeg,png,pdf', '074010', '1', '放款阶段-保险单', '2021/06/28 09:30:01', '2021/06/28 09:30:01', '0');
+INSERT INTO `apzl`.`fc_file_config` (`ID`, `CHANNEL_NO`, `CHANNEL_NAME`, `FC_FLOW_TYPE`, `FC_FLOW_TYPE_NAME`, `FC_FILE_CODE`, `FC_FILE_CODE_NAME`, `FC_FILE_TYPE`, `PRD_FILE_CODE`, `PRD_FILE_NUM`, `PRD_FILE_CODE_NAME`, `CREATE_TIME`, `UPDATE_TIME`, `del_flag`) VALUES ('14', 'PSBC', '邮储助贷', 'FundPaymentCarFlow', '放款', 'otherInsurance', '保单-其他', 'jpg,jpeg,png,pdf', '074010', '1', '放款阶段-保险单', '2021/06/28 09:30:01', '2021/06/28 09:30:01', '0');
+INSERT INTO `apzl`.`fc_file_config` (`ID`, `CHANNEL_NO`, `CHANNEL_NAME`, `FC_FLOW_TYPE`, `FC_FLOW_TYPE_NAME`, `FC_FILE_CODE`, `FC_FILE_CODE_NAME`, `FC_FILE_TYPE`, `PRD_FILE_CODE`, `PRD_FILE_NUM`, `PRD_FILE_CODE_NAME`, `CREATE_TIME`, `UPDATE_TIME`, `del_flag`) VALUES ('15', 'PSBC', '邮储助贷', 'FundPaymentCarFlow', '放款', 'affiliationLicense', '挂靠公司营业执照', 'jpg,jpeg,png,pdf', '073008', '1', '申请阶段-挂靠公司材料', '2021/06/28 09:30:01', '2021/06/28 09:30:01', '0');
+INSERT INTO `apzl`.`fc_file_config` (`ID`, `CHANNEL_NO`, `CHANNEL_NAME`, `FC_FLOW_TYPE`, `FC_FLOW_TYPE_NAME`, `FC_FILE_CODE`, `FC_FILE_CODE_NAME`, `FC_FILE_TYPE`, `PRD_FILE_CODE`, `PRD_FILE_NUM`, `PRD_FILE_CODE_NAME`, `CREATE_TIME`, `UPDATE_TIME`, `del_flag`) VALUES ('16', 'PSBC', '邮储助贷', 'FundPaymentCarFlow', '放款', 'affiliationAgree', '挂靠协议书', 'jpg,jpeg,png,pdf', '074005', '1', '放款阶段-挂靠协议（商用车版）', '2021/06/28 09:30:01', '2021/06/28 09:30:01', '0');
+INSERT INTO `apzl`.`fc_file_config` (`ID`, `CHANNEL_NO`, `CHANNEL_NAME`, `FC_FLOW_TYPE`, `FC_FLOW_TYPE_NAME`, `FC_FILE_CODE`, `FC_FILE_CODE_NAME`, `FC_FILE_TYPE`, `PRD_FILE_CODE`, `PRD_FILE_NUM`, `PRD_FILE_CODE_NAME`, `CREATE_TIME`, `UPDATE_TIME`, `del_flag`) VALUES ('17', 'PSBC', '邮储助贷', 'FundPaymentCarFlow', '放款', 'roadTransportPermit', '挂靠公司道路运输许可证', 'jpg,jpeg,png,pdf', '074016', '1', '放款阶段-《道路运输经营许可证》', '2021/06/28 09:30:01', '2021/06/28 09:30:01', '0');
+INSERT INTO `apzl`.`fc_file_config` (`ID`, `CHANNEL_NO`, `CHANNEL_NAME`, `FC_FLOW_TYPE`, `FC_FLOW_TYPE_NAME`, `FC_FILE_CODE`, `FC_FILE_CODE_NAME`, `FC_FILE_TYPE`, `PRD_FILE_CODE`, `PRD_FILE_NUM`, `PRD_FILE_CODE_NAME`, `CREATE_TIME`, `UPDATE_TIME`, `del_flag`) VALUES ('18', 'PSBC', '邮储助贷', 'FundPaymentCarFlow', '放款', 'financelease', '融资租赁协议及附件', 'jpg,jpeg,png,pdf', 'contract', '1', '放款阶段-融资租赁合同套系', '2021/06/28 09:30:01', '2021/06/28 09:30:01', '0');
+INSERT INTO `apzl`.`fc_file_config` (`ID`, `CHANNEL_NO`, `CHANNEL_NAME`, `FC_FLOW_TYPE`, `FC_FLOW_TYPE_NAME`, `FC_FILE_CODE`, `FC_FILE_CODE_NAME`, `FC_FILE_TYPE`, `PRD_FILE_CODE`, `PRD_FILE_NUM`, `PRD_FILE_CODE_NAME`, `CREATE_TIME`, `UPDATE_TIME`, `del_flag`) VALUES ('19', 'PSBC', '邮储助贷', 'FundPaymentCarFlow', '放款', 'deliveryProof', '车辆交付证明', 'jpg,jpeg,png,pdf', 'contract', '1', '放款阶段-融资租赁合同套系', '2021/06/28 09:30:01', '2021/06/28 09:30:01', '0');
+INSERT INTO `apzl`.`fc_file_config` (`ID`, `CHANNEL_NO`, `CHANNEL_NAME`, `FC_FLOW_TYPE`, `FC_FLOW_TYPE_NAME`, `FC_FILE_CODE`, `FC_FILE_CODE_NAME`, `FC_FILE_TYPE`, `PRD_FILE_CODE`, `PRD_FILE_NUM`, `PRD_FILE_CODE_NAME`, `CREATE_TIME`, `UPDATE_TIME`, `del_flag`) VALUES ('20', 'PSBC', '邮储助贷', 'FundPaymentCarFlow', '放款', 'transferAgree', '所有权转让协议', 'jpg,jpeg,png,pdf', 'contract', '1', '放款阶段-融资租赁合同套系', '2021/06/28 09:30:01', '2021/06/28 09:30:01', '0');
+INSERT INTO `apzl`.`fc_file_config` (`ID`, `CHANNEL_NO`, `CHANNEL_NAME`, `FC_FLOW_TYPE`, `FC_FLOW_TYPE_NAME`, `FC_FILE_CODE`, `FC_FILE_CODE_NAME`, `FC_FILE_TYPE`, `PRD_FILE_CODE`, `PRD_FILE_NUM`, `PRD_FILE_CODE_NAME`, `CREATE_TIME`, `UPDATE_TIME`, `del_flag`) VALUES ('101', 'PSBC', '邮储助贷', 'AfterLoanCarFlow', '贷后', 'purchaseProof', '付款证明', 'jpg,jpeg,png,pdf', '073003', '1', '身份证-测试', '2021/06/28 09:30:01', '2021/06/28 09:30:01', '0');
+INSERT INTO `apzl`.`fc_file_config` (`ID`, `CHANNEL_NO`, `CHANNEL_NAME`, `FC_FLOW_TYPE`, `FC_FLOW_TYPE_NAME`, `FC_FILE_CODE`, `FC_FILE_CODE_NAME`, `FC_FILE_TYPE`, `PRD_FILE_CODE`, `PRD_FILE_NUM`, `PRD_FILE_CODE_NAME`, `CREATE_TIME`, `UPDATE_TIME`, `del_flag`) VALUES ('102', 'PSBC', '邮储助贷', 'AfterLoanCarFlow', '贷后', 'registrationcertificate', '车辆登记证书-车辆信息页', 'jpg,jpeg,png,pdf', '075002', '1', '放款后督阶段-车辆登记证', '2021/06/28 09:30:01', '2021/06/28 09:30:01', '0');
+INSERT INTO `apzl`.`fc_file_config` (`ID`, `CHANNEL_NO`, `CHANNEL_NAME`, `FC_FLOW_TYPE`, `FC_FLOW_TYPE_NAME`, `FC_FILE_CODE`, `FC_FILE_CODE_NAME`, `FC_FILE_TYPE`, `PRD_FILE_CODE`, `PRD_FILE_NUM`, `PRD_FILE_CODE_NAME`, `CREATE_TIME`, `UPDATE_TIME`, `del_flag`) VALUES ('103', 'PSBC', '邮储助贷', 'AfterLoanCarFlow', '贷后', 'registrationcertificate', '车辆登记证书-抵押信息页', 'jpg,jpeg,png,pdf', '075002', '1', '放款后督阶段-车辆登记证', '2021/06/28 09:30:01', '2021/06/28 09:30:01', '0');
+INSERT INTO `apzl`.`fc_file_config` (`ID`, `CHANNEL_NO`, `CHANNEL_NAME`, `FC_FLOW_TYPE`, `FC_FLOW_TYPE_NAME`, `FC_FILE_CODE`, `FC_FILE_CODE_NAME`, `FC_FILE_TYPE`, `PRD_FILE_CODE`, `PRD_FILE_NUM`, `PRD_FILE_CODE_NAME`, `CREATE_TIME`, `UPDATE_TIME`, `del_flag`) VALUES ('104', 'PSBC', '邮储助贷', 'AfterLoanCarFlow', '贷后', 'insurance', '保险单', 'jpg,jpeg,png,pdf', '074010', '1', '放款阶段-保险单', '2021/06/28 09:30:01', '2021/06/28 09:30:01', '0');
+INSERT INTO `apzl`.`fc_file_config` (`ID`, `CHANNEL_NO`, `CHANNEL_NAME`, `FC_FLOW_TYPE`, `FC_FLOW_TYPE_NAME`, `FC_FILE_CODE`, `FC_FILE_CODE_NAME`, `FC_FILE_TYPE`, `PRD_FILE_CODE`, `PRD_FILE_NUM`, `PRD_FILE_CODE_NAME`, `CREATE_TIME`, `UPDATE_TIME`, `del_flag`) VALUES ('105', 'PSBC', '邮储助贷', 'AfterLoanCarFlow', '贷后', 'purchaseTaxInvoice', '购置税缴纳凭证', 'jpg,jpeg,png,pdf', '075001', '1', '放款后督阶段-车辆购置税凭证', '2021/06/28 09:30:01', '2021/06/28 09:30:01', '0');
+INSERT INTO `apzl`.`fc_file_config` (`ID`, `CHANNEL_NO`, `CHANNEL_NAME`, `FC_FLOW_TYPE`, `FC_FLOW_TYPE_NAME`, `FC_FILE_CODE`, `FC_FILE_CODE_NAME`, `FC_FILE_TYPE`, `PRD_FILE_CODE`, `PRD_FILE_NUM`, `PRD_FILE_CODE_NAME`, `CREATE_TIME`, `UPDATE_TIME`, `del_flag`) VALUES ('106', 'PSBC', '邮储助贷', 'AfterLoanCarFlow', '贷后', 'purchaseInvoice', '汽车发票', 'jpg,jpeg,png,pdf', '073003', '1', '身份证-测试', '2021/06/28 09:30:01', '2021/06/28 09:30:01', '0');
+
+
+INSERT INTO `apzl`.`code_library` (`codeno`, `itemno`, `itemname`, `bankno`, `sortno`, `isinuse`, `itemdescribe`, `itemattribute`, `relativecode`, `attribute1`, `attribute2`, `attribute3`, `attribute4`, `attribute5`, `attribute6`, `attribute7`, `attribute8`, `inputuser`, `inputorg`, `inputtime`, `updateuser`, `updatetime`, `remark`, `helptext`) VALUES ('fc_request_sts', '0', '资方信息初始化成功', NULL, '0010', '1', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'SYS_Designer', NULL, '2021/05/31 15:16:14', 'SYS_Designer', '2021/05/31 15:16:14', NULL, NULL);
+INSERT INTO `apzl`.`code_library` (`codeno`, `itemno`, `itemname`, `bankno`, `sortno`, `isinuse`, `itemdescribe`, `itemattribute`, `relativecode`, `attribute1`, `attribute2`, `attribute3`, `attribute4`, `attribute5`, `attribute6`, `attribute7`, `attribute8`, `inputuser`, `inputorg`, `inputtime`, `updateuser`, `updatetime`, `remark`, `helptext`) VALUES ('fc_request_sts', '1000', '推送预审成功', NULL, '0020', '1', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'SYS_Designer', NULL, '2021/05/31 15:16:14', 'SYS_Designer', '2021/05/31 15:16:14', NULL, NULL);
+INSERT INTO `apzl`.`code_library` (`codeno`, `itemno`, `itemname`, `bankno`, `sortno`, `isinuse`, `itemdescribe`, `itemattribute`, `relativecode`, `attribute1`, `attribute2`, `attribute3`, `attribute4`, `attribute5`, `attribute6`, `attribute7`, `attribute8`, `inputuser`, `inputorg`, `inputtime`, `updateuser`, `updatetime`, `remark`, `helptext`) VALUES ('fc_request_sts', '1100', '推送预审失败', NULL, '0030', '1', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'SYS_Designer', NULL, '2021/05/31 15:16:14', 'SYS_Designer', '2021/05/31 15:16:14', NULL, NULL);
+INSERT INTO `apzl`.`code_library` (`codeno`, `itemno`, `itemname`, `bankno`, `sortno`, `isinuse`, `itemdescribe`, `itemattribute`, `relativecode`, `attribute1`, `attribute2`, `attribute3`, `attribute4`, `attribute5`, `attribute6`, `attribute7`, `attribute8`, `inputuser`, `inputorg`, `inputtime`, `updateuser`, `updatetime`, `remark`, `helptext`) VALUES ('fc_request_sts', '1200', '预审返回失败', NULL, '0040', '1', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'SYS_Designer', NULL, '2021/05/31 15:16:14', 'SYS_Designer', '2021/05/31 15:16:14', NULL, NULL);
+INSERT INTO `apzl`.`code_library` (`codeno`, `itemno`, `itemname`, `bankno`, `sortno`, `isinuse`, `itemdescribe`, `itemattribute`, `relativecode`, `attribute1`, `attribute2`, `attribute3`, `attribute4`, `attribute5`, `attribute6`, `attribute7`, `attribute8`, `inputuser`, `inputorg`, `inputtime`, `updateuser`, `updatetime`, `remark`, `helptext`) VALUES ('fc_request_sts', '1210', '资方预审通过', NULL, '0050', '1', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'SYS_Designer', NULL, '2021/05/31 15:16:14', 'SYS_Designer', '2021/05/31 15:16:14', NULL, NULL);
+INSERT INTO `apzl`.`code_library` (`codeno`, `itemno`, `itemname`, `bankno`, `sortno`, `isinuse`, `itemdescribe`, `itemattribute`, `relativecode`, `attribute1`, `attribute2`, `attribute3`, `attribute4`, `attribute5`, `attribute6`, `attribute7`, `attribute8`, `inputuser`, `inputorg`, `inputtime`, `updateuser`, `updatetime`, `remark`, `helptext`) VALUES ('fc_request_sts', '1300', '推送订单信息成功', NULL, '0050', '1', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'SYS_Designer', NULL, '2021/05/31 15:16:14', 'SYS_Designer', '2021/05/31 15:16:14', NULL, NULL);
+INSERT INTO `apzl`.`code_library` (`codeno`, `itemno`, `itemname`, `bankno`, `sortno`, `isinuse`, `itemdescribe`, `itemattribute`, `relativecode`, `attribute1`, `attribute2`, `attribute3`, `attribute4`, `attribute5`, `attribute6`, `attribute7`, `attribute8`, `inputuser`, `inputorg`, `inputtime`, `updateuser`, `updatetime`, `remark`, `helptext`) VALUES ('fc_request_sts', '1400', '推送订单信息失败', NULL, '0060', '1', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'SYS_Designer', NULL, '2021/05/31 15:16:14', 'SYS_Designer', '2021/05/31 15:16:14', NULL, NULL);
+INSERT INTO `apzl`.`code_library` (`codeno`, `itemno`, `itemname`, `bankno`, `sortno`, `isinuse`, `itemdescribe`, `itemattribute`, `relativecode`, `attribute1`, `attribute2`, `attribute3`, `attribute4`, `attribute5`, `attribute6`, `attribute7`, `attribute8`, `inputuser`, `inputorg`, `inputtime`, `updateuser`, `updatetime`, `remark`, `helptext`) VALUES ('fc_request_sts', '1410', '初审返回否决', NULL, '0010', '1', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'SYS_Designer', NULL, '2021/05/31 15:16:14', 'SYS_Designer', '2021/05/31 15:16:14', NULL, NULL);
+INSERT INTO `apzl`.`code_library` (`codeno`, `itemno`, `itemname`, `bankno`, `sortno`, `isinuse`, `itemdescribe`, `itemattribute`, `relativecode`, `attribute1`, `attribute2`, `attribute3`, `attribute4`, `attribute5`, `attribute6`, `attribute7`, `attribute8`, `inputuser`, `inputorg`, `inputtime`, `updateuser`, `updatetime`, `remark`, `helptext`) VALUES ('fc_request_sts', '1420', '资方初审通过', NULL, '0010', '1', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'SYS_Designer', NULL, '2021/05/31 15:16:14', 'SYS_Designer', '2021/05/31 15:16:14', NULL, NULL);
+INSERT INTO `apzl`.`code_library` (`codeno`, `itemno`, `itemname`, `bankno`, `sortno`, `isinuse`, `itemdescribe`, `itemattribute`, `relativecode`, `attribute1`, `attribute2`, `attribute3`, `attribute4`, `attribute5`, `attribute6`, `attribute7`, `attribute8`, `inputuser`, `inputorg`, `inputtime`, `updateuser`, `updatetime`, `remark`, `helptext`) VALUES ('fc_request_sts', '1500', '终审返回失败', NULL, '0070', '1', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'SYS_Designer', NULL, '2021/05/31 15:16:14', 'SYS_Designer', '2021/05/31 15:16:14', NULL, NULL);
+INSERT INTO `apzl`.`code_library` (`codeno`, `itemno`, `itemname`, `bankno`, `sortno`, `isinuse`, `itemdescribe`, `itemattribute`, `relativecode`, `attribute1`, `attribute2`, `attribute3`, `attribute4`, `attribute5`, `attribute6`, `attribute7`, `attribute8`, `inputuser`, `inputorg`, `inputtime`, `updateuser`, `updatetime`, `remark`, `helptext`) VALUES ('fc_request_sts', '1700', '资方终审通过', NULL, '0050', '1', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'SYS_Designer', NULL, '2021/05/31 15:16:14', 'SYS_Designer', '2021/05/31 15:16:14', NULL, NULL);
+INSERT INTO `apzl`.`code_library` (`codeno`, `itemno`, `itemname`, `bankno`, `sortno`, `isinuse`, `itemdescribe`, `itemattribute`, `relativecode`, `attribute1`, `attribute2`, `attribute3`, `attribute4`, `attribute5`, `attribute6`, `attribute7`, `attribute8`, `inputuser`, `inputorg`, `inputtime`, `updateuser`, `updatetime`, `remark`, `helptext`) VALUES ('fc_request_sts', '1800', '合同签署失败', NULL, '0010', '1', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'SYS_Designer', NULL, '2021/05/31 15:16:14', 'SYS_Designer', '2021/05/31 15:16:14', NULL, NULL);
+INSERT INTO `apzl`.`code_library` (`codeno`, `itemno`, `itemname`, `bankno`, `sortno`, `isinuse`, `itemdescribe`, `itemattribute`, `relativecode`, `attribute1`, `attribute2`, `attribute3`, `attribute4`, `attribute5`, `attribute6`, `attribute7`, `attribute8`, `inputuser`, `inputorg`, `inputtime`, `updateuser`, `updatetime`, `remark`, `helptext`) VALUES ('fc_request_sts', '1900', '合同签署成功', NULL, '0010', '1', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'SYS_Designer', NULL, '2021/05/31 15:16:14', 'SYS_Designer', '2021/05/31 15:16:14', NULL, NULL);
+INSERT INTO `apzl`.`code_library` (`codeno`, `itemno`, `itemname`, `bankno`, `sortno`, `isinuse`, `itemdescribe`, `itemattribute`, `relativecode`, `attribute1`, `attribute2`, `attribute3`, `attribute4`, `attribute5`, `attribute6`, `attribute7`, `attribute8`, `inputuser`, `inputorg`, `inputtime`, `updateuser`, `updatetime`, `remark`, `helptext`) VALUES ('fc_request_sts', '2000', '推送放款申请成功', NULL, '0080', '1', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'SYS_Designer', NULL, '2021/05/31 15:16:14', 'SYS_Designer', '2021/05/31 15:16:14', NULL, NULL);
+INSERT INTO `apzl`.`code_library` (`codeno`, `itemno`, `itemname`, `bankno`, `sortno`, `isinuse`, `itemdescribe`, `itemattribute`, `relativecode`, `attribute1`, `attribute2`, `attribute3`, `attribute4`, `attribute5`, `attribute6`, `attribute7`, `attribute8`, `inputuser`, `inputorg`, `inputtime`, `updateuser`, `updatetime`, `remark`, `helptext`) VALUES ('fc_request_sts', '2100', '推送放款申请失败', NULL, '0090', '1', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'SYS_Designer', NULL, '2021/05/31 15:16:14', 'SYS_Designer', '2021/05/31 15:16:14', NULL, NULL);
+INSERT INTO `apzl`.`code_library` (`codeno`, `itemno`, `itemname`, `bankno`, `sortno`, `isinuse`, `itemdescribe`, `itemattribute`, `relativecode`, `attribute1`, `attribute2`, `attribute3`, `attribute4`, `attribute5`, `attribute6`, `attribute7`, `attribute8`, `inputuser`, `inputorg`, `inputtime`, `updateuser`, `updatetime`, `remark`, `helptext`) VALUES ('fc_request_sts', '2200', '资方放款否决', NULL, '0100', '1', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'SYS_Designer', NULL, '2021/05/31 15:16:14', 'SYS_Designer', '2021/05/31 15:16:14', NULL, NULL);
+INSERT INTO `apzl`.`code_library` (`codeno`, `itemno`, `itemname`, `bankno`, `sortno`, `isinuse`, `itemdescribe`, `itemattribute`, `relativecode`, `attribute1`, `attribute2`, `attribute3`, `attribute4`, `attribute5`, `attribute6`, `attribute7`, `attribute8`, `inputuser`, `inputorg`, `inputtime`, `updateuser`, `updatetime`, `remark`, `helptext`) VALUES ('fc_request_sts', '2250', '放款审批处理中', NULL, '0010', '1', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'SYS_Designer', NULL, '2021/05/31 15:16:14', 'SYS_Designer', '2021/05/31 15:16:14', NULL, NULL);
+INSERT INTO `apzl`.`code_library` (`codeno`, `itemno`, `itemname`, `bankno`, `sortno`, `isinuse`, `itemdescribe`, `itemattribute`, `relativecode`, `attribute1`, `attribute2`, `attribute3`, `attribute4`, `attribute5`, `attribute6`, `attribute7`, `attribute8`, `inputuser`, `inputorg`, `inputtime`, `updateuser`, `updatetime`, `remark`, `helptext`) VALUES ('fc_request_sts', '2300', '资方放款成功', NULL, '0100', '1', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'SYS_Designer', NULL, '2021/05/31 15:16:14', 'SYS_Designer', '2021/05/31 15:16:14', NULL, NULL);
+INSERT INTO `apzl`.`code_library` (`codeno`, `itemno`, `itemname`, `bankno`, `sortno`, `isinuse`, `itemdescribe`, `itemattribute`, `relativecode`, `attribute1`, `attribute2`, `attribute3`, `attribute4`, `attribute5`, `attribute6`, `attribute7`, `attribute8`, `inputuser`, `inputorg`, `inputtime`, `updateuser`, `updatetime`, `remark`, `helptext`) VALUES ('fc_request_sts', '3000', '推送贷后信息成功', NULL, '0110', '1', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'SYS_Designer', NULL, '2021/05/31 15:16:14', 'SYS_Designer', '2021/05/31 15:16:14', NULL, NULL);
+INSERT INTO `apzl`.`code_library` (`codeno`, `itemno`, `itemname`, `bankno`, `sortno`, `isinuse`, `itemdescribe`, `itemattribute`, `relativecode`, `attribute1`, `attribute2`, `attribute3`, `attribute4`, `attribute5`, `attribute6`, `attribute7`, `attribute8`, `inputuser`, `inputorg`, `inputtime`, `updateuser`, `updatetime`, `remark`, `helptext`) VALUES ('fc_request_sts', '3100', '推送贷后信息失败', NULL, '0120', '1', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'SYS_Designer', NULL, '2021/05/31 15:16:14', 'SYS_Designer', '2021/05/31 15:16:14', NULL, NULL);
+INSERT INTO `apzl`.`code_library` (`codeno`, `itemno`, `itemname`, `bankno`, `sortno`, `isinuse`, `itemdescribe`, `itemattribute`, `relativecode`, `attribute1`, `attribute2`, `attribute3`, `attribute4`, `attribute5`, `attribute6`, `attribute7`, `attribute8`, `inputuser`, `inputorg`, `inputtime`, `updateuser`, `updatetime`, `remark`, `helptext`) VALUES ('fc_request_sts', '3200', '贷后信息返回失败', NULL, '0130', '1', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'SYS_Designer', NULL, '2021/05/31 15:16:14', 'SYS_Designer', '2021/05/31 15:16:14', NULL, NULL);
+
+
+
+INSERT INTO `apzl`.`code_library` (`codeno`, `itemno`, `itemname`, `bankno`, `sortno`, `isinuse`, `itemdescribe`, `itemattribute`, `relativecode`, `attribute1`, `attribute2`, `attribute3`, `attribute4`, `attribute5`, `attribute6`, `attribute7`, `attribute8`, `inputuser`, `inputorg`, `inputtime`, `updateuser`, `updatetime`, `remark`, `helptext`) VALUES ('source_product', 'PSBC01', '邮储产品01', '', '0010', '1', '添加时注意，itemno前面必须与资方ID相同', 'PSBC', '', '8', 'AP001', '', '', '', '', '', '', 'SYS_Designer', NULL, '2021/07/15 16:51:02', 'SYS_Designer', '2021/07/15 16:54:07', '', '');
+INSERT INTO `apzl`.`code_library` (`codeno`, `itemno`, `itemname`, `bankno`, `sortno`, `isinuse`, `itemdescribe`, `itemattribute`, `relativecode`, `attribute1`, `attribute2`, `attribute3`, `attribute4`, `attribute5`, `attribute6`, `attribute7`, `attribute8`, `inputuser`, `inputorg`, `inputtime`, `updateuser`, `updatetime`, `remark`, `helptext`) VALUES ('source_product', 'PSBC02', '邮储产品02', '', '0020', '1', '添加时注意，itemno前面必须与资方ID相同', 'PSBC', '', '5.5', 'AP002', '', '', '', '', '', '', 'SYS_Designer', NULL, '2021/07/15 16:51:02', 'SYS_Designer', '2021/07/15 16:54:07', '', '');
+
+
+
+INSERT INTO `apzl`.`bf_template` (`ID`, `SERIALNO`, `SORTNUMBER`, `TEMPLATENAME`, `TEMPLATESHOWNAME`, `TEMPLATEPATH`, `TEMPLATETYPE`, `OPERATETYPE`, `CALLBACK`, `CREATEMETHOD`, `DOCTYPE`, `ONECLASSIFY`, `TWOCLASSIFY`, `THREECLASSIFY`, `FOURCLASSIFY`, `TEMPLATEVERSION`, `STATUS`, `REMARK`, `INPUTUSERID`, `INPUTORGID`, `INPUTTIME`, `UPDATEUSERID`, `UPDATEORGID`, `UPDATETIME`, `CREATECONDITION`, `CREATESHEETCONDITION`) VALUES ('65b12cbfd98611eb970e00163e0ad612', NULL, '', '征信授权书', '征信授权书_{customername}.docx', '征信授权书.docx', 'word', 'create', '', NULL, '030', '030002', '', '', '', '1', '', '天津', 'administrator', '8009001', '2021/02/18 15:14:43', 'admin', '8009001', '2021/07/12 14:26:50', '', '');
+INSERT INTO `apzl`.`bf_template` (`ID`, `SERIALNO`, `SORTNUMBER`, `TEMPLATENAME`, `TEMPLATESHOWNAME`, `TEMPLATEPATH`, `TEMPLATETYPE`, `OPERATETYPE`, `CALLBACK`, `CREATEMETHOD`, `DOCTYPE`, `ONECLASSIFY`, `TWOCLASSIFY`, `THREECLASSIFY`, `FOURCLASSIFY`, `TEMPLATEVERSION`, `STATUS`, `REMARK`, `INPUTUSERID`, `INPUTORGID`, `INPUTTIME`, `UPDATEUSERID`, `UPDATEORGID`, `UPDATETIME`, `CREATECONDITION`, `CREATESHEETCONDITION`) VALUES ('65bd277ad98611eb970e00163e0ad612', NULL, '', '征信授权书_邮储', '征信授权书_邮储_{customername}.docx', '征信授权书_邮储.docx', 'word', 'create', '', NULL, '030', '030002', '', '', '', '1', '', '天津', 'administrator', '8009001', '2021/02/18 15:14:43', 'admin', '8009001', '2021/07/23 15:24:39', '', '');
+INSERT INTO `apzl`.`bf_template` (`ID`, `SERIALNO`, `SORTNUMBER`, `TEMPLATENAME`, `TEMPLATESHOWNAME`, `TEMPLATEPATH`, `TEMPLATETYPE`, `OPERATETYPE`, `CALLBACK`, `CREATEMETHOD`, `DOCTYPE`, `ONECLASSIFY`, `TWOCLASSIFY`, `THREECLASSIFY`, `FOURCLASSIFY`, `TEMPLATEVERSION`, `STATUS`, `REMARK`, `INPUTUSERID`, `INPUTORGID`, `INPUTTIME`, `UPDATEUSERID`, `UPDATEORGID`, `UPDATETIME`, `CREATECONDITION`, `CREATESHEETCONDITION`) VALUES ('134f3d88e2f811eb970e00163e0ad612', NULL, '', '借款服务确认书_邮储', '借款服务确认书_邮储_{customername}.docx', '借款服务确认书_邮储.docx', 'word', 'create', '', NULL, '030', '030002', '', '', '', '1', '', '天津', 'administrator', '8009001', '2021/02/18 15:14:43', 'admin', '8009001', '2021/07/14 09:20:13', '', '');
+
+INSERT INTO `apzl`.`bf_lableconfig` (`ID`, `TAGNUMBER`, `TAGNAME`, `TITLE`, `TAGTYPE`, `VALUETYPE`, `VALUEFIELD`, `VALUEMETHOD`, `THOUSANDSFIELD`, `ISSHOEINDEX`, `REMARK`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`, `OPERATORCLASS`) VALUES ('0d36cd64dfd911eb970e00163e0ad612', '91014', 'credAuthUserSub5', '征信授权用户05', 'tag_type2', 'value_type3', 'phone', 'SELECT :{PLAN_NUMBER} phone FROM DUAL', NULL, 'N', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'word_default_class');
+INSERT INTO `apzl`.`bf_lableconfig` (`ID`, `TAGNUMBER`, `TAGNAME`, `TITLE`, `TAGTYPE`, `VALUETYPE`, `VALUEFIELD`, `VALUEMETHOD`, `THOUSANDSFIELD`, `ISSHOEINDEX`, `REMARK`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`, `OPERATORCLASS`) VALUES ('60578251deec11eb970e00163e0ad612', '91010', 'credAuthUserSub1', '征信授权用户01', 'tag_type2', 'value_type3', 'username', 'SELECT :{customername} username FROM DUAL', NULL, 'N', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'word_default_class');
+INSERT INTO `apzl`.`bf_lableconfig` (`ID`, `TAGNUMBER`, `TAGNAME`, `TITLE`, `TAGTYPE`, `VALUETYPE`, `VALUEFIELD`, `VALUEMETHOD`, `THOUSANDSFIELD`, `ISSHOEINDEX`, `REMARK`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`, `OPERATORCLASS`) VALUES ('605dcb6ddeec11eb970e00163e0ad612', '91011', 'credAuthUserSub2', '征信授权用户02', 'tag_type2', 'value_type3', 'id_card', 'SELECT :{contract_no} id_card FROM DUAL', NULL, 'N', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'word_default_class');
+INSERT INTO `apzl`.`bf_lableconfig` (`ID`, `TAGNUMBER`, `TAGNAME`, `TITLE`, `TAGTYPE`, `VALUETYPE`, `VALUEFIELD`, `VALUEMETHOD`, `THOUSANDSFIELD`, `ISSHOEINDEX`, `REMARK`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`, `OPERATORCLASS`) VALUES ('6062d500deec11eb970e00163e0ad612', '91012', 'credAuthUserSub3', '征信授权用户03', 'tag_type2', 'value_type3', 'username', 'SELECT :{customername} username FROM DUAL', NULL, 'N', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'word_default_class');
+INSERT INTO `apzl`.`bf_lableconfig` (`ID`, `TAGNUMBER`, `TAGNAME`, `TITLE`, `TAGTYPE`, `VALUETYPE`, `VALUEFIELD`, `VALUEMETHOD`, `THOUSANDSFIELD`, `ISSHOEINDEX`, `REMARK`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`, `OPERATORCLASS`) VALUES ('606806aedeec11eb970e00163e0ad612', '91013', 'credAuthUserSub4', '征信授权用户04', 'tag_type2', 'value_type3', 'id_card', 'SELECT :{contract_no} id_card FROM DUAL', NULL, 'N', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'word_default_class');
+INSERT INTO `apzl`.`bf_lableconfig` (`ID`, `TAGNUMBER`, `TAGNAME`, `TITLE`, `TAGTYPE`, `VALUETYPE`, `VALUEFIELD`, `VALUEMETHOD`, `THOUSANDSFIELD`, `ISSHOEINDEX`, `REMARK`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`, `OPERATORCLASS`) VALUES ('706dd501e44111eb970e00163e0ad612', '91015', 'credAuthUserSub6', '征信授权用户06', 'tag_type2', 'value_type3', 'FULLADDRESS', 'SELECT FULLADDRESS from CUSTOMER_ADDRESS_TEMP where flowunid=:{insurance_no}', NULL, 'N', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'word_default_class');
+INSERT INTO `apzl`.`bf_lableconfig` (`ID`, `TAGNUMBER`, `TAGNAME`, `TITLE`, `TAGTYPE`, `VALUETYPE`, `VALUEFIELD`, `VALUEMETHOD`, `THOUSANDSFIELD`, `ISSHOEINDEX`, `REMARK`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`, `OPERATORCLASS`) VALUES ('b39d0025de4811eb970e00163e0ad612', '91001', 'credAuthUser1', '征信授权用户1', 'tag_type2', 'value_type3', 'username, id_card, mobile', 'SELECT :{customername} username,:{contract_no} id_card,:{PLAN_NUMBER} mobile FROM DUAL', NULL, 'N', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'word_default_class');
+INSERT INTO `apzl`.`bf_lableconfig` (`ID`, `TAGNUMBER`, `TAGNAME`, `TITLE`, `TAGTYPE`, `VALUETYPE`, `VALUEFIELD`, `VALUEMETHOD`, `THOUSANDSFIELD`, `ISSHOEINDEX`, `REMARK`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`, `OPERATORCLASS`) VALUES ('b3a1ba88de4811eb970e00163e0ad612', '91002', 'credAuthUser2', '征信授权用户2', 'tag_type2', 'value_type3', 'username, id_card, mobile', 'SELECT :{customername} username,:{CUST_ID} id_card,:{PLAN_NUMBER} mobile FROM DUAL', NULL, 'N', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'word_default_class');
+
+
+INSERT INTO `apzl`.`bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('004a12c3cb9f4d458b0302688732130f', 'b3a1ba88de4811eb970e00163e0ad612', '65bd277ad98611eb970e00163e0ad612', NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `apzl`.`bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('0314bb23f05e4ab28f5c7b094837d85a', 'b39d0025de4811eb970e00163e0ad612', '65bd277ad98611eb970e00163e0ad612', NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `apzl`.`bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('038ff76ca3e345ac9c1698a22d365fd4', '606806aedeec11eb970e00163e0ad612', '65b12cbfd98611eb970e00163e0ad612', NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `apzl`.`bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('227c13cb098648d194e716efe0c8f05c', '60578251deec11eb970e00163e0ad612', '65b12cbfd98611eb970e00163e0ad612', NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `apzl`.`bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('38691bb81512411ab370550c32aeb365', '706dd501e44111eb970e00163e0ad612', '134f3d88e2f811eb970e00163e0ad612', NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `apzl`.`bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('677b9a8ebcae4210b0f513178fb5a757', '606806aedeec11eb970e00163e0ad612', '65bd277ad98611eb970e00163e0ad612', NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `apzl`.`bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('6c4aa41c80d04d75a581d94b88d1ce33', '605dcb6ddeec11eb970e00163e0ad612', '65bd277ad98611eb970e00163e0ad612', NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `apzl`.`bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('6e83c79e20e040c8a3e6dfafbf37e993', '0d36cd64dfd911eb970e00163e0ad612', '134f3d88e2f811eb970e00163e0ad612', NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `apzl`.`bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('86d6cd9c29a343d7b31b35df4a30d744', '605dcb6ddeec11eb970e00163e0ad612', '65b12cbfd98611eb970e00163e0ad612', NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `apzl`.`bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('a6f0641f4b174c5887263aba2ead9e6a', 'b39d0025de4811eb970e00163e0ad612', '65b12cbfd98611eb970e00163e0ad612', NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `apzl`.`bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('ab33d802bec747728a7a5f76d6acba26', '6062d500deec11eb970e00163e0ad612', '65bd277ad98611eb970e00163e0ad612', NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `apzl`.`bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('c6631e80ca2d4123a41fe72b3c1a3cd7', '60578251deec11eb970e00163e0ad612', '65bd277ad98611eb970e00163e0ad612', NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `apzl`.`bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('cf9c36f6d34e4977856257dea19b561b', '0d36cd64dfd911eb970e00163e0ad612', '65bd277ad98611eb970e00163e0ad612', NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `apzl`.`bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('d6ac5d284c2b465d84eac799a1c9ef13', '6062d500deec11eb970e00163e0ad612', '65b12cbfd98611eb970e00163e0ad612', NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `apzl`.`bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('f2d0b0b0a44f4ed8974e9859dbd49a6b', '606806aedeec11eb970e00163e0ad612', '134f3d88e2f811eb970e00163e0ad612', NULL, NULL, NULL, NULL, NULL, NULL);
+
+
+
+INSERT INTO `apzl`.`prd_nodeinfo` (`nodeid`, `nodename`, `sortno`, `isinuse`, `itemdescribe`, `inputuserid`, `inputorgid`, `inputtime`, `updateuserid`, `updatetime`, `initscript`, `exportscript`, `phasescript`, `deletescript`, `remark`, `formalClass`, `querycondition`) VALUES ('990004', '征信和借款服务签约', '990004', '1', '/Tenwa/alpha/creditAuth/creditAuthList.jsp', 'admin', '8009001', '2021/07/06', 'administrator', '2021/07/20', '', '', '', '', '', '', '');
+
+
+-- 创建资金来源与产品配置表
+create table lb_product_corpus_source
+(
+    id            varchar(32) not null
+        primary key,
+    product_id    varchar(32) null comment '产品ID',
+    corpus_source varchar(32) null comment '资金来源',
+    channel_product_id varchar(32) null comment '对应资方产品',
+    order_list    int         null comment '排序',
+    inputtime     varchar(32) null,
+    inputuserid   varchar(32) null,
+    updatetime    varchar(32) null,
+    updateuserid  varchar(32) null,
+	constraint product_corpus_index
+        unique (product_id, corpus_source)
+);
+-- 视图
+drop view vi_product_corpus_source;
+create definer = apzl@`%` view vi_product_corpus_source as
+select `t`.`product_id`                                                              AS `product_id`,
+       `bt`.`typename`                                                               AS `PRODUCT_NAME`,
+       group_concat(`t`.`corpus_source` order by `t`.`order_list` ASC separator '>') AS `corpus_source_list`
+
+from (((select `apzl`.`lb_product_corpus_source`.`product_id`                                    AS `product_id`,
+               concat(`getItemName`('corpus_source', `apzl`.`lb_product_corpus_source`.`corpus_source`),'(',`getItemName`('source_product', `apzl`.`lb_product_corpus_source`.`CHANNEL_PRODUCT_ID`),')') AS `corpus_source`,
+               `apzl`.`lb_product_corpus_source`.`order_list`                                    AS `order_list`
+        from `apzl`.`lb_product_corpus_source`)) `t`
+         left join `apzl`.`business_type` `bt` on ((`bt`.`typeno` = `t`.`product_id`)))
+group by `t`.`product_id`;
+
+--创建分润表
+create table lc_profit_plan
+(
+    id           varchar(32)    not null
+        primary key,
+    rent_plan_id varchar(32)    null comment '对应租金计划ID',
+	corpus_rate varchar(32)    null comment '资方利率',
+    profit       decimal(22, 2) null comment '分润金额',
+    inputtime    varchar(32)    null
+)
+    comment '资方分润计划';
+
+create index rent_id_idx
+    on lc_profit_plan (rent_plan_id);
+
+-- 数据字典
+delete from code_library where codeno='corpus_source';
+INSERT INTO apzl.code_library (codeno, itemno, itemname, bankno, sortno, isinuse, itemdescribe, itemattribute, relativecode, attribute1, attribute2, attribute3, attribute4, attribute5, attribute6, attribute7, attribute8, inputuser, inputorg, inputtime, updateuser, updatetime, remark, helptext) VALUES ('corpus_source', 'AP', '安鹏自有资金', null, '0010', '1', null, null, null, null, null, null, null, null, null, null, null, 'SYS_Designer', null, '2021/05/19 15:16:14', 'SYS_Designer', '2021/05/19 15:16:14', null, null);
+INSERT INTO apzl.code_library (codeno, itemno, itemname, bankno, sortno, isinuse, itemdescribe, itemattribute, relativecode, attribute1, attribute2, attribute3, attribute4, attribute5, attribute6, attribute7, attribute8, inputuser, inputorg, inputtime, updateuser, updatetime, remark, helptext) VALUES ('corpus_source', 'JJCCB', '九江银行', null, '0030', '1', null, null, null, '1', null, null, null, null, null, null, null, 'SYS_Designer', null, '2021/05/19 15:16:14', 'SYS_Designer', '2021/05/19 15:16:14', null, null);
+INSERT INTO apzl.code_library (codeno, itemno, itemname, bankno, sortno, isinuse, itemdescribe, itemattribute, relativecode, attribute1, attribute2, attribute3, attribute4, attribute5, attribute6, attribute7, attribute8, inputuser, inputorg, inputtime, updateuser, updatetime, remark, helptext) VALUES ('corpus_source', 'PSBC', '邮储银行', null, '0020', '1', null, null, null, '1', null, null, null, null, null, null, null, 'SYS_Designer', null, '2021/05/19 15:16:14', 'SYS_Designer', '2021/05/19 15:16:14', null, null);
+
+
+-- 资金来源排序总页面模板
+delete from awe_do_catalog where dono='VI_PRODUCT_CORPUS_SOURCE';
+delete from awe_do_library where dono='VI_PRODUCT_CORPUS_SOURCE';
+INSERT INTO apzl.awe_do_catalog (dono, doname, dodescribe, dotype, doclass, isinuse, colcount, modeid, jboclass, jbofrom, jbowhere, jbogroup, jboorder, businessprocess, exportflag, inputuser, inputtime, updateuser, updatetime, remark, isvalidate, parent) VALUES ('VI_PRODUCT_CORPUS_SOURCE', '产品资金来源清单', null, '30', null, '1', '1', 'default', 'jbo.prd.VI_PRODUCT_CORPUS_SOURCE', 'O', '', '', '', '', '', 'SYS_Designer', '2021/05/21 11:12:13', 'SYS_Designer', '2021/05/21 11:12:13', null, '1', '');
+INSERT INTO apzl.awe_do_library (dono, colindex, sortno, isinuse, coltablename, colactualname, colname, coltype, coldefaultvalue, colheader, colunit, colcolumntype, coleditstyle, colcheckformat, colalign, coleditsourcetype, coleditsource, colhtmlstyle, collimit, colvisible, colreadonly, colrequired, colsortable, isfilter, colspan, isautocomplete, groupid, colfilterrefid, inputuser, inputtime, updateuser, updatetime, isaudit, colfilterattrs, isupdate, parentcolindex, tips, colinnerbtevent, colfilteroptions) VALUES ('VI_PRODUCT_CORPUS_SOURCE', '1000', '1000', '1', 'O', 'PRODUCT_ID', 'PRODUCT_ID', 'String', '', '产品编号', '', '1', 'Text', '1', '1', '', '', '', '20', '0', '0', '0', '1', '1', 1, '0', '', '', 'SYS_DESIGNER', '2021/05/21 11:12:13', 'SYS_Designer', '2021/05/21 11:12:40', '', '', '1', '', '', '', '');
+INSERT INTO apzl.awe_do_library (dono, colindex, sortno, isinuse, coltablename, colactualname, colname, coltype, coldefaultvalue, colheader, colunit, colcolumntype, coleditstyle, colcheckformat, colalign, coleditsourcetype, coleditsource, colhtmlstyle, collimit, colvisible, colreadonly, colrequired, colsortable, isfilter, colspan, isautocomplete, groupid, colfilterrefid, inputuser, inputtime, updateuser, updatetime, isaudit, colfilterattrs, isupdate, parentcolindex, tips, colinnerbtevent, colfilteroptions) VALUES ('VI_PRODUCT_CORPUS_SOURCE', '1010', '1010', '1', 'O', 'PRODUCT_NAME', 'PRODUCT_NAME', 'String', '', '产品名称', '', '1', 'Text', '1', '1', '', '', '', '20', '1', '0', '0', '1', '1', 1, '0', '', '', 'SYS_DESIGNER', '2021/05/21 11:12:13', 'SYS_Designer', '2021/05/21 11:12:13', '', '', '1', '', '', null, null);
+INSERT INTO apzl.awe_do_library (dono, colindex, sortno, isinuse, coltablename, colactualname, colname, coltype, coldefaultvalue, colheader, colunit, colcolumntype, coleditstyle, colcheckformat, colalign, coleditsourcetype, coleditsource, colhtmlstyle, collimit, colvisible, colreadonly, colrequired, colsortable, isfilter, colspan, isautocomplete, groupid, colfilterrefid, inputuser, inputtime, updateuser, updatetime, isaudit, colfilterattrs, isupdate, parentcolindex, tips, colinnerbtevent, colfilteroptions) VALUES ('VI_PRODUCT_CORPUS_SOURCE', '1020', '1020', '1', 'O', 'CORPUS_SOURCE_LIST', 'CORPUS_SOURCE_LIST', 'String', '', '资金来源顺序', '', '1', 'Text', '1', '1', '', '', '', '20', '1', '0', '0', '1', '1', 1, '0', '', '', 'SYS_DESIGNER', '2021/05/21 11:12:13', 'SYS_Designer', '2021/05/21 11:12:13', '', '', '1', '', '', null, null);
+
+-- 新增资方配置选择SQL
+delete from select_catalog where selname='selectProductList';
+INSERT INTO apzl.select_catalog (selname, seltype, seldescribe, seltablename, selprimarykey, selbrowsemode, selargs, selhidefield, selcode, selfieldname, selfielddisp, selreturnvalue, selfilterfield, isinuse, mutilorsingle, attribute1, attribute2, attribute3, attribute4, attribute5, inputuser, inputorg, inputtime, updateuser, updatetime, remark) VALUES ('selectProductList', 'Sql', '选择产品', 'business_type', 'typeno', 'Grid', '', 'typeno', 'select typeno,typename from business_type where attribute2=''car_product''', '产品编号,产品名称', 'typename@style={width:250px;}', 'typeno@typename', 'typename', '1', 'Single', '', '', '', '', '', 'SYS_Designer', '', '2019/08/24 10:35:24', 'SYS_Designer', '2021/04/09 15:29:14', '');
+
+-- tab1页面模板
+delete from awe_do_catalog where dono='LbProductInfo';
+delete from awe_do_library where dono='LbProductInfo';
+delete from awe_do_group where dono='LbProductInfo';
+INSERT INTO apzl.awe_do_catalog (dono, doname, dodescribe, dotype, doclass, isinuse, colcount, modeid, jboclass, jbofrom, jbowhere, jbogroup, jboorder, businessprocess, exportflag, inputuser, inputtime, updateuser, updatetime, remark, isvalidate, parent) VALUES ('LbProductInfo', '产品详情', null, '30', null, '1', '2', 'default', 'jbo.prd.BUSINESS_TYPE', 'O', 'TypeNo=:productId', '', '', '', null, 'SYS_Designer', '2021/05/21 11:49:39', 'SYS_Designer', '2021/05/21 12:01:00', '', '1', '');
+INSERT INTO apzl.awe_do_library (dono, colindex, sortno, isinuse, coltablename, colactualname, colname, coltype, coldefaultvalue, colheader, colunit, colcolumntype, coleditstyle, colcheckformat, colalign, coleditsourcetype, coleditsource, colhtmlstyle, collimit, colvisible, colreadonly, colrequired, colsortable, isfilter, colspan, isautocomplete, groupid, colfilterrefid, inputuser, inputtime, updateuser, updatetime, isaudit, colfilterattrs, isupdate, parentcolindex, tips, colinnerbtevent, colfilteroptions) VALUES ('LbProductInfo', '1000', '1000', '1', 'O', 'TypeNo', 'TypeNo', 'String', '', '产品编号', '', '1', 'Text', '1', '1', '', '', '', '32', '1', '1', '1', '0', '0', 2, '0', '0010', '', 'SYS_Designer', '2021/05/21 11:49:39', 'SYS_Designer', '2021/05/21 12:01:00', '', '', '1', '', '', '', '');
+INSERT INTO apzl.awe_do_library (dono, colindex, sortno, isinuse, coltablename, colactualname, colname, coltype, coldefaultvalue, colheader, colunit, colcolumntype, coleditstyle, colcheckformat, colalign, coleditsourcetype, coleditsource, colhtmlstyle, collimit, colvisible, colreadonly, colrequired, colsortable, isfilter, colspan, isautocomplete, groupid, colfilterrefid, inputuser, inputtime, updateuser, updatetime, isaudit, colfilterattrs, isupdate, parentcolindex, tips, colinnerbtevent, colfilteroptions) VALUES ('LbProductInfo', '1010', '1010', '1', 'O', 'TypeName', 'TypeName', 'String', '', '产品名称', '', '1', 'Text', '1', '1', '', '', '', '200', '1', '1', '1', '0', '0', 2, '0', '0010', '', 'SYS_Designer', '2021/05/21 11:49:39', 'SYS_Designer', '2021/05/21 14:56:57', '', '', '1', '', '', '', '');
+INSERT INTO apzl.awe_do_group (dono, dockid, dockname, inputuser, inputtime, updateuser, updatetime, inputorg, sortno, grouphead, groupfoot, groupbody, colcount, styleid, isexpand, groupbody1, groupbody2) VALUES ('LbProductInfo', '0010', '基本信息', 'SYS_Designer', '2021/05/21 11:49:39', 'SYS_Designer', '2021/05/21 14:56:50', '', '0010', '', '', '', 2, '', '', '', '');
+
+-- tab2页面模板
+delete from awe_do_catalog where dono='LB_PRODUCT_CORPUS_SOURCE';
+delete from awe_do_library where dono='LB_PRODUCT_CORPUS_SOURCE';
+INSERT INTO apzl.awe_do_catalog (dono, doname, dodescribe, dotype, doclass, isinuse, colcount, modeid, jboclass, jbofrom, jbowhere, jbogroup, jboorder, businessprocess, exportflag, inputuser, inputtime, updateuser, updatetime, remark, isvalidate, parent) VALUES ('LB_PRODUCT_CORPUS_SOURCE', '产品资金来源表', null, '30', null, '1', '1', 'default', 'jbo.prd.LB_PRODUCT_CORPUS_SOURCE', 'O', 'PRODUCT_ID=:productID ', '', 'O.order_list', 'com.amarsoft.awe.dw.handler.impl.CommonHandler', '', 'SYS_Designer', '2021/05/21 09:54:11', 'SYS_Designer', '2021/05/21 19:04:59', '', '1', '');
+INSERT INTO apzl.awe_do_library (dono, colindex, sortno, isinuse, coltablename, colactualname, colname, coltype, coldefaultvalue, colheader, colunit, colcolumntype, coleditstyle, colcheckformat, colalign, coleditsourcetype, coleditsource, colhtmlstyle, collimit, colvisible, colreadonly, colrequired, colsortable, isfilter, colspan, isautocomplete, groupid, colfilterrefid, inputuser, inputtime, updateuser, updatetime, isaudit, colfilterattrs, isupdate, parentcolindex, tips, colinnerbtevent, colfilteroptions) VALUES ('LB_PRODUCT_CORPUS_SOURCE', '1000', '1000', '1', 'O', 'ID', 'ID', 'String', '', 'ID', '', '1', 'Text', '1', '1', '', '', '', '32', '0', '0', '1', '1', '1', 1, '0', '', '', 'SYS_DESIGNER', '2021/05/21 09:54:11', 'administrator', '2021/07/15 16:42:31', '', '', '1', '', '', '', '');
+INSERT INTO apzl.awe_do_library (dono, colindex, sortno, isinuse, coltablename, colactualname, colname, coltype, coldefaultvalue, colheader, colunit, colcolumntype, coleditstyle, colcheckformat, colalign, coleditsourcetype, coleditsource, colhtmlstyle, collimit, colvisible, colreadonly, colrequired, colsortable, isfilter, colspan, isautocomplete, groupid, colfilterrefid, inputuser, inputtime, updateuser, updatetime, isaudit, colfilterattrs, isupdate, parentcolindex, tips, colinnerbtevent, colfilteroptions) VALUES ('LB_PRODUCT_CORPUS_SOURCE', '1010', '1010', '1', 'O', 'PRODUCT_ID', 'PRODUCT_ID', 'String', '', '产品ID', '', '1', 'Text', '1', '1', '', '', '', '32', '1', '1', '0', '1', '1', 1, '0', '', '', 'SYS_DESIGNER', '2021/05/21 09:54:11', 'administrator', '2021/07/15 16:42:31', '', '', '1', '', '', '', '');
+INSERT INTO apzl.awe_do_library (dono, colindex, sortno, isinuse, coltablename, colactualname, colname, coltype, coldefaultvalue, colheader, colunit, colcolumntype, coleditstyle, colcheckformat, colalign, coleditsourcetype, coleditsource, colhtmlstyle, collimit, colvisible, colreadonly, colrequired, colsortable, isfilter, colspan, isautocomplete, groupid, colfilterrefid, inputuser, inputtime, updateuser, updatetime, isaudit, colfilterattrs, isupdate, parentcolindex, tips, colinnerbtevent, colfilteroptions) VALUES ('LB_PRODUCT_CORPUS_SOURCE', '1020', '1020', '1', 'O', 'CORPUS_SOURCE', 'CORPUS_SOURCE', 'String', '', '资金来源', '', '1', 'Select', '1', '1', 'JBO', 'jbo.sys.CODE_LIBRARY,itemno,itemname,codeno=''corpus_source'' and isinuse=''1'' and attribute1=''1''', '', '32', '1', '0', '0', '1', '1', 1, '0', '', '', 'SYS_DESIGNER', '2021/05/21 09:54:11', 'administrator', '2021/07/15 16:42:31', '', '', '1', '', '', '', '');
+INSERT INTO apzl.awe_do_library (dono, colindex, sortno, isinuse, coltablename, colactualname, colname, coltype, coldefaultvalue, colheader, colunit, colcolumntype, coleditstyle, colcheckformat, colalign, coleditsourcetype, coleditsource, colhtmlstyle, collimit, colvisible, colreadonly, colrequired, colsortable, isfilter, colspan, isautocomplete, groupid, colfilterrefid, inputuser, inputtime, updateuser, updatetime, isaudit, colfilterattrs, isupdate, parentcolindex, tips, colinnerbtevent, colfilteroptions) VALUES ('LB_PRODUCT_CORPUS_SOURCE', '1025', '1025', '1', 'O', 'CHANNEL_PRODUCT_ID', 'CHANNEL_PRODUCT_ID', 'String', '', '对应资方产品', '', '1', 'Select', '1', '1', 'JBO', 'jbo.sys.CODE_LIBRARY,itemno,itemname,codeno=''source_product''', '', '32', '1', '0', '0', '1', '1', 1, '0', '', '', '', '', 'SYS_Designer', '2021/07/15 16:55:36', '', '', '1', '', '', '', '');
+INSERT INTO apzl.awe_do_library (dono, colindex, sortno, isinuse, coltablename, colactualname, colname, coltype, coldefaultvalue, colheader, colunit, colcolumntype, coleditstyle, colcheckformat, colalign, coleditsourcetype, coleditsource, colhtmlstyle, collimit, colvisible, colreadonly, colrequired, colsortable, isfilter, colspan, isautocomplete, groupid, colfilterrefid, inputuser, inputtime, updateuser, updatetime, isaudit, colfilterattrs, isupdate, parentcolindex, tips, colinnerbtevent, colfilteroptions) VALUES ('LB_PRODUCT_CORPUS_SOURCE', '1030', '1030', '1', 'O', 'ORDER_LIST', 'ORDER_LIST', 'Number', '', '资金顺序', '', '1', 'Text', '5', '1', '', '', '', '20', '1', '0', '0', '1', '1', 1, '0', '', '', 'SYS_DESIGNER', '2021/05/21 09:54:11', 'administrator', '2021/07/15 16:42:31', '', '', '1', '', '', '', '');
+INSERT INTO apzl.awe_do_library (dono, colindex, sortno, isinuse, coltablename, colactualname, colname, coltype, coldefaultvalue, colheader, colunit, colcolumntype, coleditstyle, colcheckformat, colalign, coleditsourcetype, coleditsource, colhtmlstyle, collimit, colvisible, colreadonly, colrequired, colsortable, isfilter, colspan, isautocomplete, groupid, colfilterrefid, inputuser, inputtime, updateuser, updatetime, isaudit, colfilterattrs, isupdate, parentcolindex, tips, colinnerbtevent, colfilteroptions) VALUES ('LB_PRODUCT_CORPUS_SOURCE', '1040', '1040', '1', 'O', 'INPUTTIME', 'INPUTTIME', 'String', '', '创建时间', '', '1', 'Text', '1', '2', '', '', '', '30', '0', '0', '0', '1', '1', 1, '0', '', '', 'SYS_DESIGNER', '2021/05/21 09:54:11', 'administrator', '2021/07/15 16:42:31', '', '', '1', '', '', '', '');
+INSERT INTO apzl.awe_do_library (dono, colindex, sortno, isinuse, coltablename, colactualname, colname, coltype, coldefaultvalue, colheader, colunit, colcolumntype, coleditstyle, colcheckformat, colalign, coleditsourcetype, coleditsource, colhtmlstyle, collimit, colvisible, colreadonly, colrequired, colsortable, isfilter, colspan, isautocomplete, groupid, colfilterrefid, inputuser, inputtime, updateuser, updatetime, isaudit, colfilterattrs, isupdate, parentcolindex, tips, colinnerbtevent, colfilteroptions) VALUES ('LB_PRODUCT_CORPUS_SOURCE', '1050', '1050', '1', 'O', 'INPUTUSERID', 'INPUTUSERID', 'String', '', '创建人', '', '1', 'Text', '1', '1', '', '', '', '30', '0', '0', '0', '1', '1', 1, '0', '', '', 'SYS_DESIGNER', '2021/05/21 09:54:11', 'administrator', '2021/07/15 16:42:31', '', '', '1', '', '', '', '');
+INSERT INTO apzl.awe_do_library (dono, colindex, sortno, isinuse, coltablename, colactualname, colname, coltype, coldefaultvalue, colheader, colunit, colcolumntype, coleditstyle, colcheckformat, colalign, coleditsourcetype, coleditsource, colhtmlstyle, collimit, colvisible, colreadonly, colrequired, colsortable, isfilter, colspan, isautocomplete, groupid, colfilterrefid, inputuser, inputtime, updateuser, updatetime, isaudit, colfilterattrs, isupdate, parentcolindex, tips, colinnerbtevent, colfilteroptions) VALUES ('LB_PRODUCT_CORPUS_SOURCE', '1060', '1060', '1', 'O', 'UPDATETIME', 'UPDATETIME', 'String', '', '更新时间', '', '1', 'Text', '1', '2', '', '', '', '30', '0', '0', '0', '1', '1', 1, '0', '', '', 'SYS_DESIGNER', '2021/05/21 09:54:11', 'administrator', '2021/07/15 16:42:31', '', '', '1', '', '', '', '');
+INSERT INTO apzl.awe_do_library (dono, colindex, sortno, isinuse, coltablename, colactualname, colname, coltype, coldefaultvalue, colheader, colunit, colcolumntype, coleditstyle, colcheckformat, colalign, coleditsourcetype, coleditsource, colhtmlstyle, collimit, colvisible, colreadonly, colrequired, colsortable, isfilter, colspan, isautocomplete, groupid, colfilterrefid, inputuser, inputtime, updateuser, updatetime, isaudit, colfilterattrs, isupdate, parentcolindex, tips, colinnerbtevent, colfilteroptions) VALUES ('LB_PRODUCT_CORPUS_SOURCE', '1070', '1070', '1', 'O', 'UPDATEUSERID', 'UPDATEUSERID', 'String', '', '更新人', '', '1', 'Text', '1', '1', '', '', '', '30', '0', '0', '0', '1', '1', 1, '0', '', '', 'SYS_DESIGNER', '2021/05/21 09:54:11', 'administrator', '2021/07/15 16:42:31', '', '', '1', '', '', '', '');
+
+--消息推送数据字典添加
+INSERT INTO apzl.code_library (codeno, itemno, itemname, bankno, sortno, isinuse, itemdescribe, itemattribute, relativecode, attribute1, attribute2, attribute3, attribute4, attribute5, attribute6, attribute7, attribute8, inputuser, inputorg, inputtime, updateuser, updatetime, remark, helptext) VALUES ('message_catalog', 'supple_file', '资方资料补充', null, '0140', '1', null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+
+-- 资料补充消息推送配置
+INSERT INTO apzl.bt_bussiness_message_config (id, message_no, message_catalog, message_title, send_person, message_class, message_page, message_time, message_status, INPUTUSERID, INPUTTIME, INPUTORGID, UPDATEUSERID, UPDATEORGID, UPDATETIME, cparam, memo, is_valid, defaultStart) VALUES ('7373dc10d40211eb970e00163e0ad612', '0004', 'supple_file', '有材料需要补充', '[{usertype:"指定人员",userinfo:"admin,admin"}]', 'kong', '/com/tenwa/apzl/CorpusSource/FcRequestDocTab.jsp', null, 'PAUSED', null, null, null, null, null, null, null, null, 'valid', 'Y');
+
+-- 请求页面list模板
+delete from awe_do_catalog where dono='FC_REQUEST';
+delete from awe_do_library where dono='FC_REQUEST';
+INSERT INTO apzl.awe_do_catalog (dono, doname, dodescribe, dotype, doclass, isinuse, colcount, modeid, jboclass, jbofrom, jbowhere, jbogroup, jboorder, businessprocess, exportflag, inputuser, inputtime, updateuser, updatetime, remark, isvalidate, parent) VALUES ('FC_REQUEST', '接口状态表', null, '30060', null, '1', '1', 'default', 'jbo.oti.FC_REQUEST', 'O', 'O.DEL_FLAG=''0''', '', 'SUPPLEMENT_STS desc,SUPPLEMENT_TIME desc,UPDATE_TIME desc', '', '', 'SYS_Designer', '2021/05/31 14:18:54', 'SYS_Designer', '2021/06/29 11:38:27', '', '1', '');
+INSERT INTO apzl.awe_do_library (dono, colindex, sortno, isinuse, coltablename, colactualname, colname, coltype, coldefaultvalue, colheader, colunit, colcolumntype, coleditstyle, colcheckformat, colalign, coleditsourcetype, coleditsource, colhtmlstyle, collimit, colvisible, colreadonly, colrequired, colsortable, isfilter, colspan, isautocomplete, groupid, colfilterrefid, inputuser, inputtime, updateuser, updatetime, isaudit, colfilterattrs, isupdate, parentcolindex, tips, colinnerbtevent, colfilteroptions) VALUES ('FC_REQUEST', '1000', '1000', '1', 'O', 'ID', 'ID', 'String', '', '资金渠道申请ID', '', '1', 'Text', '1', '1', '', '', '', '32', '1', '0', '1', '1', '1', 1, '0', '', '', 'SYS_DESIGNER', '2021/05/31 14:18:55', 'administrator', '2021/07/08 17:03:12', '', '', '1', '', '', '', '');
+INSERT INTO apzl.awe_do_library (dono, colindex, sortno, isinuse, coltablename, colactualname, colname, coltype, coldefaultvalue, colheader, colunit, colcolumntype, coleditstyle, colcheckformat, colalign, coleditsourcetype, coleditsource, colhtmlstyle, collimit, colvisible, colreadonly, colrequired, colsortable, isfilter, colspan, isautocomplete, groupid, colfilterrefid, inputuser, inputtime, updateuser, updatetime, isaudit, colfilterattrs, isupdate, parentcolindex, tips, colinnerbtevent, colfilteroptions) VALUES ('FC_REQUEST', '1010', '1010', '1', 'O', 'FC_LOAN_ID', 'FC_LOAN_ID', 'String', '', '资金渠道放款申请ID', '', '1', 'Text', '1', '1', '', '', '', '32', '0', '0', '0', '1', '1', 1, '0', '', '', 'SYS_DESIGNER', '2021/05/31 14:18:55', 'administrator', '2021/07/08 17:03:12', '', '', '1', '', '', '', '');
+INSERT INTO apzl.awe_do_library (dono, colindex, sortno, isinuse, coltablename, colactualname, colname, coltype, coldefaultvalue, colheader, colunit, colcolumntype, coleditstyle, colcheckformat, colalign, coleditsourcetype, coleditsource, colhtmlstyle, collimit, colvisible, colreadonly, colrequired, colsortable, isfilter, colspan, isautocomplete, groupid, colfilterrefid, inputuser, inputtime, updateuser, updatetime, isaudit, colfilterattrs, isupdate, parentcolindex, tips, colinnerbtevent, colfilteroptions) VALUES ('FC_REQUEST', '1020', '1020', '1', 'O', 'CHANNEL_NO', 'CHANNEL_NO', 'String', '', '资金渠道编号', '', '1', 'Text', '1', '1', '', '', '', '32', '0', '0', '0', '1', '1', 1, '0', '', '', 'SYS_DESIGNER', '2021/05/31 14:18:55', 'administrator', '2021/07/08 17:03:12', '', '', '1', '', '', '', '');
+INSERT INTO apzl.awe_do_library (dono, colindex, sortno, isinuse, coltablename, colactualname, colname, coltype, coldefaultvalue, colheader, colunit, colcolumntype, coleditstyle, colcheckformat, colalign, coleditsourcetype, coleditsource, colhtmlstyle, collimit, colvisible, colreadonly, colrequired, colsortable, isfilter, colspan, isautocomplete, groupid, colfilterrefid, inputuser, inputtime, updateuser, updatetime, isaudit, colfilterattrs, isupdate, parentcolindex, tips, colinnerbtevent, colfilteroptions) VALUES ('FC_REQUEST', '1030', '1030', '1', 'O', 'CHANNEL_NAME', 'CHANNEL_NAME', 'String', '', '资金渠道名称', '', '1', 'Text', '1', '1', '', '', '', '32', '1', '0', '0', '1', '1', 1, '0', '', '', 'SYS_DESIGNER', '2021/05/31 14:18:55', 'administrator', '2021/07/08 17:03:12', '', '', '1', '', '', '', '');
+INSERT INTO apzl.awe_do_library (dono, colindex, sortno, isinuse, coltablename, colactualname, colname, coltype, coldefaultvalue, colheader, colunit, colcolumntype, coleditstyle, colcheckformat, colalign, coleditsourcetype, coleditsource, colhtmlstyle, collimit, colvisible, colreadonly, colrequired, colsortable, isfilter, colspan, isautocomplete, groupid, colfilterrefid, inputuser, inputtime, updateuser, updatetime, isaudit, colfilterattrs, isupdate, parentcolindex, tips, colinnerbtevent, colfilteroptions) VALUES ('FC_REQUEST', '1040', '1040', '1', 'O', 'PROJECT_ID', 'PROJECT_ID', 'String', '', '项目ID', '', '1', 'Text', '1', '1', '', '', '', '32', '0', '0', '0', '1', '1', 1, '0', '', '', 'SYS_DESIGNER', '2021/05/31 14:18:55', 'administrator', '2021/07/08 17:03:12', '', '', '1', '', '', '', '');
+INSERT INTO apzl.awe_do_library (dono, colindex, sortno, isinuse, coltablename, colactualname, colname, coltype, coldefaultvalue, colheader, colunit, colcolumntype, coleditstyle, colcheckformat, colalign, coleditsourcetype, coleditsource, colhtmlstyle, collimit, colvisible, colreadonly, colrequired, colsortable, isfilter, colspan, isautocomplete, groupid, colfilterrefid, inputuser, inputtime, updateuser, updatetime, isaudit, colfilterattrs, isupdate, parentcolindex, tips, colinnerbtevent, colfilteroptions) VALUES ('FC_REQUEST', '1050', '1050', '1', 'O', 'PROJECT_NO', 'PROJECT_NO', 'String', '', '项目编号', '', '1', 'Text', '1', '1', '', '', '', '32', '1', '0', '0', '1', '1', 1, '0', '', '', 'SYS_DESIGNER', '2021/05/31 14:18:55', 'administrator', '2021/07/08 17:03:12', '', '', '1', '', '', '', '');
+INSERT INTO apzl.awe_do_library (dono, colindex, sortno, isinuse, coltablename, colactualname, colname, coltype, coldefaultvalue, colheader, colunit, colcolumntype, coleditstyle, colcheckformat, colalign, coleditsourcetype, coleditsource, colhtmlstyle, collimit, colvisible, colreadonly, colrequired, colsortable, isfilter, colspan, isautocomplete, groupid, colfilterrefid, inputuser, inputtime, updateuser, updatetime, isaudit, colfilterattrs, isupdate, parentcolindex, tips, colinnerbtevent, colfilteroptions) VALUES ('FC_REQUEST', '1060', '1060', '1', 'O', 'CONTRACT_ID', 'CONTRACT_ID', 'String', '', '合同ID', '', '1', 'Text', '1', '1', '', '', '', '32', '0', '0', '0', '1', '1', 1, '0', '', '', 'SYS_DESIGNER', '2021/05/31 14:18:55', 'administrator', '2021/07/08 17:03:12', '', '', '1', '', '', '', '');
+INSERT INTO apzl.awe_do_library (dono, colindex, sortno, isinuse, coltablename, colactualname, colname, coltype, coldefaultvalue, colheader, colunit, colcolumntype, coleditstyle, colcheckformat, colalign, coleditsourcetype, coleditsource, colhtmlstyle, collimit, colvisible, colreadonly, colrequired, colsortable, isfilter, colspan, isautocomplete, groupid, colfilterrefid, inputuser, inputtime, updateuser, updatetime, isaudit, colfilterattrs, isupdate, parentcolindex, tips, colinnerbtevent, colfilteroptions) VALUES ('FC_REQUEST', '1070', '1070', '1', 'O', 'CONTRACT_NO', 'CONTRACT_NO', 'String', '', '合同编号', '', '1', 'Text', '1', '1', '', '', '', '32', '1', '0', '0', '1', '1', 1, '0', '', '', 'SYS_DESIGNER', '2021/05/31 14:18:55', 'administrator', '2021/07/08 17:03:12', '', '', '1', '', '', '', '');
+INSERT INTO apzl.awe_do_library (dono, colindex, sortno, isinuse, coltablename, colactualname, colname, coltype, coldefaultvalue, colheader, colunit, colcolumntype, coleditstyle, colcheckformat, colalign, coleditsourcetype, coleditsource, colhtmlstyle, collimit, colvisible, colreadonly, colrequired, colsortable, isfilter, colspan, isautocomplete, groupid, colfilterrefid, inputuser, inputtime, updateuser, updatetime, isaudit, colfilterattrs, isupdate, parentcolindex, tips, colinnerbtevent, colfilteroptions) VALUES ('FC_REQUEST', '1080', '1080', '1', 'O', 'PRODUCT_ID', 'PRODUCT_ID', 'String', '', '产品ID', '', '1', 'Text', '1', '1', '', '', '', '32', '0', '0', '0', '1', '1', 1, '0', '', '', 'SYS_DESIGNER', '2021/05/31 14:18:55', 'administrator', '2021/07/08 17:03:12', '', '', '1', '', '', '', '');
+INSERT INTO apzl.awe_do_library (dono, colindex, sortno, isinuse, coltablename, colactualname, colname, coltype, coldefaultvalue, colheader, colunit, colcolumntype, coleditstyle, colcheckformat, colalign, coleditsourcetype, coleditsource, colhtmlstyle, collimit, colvisible, colreadonly, colrequired, colsortable, isfilter, colspan, isautocomplete, groupid, colfilterrefid, inputuser, inputtime, updateuser, updatetime, isaudit, colfilterattrs, isupdate, parentcolindex, tips, colinnerbtevent, colfilteroptions) VALUES ('FC_REQUEST', '1090', '1090', '1', 'O', 'PRODUCT_NAME', 'PRODUCT_NAME', 'String', '', '产品名称', '', '1', 'Text', '1', '1', '', '', '', '32', '0', '0', '0', '1', '1', 1, '0', '', '', 'SYS_DESIGNER', '2021/05/31 14:18:55', 'administrator', '2021/07/08 17:03:12', '', '', '1', '', '', '', '');
+
+-- 资料清单页面模板
+delete from awe_do_catalog where dono='FcRequestFileList';
+delete from awe_do_library where dono='FcRequestFileList';
+INSERT INTO apzl.awe_do_catalog (dono, doname, dodescribe, dotype, doclass, isinuse, colcount, modeid, jboclass, jbofrom, jbowhere, jbogroup, jboorder, businessprocess, exportflag, inputuser, inputtime, updateuser, updatetime, remark, isvalidate, parent) VALUES ('FcRequestFileList', '接口资料表', null, '30060', null, '1', '1', 'default', 'jbo.oti.FC_REQUEST_FILE', 'O', 'O.FC_FLOW_TYPE=:fcFlowType and O.FC_REQUEST_ID=:fcRequestId and O.DEL_FLAG=''0''', 'O.FC_FILE_CODE', '', '', null, 'SYS_Designer', '2021/06/29 11:47:55', 'SYS_Designer', '2021/06/29 11:51:50', '', '1', '');
+INSERT INTO apzl.awe_do_library (dono, colindex, sortno, isinuse, coltablename, colactualname, colname, coltype, coldefaultvalue, colheader, colunit, colcolumntype, coleditstyle, colcheckformat, colalign, coleditsourcetype, coleditsource, colhtmlstyle, collimit, colvisible, colreadonly, colrequired, colsortable, isfilter, colspan, isautocomplete, groupid, colfilterrefid, inputuser, inputtime, updateuser, updatetime, isaudit, colfilterattrs, isupdate, parentcolindex, tips, colinnerbtevent, colfilteroptions) VALUES ('FcRequestFileList', '1000', '1000', '1', 'O', 'ID', 'ID', 'String', '', '唯一标识', '', '1', 'Text', '1', '1', '', '', '', '32', '0', '0', '1', '1', '1', 1, '0', '', '', 'SYS_Designer', '2021/06/29 11:47:55', 'administrator', '2021/07/19 10:56:56', '', '', '1', '', '', '', '');
+INSERT INTO apzl.awe_do_library (dono, colindex, sortno, isinuse, coltablename, colactualname, colname, coltype, coldefaultvalue, colheader, colunit, colcolumntype, coleditstyle, colcheckformat, colalign, coleditsourcetype, coleditsource, colhtmlstyle, collimit, colvisible, colreadonly, colrequired, colsortable, isfilter, colspan, isautocomplete, groupid, colfilterrefid, inputuser, inputtime, updateuser, updatetime, isaudit, colfilterattrs, isupdate, parentcolindex, tips, colinnerbtevent, colfilteroptions) VALUES ('FcRequestFileList', '1010', '1010', '1', 'O', 'FC_REQUEST_ID', 'FC_REQUEST_ID', 'String', '', '资金渠道申请ID', '', '1', 'Text', '1', '1', '', '', '', '32', '0', '0', '0', '1', '1', 1, '0', '', '', 'SYS_Designer', '2021/06/29 11:47:55', 'administrator', '2021/07/19 10:56:56', '', '', '1', '', '', '', '');
+INSERT INTO apzl.awe_do_library (dono, colindex, sortno, isinuse, coltablename, colactualname, colname, coltype, coldefaultvalue, colheader, colunit, colcolumntype, coleditstyle, colcheckformat, colalign, coleditsourcetype, coleditsource, colhtmlstyle, collimit, colvisible, colreadonly, colrequired, colsortable, isfilter, colspan, isautocomplete, groupid, colfilterrefid, inputuser, inputtime, updateuser, updatetime, isaudit, colfilterattrs, isupdate, parentcolindex, tips, colinnerbtevent, colfilteroptions) VALUES ('FcRequestFileList', '1020', '1020', '1', 'O', 'FC_FLOW_TYPE', 'FC_FLOW_TYPE', 'String', '', '流程类型', '', '1', 'Text', '1', '1', '', '', '', '32', '0', '0', '0', '1', '1', 1, '0', '', '', 'SYS_Designer', '2021/06/29 11:47:55', 'administrator', '2021/07/19 10:56:56', '', '', '1', '', '', '', '');
+INSERT INTO apzl.awe_do_library (dono, colindex, sortno, isinuse, coltablename, colactualname, colname, coltype, coldefaultvalue, colheader, colunit, colcolumntype, coleditstyle, colcheckformat, colalign, coleditsourcetype, coleditsource, colhtmlstyle, collimit, colvisible, colreadonly, colrequired, colsortable, isfilter, colspan, isautocomplete, groupid, colfilterrefid, inputuser, inputtime, updateuser, updatetime, isaudit, colfilterattrs, isupdate, parentcolindex, tips, colinnerbtevent, colfilteroptions) VALUES ('FcRequestFileList', '1030', '1030', '1', 'O', 'FC_FLOW_TYPE_NAME', 'FC_FLOW_TYPE_NAME', 'String', '', '流程类型名称', '', '1', 'Text', '1', '1', '', '', '', '32', '0', '0', '0', '1', '1', 1, '0', '', '', 'SYS_Designer', '2021/06/29 11:47:55', 'administrator', '2021/07/19 10:56:56', '', '', '1', '', '', '', '');
+INSERT INTO apzl.awe_do_library (dono, colindex, sortno, isinuse, coltablename, colactualname, colname, coltype, coldefaultvalue, colheader, colunit, colcolumntype, coleditstyle, colcheckformat, colalign, coleditsourcetype, coleditsource, colhtmlstyle, collimit, colvisible, colreadonly, colrequired, colsortable, isfilter, colspan, isautocomplete, groupid, colfilterrefid, inputuser, inputtime, updateuser, updatetime, isaudit, colfilterattrs, isupdate, parentcolindex, tips, colinnerbtevent, colfilteroptions) VALUES ('FcRequestFileList', '1040', '1040', '1', 'O', 'FC_FILE_CODE', 'FC_FILE_CODE', 'String', '', '资方：文件编号', '', '1', 'Text', '1', '1', '', '', '', '32', '0', '0', '0', '1', '1', 1, '0', '', '', 'SYS_Designer', '2021/06/29 11:47:56', 'administrator', '2021/07/19 10:56:56', '', '', '1', '', '', '', '');
+INSERT INTO apzl.awe_do_library (dono, colindex, sortno, isinuse, coltablename, colactualname, colname, coltype, coldefaultvalue, colheader, colunit, colcolumntype, coleditstyle, colcheckformat, colalign, coleditsourcetype, coleditsource, colhtmlstyle, collimit, colvisible, colreadonly, colrequired, colsortable, isfilter, colspan, isautocomplete, groupid, colfilterrefid, inputuser, inputtime, updateuser, updatetime, isaudit, colfilterattrs, isupdate, parentcolindex, tips, colinnerbtevent, colfilteroptions) VALUES ('FcRequestFileList', '1050', '1050', '1', 'O', 'FC_FILE_CODE_NAME', 'FC_FILE_CODE_NAME', 'String', '', '文件类别', '', '1', 'Text', '1', '2', '', '', '', '32', '1', '0', '0', '1', '1', 1, '0', '', '', 'SYS_Designer', '2021/06/29 11:47:56', 'administrator', '2021/07/19 10:56:56', '', '', '1', '', '', '', '');
+INSERT INTO apzl.awe_do_library (dono, colindex, sortno, isinuse, coltablename, colactualname, colname, coltype, coldefaultvalue, colheader, colunit, colcolumntype, coleditstyle, colcheckformat, colalign, coleditsourcetype, coleditsource, colhtmlstyle, collimit, colvisible, colreadonly, colrequired, colsortable, isfilter, colspan, isautocomplete, groupid, colfilterrefid, inputuser, inputtime, updateuser, updatetime, isaudit, colfilterattrs, isupdate, parentcolindex, tips, colinnerbtevent, colfilteroptions) VALUES ('FcRequestFileList', '1060', '1060', '1', 'O', 'FC_FILE_TYPE', 'FC_FILE_TYPE', 'String', '', '文件类型', '', '1', 'Text', '1', '2', '', '', '', '32', '0', '0', '0', '1', '1', 1, '0', '', '', 'SYS_Designer', '2021/06/29 11:47:56', 'administrator', '2021/07/19 10:56:56', '', '', '1', '', '', '', '');
+INSERT INTO apzl.awe_do_library (dono, colindex, sortno, isinuse, coltablename, colactualname, colname, coltype, coldefaultvalue, colheader, colunit, colcolumntype, coleditstyle, colcheckformat, colalign, coleditsourcetype, coleditsource, colhtmlstyle, collimit, colvisible, colreadonly, colrequired, colsortable, isfilter, colspan, isautocomplete, groupid, colfilterrefid, inputuser, inputtime, updateuser, updatetime, isaudit, colfilterattrs, isupdate, parentcolindex, tips, colinnerbtevent, colfilteroptions) VALUES ('FcRequestFileList', '1070', '1070', '1', 'O', 'FILE_NAME', 'FILE_NAME', 'String', '', '文件名称', '', '1', 'Text', '1', '1', '', '', 'style={width:200px;word-break:break-all;}', '32', '0', '0', '0', '1', '1', 1, '0', '', '', 'SYS_Designer', '2021/06/29 11:47:56', 'administrator', '2021/07/19 10:56:56', '', '', '1', '', '', '', '');
+INSERT INTO apzl.awe_do_library (dono, colindex, sortno, isinuse, coltablename, colactualname, colname, coltype, coldefaultvalue, colheader, colunit, colcolumntype, coleditstyle, colcheckformat, colalign, coleditsourcetype, coleditsource, colhtmlstyle, collimit, colvisible, colreadonly, colrequired, colsortable, isfilter, colspan, isautocomplete, groupid, colfilterrefid, inputuser, inputtime, updateuser, updatetime, isaudit, colfilterattrs, isupdate, parentcolindex, tips, colinnerbtevent, colfilteroptions) VALUES ('FcRequestFileList', '1080', '1080', '1', 'O', 'FILE_PATH', 'FILE_PATH', 'String', '', '文件路径', '', '1', 'Text', '1', '1', '', '', '', '32', '0', '0', '0', '1', '1', 1, '0', '', '', 'SYS_Designer', '2021/06/29 11:47:56', 'administrator', '2021/07/19 10:56:56', '', '', '1', '', '', '', '');
+INSERT INTO apzl.awe_do_library (dono, colindex, sortno, isinuse, coltablename, colactualname, colname, coltype, coldefaultvalue, colheader, colunit, colcolumntype, coleditstyle, colcheckformat, colalign, coleditsourcetype, coleditsource, colhtmlstyle, collimit, colvisible, colreadonly, colrequired, colsortable, isfilter, colspan, isautocomplete, groupid, colfilterrefid, inputuser, inputtime, updateuser, updatetime, isaudit, colfilterattrs, isupdate, parentcolindex, tips, colinnerbtevent, colfilteroptions) VALUES ('FcRequestFileList', '1090', '1090', '1', 'O', 'FC_FILE_STS', 'FC_FILE_STS', 'String', '', '文件状态', '', '1', 'Text', '1', '1', '', '', '', '32', '0', '1', '0', '1', '1', 1, '0', '', '', 'SYS_Designer', '2021/06/29 11:47:56', 'administrator', '2021/07/19 10:56:56', '0', '', '1', '', '', '', '');
+
+-- 租金计划转换 定时任务配置(数据字典中配置，还需要在系统中去配置定时任务触发)
+delete from code_library where codeno='MissionName' and itemname='租金计划转换';
+INSERT INTO apzl.code_library (codeno, itemno, itemname, bankno, sortno, isinuse, itemdescribe, itemattribute, relativecode, attribute1, attribute2, attribute3, attribute4, attribute5, attribute6, attribute7, attribute8, inputuser, inputorg, inputtime, updateuser, updatetime, remark, helptext) VALUES ('MissionName', 'com.tenwa.lease.app.quartzmession.CorpusSourceRentPlanCopy', '租金计划转换', null, '0610', '1', '资方租金计划转换到C端', null, null, null, null, null, null, null, null, null, null, 'SYS_Designer', null, '2021/07/05 15:08:32', 'SYS_Designer', '2021/07/05 15:08:32', null, null);
+
+-- 资方信息模板显示
+-- 业务申请
+delete from awe_do_library where dono='VI_PROJECTINFO_APPROVAL' and colname='CORPUS_SOURCE';
+INSERT INTO apzl.awe_do_library (dono, colindex, sortno, isinuse, coltablename, colactualname, colname, coltype, coldefaultvalue, colheader, colunit, colcolumntype, coleditstyle, colcheckformat, colalign, coleditsourcetype, coleditsource, colhtmlstyle, collimit, colvisible, colreadonly, colrequired, colsortable, isfilter, colspan, isautocomplete, groupid, colfilterrefid, inputuser, inputtime, updateuser, updatetime, isaudit, colfilterattrs, isupdate, parentcolindex, tips, colinnerbtevent, colfilteroptions) VALUES ('VI_PROJECTINFO_APPROVAL', '1320', '1320', '1', 'lpit', 'CORPUS_SOURCE', 'CORPUS_SOURCE', 'String', '', '资金来源', '', '1', 'Select', '1', '1', 'Code', 'corpus_source', '', '32', '1', '1', '0', '1', '0', 1, '', '0009', '', 'SYS_Designer', '2021/05/25 13:50:37', 'SYS_Designer', '2021/05/25 15:51:31', '0', '', '1', '', '', '', '');
+
+-- 合同制作
+delete from awe_do_library where dono='LBContractPersonBaseInfoTemp' and colname='CORPUS_SOURCE';
+INSERT INTO apzl.awe_do_library (dono, colindex, sortno, isinuse, coltablename, colactualname, colname, coltype, coldefaultvalue, colheader, colunit, colcolumntype, coleditstyle, colcheckformat, colalign, coleditsourcetype, coleditsource, colhtmlstyle, collimit, colvisible, colreadonly, colrequired, colsortable, isfilter, colspan, isautocomplete, groupid, colfilterrefid, inputuser, inputtime, updateuser, updatetime, isaudit, colfilterattrs, isupdate, parentcolindex, tips, colinnerbtevent, colfilteroptions) VALUES ('LBContractPersonBaseInfoTemp', '1070', '1070', '1', 'O', 'CORPUS_SOURCE', 'CORPUS_SOURCE', 'String', '', '资金来源', '', '1', 'Select', '1', '1', 'Code', 'corpus_source', '', '32', '1', '1', '0', '1', '0', 2, '', '0010', '', 'SYS_Designer', '2021/05/25 13:50:37', 'administrator', '2021/07/16 16:25:00', '0', '', '1', '', '', '', '');
+
+-- 放款申请
+delete from awe_do_library where dono='LB_CONTRACT_INFO_PAY' and colname='CORPUS_SOURCE';
+INSERT INTO apzl.awe_do_library (dono, colindex, sortno, isinuse, coltablename, colactualname, colname, coltype, coldefaultvalue, colheader, colunit, colcolumntype, coleditstyle, colcheckformat, colalign, coleditsourcetype, coleditsource, colhtmlstyle, collimit, colvisible, colreadonly, colrequired, colsortable, isfilter, colspan, isautocomplete, groupid, colfilterrefid, inputuser, inputtime, updateuser, updatetime, isaudit, colfilterattrs, isupdate, parentcolindex, tips, colinnerbtevent, colfilteroptions) VALUES ('LB_CONTRACT_INFO_PAY', '7020', '7020', '1', 'O', 'CORPUS_SOURCE', 'CORPUS_SOURCE', 'String', '', '资金方', '', '1', 'Select', '1', '1', 'Code', 'corpus_source', '', '100', '1', '1', '0', '1', '0', 0, '', '0010', '', 'SYS_Designer', '2021/05/25 11:20:27', 'administrator', '2021/07/08 14:55:29', '0', '', '1', '', '', '', '');
+
+-- 凭证定时任务
+delete from code_library where codeno='MissionName' and itemname='资方放款凭证';
+INSERT INTO apzl.code_library (codeno, itemno, itemname, bankno, sortno, isinuse, itemdescribe, itemattribute, relativecode, attribute1, attribute2, attribute3, attribute4, attribute5, attribute6, attribute7, attribute8, inputuser, inputorg, inputtime, updateuser, updatetime, remark, helptext) VALUES ('MissionName', 'com.tenwa.lease.app.quartzmession.CorpusSourceFundIncomeCreateVoucherJob', '资方放款凭证', null, '0620', '1', '资方放款凭证', null, null, null, null, null, null, null, null, null, null, 'SYS_Designer', null, '2021/07/05 15:08:32', 'SYS_Designer', '2021/07/05 15:08:32', null, null);
+
+
+CREATE ALGORITHM=UNDEFINED DEFINER=`apzl`@`%` SQL SECURITY DEFINER VIEW `vi_lb_identity_check_creditauth` AS (select `a`.`name` AS `fullName`,`a`.`certid` AS `certId`,`a`.`relation` AS `relation`,`a`.`creditauth` AS `creditauth`,`a`.`credittype` AS `credittype`,`a`.`flowunid` AS `flowunid`,`a`.`phone` AS `phone` from (select `ut`.`name` AS `name`,`ut`.`certid` AS `certid`,(case when (`ut`.`Partner_` = 'Y') then '共同申请人' when ((`ut`.`Partner_` = 'N') and (`ut`.`Spouse_` = 'Y')) then '配偶' when (`ut`.`Partner_` = 'gua') then '担保人' when (`ut`.`Partner_` = 'cust') then '申请人' else '' end) AS `relation`,(case when (`ut`.`creditauth` = 'ap') then '征信授权书_安鹏' when (`ut`.`creditauth` = 'yc') then '征信授权书_邮储' when (`ut`.`creditauth` = 'yc_audit') then '借款服务确认书_邮储' else '' end) AS `creditauth`,(case when (`ut`.`creditauth` = 'ap') then '99001' when (`ut`.`creditauth` = 'yc') then '99002' when (`ut`.`creditauth` = 'yc_audit') then '99003' else '' end) AS `credittype`,`ut`.`flowunid` AS `flowunid`,`ut`.`phone` AS `phone` from (select `cf1`.`name` AS `name`,`cf1`.`certid` AS `certid`,`cf1`.`Partner_` AS `Partner_`,`cf1`.`Spouse_` AS `Spouse_`,'ap' AS `creditauth`,`cf1`.`flowunid` AS `flowunid`,`cf1`.`tel` AS `phone` from `apzl`.`customer_family_temp` `cf1` where (`cf1`.`Partner_` = 'Y') union all (select `lgut`.`FULLNAME` AS `FULLNAME`,`lgut`.`CERTID` AS `CERTID`,'gua' AS `Partner_`,'gua' AS `Spouse_`,'ap' AS `creditauth`,`lgut`.`FLOWUNID` AS `flowunid`,`lgut`.`MOBILE` AS `phone` from `apzl`.`lb_guarantee_unit_temp` `lgut`) union all (select `ccpt`.`FULLNAME` AS `FULLNAME`,`ccpt`.`CERTID` AS `CERTID`,'cust' AS `Partner_`,'cust' AS `Spouse_`,'ap' AS `creditauth`,`ccpt`.`FLOWUNID` AS `flowunid`,`ccpt`.`mobile` AS `phone` from `apzl`.`customer_person_temp` `ccpt` where (`ccpt`.`BALANCESHEET` = '申请人'))) `ut`) `a`);
+CREATE ALGORITHM=UNDEFINED DEFINER=`apzl`@`%` SQL SECURITY DEFINER VIEW `vi_lb_identity_check_creditauth_loan` AS (select `a`.`name` AS `fullName`,`a`.`certid` AS `certId`,`a`.`relation` AS `relation`,`a`.`creditauth` AS `creditauth`,`a`.`credittype` AS `credittype`,`a`.`flowunid` AS `flowunid`,`a`.`phone` AS `phone` from (select `ut`.`name` AS `name`,`ut`.`certid` AS `certid`,(case when (`ut`.`Partner_` = 'Y') then '共同申请人' when ((`ut`.`Partner_` = 'N') and (`ut`.`Spouse_` = 'Y')) then '配偶' when (`ut`.`Partner_` = 'gua') then '担保人' when (`ut`.`Partner_` = 'cust') then '申请人' else '' end) AS `relation`,(case when (`ut`.`creditauth` = 'ap') then '征信授权书_安鹏' when (`ut`.`creditauth` = 'yc') then '征信授权书_邮储' when (`ut`.`creditauth` = 'yc_audit') then '借款服务确认书_邮储' else '' end) AS `creditauth`,(case when (`ut`.`creditauth` = 'ap') then '99001' when (`ut`.`creditauth` = 'yc') then '99002' when (`ut`.`creditauth` = 'yc_audit') then '99003' else '' end) AS `credittype`,`ut`.`flowunid` AS `flowunid`,`ut`.`phone` AS `phone` from (select `cf1`.`name` AS `name`,`cf1`.`certid` AS `certid`,`cf1`.`Partner_` AS `Partner_`,`cf1`.`Spouse_` AS `Spouse_`,'ap' AS `creditauth`,`cf1`.`PROJECT_ID` AS `flowunid`,`cf1`.`tel` AS `phone` from `apzl`.`customer_family` `cf1` where (`cf1`.`Partner_` = 'Y') union all (select `lgut`.`FULLNAME` AS `FULLNAME`,`lgut`.`CERTID` AS `CERTID`,'gua' AS `Partner_`,'gua' AS `Spouse_`,'ap' AS `creditauth`,`lgut`.`PROJECT_ID` AS `flowunid`,`lgut`.`MOBILE` AS `phone` from `apzl`.`lb_guarantee_unit` `lgut`) union all (select `ccpt`.`FULLNAME` AS `FULLNAME`,`ccpt`.`CERTID` AS `CERTID`,'cust' AS `Partner_`,'cust' AS `Spouse_`,'ap' AS `creditauth`,`lul`.`PROJECT_ID` AS `flowunid`,`ccpt`.`mobile` AS `phone` from (`apzl`.`customer_person` `ccpt` left join `apzl`.`lb_union_lessee` `lul` on((`ccpt`.`CUSTOMERID` = `lul`.`CUSTOMER_ID`))) where (`ccpt`.`BALANCESHEET` = '申请人'))) `ut`) `a`);
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+