Merge branch 'develop' of git@git2.tenwa.com.cn:ApzlDev/apzl_leasing.git into develop

WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp

@@ -139,6 +139,16 @@
 	}else{
 		doTemp.setVisible("RENT_RATIO",false);	
 	}
+ 
+
+	if(CurUser.hasRole("401")){
+		doTemp.setVisible("DISCOUNT", false);
+	//	doTemp.setColumnAttribute("DISCOUNT","colvisible","0");
+	} 
+	if(CurUser.hasRole("800R00000013")||CurUser.hasRole("800R00000014")||CurUser.hasRole("800R00000015")){
+		doTemp.setVisible("YEAR_RATE", true);
+	}
+	
 	ASObjectWindowCalc dwTemp = new ASObjectWindowCalc(CurPage, doTemp,request);
 	
 	

WebContent/Accounting/LoanSimulation/RentPlanList.jsp

@@ -21,14 +21,13 @@
 	   doTemp.setDataQueryClass("com.tenwa.lease.flow.flowarchive.calcarchive.CalcRentListArachiveShow");
 	}
 	String Distributor=CurPage.getParameter("isDistributor");
+	String orgid = CurUser.getOrgID();
 	if("true".equals(Distributor)||CurUser.hasRole("401")){
 		doTemp.setVisible("CORPUS", false);
 		doTemp.setVisible("INTEREST", false);
 		doTemp.setVisible("CORPUS_BUSINESS", false);
 		doTemp.setVisible("INTEREST_BUSINESS", false);
-	}
-	String orgid = CurUser.getOrgID();
-	if("8009012002".equals(orgid)){
+	}else if(!"8009012002".equals(orgid)){
 		doTemp.setVisible("CORPUS", false);
 		doTemp.setVisible("INTEREST", false);
 	}

WebContent/AppMain/Logon/logon.css

@@ -11,10 +11,10 @@ body{
 /*登录页面logo更换  高42px  宽213px 格式*/
 .logo_pic{
 	float:left;
-	height:32px;
+	height:88px;
 	width:213px;
 	background:url(logo_amarsoft.png);
-	margin-top:280px;
+	margin-top:267px;
 	margin-left:90px;
 	display: inline;
 }

WebContent/Tenwa/Comm/Document/LBDocumentListInfo.jsp

@@ -28,7 +28,7 @@
 	}else if("proj".equals(type)){
 		otherWhere=" and O.proj_id='"+proj_id+"' order by O.INPUTTIME DESC";
 	}else if("contract".equals(type)){
-		otherWhere=" and (O.contract_id='"+contract_id+"' OR O.proj_id='"+proj_id+"') order by O.INPUTTIME DESC";
+		otherWhere=" and (O.contract_id='"+contract_id+"' OR O.proj_id='"+proj_id+"') ";
 	}
 	
 	

WebContent/Tenwa/Core/ChannelCRMManager/ChannelOrg/OrgTree.jsp

@@ -50,7 +50,7 @@ overflow: hidden;
     
 }
 </style>
-<div id="id_menu_tabs_menu" style="overflow:auto;width:380px;" oncontextmenu='cancelBubble(event);'  class="main_left">
+<div id="id_menu_tabs_menu" style="overflow:auto;width:400px;" oncontextmenu='cancelBubble(event);'  class="main_left">
 </div>
 <%
 String compClientID = request.getParameter("CompClientID");
@@ -68,7 +68,7 @@ jQuery(function(){
 		loadMask = new tracywindyLoadMask(document.body,"数据加载中 请稍后...");
     }
 	var height=$("body").height();
-	$("#id_menu_tabs_menu").height((height-30) <= 0 ? "100%" : height-30);
+	$("#id_menu_tabs_menu").height(height-30 <=0 ? "100%": height-30);
 	initDeptTree(sOrgId,"");
 });	
 

WebContent/Tenwa/Core/FlowManager/BaseFunction/BaseFlowListFunctionForTab.jspf

@@ -114,7 +114,7 @@ function backStep(){
 	if("BusinessApplyFlow"==param["FlowNo"]){
 		if("0030,0040,0050".indexOf(param["PhaseNo"])>-1){
 	 	    var sReturn = AsControl.RunJavaMethodTrans("com.tenwa.controller.LAElementConfigController","queryBusinessApproval","PhaseNo="+param["PhaseNo"]+",ObjectNo="+param["ObjectNo"]);//返回值: yes-有意见; no-无意见; error-查询出错
-            if("0020"==sReturn){
+            if("0070"==sReturn){
              if (!confirm('已选择同意是否确实要退回')) return false;
             }
 		}

WebContent/Tenwa/Core/InvoiceManager/TablesXML/RentInvoice/rent_invoice_plan.xml

@@ -43,7 +43,7 @@ select id,contractnumber,paymentnumber,customername,rentlist,plandate,planmoney,
           		rlrp.plan_list AS rentlist,
           		rlrp.plan_date AS plandate,
 		       	rlrp.rent AS planmoney,
-		        'rent' AS renttype,
+		        CONVERT('rent' USING utf8) AS renttype,
 		        invoiceinfo.interest_invoice_type AS rentinvoicetype,
 		        invoiceinfo.interest_rate AS rentrate,
 		        lccs.contract_id AS contractid
@@ -81,7 +81,7 @@ select id,contractnumber,paymentnumber,customername,rentlist,plandate,planmoney,
 					LEFT JOIN
 						(SELECT asset_type,lease_form,tax_reg_type,interest_rate,interest_invoice_type,corpus_rate,corpus_invoice_type,hand_rate,hand_invoice_type,service_rate,service_invoice_type,nominal_rate,nominal_invoice_type,caution_invoice_type FROM TAX_INFO WHERE CONTRACT_DATE='2016/05/01' AND before_after='after' AND asset_type='asset_type01') taxrate2 ON taxrate2.asset_type=lci.asset_type AND taxrate2.tax_reg_type=lcit.tax_reg_type AND taxrate2.lease_form=lci.lease_form 
 				) invoiceinfo on lci.id= invoiceinfo.id
-		        WHERE lci.rent_invoice_type in ('invoice_type03','invoice_type05') AND lccs.PLAN_STATUS>=31
+		        WHERE lccs.PLAN_STATUS>=31
 			UNION ALL
 			SELECT 
 	  			clrp.id AS id,
@@ -89,7 +89,7 @@ select id,contractnumber,paymentnumber,customername,rentlist,plandate,planmoney,
           		clrp.plan_list AS rentlist,
           		clrp.plan_date AS plandate,
           		clrp.corpus AS planmoney,
-          		'corpus' AS renttype,
+          		CONVERT('corpus' USING utf8) AS renttype,
           		invoiceinfo.corpus_invoice_type AS rentinvoicetype,
          		invoiceinfo.corpus_rate AS rentrate,
          		lccs.contract_id AS contractid
@@ -128,7 +128,7 @@ select id,contractnumber,paymentnumber,customername,rentlist,plandate,planmoney,
 				(SELECT asset_type,lease_form,tax_reg_type,interest_rate,interest_invoice_type,corpus_rate,corpus_invoice_type,hand_rate,hand_invoice_type,service_rate,service_invoice_type,nominal_rate,nominal_invoice_type,caution_invoice_type FROM TAX_INFO WHERE CONTRACT_DATE='2016/05/01' AND before_after='after' AND asset_type='asset_type01') taxrate2 ON taxrate2.asset_type=lci.asset_type AND taxrate2.tax_reg_type=lcit.tax_reg_type AND taxrate2.lease_form=lci.lease_form
 			where lci.sign_date>='2016/05/01'
 				) invoiceinfo on lci.id= invoiceinfo.id
-          	WHERE lci.rent_invoice_type='invoice_type04' AND lccs.PLAN_STATUS>=31
+          	WHERE lccs.PLAN_STATUS>=31
 		UNION ALL 
 		SELECT 
 	  		ilrp.id AS id,
@@ -136,7 +136,7 @@ select id,contractnumber,paymentnumber,customername,rentlist,plandate,planmoney,
           	ilrp.plan_list AS rentlist,
           	ilrp.plan_date AS plandate,
           	ilrp.interest AS planmoney,
-          	'interest' AS renttype,
+          	CONVERT('interest' USING utf8) AS renttype,
           	invoiceinfo.interest_invoice_type AS rentinvoicetype,
           	invoiceinfo.interest_rate AS rentrate,
           	lccs.contract_id AS contractid
@@ -175,7 +175,7 @@ select id,contractnumber,paymentnumber,customername,rentlist,plandate,planmoney,
 				(SELECT asset_type,lease_form,tax_reg_type,interest_rate,interest_invoice_type,corpus_rate,corpus_invoice_type,hand_rate,hand_invoice_type,service_rate,service_invoice_type,nominal_rate,nominal_invoice_type,caution_invoice_type FROM TAX_INFO WHERE CONTRACT_DATE='2016/05/01' AND before_after='after' AND asset_type='asset_type01') taxrate2 ON taxrate2.asset_type=lci.asset_type AND taxrate2.tax_reg_type=lcit.tax_reg_type AND taxrate2.lease_form=lci.lease_form 
 			where lci.sign_date>='2016/05/01'
 		) invoiceinfo on lci.id= invoiceinfo.id
-          WHERE lci.rent_invoice_type IN ('invoice_type01','invoice_type02','invoice_type04','invoice_type06') AND lccs.PLAN_STATUS>=31
+          WHERE lccs.PLAN_STATUS>=31
      	) rentplan
           LEFT JOIN LB_CONTRACT_INFO lci ON rentplan.contractid=lci.id
           LEFT JOIN lb_contract_invoice_type lcit ON lcit.contract_id=lci.id AND lcit.is_main='Y'
@@ -265,7 +265,7 @@ select id,contractnumber,paymentnumber,customername,rentlist,plandate,planmoney,
 					LEFT JOIN
 						(SELECT asset_type,lease_form,tax_reg_type,interest_rate,interest_invoice_type,corpus_rate,corpus_invoice_type,hand_rate,hand_invoice_type,service_rate,service_invoice_type,nominal_rate,nominal_invoice_type,caution_invoice_type FROM TAX_INFO WHERE CONTRACT_DATE='2016/05/01' AND before_after='after' AND asset_type='asset_type01') taxrate2 ON taxrate2.asset_type=lci.asset_type AND taxrate2.tax_reg_type=lcit.tax_reg_type AND taxrate2.lease_form=lci.lease_form 
 				) invoiceinfo on lci.id= invoiceinfo.id
-		        WHERE lci.rent_invoice_type in ('invoice_type03','invoice_type05') AND lccs.PLAN_STATUS>=31
+		        WHERE lccs.PLAN_STATUS>=31
 			UNION ALL
 			SELECT 
 	  			clrp.id AS id,
@@ -312,7 +312,7 @@ select id,contractnumber,paymentnumber,customername,rentlist,plandate,planmoney,
 				(SELECT asset_type,lease_form,tax_reg_type,interest_rate,interest_invoice_type,corpus_rate,corpus_invoice_type,hand_rate,hand_invoice_type,service_rate,service_invoice_type,nominal_rate,nominal_invoice_type,caution_invoice_type FROM TAX_INFO WHERE CONTRACT_DATE='2016/05/01' AND before_after='after' AND asset_type='asset_type01') taxrate2 ON taxrate2.asset_type=lci.asset_type AND taxrate2.tax_reg_type=lcit.tax_reg_type AND taxrate2.lease_form=lci.lease_form
 			where lci.sign_date>='2016/05/01'
 				) invoiceinfo on lci.id= invoiceinfo.id
-          	WHERE lci.rent_invoice_type='invoice_type04' AND lccs.PLAN_STATUS>=31
+          	WHERE lccs.PLAN_STATUS>=31
 		UNION ALL 
 		SELECT 
 	  		ilrp.id AS id,
@@ -359,7 +359,7 @@ select id,contractnumber,paymentnumber,customername,rentlist,plandate,planmoney,
 				(SELECT asset_type,lease_form,tax_reg_type,interest_rate,interest_invoice_type,corpus_rate,corpus_invoice_type,hand_rate,hand_invoice_type,service_rate,service_invoice_type,nominal_rate,nominal_invoice_type,caution_invoice_type FROM TAX_INFO WHERE CONTRACT_DATE='2016/05/01' AND before_after='after' AND asset_type='asset_type01') taxrate2 ON taxrate2.asset_type=lci.asset_type AND taxrate2.tax_reg_type=lcit.tax_reg_type AND taxrate2.lease_form=lci.lease_form 
 			where lci.sign_date>='2016/05/01'
 		) invoiceinfo on lci.id= invoiceinfo.id
-          WHERE lci.rent_invoice_type IN ('invoice_type01','invoice_type02','invoice_type04','invoice_type06') AND lccs.PLAN_STATUS>=31
+          WHERE lccs.PLAN_STATUS>=31
      	) rentplan
           LEFT JOIN LB_CONTRACT_INFO lci ON rentplan.contractid=lci.id
           LEFT JOIN lb_contract_invoice_type lcit ON lcit.contract_id=lci.id AND lcit.is_main='Y'

WebContent/Tenwa/Lease/Flow/CollectionAudit/LcCustomerBankVertifyList.jsp

@@ -17,7 +17,7 @@
 
 	//0、是否展示 1、	权限控制  2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码	6、	7、	8、	9、图标，CSS层叠样式 10、风格
 	String sButtons[][] = {
-		{"true","All","Button","验证银行卡信息","验证银行卡信息","verifyBankInfo()","","","","btn_icon_add",""}
+		{"false","All","Button","验证银行卡信息","验证银行卡信息","verifyBankInfo()","","","","btn_icon_add",""}
 		//{"true","All","Button","编辑","编辑","viewAndEdit()","","","","btn_icon_add",""},
 	};
 %><%@include file="/Frame/resources/include/ui/include_list.jspf"%>

WebContent/Tenwa/Lease/Flow/Comm/LCContractTerminate/LCContractTerminateInfo.jsp

@@ -8,9 +8,9 @@
     */
 
 	String flowunid = CurPage.getParameter("FlowUnid");
-String RightType = CurPage.getParameter("RightType");//Ñ¡Ôñģʽ
-String ishistory=CurPage.getParameter("IsHistory");
-String nodeNo=CurPage.getParameter("NodeNo");
+    String RightType = CurPage.getParameter("RightType");//Ñ¡Ôñģʽ
+    String ishistory=CurPage.getParameter("IsHistory");
+    String nodeNo=CurPage.getParameter("NodeNo");
 
 	BizObject condition=JBOFactory.createBizObjectQuery("jbo.app.tenwa.calc.LC_CALC_CONDITION_TEMP","flowunid=:flowunid").setParameter("flowunid", flowunid).getSingleResult(false);
 	String paymentnumber=condition.getAttribute("payment_number").getString();
@@ -78,6 +78,9 @@ String nodeNo=CurPage.getParameter("NodeNo");
 			setItemValue(0,getRow(),"REPURCHASE_RATIO","100");
 			//回购本金
 			setItemValue(0,getRow(),"REPURCHASE_MONEY",remaincorpus);
+			
+			setItemValue(0,getRow(),"FIST_RENT",terminateInfo.fist_rent);
+
 		}
 	}
 	
@@ -128,6 +131,7 @@ String nodeNo=CurPage.getParameter("NodeNo");
 	
 	jQuery(function(){
 		setItemValue(0,0,"flowunid","<%=flowunid%>");
+		setItemValue(0,0,"PAYDAY_DATE","<%=StringFunction.getToday()%>");  
 		//设置商定罚息带出逾期罚息
 		setItemValue(0,0,"AGREED_PENALTY",getItemValue(0,0,'DUN_PENALTY'));
 		//判断其他应收和其他应退是否为空

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

@@ -11,7 +11,7 @@
 	String sTempletNo = "ActualPaymentBatchModify";//--Ä£°åºÅ--
 	ASObjectModel doTemp = new ASObjectModel(sTempletNo);
 	if("0020".equals(phaseNo)){
-		doTemp.setVisible("EBANK_STATUS", false);
+		//doTemp.setVisible("EBANK_STATUS", false);
 		doTemp.setReadOnly("BANK", true);
 		doTemp.setRequired("BANK", false);
 	}

WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp

@@ -273,12 +273,12 @@
 		var secondchoice = getItemValue(0,0,"secondchoice");
 		if(secondchoice==""){
 			setItemRequired(0,"InterOpinion2",false);
-			setItemRequired(0,"DistriOpinion2",false);
+			//setItemRequired(0,"DistriOpinion2",false);
 			$("#SECONDOPINION").removeAttr("disabled");
 		}
 		if(secondchoice=="0020"){
 			setItemRequired(0,"InterOpinion2",true);
-			setItemRequired(0,"DistriOpinion2",false);
+			//setItemRequired(0,"DistriOpinion2",false);
 			$("#SECONDOPINION").removeAttr("disabled");
 			var obj=document.getElementById('SECONDOPINION');
 			for(var i=0;i<7;i++){
@@ -289,7 +289,7 @@
 		if(secondchoice=="0010"){
 			setItemRequired(0,"A_div_1240",true);
 			setItemRequired(0,"InterOpinion2",false);
-			setItemRequired(0,"DistriOpinion2",true);
+			//setItemRequired(0,"DistriOpinion2",true);
 			$("#SECONDOPINION").removeAttr("disabled");
 			var obj=document.getElementById('SECONDOPINION'); 
 			for(var i=0;i<7;i++){
@@ -299,14 +299,14 @@
 		}
  		if(secondchoice=="0030"){
  			setItemRequired(0,"InterOpinion2",false);
-			setItemRequired(0,"DistriOpinion2",true);
+			//setItemRequired(0,"DistriOpinion2",true);
 			setItemRequired(0,"secondopinion",false);
 			setItemValue(0,0,"secondopinion","");
 			$("#SECONDOPINION").attr("disabled","disabled");
 		} 
 		if(secondchoice=="0040"){
 			setItemRequired(0,"InterOpinion2",false);
-			setItemRequired(0,"DistriOpinion2",true);
+			//setItemRequired(0,"DistriOpinion2",true);
 			setItemValue(0,0,"secondopinion","");
 			$("#SECONDOPINION").attr("disabled","disabled");
 		}
@@ -317,13 +317,13 @@
 		var thirdchoice = getItemValue(0,0,"thirdchoice");
 		if(thirdchoice==""){
 			setItemRequired(0,"InterOpinion3",false);
-			setItemRequired(0,"DistriOpinion3",false);
+			//setItemRequired(0,"DistriOpinion3",false);
 			$("#THIRDOPINION").removeAttr("disabled");
 		}
 		if(thirdchoice=="0010"){
 			setItemRequired(0,"A_div_1260",true);
 			setItemRequired(0,"InterOpinion3",false);
-			setItemRequired(0,"DistriOpinion3",true);
+			//setItemRequired(0,"DistriOpinion3",true);
 			$("#THIRDOPINION").removeAttr("disabled");
 			var obj=document.getElementById('THIRDOPINION'); 
 			for(var i=0;i<7;i++){
@@ -333,7 +333,7 @@
 		}
 		if(thirdchoice=="0020"){
 			setItemRequired(0,"InterOpinion3",true);
-			setItemRequired(0,"DistriOpinion3",false);
+			//setItemRequired(0,"DistriOpinion3",false);
 			$("#THIRDOPINION").removeAttr("disabled");
 			var obj=document.getElementById('THIRDOPINION');
 			for(var i=0;i<7;i++){
@@ -343,14 +343,14 @@
 		}
 		if(thirdchoice=="0030"){
 			setItemRequired(0,"InterOpinion3",false);
-			setItemRequired(0,"DistriOpinion3",true);
+			//setItemRequired(0,"DistriOpinion3",true);
 			setItemRequired(0,"thirdopinion",false);
 			setItemValue(0,0,"thirdopinion","");
 			$("#THIRDOPINION").attr("disabled","disabled");
 		}
 		if(thirdchoice=="0040"){
 			setItemRequired(0,"InterOpinion3",false);
-			setItemRequired(0,"DistriOpinion3",true);
+			//setItemRequired(0,"DistriOpinion3",true);
 			setItemValue(0,0,"thirdopinion","");
 			$("#THIRDOPINION").attr("disabled","disabled");
 		}

WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerInfo.jsp

@@ -72,6 +72,7 @@
 	function changeChildrensNumber(){//已婚时显示配偶信息页面
 		var marriage = getItemValue(0,0,"MARRIAGE");
 		if("01" == marriage){
+			setItemRequired(0, "childrens_number", true);
 			$("#CHILDRENS_NUMBER").removeAttr("ReadOnly");//删除子女人数字段只读属性
 			$("#A_Group_0030").attr("style","display:block;");
 			changeFamilyRequired();

WebContent/WEB-INF/etc/app/component/component-config.xml

@@ -1085,7 +1085,7 @@
 	
 	<Component FORMAT="1" ID="OTHER_INCOME" NAME="其他收入" STATUS="2" TYPE="PRD0315"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收取方向" PARAMETERID="CostType01" PARAMETERNAME="收取方向" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收付节点" PARAMETERID="CostType02" PARAMETERNAME="收付节点" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收付对象" PARAMETERID="CostType03" PARAMETERNAME="收付对象" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="科目编码" PARAMETERID="CostType04" PARAMETERNAME="科目编码" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="是否显示比例" PARAMETERID="CostType05" PARAMETERNAME="是否显示比例" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="输入方式" PARAMETERID="CostType06" PARAMETERNAME="输入方式" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="比例参照费用" PARAMETERID="CostType07" PARAMETERNAME="比例参照费用" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="金额限定" PARAMETERID="CostType08" PARAMETERNAME="金额限定" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="比例限定" PARAMETERID="CostType09" PARAMETERNAME="比例限定" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="是否参与IRR/XIRR核算" PARAMETERID="CostType10" PARAMETERNAME="是否参与IRR/XIRR核算" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="显示次序" PARAMETERID="DISPLAY_ORDER" PARAMETERNAME="显示次序" PRIGHTTYPE="Required"/></Parameters></Component>
 	<Component FORMAT="1" ID="OTHER_EXPENDITURE" NAME="其他支出" STATUS="2" TYPE="PRD0315"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收取方向" PARAMETERID="CostType01" PARAMETERNAME="收取方向" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收付节点" PARAMETERID="CostType02" PARAMETERNAME="收付节点" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收付对象" PARAMETERID="CostType03" PARAMETERNAME="收付对象" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="科目编码" PARAMETERID="CostType04" PARAMETERNAME="科目编码" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="是否显示比例" PARAMETERID="CostType05" PARAMETERNAME="是否显示比例" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="输入方式" PARAMETERID="CostType06" PARAMETERNAME="输入方式" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="比例参照费用" PARAMETERID="CostType07" PARAMETERNAME="比例参照费用" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="金额限定" PARAMETERID="CostType08" PARAMETERNAME="金额限定" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="比例限定" PARAMETERID="CostType09" PARAMETERNAME="比例限定" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="是否参与IRR/XIRR核算" PARAMETERID="CostType10" PARAMETERNAME="是否参与IRR/XIRR核算" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="显示次序" PARAMETERID="DISPLAY_ORDER" PARAMETERNAME="显示次序" PRIGHTTYPE="Required"/></Parameters></Component>
-	<Component FORMAT="1" ID="even_rent_day" NAME="等额租金按日计息" STATUS="2" TYPE="PRD0301"><Parameters><Parameter ARIGHTTYPE="All" DISPLAYNAME="默认还款日" PARAMETERID="DefaultDueDay" PARAMETERNAME="默认还款日" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="默认还款周期" PARAMETERID="PayFrequencyType" PARAMETERNAME="默认还款周期" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="指定周期(月)" PARAMETERID="PayFrequency" PARAMETERNAME="指定周期" PRIGHTTYPE="All"/></Parameters></Component><Component FORMAT="1" ID="OVER_INCOME" NAME="是否允许超期核销" STATUS="2" TYPE="PRD0307"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="是否允许超期核销" PARAMETERID="over_income" PARAMETERNAME="是否允许超期核销" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="1" ID="PenaltyRule" NAME="罚息特殊处理规则" STATUS="2" TYPE="PRD0307"><Parameters><Parameter ARIGHTTYPE="None" DISPLAYNAME="罚息特殊处理规则" PARAMETERID="PenaltyRule" PARAMETERNAME="罚息特殊处理规则" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="1" ID="ADJUST_INTEREST" NAME="利率类型" STATUS="1" TYPE="PRD0320"><Parameters><Parameter ARIGHTTYPE="None" DISPLAYNAME="利率类型" PARAMETERID="ISADJUST_INTEREST" PARAMETERNAME="是否调息" PRIGHTTYPE="None"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="调息计算方式" PARAMETERID="rate_float_type" PARAMETERNAME="调息计算方式" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="调息生效节点" PARAMETERID="adjust_style" PARAMETERNAME="调息生效节点" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="1" ID="ISSUBSECTION" NAME="是否支持分段" STATUS="1" TYPE="PRD0321"><Parameters/></Component><Component FORMAT="1" ID="FIRSTRENT_DAY" NAME="是否首期按日计息" STATUS="1" TYPE="PRD0322"/><Component FORMAT="1" ID="LASTRENT_DAY" NAME="是否末期按日计息" STATUS="1" TYPE="PRD0322"/><Component FORMAT="1" ID="RentRound" NAME="租金圆整" STATUS="1" TYPE="PRD0323"><Parameters><Parameter ARIGHTTYPE="None" DISPLAYNAME="租金圆整" PARAMETERID="RentRound" PARAMETERNAME="租金圆整" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="租金圆整方式" PARAMETERID="RentRoundType" PARAMETERNAME="租金圆整方式" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="2" ID="DocList" NAME="流程、资料清单类别、资料清单" STATUS="1" TYPE="PRD0412"><Parameters><Parameter ARIGHTTYPE="None" DISPLAYNAME="流程名称" PARAMETERID="FLOW_INFO" PARAMETERNAME="流程名称" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="类型" PARAMETERID="TYPE" PARAMETERNAME="类型" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="资料清单" PARAMETERID="DocList" PARAMETERNAME="资料清单" PRIGHTTYPE="All"/></Parameters><ChildrenComponents><ChildrenComponent FORMAT="2" ID="资料组件配置" NAME="DOC_GROUP_CONFIG" STATUS="1" TYPE="PRD0412"><Parameters><Parameter ARIGHTTYPE="None" DISPLAYNAME="序号" PARAMETERID="POSITION" PARAMETERNAME="序号" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="主体类型" PARAMETERID="MainType" PARAMETERNAME="主体类型" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="资料清单" PARAMETERID="DocList" PARAMETERNAME="资料清单" PRIGHTTYPE="Required"/></Parameters></ChildrenComponent></ChildrenComponents></Component><Component FORMAT="2" ID="DOC_GROUP_CONFIG" NAME="资料组合配置" STATUS="1" TYPE="PRD0413"><Parameters><Parameter ARIGHTTYPE="None" DISPLAYNAME="序号" PARAMETERID="POSITION" PARAMETERNAME="序号" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="主体类型" PARAMETERID="MainType" PARAMETERNAME="主体类型" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="资料清单" PARAMETERID="DocList" PARAMETERNAME="资料清单" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="2" ID="FlowAccessory" NAME="流程附件" STATUS="1" TYPE="PRD0414"><Parameters><Parameter ARIGHTTYPE="None" DISPLAYNAME="流程名称" PARAMETERID="FLOW_INFO" PARAMETERNAME="流程名称" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="资料清单" PARAMETERID="DocList" PARAMETERNAME="资料清单" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="2" ID="AssessmentReport" NAME="流程、评分模型" STATUS="1" TYPE="PRD0415"><Parameters><Parameter ARIGHTTYPE="None" DISPLAYNAME="流程名称" PARAMETERID="FLOW_INFO" PARAMETERNAME="流程名称" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="评估报告" PARAMETERID="AssessReport" PARAMETERNAME="评估报告" PRIGHTTYPE="Required"/></Parameters></Component>
+	<Component FORMAT="1" ID="even_rent_day" NAME="等额租金按日计息" STATUS="2" TYPE="PRD0301"><Parameters><Parameter ARIGHTTYPE="All" DISPLAYNAME="默认还款日" PARAMETERID="DefaultDueDay" PARAMETERNAME="默认还款日" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="默认还款周期" PARAMETERID="PayFrequencyType" PARAMETERNAME="默认还款周期" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="指定周期(月)" PARAMETERID="PayFrequency" PARAMETERNAME="指定周期" PRIGHTTYPE="All"/></Parameters></Component><Component FORMAT="1" ID="OVER_INCOME" NAME="是否允许超期核销" STATUS="2" TYPE="PRD0307"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="是否允许超期核销" PARAMETERID="over_income" PARAMETERNAME="是否允许超期核销" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="1" ID="PenaltyRule" NAME="罚息特殊处理规则" STATUS="2" TYPE="PRD0307"><Parameters><Parameter ARIGHTTYPE="None" DISPLAYNAME="罚息特殊处理规则" PARAMETERID="PenaltyRule" PARAMETERNAME="罚息特殊处理规则" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="1" ID="ADJUST_INTEREST" NAME="利率类型" STATUS="1" TYPE="PRD0320"><Parameters><Parameter ARIGHTTYPE="None" DISPLAYNAME="利率类型" PARAMETERID="ISADJUST_INTEREST" PARAMETERNAME="是否调息" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="调息计算方式" PARAMETERID="rate_float_type" PARAMETERNAME="调息计算方式" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="调息生效节点" PARAMETERID="adjust_style" PARAMETERNAME="调息生效节点" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="1" ID="ISSUBSECTION" NAME="是否支持分段" STATUS="1" TYPE="PRD0321"><Parameters/></Component><Component FORMAT="1" ID="FIRSTRENT_DAY" NAME="是否首期按日计息" STATUS="1" TYPE="PRD0322"/><Component FORMAT="1" ID="LASTRENT_DAY" NAME="是否末期按日计息" STATUS="1" TYPE="PRD0322"/><Component FORMAT="1" ID="RentRound" NAME="租金圆整" STATUS="1" TYPE="PRD0323"><Parameters><Parameter ARIGHTTYPE="None" DISPLAYNAME="租金圆整" PARAMETERID="RentRound" PARAMETERNAME="租金圆整" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="租金圆整方式" PARAMETERID="RentRoundType" PARAMETERNAME="租金圆整方式" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="2" ID="DocList" NAME="流程、资料清单类别、资料清单" STATUS="1" TYPE="PRD0412"><Parameters><Parameter ARIGHTTYPE="None" DISPLAYNAME="流程名称" PARAMETERID="FLOW_INFO" PARAMETERNAME="流程名称" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="类型" PARAMETERID="TYPE" PARAMETERNAME="类型" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="资料清单" PARAMETERID="DocList" PARAMETERNAME="资料清单" PRIGHTTYPE="All"/></Parameters><ChildrenComponents><ChildrenComponent FORMAT="2" ID="资料组件配置" NAME="DOC_GROUP_CONFIG" STATUS="1" TYPE="PRD0412"><Parameters><Parameter ARIGHTTYPE="None" DISPLAYNAME="序号" PARAMETERID="POSITION" PARAMETERNAME="序号" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="主体类型" PARAMETERID="MainType" PARAMETERNAME="主体类型" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="资料清单" PARAMETERID="DocList" PARAMETERNAME="资料清单" PRIGHTTYPE="Required"/></Parameters></ChildrenComponent></ChildrenComponents></Component><Component FORMAT="2" ID="DOC_GROUP_CONFIG" NAME="资料组合配置" STATUS="1" TYPE="PRD0413"><Parameters><Parameter ARIGHTTYPE="None" DISPLAYNAME="序号" PARAMETERID="POSITION" PARAMETERNAME="序号" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="主体类型" PARAMETERID="MainType" PARAMETERNAME="主体类型" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="资料清单" PARAMETERID="DocList" PARAMETERNAME="资料清单" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="2" ID="FlowAccessory" NAME="流程附件" STATUS="1" TYPE="PRD0414"><Parameters><Parameter ARIGHTTYPE="None" DISPLAYNAME="流程名称" PARAMETERID="FLOW_INFO" PARAMETERNAME="流程名称" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="资料清单" PARAMETERID="DocList" PARAMETERNAME="资料清单" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="2" ID="AssessmentReport" NAME="流程、评分模型" STATUS="1" TYPE="PRD0415"><Parameters><Parameter ARIGHTTYPE="None" DISPLAYNAME="流程名称" PARAMETERID="FLOW_INFO" PARAMETERNAME="流程名称" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="评估报告" PARAMETERID="AssessReport" PARAMETERNAME="评估报告" PRIGHTTYPE="Required"/></Parameters></Component>
 	<Component FORMAT="1" ID="PENALTY_RATE_DAY" NAME="罚息日利率" STATUS="1" TYPE="PRD0308">
 		<Parameters>
 			<Parameter ARIGHTTYPE="Required" DISPLAYNAME="罚息日利率%%" PARAMETERID="PENALTY_RATE_DAY" PARAMETERNAME="罚息日利率" PRIGHTTYPE="Required"/>

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

@@ -305,6 +305,13 @@
 				<attribute name="UPDATEUSERID" label="更新人" type="STRING" length="32"/>
 				<attribute name="UPDATEORGID" label="更新部门" type="STRING" length="32"/>
 				<attribute name="UPDATETIME" label="更新时间" type="STRING" length="32"/>
+			    <attribute name="PAYDAY_DATE" label="商定时间" type="STRING" length="100"/>
+			    <attribute name="NOMINAL_PRICE" label="留购价" type="DOUBLE" length="22" scale="2"/>
+			    <attribute name="SDNOMINAL_PRICE" label="商定留购价" type="DOUBLE" length="22" scale="2"/>
+			    <attribute name="SDHANDLING_CHARGE" label="商定手续费" type="DOUBLE" length="22" scale="2"/>
+			    <attribute name="FIST_RENT" label="一年内未还租金" type="DOUBLE" length="22" scale="2"/>
+			    <attribute name="REPAYMENT_INTEREST" label="还款日差利息" type="DOUBLE" length="22" scale="2"/>
+			   
 			</attributes>
 			<manager>
 				<managerProperties>
@@ -345,6 +352,12 @@
 				<attribute name="UPDATEUSERID" label="更新人" type="STRING" length="32"/>
 				<attribute name="UPDATEORGID" label="更新部门" type="STRING" length="32"/>
 				<attribute name="UPDATETIME" label="更新时间" type="STRING" length="32"/>
+				<attribute name="PAYDAY_DATE" label="商定时间" type="STRING" length="100"/>
+                <attribute name="NOMINAL_PRICE" label="留购价" type="DOUBLE" length="22" scale="2"/>
+			    <attribute name="SDNOMINAL_PRICE" label="商定留购价" type="DOUBLE" length="22" scale="2"/>
+			    <attribute name="SDHANDLING_CHARGE" label="商定手续费" type="DOUBLE" length="22" scale="2"/>
+			    <attribute name="FIST_RENT" label="一年内未还租金" type="DOUBLE" length="22" scale="2"/>
+			    <attribute name="REPAYMENT_INTEREST" label="还款日差利息" type="DOUBLE" length="22" scale="2"/>
 			</attributes>
 			<manager>
 				<managerProperties>

WebContent/logon.html

@@ -47,10 +47,10 @@
 		</div>
 	</div>
     <div class="logo_pic"></div>
-	<div class="logo_slogan">领先的融资租赁行业信息服务提供商</div>
+	<div class="logo_slogan">现代金融租赁服务企业</div>
 </div>	
 <div class="logon_footer">
-   <div>Copyright @2000-2018 Amarsoft all rights reserved.</div>
+   <div></div>
 </div>
 </form>
 <a class="logon_sysstyle" href="javascript:void(0)"></a>

calc/com/tenwa/reckon/executor/RentCalHelper.java

@@ -141,16 +141,16 @@ public class RentCalHelper {
 			 + " sum(case when  DATE_FORMAT(t.plandate,'%Y/%m/%d') >  DATE_FORMAT('"+this.paydayAdjust+"','%Y/%m/%d')   then t.remaininterest else 0 end ) remaininterest, "
 			 +" sum(case when  DATE_FORMAT(t.plandate,'%Y/%m/%d') >  DATE_FORMAT('"+this.paydayAdjust+"','%Y/%m/%d')  then t.corpus else 0 end ) remainfincorpus,"
 			 +" sum(case when DATE_FORMAT( t.plandate,'%Y/%m/%d') >  DATE_FORMAT('"+this.paydayAdjust+"','%Y/%m/%d')   then t.interest else 0 end ) remainfininterest,"
-			 +" sum(case when  DATE_FORMAT( t.plandate,'%Y/%m/%d')  <= DATE_FORMAT('"+this.paydayAdjust+"','%Y/%m/%d')   then t.overduerent else 0 end ) overduerent "
+			 +" sum(case when  DATE_FORMAT( t.plandate,'%Y/%m/%d')  <= DATE_FORMAT('"+this.paydayAdjust+"','%Y/%m/%d')   then t.overduerent else 0 end ) overduerent,min(t.rent*(12-t.cou))  fist_rent "
 			 + "       from ("
 	         + "       select "
 	         + "          t1.corpus-ifnull(t2.sumincomecorpus,0) remaincorpus,"
 	         + "          t1.interestbusiness - ifnull(t2.sumincomeinterest,0) remaininterest,"
-	         + "          t1.rent - ifnull(t2.sumincomerent,0) overduerent,"
+	         + "          t1.rent - ifnull(t2.sumincomerent,0) overduerent, t1.rent,"
 	         + "          t1.corpus,"
 	         + "          t1.interest,"
 	         + "          t1.plandate,"
-	         + "          t1.planlist"
+	         + "          t1.planlist,IFNULL(t2.cou,0) cou"
 	         + "           from  ("
 	         + "           select cfrp.plan_date plandate,"
 	         + "           cfrp.plan_list planlist,"
@@ -168,7 +168,7 @@ public class RentCalHelper {
 	         + "          ,sum(cfri.interest ) sumincomeinterest,"
 	         + "          sum( cfri.rent ) sumincomerent,"
 	         + "          min(cfri.contract_id) contractid,"
-	         + "          cfri.plan_list planlist"
+	         + "          cfri.plan_list planlist,count(1)  cou"
 	         + "           from  LC_RENT_INCOME cfri "
 	         + "          where cfri.contract_id = ? and payment_number=?"
 	         + "          group by cfri.plan_list"
@@ -183,6 +183,7 @@ public class RentCalHelper {
 			for(String key : detailInfo.keySet()){
 				jsonObject.appendElement(key, detailInfo.get(key));
 			}
+			System.out.println(jsonObject.toString());
 			return JSONEncoder.encode(jsonObject);
 		}catch(Exception e){
 			tx.rollback();
@@ -199,8 +200,7 @@ public class RentCalHelper {
 	 */
 	public String getTerminateOtherInfo() throws Exception {
 		JSONObject jsonObject = JSONObject.createObject();
-		
-		String fundSql = "select t2.sumplanin-ifnull(t1.sumchargein,0) fundin,t2.sumplanout- ifnull(t1.sumchargeout,0) fundout from  ( "
+		String fundSql = "select t2.sumplanin-ifnull(t1.sumchargein,0) fundin,t2.sumplanout- ifnull(t1.sumchargeout,0) fundout,max(lc.NOMINAL_PRICE) nominalprice from  ( "
 				+ " select sum(case ffc.pay_type when 'pay_type_in' then ffc.fact_money else 0 end )sumchargein, "
 				+ " sum(case ffc.pay_type when 'pay_type_out' then ffc.fact_money else 0 end )sumchargeout, "
 				+ " min(ffc.contract_id) contractid,min(ffc.payment_number) paymentnumber "
@@ -211,7 +211,7 @@ public class RentCalHelper {
 				+ "	min(ffp.contract_id) contractid,min(ffp.payment_number) paymentnumber "
 				+ "	from  LC_FUND_PLAN ffp  "
 				+ " where ffp.contract_id = ? and ffp.payment_number=?"
-				+ " )t2 on t1.contractid = t2.contractid and t1.paymentnumber=t2.paymentnumber";
+				+ " )t2 on t1.contractid = t2.contractid and t1.paymentnumber=t2.paymentnumber left join lc_calc_condition  lc on lc.CONTRACT_ID=t2.contractid";
 		if("ORACLE".equals(InitDBType.DBTYPE)){
 			fundSql=fundSql.replaceAll("ifnull", "nvl");
 		}
@@ -224,9 +224,11 @@ public class RentCalHelper {
 				Map<String, String> fundMap =  list.get(0);
 				jsonObject.appendElement("OTHER_IN",fundMap.get("fundin"));
 				jsonObject.appendElement("OTHER_OUT",fundMap.get("fundout"));
+				jsonObject.appendElement("NOMINAL_PRICE",fundMap.get("nominalprice"));
 			}else{
 				jsonObject.appendElement("OTHER_IN","0");
 				jsonObject.appendElement("OTHER_OUT","0");
+				jsonObject.appendElement("NOMINAL_PRICE","0");
 			}
 		} catch (JBOException e) {
 			tx.rollback();

src_cmb/com/tenwa/sdk/controller/CmbToCallbackController.java

@@ -147,11 +147,18 @@ public class CmbToCallbackController extends BaseFlowStartAction {
 						callback_detail_bo.setAttributeValue("RTNNAR",callback_detail.getRTNNAR());
 						this.initTabeUserInfo(callback_detail_bo);
 						callback_detail_bom.saveObject(callback_detail_bo);
+						String RTNFLG = callback_detail.getRTNFLG();
+						String sql1="";
+						if("S".equals(RTNFLG)){
+							 sql1 = "update O set O.EBANK_STATUS='05' where O.FLOWUNID='"+FLOWUNID+"'";	
+						}else{
+							 sql1 = "update O set O.EBANK_STATUS='04' where O.FLOWUNID='"+FLOWUNID+"'";
+						}
+						JBOFactory.createBizObjectQuery(LC_FUND_INCOME_TEMP.CLASS_NAME,sql1).executeUpdate();
 					}
 					map.put("code", "0") ;
 					map.put("msg", "²éѯ½á¹ûˢгɹ¦") ;
 					JSONObject jsonObj = JSONObject.fromObject(map);
-					sql();
 					return jsonObj.toString();
 				}else {
 					sql();
@@ -179,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.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+"'" ;
+				+" 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();
 	}
 }

src_tenwa/com/tenwa/controller/LAElementConfigController.java

@@ -65,13 +65,13 @@ public class LAElementConfigController {
 		BizObject bo = lleManager.createQuery("FLOWUNID=:FLOWUNID ").setParameter("FLOWUNID",this.getObjectNo()).getSingleResult(false);
 		switch (this.getPhaseNo()) {
 		case "0030":
-			meagess=bo!=null?bo.getAttribute(VI_BUSINESS_APPROVAL.firstchoice).toString():"false";
+			meagess=bo!=null?bo.getAttribute(VI_BUSINESS_APPROVAL.firstopinion).toString():"false";
 			break;
 	    case "0040":
-	    	meagess=meagess=bo!=null?bo.getAttribute(VI_BUSINESS_APPROVAL.secondchoice).toString():"false";;
+	    	meagess=meagess=bo!=null?bo.getAttribute(VI_BUSINESS_APPROVAL.secondopinion).toString():"false";;
 			break;
 	    case "0050":
-	    	meagess=meagess=bo!=null?bo.getAttribute(VI_BUSINESS_APPROVAL.thirdchoice).toString():"false";;
+	    	meagess=meagess=bo!=null?bo.getAttribute(VI_BUSINESS_APPROVAL.thirdopinion).toString():"false";;
 	 		break;
 		default:
 			meagess="false";

src_tenwa/com/tenwa/flow/fund/actualpayment/CopyFundIncomeTempToFormalCar.java

@@ -8,11 +8,14 @@ import jbo.app.tenwa.calc.LB_ACTUAL_PAYMENT_INFO;
 import jbo.app.tenwa.calc.LB_ACTUAL_PAYMENT_INFO_TEMP;
 import jbo.app.tenwa.calc.LC_FUND_INCOME;
 import jbo.app.tenwa.calc.LC_FUND_INCOME_TEMP;
+import jbo.com.tenwa.lease.carbrand.BUSINESS_STATUS;
 
 import com.amarsoft.are.jbo.BizObject;
 import com.amarsoft.are.jbo.BizObjectManager;
 import com.amarsoft.are.jbo.JBOFactory;
+import com.amarsoft.are.util.StringFunction;
 import com.amarsoft.awe.util.Transaction;
+import com.amarsoft.context.ASUser;
 import com.tenwa.comm.util.jboutil.DataOperatorUtil;
 import com.tenwa.flow.baseBussion.BaseBussiness;
 /**
@@ -25,10 +28,13 @@ public class CopyFundIncomeTempToFormalCar extends BaseBussiness{
 	public Object run(Transaction Sqlca) throws Exception{
 		this.initBussinessParam(Sqlca.getTransaction());
 		String sFlowUnid = (String)this.getAttribute("ObjectNo");
+		String userId = this.getAttribute("CurUserID").toString();
+		ASUser user = ASUser.getUser(userId, Sqlca);
 		BizObjectManager bomLFIT = JBOFactory.getBizObjectManager(LC_FUND_INCOME_TEMP.CLASS_NAME);
 		Sqlca.join(bomLFIT);
 		bomLFIT.createQuery("update O set is_flowing='1' where flowunid=:FLOWUNID").setParameter("FLOWUNID", sFlowUnid).executeUpdate();
 		List<BizObject> bos = bomLFIT.createQuery("flowunid=:flowunid and pay_status<>'apply_return' and  ebank_status='05' ").setParameter("flowunid", sFlowUnid).getResultList(false);
+		BizObjectManager bsbom = JBOFactory.getBizObjectManager(BUSINESS_STATUS.CLASS_NAME, Sqlca);
 		if(bos.size() > 0){
 			for(BizObject bo:bos){
 				Map<String,String> fromCondition = new HashMap<String,String>();
@@ -45,6 +51,14 @@ public class CopyFundIncomeTempToFormalCar extends BaseBussiness{
 					otherProperty.put("ROLL_BACK", "0");
 				}
 				DataOperatorUtil.copySingleJBO(LC_FUND_INCOME_TEMP.CLASS_NAME, fromCondition,LC_FUND_INCOME.CLASS_NAME, toCondition, otherProperty,Sqlca.getTransaction());
+				BizObject bsbo = bsbom.newObject();
+				String contractNumber = Sqlca.getString("select contract_number from lb_contract_info where id='"+bo.getAttribute(LC_FUND_INCOME_TEMP.CONTRACT_ID).getString()+"'");
+				bsbo.setAttributeValue(BUSINESS_STATUS.contract_number, contractNumber);
+				bsbo.setAttributeValue(BUSINESS_STATUS.business_status, "41");//Æð×â
+				bsbo.setAttributeValue(BUSINESS_STATUS.inputuserid, user.getUserID());
+				bsbo.setAttributeValue(BUSINESS_STATUS.inputorgid, user.getOrgID());
+				bsbo.setAttributeValue(BUSINESS_STATUS.inputtime, StringFunction.getTodayNow());
+				bsbom.saveObject(bsbo);
 			}
 			Map<String,String> condition = new HashMap<String,String>();
 			DataOperatorUtil.copySingleJBO(LB_ACTUAL_PAYMENT_INFO_TEMP.CLASS_NAME, condition,LB_ACTUAL_PAYMENT_INFO.CLASS_NAME, new HashMap<String,String>(), new HashMap<String,String>(),Sqlca.getTransaction());

src_tenwa/com/tenwa/lease/flow/project/projectapproval/BusinessApprovalStartAction.java

@@ -73,7 +73,7 @@ public class BusinessApprovalStartAction extends BaseFlowStartAction{
 		//String projectName=projectNO+"_"+this.FlowParam.get("CustName")+this.FlowParam.get("ProductName")+"项目";
 		this.FlowParam.put("ProjectNo", projectNO);//项目编号
 		this.FlowParam.put("FlowKey", projectNO);//流程互斥  
-		this.FlowParam.put("ProjectName", projectNO);//ĎîÄżĂűłĆ
+		this.FlowParam.put("ProjectName", projectNO+"-"+this.getCustname());//ÏîÄ¿Ãû³Æ
 		this.FlowParam.put("carAttributes", this.getCarAttributes());//车辆属性
 		this.FlowParam.put("leasehold", this.getLeasehold());//租赁方式
 		this.FlowParam.put("productModel", this.getProductModel());//品牌