From a5622d24abd3317440e0313dc28060640f1f8db3 Mon Sep 17 00:00:00 2001
From: zhangbb <zhangbb@DESKTOP-GH0CKE6>
Date: Thu, 22 Nov 2018 18:52:09 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=AE=9E=E9=99=85=E4=BB=98=E6=AC=BE=E6=94=B9?=
 =?UTF-8?q?=E5=9B=9E=E6=8C=89=E7=BB=8F=E9=94=80=E5=95=86=E4=BB=98=E6=AC=BE?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ActualPaymentCarTempList.jsp              | 51 +++--------------
 .../ActualPaymentTempListBySubtotal1.jsp      |  8 +--
 .../controller/CmbToCallbackController.java   |  3 +-
 .../sdk/controller/CmbToPayController.java    | 56 ++++++-------------
 .../tenwa/sdk/controller/PayController.java   |  2 -
 5 files changed, 30 insertions(+), 90 deletions(-)

diff --git a/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/ActualPaymentCarTempList.jsp b/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/ActualPaymentCarTempList.jsp
index 93cb5379a..d94f3bf56 100644
--- a/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/ActualPaymentCarTempList.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/ActualPaymentCarTempList.jsp
@@ -48,7 +48,7 @@
 	}
 	dwTemp.setPageSize(pageSize == null?10:Integer.parseInt(pageSize));
 	ASDataObject ado = dwTemp.getDataObject();
-	ado.setLockCount(3);
+	ado.setLockCount(2);
 	ado.setReadOnly("PAYMENT_NUMBER", true);
 	ado.setReadOnly("PROJECT_NAME", true);
 	ado.setReadOnly("PLAN_ID", true);
@@ -80,63 +80,30 @@
 	String[][] sButtons = null;
 	if("ReadOnly".equals(rightType)){
 		sButtons = new String[][]{
-		};
+			};
 	}else if("0010".equals(phaseNo)){
 		sButtons = new String[][]{
-				{"true","","Button","删除","删除","doDelete()","","","","btn_icon_delete",""},
-		};
+		/* 		{"true","","Button","保存","保存","as_save(0,'setColRequired()')","","","","btn_icon_saveNew",""},
+				{"true","","Button","批量修改","批量修改","batchModify()","","","","btn_icon_detail",""}, */
+				{"true","","Button","删除","删除","doDelete()","","","","btn_icon_delete",""},		};
 	}else if("0020".equals(phaseNo)){
 		sButtons = new String[][]{
 				{"true","","Button","保存","保存","as_save(0,'setColRequired()')","","","","btn_icon_saveNew",""} ,
-				{"true","","Button","批量修改","批量修改","batchModify()","","","","btn_icon_detail",""},
-				{"true","","Button","发起付款申请","保存","cmb_tp_pay()","","","","btn_icon_save",""},
-		};
-	}else if("0030".equals(phaseNo)){
-		sButtons = new String[][]{
-				{"true","","Button","付款结果回盘","付款结果回盘","cmb_tp_callback()","","","","btn_icon_delete",""},	
-		};
+				{"true","","Button","批量修改","批量修改","batchModify()","","","","btn_icon_detail",""}
+			};
 	}else{
 		sButtons = new String[][]{
 		//	{"true","","Button","保存","保存","as_save(0,'setColRequired()')","","","","btn_icon_saveNew",""},
 		//	{"true","","Button","批量修改","批量修改","batchModify()","","","","btn_icon_detail",""},
 		//	{"true","","Button","导出付款明细","导出付款明细","createFundIncomeExcel()","","","","btn_icon_up",""},
 		};
+		
 	}
 %><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
 <script type="text/javascript">
 	$(function(){
 		setColRequired();
 	})
-	function cmb_tp_pay(){
-		 var plist = getItemValueArray(0,"CONTRACT_ID")+"";
-		 if(typeof(plist)=="undefined" || plist.length==0 ){
-			alert("请至少选择一条记录！");
-			return ;
-		 }
-		 if(confirm("确认要发起付款申请吗？")){
-			ids=plist.replace(/\,/g,"@");
-			var sParams = "CurUserID=<%=CurUser.getUserID()%>,contract_ids="+ids+",FLOWUNID=<%=flowunid%>";
-			var sReturn = RunJavaMethodTrans("com.tenwa.sdk.controller.CmbToPayController", "action",sParams );
-			if(typeof(sReturn)=="undefined" || sReturn=="") return;
-			if(sReturn.code==1){
-				alert(sReturn.msg);
-			}else{
-				alert(sReturn.msg);
-				reloadSelf();
-			}
-		 }
-	}
-	function cmb_tp_callback(){
-		var sParams = "CurUserID=<%=CurUser.getUserID()%>,FLOWUNID=<%=flowunid%>";
-		var sReturn = RunJavaMethodTrans("com.tenwa.sdk.controller.CmbToCallbackController", "action",sParams );
-		if(typeof(sReturn)=="undefined" || sReturn=="") return;
-		if(sReturn.code==1){
-			alert(sReturn.msg);
-		}else{
-			alert(sReturn.msg);
-			reloadSelf();
-		}
-	}
 	function afterSearch(){
 		/* var rows = getRowCount(0);
 		for(var i=0;i<rows;i++){
@@ -296,7 +263,7 @@
 		AsDialog.PopView("/Tenwa/Lease/Flow/Fund/ActualPayment/ActualPaymentBatchModify.jsp","phaseNo="+phaseNo,"dialogWidth=800px;dialogHeight=350px;resizable=no;scrollbars=no;status:yes;maximize:no;help:no;",function(data){
 			if(data.length==0){
 				return;
-			}
+			}		
 			for(var i=0;i<rows.length;i++){
 				for (var key in data){
 			    	 if(typeof(data[key])=="undefined"||""==data[key]){
diff --git a/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/ActualPaymentTempListBySubtotal1.jsp b/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/ActualPaymentTempListBySubtotal1.jsp
index 250f8eacb..bb78e597e 100644
--- a/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/ActualPaymentTempListBySubtotal1.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/ActualPaymentTempListBySubtotal1.jsp
@@ -6,9 +6,7 @@
         History Log: 
     */
     String phaseNo = CurPage.getParameter("PhaseNo");
-	//String rightType = CurPage.getParameter("RightType");
-	//此页面以后只作为显示页面。
-	String rightType="ReadOnly";
+	String rightType = CurPage.getParameter("RightType");
     String flowunid = CurPage.getParameter("FlowUnid");
     String ishistory = CurPage.getParameter("IsHistory");
 	ASObjectModel doTemp = new ASObjectModel("LC_FUND_INCOME_TEMP_HXM");
@@ -31,7 +29,7 @@
 	}
 	dwTemp.setPageSize(10);
 	ASDataObject ado = dwTemp.getDataObject();
-	ado.setLockCount(3);
+	ado.setLockCount(5);
 	dwTemp.genHTMLObjectWindow(flowunid);
 
 	//0、是否展示 1、	权限控制  2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码	6、	7、	8、	9、图标，CSS层叠样式 10、风格
@@ -47,7 +45,7 @@
 		sButtons = new String[][]{
 				{"true","","Button","付款结果回盘","付款结果回盘","cmb_tp_callback()","","","","btn_icon_delete",""},	
 		};
-	} 
+	}
 %><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
 <script type="text/javascript">
 
diff --git a/src_cmb/com/tenwa/sdk/controller/CmbToCallbackController.java b/src_cmb/com/tenwa/sdk/controller/CmbToCallbackController.java
index c75db905d..c3f330079 100644
--- a/src_cmb/com/tenwa/sdk/controller/CmbToCallbackController.java
+++ b/src_cmb/com/tenwa/sdk/controller/CmbToCallbackController.java
@@ -83,7 +83,6 @@ public class CmbToCallbackController extends BaseFlowStartAction {
 		//安鹏要求采用固定写死值。
 		//String LGNNAM = accountBo.getAttribute("OWN_NAME").toString();
 		String LGNNAM = "安鹏经办";
-		//String LGNNAM = "银企直连测试用户113";
 		String FUNNAM = "NTSTLINF";
 		int    DATTYP = 2;
 		
@@ -187,7 +186,7 @@ public class CmbToCallbackController extends BaseFlowStartAction {
 	}
 	public void sql() throws JBOException{
 		String sql2 = "update O left join jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO lci on lci.id=O.contract_id"
-				+" left join jbo.com.tenwa.lease.comm.LC_FUND_INCOME_CALLBACK_DETAIL_TEMP tt on tt.CONTRACT_ID=lci.ID"
+				+" left join jbo.com.tenwa.lease.comm.LC_FUND_INCOME_CALLBACK_DETAIL_TEMP tt on tt.DISTRIBUTOR_ID=lci.distributor_id"
 				+" and O.FLOWUNID=tt.FLOWUNID set  O.EBANK_STATUS=case when tt.RTNFLG='S' then '05' else '04' end where O.FLOWUNID='"+FLOWUNID+"'" ;
 		JBOFactory.createBizObjectQuery(LC_FUND_INCOME_TEMP.CLASS_NAME,sql2).executeUpdate();
 	}
diff --git a/src_cmb/com/tenwa/sdk/controller/CmbToPayController.java b/src_cmb/com/tenwa/sdk/controller/CmbToPayController.java
index 2da192f90..18d7df719 100644
--- a/src_cmb/com/tenwa/sdk/controller/CmbToPayController.java
+++ b/src_cmb/com/tenwa/sdk/controller/CmbToPayController.java
@@ -37,17 +37,7 @@ import net.sf.json.JSONObject;
 
 public class CmbToPayController extends BaseFlowStartAction {
 	private String distributor_ids; 	 //获取选择的 经销商ID 
-	private String contract_ids;         //获取选择的合同ID
-	private String FLOWUNID ; //流程号、
-	
-
-	public String getContract_ids() {
-		return contract_ids;
-	}
-
-	public void setContract_ids(String contract_ids) {
-		this.contract_ids = contract_ids;
-	}
+	private String FLOWUNID ; //流程号
 
 	public String getFLOWUNID() {
 		return FLOWUNID;
@@ -83,20 +73,12 @@ public class CmbToPayController extends BaseFlowStartAction {
 			JSONObject jsonObj = JSONObject.fromObject(map);
 			return jsonObj.toString();
 		}
-		//按经销商改为按合同
-		/*List<String> distributor_id_list =  java.util.Arrays.asList(distributor_ids.split("@"));
+		List<String> distributor_id_list =  java.util.Arrays.asList(distributor_ids.split("@"));
 		if(distributor_id_list==null || distributor_id_list.size()<=0) {
 			map.put("code", "1") ;
 			map.put("msg", "尚未选择经销商,请检查") ;
 			JSONObject jsonObj = JSONObject.fromObject(map);
 			return jsonObj.toString();
-		}*/
-		List<String> contract_id_list = java.util.Arrays.asList(contract_ids.split("@"));
-		if(contract_id_list==null || contract_id_list.size()<=0) {
-			map.put("code", "1") ;
-			map.put("msg", "尚未选择合同,请检查") ;
-			JSONObject jsonObj = JSONObject.fromObject(map);
-			return jsonObj.toString();
 		}
 		/*
 		 * 基本参数检查######开始
@@ -132,7 +114,6 @@ public class CmbToPayController extends BaseFlowStartAction {
 		//安鹏要求采用固定写死值。
 		//String LGNNAM = accountBo.getAttribute("OWN_NAME").toString();
 		String LGNNAM = "安鹏经办";
-	//	String LGNNAM = "银企直连测试用户113";
 		String FUNNAM = "DCPAYREQ";
 		int    DATTYP = 2;
 		String BUSMOD = "00001";  //默认参数 请按照实际情况谨慎修改
@@ -217,7 +198,7 @@ public class CmbToPayController extends BaseFlowStartAction {
 		String error_null_tips 				= ""; //定义错误信息  是否为空
 		
 		
-		if(contract_id_list.size() > 30){ //招行文档规定 单次批量申请不能超过30条 
+		if(distributor_id_list.size() > 30){ //招行文档规定 单次批量申请不能超过30条 
 			map.put("code", "1") ;
 			map.put("msg", "单次处理不能超过30条,请检查") ;
 			JSONObject jsonObj = JSONObject.fromObject(map);
@@ -238,7 +219,7 @@ public class CmbToPayController extends BaseFlowStartAction {
 		String date 			= df.format(new Date());
 		BigDecimal all_money	= new BigDecimal("0");
 		
-		List<BizObject> income_all_list = bankBo.createQuery("select o.CMB_PAY_NO,o.FACT_MONEY,o.FLOWUNID,contract_info.ID,contract_info.CONTRACT_NO,distributor.distributor_id,distributor.acc_number,distributor.open_bank,distributor.account,distributor.district,distributor.provinceInfo from o   join jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO contract_info on o.CONTRACT_ID = contract_info.id join jbo.app.tenwa.customer.DISTRIBUTOR_ACCOUNT distributor on contract_info.distributor_id = distributor.distributor_id and distributor.is_main='Y' where FLOWUNID=:FLOWUNID and o.PAY_TYPE = 'pay_type_out' ").setParameter("FLOWUNID", FLOWUNID).getResultList(false);
+		List<BizObject> income_all_list = bankBo.createQuery("select o.CMB_PAY_NO,o.FACT_MONEY,o.FLOWUNID,contract_info.CONTRACT_NO,distributor.distributor_id,distributor.acc_number,distributor.open_bank,distributor.account,distributor.district,distributor.provinceInfo from o   join jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO contract_info on o.CONTRACT_ID = contract_info.id join jbo.app.tenwa.customer.DISTRIBUTOR_ACCOUNT distributor on contract_info.distributor_id = distributor.distributor_id and distributor.is_main='Y' where FLOWUNID=:FLOWUNID and o.PAY_TYPE = 'pay_type_out' ").setParameter("FLOWUNID", FLOWUNID).getResultList(false);
 		if(income_all_list==null) {
 			map.put("code", "1") ;
 			map.put("msg", "资金收付数据不存在,请检查") ;
@@ -246,18 +227,18 @@ public class CmbToPayController extends BaseFlowStartAction {
 			return jsonObj.toString();
 		}
 		int index = 1  ; 
-		for (String contract_id : contract_id_list) {
+		for (String distributor_id : distributor_id_list) {
 			infoOne = null ; 
-			BigDecimal contract_all_money	= new BigDecimal("0");
+			BigDecimal distributor_all_money	= new BigDecimal("0");
 			for(BizObject income_one : income_all_list) {
-				String  income_one_contract_id 	= income_one.getAttribute("ID").toString();
-				if(contract_id.equals(income_one_contract_id)) {
+				String  income_one_distributor_id 	= income_one.getAttribute("distributor_id").toString();
+				if(distributor_id.equals(income_one_distributor_id)) {
 					BigDecimal income_one_fact_money	= new BigDecimal(income_one.getAttribute("FACT_MONEY").toString());
-					contract_all_money 				= contract_all_money.add(income_one_fact_money);
+					distributor_all_money 				= distributor_all_money.add(income_one_fact_money);
 					infoOne = income_one ; 
 				}
 			}
-			all_money=all_money.add(contract_all_money);
+			all_money=all_money.add(distributor_all_money);
 			if(infoOne==null) { 
 				map.put("code", "1") ;
 				map.put("msg", "第["+index+"]笔数据不存在,请检查") ;
@@ -267,7 +248,6 @@ public class CmbToPayController extends BaseFlowStartAction {
 			 
 			String  FLOWUNID				=  this.FLOWUNID ; 
 			String  DISTRIBUTOR_ID			=  infoOne.getAttribute("distributor_id").toString();
-			String  CONTRACT_ID             =  infoOne.getAttribute("ID").toString();
 			String  CRTACC					=  infoOne.getAttribute("acc_number").toString(); 
 			String  BANK_NAME				=  infoOne.getAttribute("open_bank").toString(); 
 			String  CRTNAM					=  infoOne.getAttribute("account").toString(); 
@@ -301,9 +281,9 @@ public class CmbToPayController extends BaseFlowStartAction {
 			 * 检查当前付款信息是否存在######结束
 			 */	
 			
-			int check=contract_all_money.compareTo(BigDecimal.ZERO); 
+			int check=distributor_all_money.compareTo(BigDecimal.ZERO); 
 			
-			if(	 	CONTRACT_ID==null  	|| "".equals( CONTRACT_ID ) 
+			if(	 DISTRIBUTOR_ID==null  	|| "".equals( DISTRIBUTOR_ID ) 
 					|| CRTACC==null  	|| "".equals( CRTACC ) 
 					|| BANK_NAME==null  || "".equals( BANK_NAME ) 
 					|| CRTNAM==null  	|| "".equals( CRTNAM ) 
@@ -335,11 +315,11 @@ public class CmbToPayController extends BaseFlowStartAction {
 				YURREF_INDEX = String.format("%02d", index);  
 			}
 			
-			String TRSAMT 	= contract_all_money.toPlainString();
+			String TRSAMT 	= distributor_all_money.toPlainString();
 			String YURREF 	= YURREF_INDEX + date+ temp_str; 
 			String BNKFLG 	= checkCMB(BANK_NAME);
-			NUSAGE 			= "客户["+CRTACC+"]发起申请";
-			String BUSNAR 	= "[实际付款][客户:"+CRTACC+"][支付金额:"+TRSAMT+"]";
+			NUSAGE 			= "经销商["+CRTACC+"]发起申请";
+			String BUSNAR 	= "[实际付款][经销商:"+CRTACC+"][支付金额:"+TRSAMT+"]";
 			
 			pay_detail = new SDKDcPayReqxVO(); 
 			pay_detail.setYURREF(YURREF);
@@ -366,7 +346,6 @@ public class CmbToPayController extends BaseFlowStartAction {
 			pay_detail_bo.setAttributeValue("ID", UUID.randomUUID().toString().replaceAll("-", ""));
 			pay_detail_bo.setAttributeValue("CMB_PAY_NO", CMB_PAY_NO);
 			pay_detail_bo.setAttributeValue("DISTRIBUTOR_ID", DISTRIBUTOR_ID);
-			pay_detail_bo.setAttributeValue("CONTRACT_ID", CONTRACT_ID);
 			pay_detail_bo.setAttributeValue("FLOWUNID", FLOWUNID);
 			pay_detail_bo.setAttributeValue("YURREF", YURREF);
 			pay_detail_bo.setAttributeValue("DBTACC", DBTACC);
@@ -430,6 +409,7 @@ public class CmbToPayController extends BaseFlowStartAction {
 				return jsonObj.toString();
 			}
 			
+			
 			if(result.getInfo().getSTATUS()==1) {
 				if("0".equals( result.getInfo().getRETCOD() )) {
 					pay_info_bo.setAttributeValue("FACT_MONEY",all_money.toPlainString());
@@ -444,10 +424,9 @@ public class CmbToPayController extends BaseFlowStartAction {
 						
 						if(pay_detail_list!=null && pay_detail_list.size()>0)
 						for (BizObject pay_detail_one : pay_detail_list) {
-							BizObjectQuery income_boo=  income_bom.createQuery("update o join  jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO lcf on o.contract_id = lcf.id set o.CMB_PAY_NO=:CMB_PAY_NO  where  o.PAY_TYPE = 'pay_type_out'  and o.FLOWUNID=:FLOWUNID and lcf.ID=:CONTRACT_ID");
+							BizObjectQuery income_boo=  income_bom.createQuery("update o join  jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO lcf on o.contract_id = lcf.id set o.CMB_PAY_NO=:CMB_PAY_NO  where  o.PAY_TYPE = 'pay_type_out'  and FLOWUNID=:FLOWUNID and lcf.distributor_id=:DISTRIBUTOR_ID");
 							income_boo.setParameter("CMB_PAY_NO",CMB_PAY_NO) ;
 							income_boo.setParameter("FLOWUNID",pay_detail_one.getAttribute("FLOWUNID").toString()) ;
-							income_boo.setParameter("CONTRACT_ID",pay_detail_one.getAttribute("CONTRACT_ID").toString()) ;
 							income_boo.setParameter("DISTRIBUTOR_ID",pay_detail_one.getAttribute("DISTRIBUTOR_ID").toString()) ;
 							income_boo.executeUpdate();//更新资金收付表 
 							pay_detail_bom.saveObject(pay_detail_one); //插入支付详情表
@@ -499,7 +478,6 @@ public class CmbToPayController extends BaseFlowStartAction {
 							if(pay_detail_list!=null && pay_detail_list.size()>0) {
 								for (BizObject  pay_detail_one : pay_detail_list) {  
 									if(DETAIL_YURREF.equals( pay_detail_one.getAttribute("YURREF").toString() )) {
-										callback_detail_bo.setAttributeValue("CONTRACT_ID",pay_detail_one.getAttribute("CONTRACT_ID").toString());
 										callback_detail_bo.setAttributeValue("DISTRIBUTOR_ID",pay_detail_one.getAttribute("DISTRIBUTOR_ID").toString());
 									}
 								}
diff --git a/src_cmb/com/tenwa/sdk/controller/PayController.java b/src_cmb/com/tenwa/sdk/controller/PayController.java
index fe65f1203..b3cf1d148 100644
--- a/src_cmb/com/tenwa/sdk/controller/PayController.java
+++ b/src_cmb/com/tenwa/sdk/controller/PayController.java
@@ -108,7 +108,6 @@ public class PayController extends BaseFlowStartAction {
 		//安鹏要求采用固定写死值。
 		//String LGNNAM = accountBo.getAttribute("OWN_NAME").toString();
 		String LGNNAM = "安鹏经办";
-	//	String LGNNAM = "银企直连测试用户113";
 		String FUNNAM = "NTSTLINF";
 		int    DATTYP = 2;
 		
@@ -237,7 +236,6 @@ public class PayController extends BaseFlowStartAction {
 		//安鹏要求采用固定写死值。
 		//String LGNNAM = accountBo.getAttribute("OWN_NAME").toString();
 		String LGNNAM = "安鹏经办";
-	//	String LGNNAM = "银企直连测试用户113";
 		String FUNNAM = "DCPAYREQ";
 		int    DATTYP = 2;
 		String BUSMOD = "00001";  //默认参数 请按照实际情况谨慎修改