1.实际付款明细导出功能

WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/ActualPaymentCarTempList.jsp

@@ -79,36 +79,37 @@
 
 	//0、是否展示 1、	权限控制  2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码	6、	7、	8、	9、图标，CSS层叠样式 10、风格
 	String[][] sButtons = null;
-	if("ReadOnly".equals(rightType)){
+	if("0010".equals(phaseNo)){
 		sButtons = new String[][]{
-			};
-	}else if("0010".equals(phaseNo)){
-		sButtons = new String[][]{
-				{"true","","Button","删除","删除","doDelete()","","","","btn_icon_delete",""},		};
+				{"true","","Button","删除","删除","doDelete()","","","","btn_icon_delete",""},	
+				{"true","","Button","导出付款明细","导出付款明细","createFundIncomeExcel()","","","","btn_icon_up",""},
+				};
 	}else if("0020".equals(phaseNo)){
 		if("0010".equals(payType)){
 			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{
 			sButtons = new String[][]{
 					{"true","","Button","保存","保存","as_save(0,'setColRequired()')","","","","btn_icon_saveNew",""} ,
 					{"true","","Button","批量修改","批量修改","batchModify()","","","","btn_icon_detail",""},
-				};
+			};
 		}
-		
 	}else if("0030".equals(phaseNo)&&"0010".equals(payType)){
 		sButtons = new String[][]{
 				{"true","","Button","付款结果回盘","付款结果回盘","cmb_tp_callback()","","","","btn_icon_delete",""},	
 		};
 	}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",""},
-				};
+				{"true","","Button","导出付款明细","导出付款明细","createFundIncomeExcel()","","","","btn_icon_up",""},		
+		};
+	}
+	if("ReadOnly".equals(rightType)){
+		sButtons = new String[][]{
+				{"true","","Button","导出付款明细","导出付款明细","createFundIncomeExcel()","","","","btn_icon_up",""},
+			};
 	}
 %><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
 <script type="text/javascript">
@@ -160,41 +161,19 @@
 		}	 	
 	} */
 	function createFundIncomeExcel(){
-		var rows = getCheckedRows(0);
-		if(rows.length == 0){
-			AsDebug.showMessage("提示","请选择一行数据！","","",true);
-			return;
-		}
-		var id="";
-		var ids=getItemValueArray(0,'ID');
-		var ebankStatus=getItemValueArray(0,'Ebank_Status');
-		var rows = getSelRows(0);
-		var flag=false;
-		var nu="";
-		for(var i=0;i<ids.length;i++){
-			id+="△'"+ids[i]+"'";
-			if(eval(ebankStatus[i])>1){
-				flag=true;
-				nu+=","+eval(rows[i]+1);
-			}
-		}
-		if(flag){
-		    nu="第"+nu.substring(1)+"行,已导出了,请选其中付款明细导出";
-			AsDebug.showMessage("提示:",nu,"","", true); 
-			return;
-		}
+		
 		
 		var param={};
 		var tempParam={};
 		var sparam="";
-		param["templateNo"]="d7f8a7e3972940069b96018488f193d3";//选择的模板ID
+		param["templateNo"]="c6e0c939424545b0a3bf458ce22d9814";//选择的模板ID
 		tempParam["OBJECTTYPE"]="ActualPaymentCarApply";
-		tempParam["FLOW_UNID"]=new Date().Format("yyyyMMddhhmmssSS");
+		tempParam["FLOW_UNID"]="<%=flowunid%>";
 		tempParam["CurUserId"]="<%=CurUser.getUserID()%>"
 		tempParam["fileSaveMode"]="<%=sFileSaveMode%>";
 		tempParam["fileSavePath"]="<%=sFileSavePath%>";
 		tempParam["fileNameType"]="<%=sFileNameType%>";
-		tempParam["ids"]=id.substring(1);
+		
 		param["templateParam"]=JSON.stringify(tempParam).replace(/,/g,"@");
 		for(var key in param){
 		   if(sparam.length>0){sparam+=",";}
@@ -202,16 +181,14 @@
 		}
 		var result=RunJavaMethodTrans("com.tenwa.officetempalte.action.CreateOfficeAction","createOfficeByTemplate",sparam);
 		if(result!="success"){
-		    alert("生成文件失败!");
+		    alert("导出失败!");
 		    return;
 		}else{
 			var attributeID = AsControl.RunJsp("/Tenwa/Lease/Flow/Rent/BatchIncome/GetLBDocAttributeID.jsp",
 					"FLOW_UNID="+tempParam["FLOW_UNID"]+"&OBJECTTYPE="+tempParam["OBJECTTYPE"]);
-	        if(attributeID!=""){
-	         RunJavaMethodTrans("com.tenwa.officetempalte.action.CreateOfficeAction","createFundIncomeExcel","ids="+tempParam["ids"]);
-	         downloadFile(attributeID);
-	         reloadSelf();
-	        }
+	        downloadFile(attributeID);
+	        reloadSelf();
+	        
 		}
 	}
 	function downloadFile(id){

WebContent/WEB-INF/etc/jbo/jbo_prd.xml

@@ -88,7 +88,7 @@
 				<attribute name="GPS_VENDOR" label="GPS供应商" type="STRING" length="32"/>
 				<attribute name="ManySubject" label="主体" type="STRING" length="32"/>
 				<attribute name="whether" label="是否活体检测" type="STRING" length="32"/>
-				<attribute name="licenseToSubject" label="车牌号对应主体" type="STRING" length="32"/>
+				
 			</attributes>
 			<manager>
 				<managerProperties>

src_jbo/jbo/prd/PRD_SPECIFIC_LIBRARY.java

@@ -137,8 +137,4 @@ public interface PRD_SPECIFIC_LIBRARY{
 	* 是否活体检测 STRING(32)<br>
 	*/
 	public static final String whether = "whether";
-	/**
-	* 车牌号对应主体 STRING(32)<br>
-	*/
-	public static final String licenseToSubject = "licenseToSubject";
 }

src_sql/投产SQL/v20200915/zhangbb0915.sql

@@ -46,4 +46,20 @@ Insert Into AWE_Role_Menu (roleid,menuid) Values ('099','30001001900120');
 Insert Into AWE_Role_Menu (roleid,menuid) Values ('299','30001001900120');
 Insert Into AWE_Role_Menu (roleid,menuid) Values ('399','30001001900120');
 
---
+-- 首付款差额放款数据字典更改
+delete from Code_Library where codeno='FeeType' and itemno='feetype5';
+Insert Into 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 ('FeeType','feetype5','首付款','','','1','','','FIRST_PAYMENT','pay_type_in','','','','','','','','',null,'','SYS_Designer','2020/08/10 14:53:09','','');
+
+-- 付款申请本次付款明细页面增加抵扣首付款
+Insert Into 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 ('LCFundPaymentTempInfo','0230','0055','1','','''''','FIRST_PAYMENT','String','','抵扣首付款','','1','Text','2','1','','','',null,'0','1','0','1','0',0,'','','','SYS_Designer','2020/08/10 11:17:19','SYS_Designer','2020/08/10 15:37:44','','','1','','','','');
+
+-- 实际付款明细excel模板
+insert into 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('c6e0c939424545b0a3bf458ce22d9814',NULL,'','实际付款明细导出','实际付款明细.xlsx','实际付款明细.xlsx','excel','create','',NULL,'','','','','','1','','','administrator','8009001','2020/08/11 14:50:02','administrator','8009001','2020/08/11 17:43:46','','');
+
+-- 实际付款明细excel标签
+insert into `BF_LABLECONFIG` (`ID`, `TAGNUMBER`, `TAGNAME`, `TITLE`, `TAGTYPE`, `VALUETYPE`, `VALUEFIELD`, `VALUEMETHOD`, `THOUSANDSFIELD`, `ISSHOEINDEX`, `REMARK`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`, `OPERATORCLASS`) values('e3237a3c6a38470983499c3a8e813c76','95','factManyOut','实际付款明细导出','tag_type3','value_type3','contract_no,customer_name,FACT_OBJECT,fact_money,fact_date,CLEAN_LEASE_MONEY,HANDLING_CHARGE_MONEY,CAUTION_MONEY,GPS_FEE,PURCHASE_TAX,INSURANCE_PREMIUM,INCIDENTAL','SELECT \r\n  lci.contract_no,\r\n  lul.customer_name,\r\n  O.FACT_OBJECT,\r\n  O.fact_money,\r\n  O.fact_date,\r\n  lcc.CLEAN_LEASE_MONEY,\r\n  lcc.HANDLING_CHARGE_MONEY,\r\n  lcc.CAUTION_MONEY,\r\n  lcc.GPS_FEE,\r\n  lcc.PURCHASE_TAX,\r\n  lcc.INSURANCE_PREMIUM,\r\n  lcc.INCIDENTAL\r\nFROM\r\n  lc_fund_income_temp O \r\n  LEFT JOIN LB_UNION_LESSEE lul \r\n    ON lul.contract_id = O.contract_id \r\n  LEFT JOIN LC_CALC_CONDITION lcc \r\n    ON lcc.contract_id = O.contract_id \r\n  LEFT JOIN LB_CONTRACT_INFO lci \r\n    ON lci.id = O.contract_id \r\n  LEFT JOIN DISTRIBUTOR_INFO di \r\n    ON lci.distributor_id = di.distributor_no \r\n  LEFT JOIN DISTRIBUTOR_ACCOUNT da \r\n    ON da.distributor_id = di.distributor_no \r\n  LEFT JOIN LC_FUND_INCOME_CALLBACK_DETAIL_TEMP ld \r\n    ON (\r\n      O.FLOWUNID = ld.flowunid \r\n      AND lci.id = ld.contract_id\r\n    )\r\n    WHERE \r\n     O.FLOWUNID=:{FLOW_UNID} AND\r\n     O.pay_type=\'pay_type_out\' AND da.is_main=\'Y\'','','N','','','','','','','','');
+
+-- 实际付款明细excel关联
+insert into `bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) values('697046c6df78483b80921743a22894c8','e3237a3c6a38470983499c3a8e813c76','c6e0c939424545b0a3bf458ce22d9814',NULL,NULL,NULL,NULL,NULL,NULL);
+
+