From f06d9d3ad218a61696edbf3e7cc0579662c5890f Mon Sep 17 00:00:00 2001
From: zhangbb <zhangbb@DESKTOP-GH0CKE6>
Date: Thu, 16 May 2019 17:33:04 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=8D=A1=E5=B0=94=E7=9A=84=E5=90=88=E5=90=8C?=
 =?UTF-8?q?=E5=88=B6=E4=BD=9C=EF=BC=8C=E5=8F=98=E6=9B=B4=EF=BC=8C=E4=BB=98?=
 =?UTF-8?q?=E6=AC=BE=E7=94=B3=E8=AF=B7=E3=80=82=E6=96=B0=E5=A2=9E=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E9=80=BB=E8=BE=91=E6=9B=B4=E6=94=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SelectCatalog/SelectContractPaymentKE.xml | 203 ++++++++++++++++++
 .../ContractApprovalApplyList.jsp             |  15 +-
 .../ContractChangeApplyList_Car.jsp           |  13 +-
 .../Fund/FundPayment/FundPaymentApplyList.jsp |  10 +-
 4 files changed, 235 insertions(+), 6 deletions(-)
 create mode 100644 WebContent/Tenwa/Core/InvoiceManager/TablesXML/SelectCatalog/SelectContractPaymentKE.xml

diff --git a/WebContent/Tenwa/Core/InvoiceManager/TablesXML/SelectCatalog/SelectContractPaymentKE.xml b/WebContent/Tenwa/Core/InvoiceManager/TablesXML/SelectCatalog/SelectContractPaymentKE.xml
new file mode 100644
index 000000000..bef0b75ca
--- /dev/null
+++ b/WebContent/Tenwa/Core/InvoiceManager/TablesXML/SelectCatalog/SelectContractPaymentKE.xml
@@ -0,0 +1,203 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<table-root 
+  xmlns="http://www.tracywindy.org/table" 
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://www.tracywindy.org/table http://www.tracywindy.org/table/table-1.0.xsd">
+  <table>
+    <data>
+    <MYSQL>
+      <table_sql> 
+	        <![CDATA[
+	 select  
+	   ID,
+  CONTRACT_NUMBER,
+ CONTRACT_NO,
+  PROJECT_ID,
+  PRODUCT_ID,
+  PROJECT_NAME,
+  customerid,
+  customername,
+  total,
+  usedlines,
+  relines,
+  plan_money,
+   afact_money,
+  allfact_money,
+  fee_adjust,
+  overmoney,
+  username   from (
+SELECT 
+  lci.ID,
+  lci.CONTRACT_NUMBER,
+  lci.CONTRACT_NO,
+  lci.PROJECT_ID,
+  lci.PRODUCT_ID,
+  lci.PROJECT_NAME,
+  lul.customerid,
+  lul.customername,
+  di.total,
+  di.usedlines,
+  di.relines,
+  vlfp.plan_money,
+  IFNULL(lfi.allfact_money, 0) AS afact_money,
+  vlfp.allfact_money,
+  vlfp.fee_adjust,
+  vlfp.overmoney,
+  ui.username 
+FROM
+  LB_CONTRACT_INFO AS lci 
+  LEFT JOIN 
+    (SELECT 
+      lu.contract_id,
+      ci.customerid,
+      ci.customername 
+    FROM
+      LB_UNION_LESSEE lu,
+      CUSTOMER_INFO ci 
+    WHERE lu.CUSTOMER_ID = ci.customerid 
+      AND is_main = 'y') AS lul 
+    ON lul.CONTRACT_ID = lci.ID 
+  LEFT JOIN 
+    (SELECT 
+      vl.contract_id,
+      SUM(vl.plan_money) plan_money,
+      SUM(vl.allfact_money) allfact_money,
+      SUM(vl.fee_adjust) fee_adjust,
+      SUM(vl.overmoney) overmoney 
+    FROM
+      vi_lc_fund_plan vl 
+    WHERE vl.pay_type = 'pay_type_out' 
+      AND vl.fee_type NOT IN ('feetype16', 'feetype17') 
+    GROUP BY vl.contract_id) vlfp 
+    ON vlfp.contract_id = lci.ID 
+  LEFT JOIN 
+    (SELECT 
+      contract_id,
+      SUM(IFNULL(fact_money, 0)) + SUM(IFNULL(fee_adjust, 0)) AS allfact_money 
+    FROM
+      lc_fund_income 
+    WHERE pay_type = 'pay_type_out' 
+      AND roll_back = '0' 
+      AND pay_status = 'apply_pass' 
+    GROUP BY contract_id) AS lfi 
+    ON lfi.contract_id = lci.ID 
+  LEFT JOIN user_info AS ui 
+    ON lci.PROJECT_MANAGE = ui.userid  
+    left join vi_distributor_lines di on lci.distributor_id=di.distributor_no
+WHERE (
+    lci.contract_status = '21' 
+    OR lci.contract_status = '25' 
+    OR lci.contract_status = '26'
+  )
+  AND lci.BUSINESSTYPE='1' 
+  AND lci.INPUTORGID='#orgid' 
+  AND IFNULL(lfi.allfact_money, 0) < vlfp.plan_money 
+  AND lci.ID NOT IN 
+  (SELECT 
+    contract_id 
+  FROM
+    flow_bussiness_object fbo,
+    flow_object fo 
+  WHERE fbo.flow_unid = fo.objectno 
+    AND fbo.flow_name = '资金付款' 
+    AND fo.phaseno NOT IN ('1000', '8000'))) tab where tab.overmoney>0
+    
+			 ]]> 
+	  </table_sql>
+	  </MYSQL>
+	<ORACLE>
+      <table_sql> 
+	        <![CDATA[
+	   select  
+	   ID,
+  CONTRACT_NUMBER,
+ CONTRACT_NO,
+  PROJECT_ID,
+  PRODUCT_ID,
+  PROJECT_NAME,
+  customerid,
+  customername,
+  plan_money,
+   afact_money,
+  allfact_money,
+  fee_adjust,
+  overmoney,
+  username   from (
+SELECT 
+  lci.ID,
+  lci.CONTRACT_NUMBER,
+  lci.CONTRACT_NO,
+  lci.PROJECT_ID,
+  lci.PRODUCT_ID,
+  lci.PROJECT_NAME,
+  lul.customerid,
+  lul.customername,
+  vlfp.plan_money,
+  (NVL(lfi.allfact_money, 0)) AS afact_money,
+  vlfp.allfact_money,
+  vlfp.fee_adjust,
+  vlfp.overmoney,
+  ui.username 
+FROM
+  LB_CONTRACT_INFO  lci 
+  LEFT JOIN 
+    (SELECT 
+      lu.contract_id,
+      ci.customerid,
+      ci.customername 
+    FROM
+      LB_UNION_LESSEE lu,
+      CUSTOMER_INFO ci 
+    WHERE lu.CUSTOMER_ID = ci.customerid 
+      AND is_main = 'Y')  lul 
+    ON lul.CONTRACT_ID = lci.ID 
+  LEFT JOIN 
+    (SELECT 
+      vl.contract_id,
+      SUM(vl.plan_money) plan_money,
+      SUM(vl.allfact_money) allfact_money,
+      SUM(vl.fee_adjust) fee_adjust,
+      SUM(vl.overmoney) overmoney 
+    FROM
+      vi_lc_fund_plan vl 
+    WHERE vl.pay_type = 'pay_type_out' 
+      AND vl.fee_type NOT IN ('feetype16', 'feetype17') 
+    GROUP BY vl.contract_id) vlfp 
+    ON vlfp.contract_id = lci.ID 
+  LEFT JOIN 
+    (SELECT 
+      contract_id,
+      SUM(NVL(fact_money, 0)) + SUM(NVL(fee_adjust, 0)) AS allfact_money 
+    FROM
+      lc_fund_income 
+    WHERE pay_type = 'pay_type_out' 
+      AND roll_back = '0' 
+      AND pay_status = 'apply_pass' 
+    GROUP BY contract_id)  lfi 
+    ON lfi.contract_id = lci.ID 
+  LEFT JOIN user_info  ui 
+    ON lci.PROJECT_MANAGE = ui.userid 
+WHERE (
+    lci.contract_status = '21' 
+    OR lci.contract_status = '25' 
+    OR lci.contract_status = '26'
+  ) 
+  AND NVL(lfi.allfact_money, 0) < vlfp.plan_money 
+  AND lci.ID NOT IN 
+  (SELECT 
+    contract_id 
+  FROM
+    flow_bussiness_object fbo,
+    flow_object fo 
+  WHERE fbo.flow_unid = fo.objectno 
+    AND fbo.flow_name = '资金付款' 
+    AND fo.phaseno NOT IN ('1000', '8000'))) tab  where tab.overmoney>0
+			 ]]> 
+	  </table_sql>
+	</ORACLE>
+      <dataSource>dataSource</dataSource>
+      <show_sql>false</show_sql>
+    </data>
+  </table>
+</table-root>
\ 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 cb6551995..e47d28bf0 100644
--- a/WebContent/Tenwa/Lease/Flow/Contract/ContractApproval/ContractApprovalApplyList.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Contract/ContractApproval/ContractApprovalApplyList.jsp
@@ -9,14 +9,23 @@
 	})
  	
 	function newApply()
- 	{  var userid="<%=CurUser.getUserID()%>";
+ 	{  
+ 		var userid="<%=CurUser.getUserID()%>";
  		var flowno="<%=CurPage.getParameter("ApplyType")%>";
  	   var selname="";
- 	   var orgId="<%=CurUser.getOrgID()%>".substring(0,7);
+ 	   var param="userid,"+userid;
+ 	  var getorgid="<%=CurUser.getOrgID()%>";
+ 	  var orgId="<%=CurUser.getOrgID()%>".substring(0,7);
 		var businessType="";
  	   if(flowno=="BContractApproveApply"){
  		  selname="SelectProjectForContract_Car";
  		  businessType="1";
+ 		  //¿¨¶û
+ 		   if(getorgid=="8006009"){
+ 			   selname="SelectProjectForContract_Car_KE";
+ 			   param="orgid,"+getorgid;
+ 		   }
+ 		  
     	}else{
     	  selname="SelectProjectForContract";
     	  if(orgId=="8009010"){
@@ -28,7 +37,7 @@
 	   		return;
 	   	  }
  	    }
-		AsDialog.OpenSelector(selname,"userid,"+userid+",businessType,"+businessType,"dialogWidth=" + parseInt(window.screen.width * 0.8) + "px dialogHeight=" + parseInt(window.screen.height * 0.6) + "px",function(sReturn){
+		AsDialog.OpenSelector(selname,param+",businessType,"+businessType,"dialogWidth=" + parseInt(window.screen.width * 0.8) + "px dialogHeight=" + parseInt(window.screen.height * 0.6) + "px",function(sReturn){
 			if(!sReturn||sReturn=="_CANCEL_"||sReturn=="_NONE_"){
 				//alert(getHtmlMessage('1'));//ÇëÑ¡ÔñÒ»ÌõÐÅÏ¢£¡
 	    	return;
diff --git a/WebContent/Tenwa/Lease/Flow/Contract/ContractChange/ContractChangeApplyList_Car.jsp b/WebContent/Tenwa/Lease/Flow/Contract/ContractChange/ContractChangeApplyList_Car.jsp
index 335f98376..93c0b4d94 100644
--- a/WebContent/Tenwa/Lease/Flow/Contract/ContractChange/ContractChangeApplyList_Car.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Contract/ContractChange/ContractChangeApplyList_Car.jsp
@@ -5,8 +5,17 @@
  	/*~[Describe=ÐÂÔö¼Ç¼;InputParam=ÎÞ;OutPutParam=ÎÞ;]~*/
 	function newApply()
  	{
-		var userid="<%=CurUser.getUserID()%>";
-		AsDialog.OpenSelector("SelectContractCar","userid,"+userid,"dialogWidth=" + parseInt(window.screen.width * 0.8) + "px dialogHeight=" + parseInt(window.screen.height * 0.6) + "px",function(sReturn){
+ 		debugger;
+		var selname="SelectContractCar";
+		var param="userid,"+userid;
+ 		var userid="<%=CurUser.getUserID()%>";
+		var orgid="<%=CurUser.getOrgID()%>";
+		//¿¨¶û
+		if(orgid=="8006009"){
+			selname="SelectContractCar_KE";
+			param="orgid,"+orgid;
+		}
+		AsDialog.OpenSelector(selname,param,"dialogWidth=" + parseInt(window.screen.width * 0.8) + "px dialogHeight=" + parseInt(window.screen.height * 0.6) + "px",function(sReturn){
 			if(!sReturn||sReturn=="_CANCEL_"||sReturn=="_NONE_"){
 				//alert(getHtmlMessage('1'));//ÇëÑ¡ÔñÒ»ÌõÐÅÏ¢£¡
 	    	return;
diff --git a/WebContent/Tenwa/Lease/Flow/Fund/FundPayment/FundPaymentApplyList.jsp b/WebContent/Tenwa/Lease/Flow/Fund/FundPayment/FundPaymentApplyList.jsp
index d011c6a28..7fcc55781 100644
--- a/WebContent/Tenwa/Lease/Flow/Fund/FundPayment/FundPaymentApplyList.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Fund/FundPayment/FundPaymentApplyList.jsp
@@ -5,7 +5,15 @@
  	/*~[Describe=ÐÂÔö¼Ç¼;InputParam=ÎÞ;OutPutParam=ÎÞ;]~*/
 	function newApply(){
 		var userid="<%=CurUser.getUserID()%>";
-		AsDialog.OpenSelector("SelectContractPayment","userid,"+userid,"dialogWidth=" + parseInt(window.screen.width * 0.8) + "px dialogHeight=" + parseInt(window.screen.height * 0.6) + "px",function(sReturn){
+		var orgid="<%=CurUser.getOrgID()%>";
+		var selName="SelectContractPayment";
+		var param="userid,"+userid;
+		//¿¨¶û
+		if(orgid=="8006009"){
+			selName="SelectContractPayment_KE";
+			param="orgid,"+orgid;
+		}
+		AsDialog.OpenSelector(selName,param,"dialogWidth=" + parseInt(window.screen.width * 0.8) + "px dialogHeight=" + parseInt(window.screen.height * 0.6) + "px",function(sReturn){
 			if(!sReturn||sReturn=="_CANCEL_"){
    			 return;
 	    	}