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

WebContent/Accounting/LoanSimulation/RentPlanList.jsp

@@ -22,7 +22,7 @@
 	}
 	String Distributor=CurPage.getParameter("isDistributor");
 	String orgid = CurUser.getOrgID();
-	if("true".equals(Distributor)||CurUser.hasRole("401")){
+	if(CurUser.hasRole("401")){
 		doTemp.setVisible("CORPUS", false);
 		doTemp.setVisible("INTEREST", false);
 		doTemp.setVisible("CORPUS_BUSINESS", false);

WebContent/AppConfig/RoleManage/AddRoleMenu.jsp

@@ -281,6 +281,7 @@
 		}else{
 			alert("菜单授权失败！");	
 		}
+		parent.AsDialog.ClosePage();
 	}
 	
 	function doDefault(){

WebContent/Common/WorkFlow/FlowSubmitDialog.jsp

@@ -183,6 +183,11 @@
 	   var actionSet = $("#actionreadset");
 	   if(actionSet.html().length<=2){
 	   var actionList=routeJson.readUser;
+	   var phaseNo=routeJson.route[0].phaseNo;
+	   if("BusinessApplyFlow"=='<%=flowNo%>'&&"1000"!=phaseNo){
+		   actionList = "";
+		   return;
+	   }
 	   if(actionList.length>0){
 		actionSet.empty().show();
 	    actionSet.append("<div style='margin-top:10px;margin-left:15px;font-size:12px;'><font color='#000000'><b>请选择传阅的用户：</b></font></div><div id='phaseactionReader' style='margin-top:10px;margin-left:10px;font-size:12px;border:1px solid lightgray;padding:5px;'></div>");

WebContent/Frame/page/js/as_control.js

@@ -675,8 +675,7 @@ var AsDialog = {
 		var d = top.dialog({
 			width:pageinfo.width,
 			height:pageinfo.height,
-			url:sPageURL,
+			url:sPageURL
-			quickClose: true
 		});
 
 		if (pageinfo.title) d.title(pageinfo.title);

WebContent/Frame/page/tools/dialog/SelectCatalogGrid.jsp

@@ -18,6 +18,7 @@
 	String PG_TITLE = "选择信息"; // 浏览器窗口标题 <title> PG_TITLE </title>
 
 	//获取参数：查询名称和参数
+	String pageSize = CurPage.getParameter("PageSize");
 	String sSelName  = CurPage.getParameter("SelName");
 	String sParaString = CurPage.getParameter("ParaString");
 	String RightType=CurPage.getParameter("RightType");
@@ -242,8 +243,9 @@
 	ASDataWindow dwTemp = new ASDataWindow(CurPage,doTemp,Sqlca);
 	dwTemp.Style="1";      //设置DW风格 1:Grid 2:Freeform
 	dwTemp.ReadOnly = "1"; //设置是否只读 1:只读 0:可写
-	dwTemp.setPageSize(10);  //服务器分页
+// 	dwTemp.setPageSize(10);  //服务器分页
-
+	
+	dwTemp.setPageSize(pageSize==null?20:Integer.parseInt(pageSize));
 	
 	//生成HTMLDataWindow
 	Vector vTemp = dwTemp.genHTMLDataWindow("%");
@@ -254,6 +256,7 @@
 	String sButtons[][] = {};
 %><%@include file="/Resources/CodeParts/List05.jsp"%>
 <script type="text/javascript">
+
 	<%/*~[Describe=提交;]~*/%>	
 	function doSearch(){
 		document.forms["form1"].submit();
@@ -325,7 +328,7 @@
 	window.onload=function(){
 	AsOne.AsInit();
 	init();
-	my_load(2,0,'myiframe0');	
+	my_load(2,0,'myiframe0');
 	}	
 </script>	
 <%@ include file="/IncludeEnd.jsp"%>

WebContent/Tenwa/Apzl/productCar/LmProductAndCarList.jsp

@@ -20,7 +20,7 @@
 		{"true","","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","删除","删除","asDelete()","","","","btn_icon_delete",""},
+		{"true","","Button","删除","删除","as_delete(0)","","","","btn_icon_delete",""},
 	};
 %><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
 <script type="text/javascript">
@@ -53,12 +53,12 @@
 	}
 	
 	function asDelete(){
-		var unionId = getItemValue(0,getRow(0),"ID");
+// 		var unionId = getItemValue(0,getRow(0),"ID");
-		//alert(unionId);
+// 		//alert(unionId);
-		var sReturnInfo = RunJavaMethodTrans("com.tenwa.apzl.saveunioncar.saveProductAndCar","deleteLmProductCar","unionId="+unionId);
+// 		var sReturnInfo = RunJavaMethodTrans("com.tenwa.apzl.saveunioncar.saveProductAndCar","deleteLmProductCar","unionId="+unionId);
-		if(sReturnInfo=="success"){
+// 		if(sReturnInfo=="success"){
-			alert("删除成功！");
+// 			alert("删除成功！");
-		}
+// 		}
 		reloadSelf();
 	}
 	

WebContent/Tenwa/Core/FlowManager/BaseFlowList/BaseFlowApplyListStart.jspf

@@ -27,6 +27,10 @@
 	ApplyManager applyManager = new ApplyManager(sApplyType,sPhaseType,CurUser);
 	ASObjectModel doTemp = new ASObjectModel(applyManager.getDono());
 	doTemp.setLockCount(2);
+	if("BusinessApplyApply".equals(sApplyType) || "BusinessCancelApply".equals(sApplyType)){
+		doTemp.setVisible("flow_key", false);
+		doTemp.setVisible("PROJECT_NO", true);
+	}
 	//doTemp.appendJboWhere(applyManager.getWhereClause()+" order by objectNo desc ");
 	doTemp.appendJboWhere(applyManager.getWhereClause());
 	ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);

WebContent/Tenwa/Core/SystemConfig/OwnConfig/BOwnAccount/BOwnAccountList.jsp

@@ -62,7 +62,7 @@
 /*~[Describe=新增记录;InputParam=无;OutPutParam=无;]~*/
 function newRecord(){
 	 var sUrl = "/Tenwa/Core/SystemConfig/OwnConfig/BOwnAccount/BOwnAccount.jsp";
-	 AsDialog.PopView(sUrl,'',"resizable=yes;dialogWidth=800px;dialogHeight=400px;center:yes;status:no;statusbar:no",function(){
+	 AsDialog.PopView(sUrl,'',"resizable=yes;dialogWidth=900px;dialogHeight=400px;center:yes;status:no;statusbar:no",function(){
 		   reloadSelf();		   
 	},"新增本方信息");
 }
@@ -76,7 +76,7 @@ function view(){
 			alert("请选择一条信息！");
 			return ;
 	 }
-	 AsDialog.PopView(sUrl,'id='+id+'&rightType=ReadOnly',"resizable=yes;dialogWidth=800px;dialogHeight=400px;center:yes;status:no;statusbar:no",function(){
+	 AsDialog.PopView(sUrl,'id='+id+'&rightType=ReadOnly',"resizable=yes;dialogWidth=900px;dialogHeight=400px;center:yes;status:no;statusbar:no",function(){
 		 reloadSelf();		   
 	},"本方信息详情");
 }
@@ -89,7 +89,7 @@ function edit(){
 			alert("请选择一条信息！");
 			return ;
 	 }
-	 AsDialog.PopView(sUrl,'id='+id,"resizable=yes;dialogWidth=800px;dialogHeight=400px;center:yes;status:no;statusbar:no",function(){
+	 AsDialog.PopView(sUrl,'id='+id,"resizable=yes;dialogWidth=900px;dialogHeight=400px;center:yes;status:no;statusbar:no",function(){
 		 reloadSelf();		   
 	},"修改本方信息");
 }

WebContent/Tenwa/Customer/Lessee/Person/CustomerCompanyTempInfo.jsp

@@ -30,12 +30,13 @@
 <script type="text/javascript">
 	$(document).ready(function(){
 		var nameResult = checkName();
-		if(nameResult=="2"){
+		var flowName = "<%=flowName%>"
+		if(nameResult=="2" && "ｺﾏﾍｬﾖﾆﾗ<EFBE86><EFBE97>ﾌ"!=flowName){
 			//$("#FULLNAME").attr("style","color:red;");
 			$("#ENTERPRISENAME").css("color","red");
 		}
 		var certResult = checkCertId();
-		if(certResult=="4"){
+		if(certResult=="4" && "ｺﾏﾍｬﾖﾆﾗ<EFBE86><EFBE97>ﾌ"!=flowName){
 			//$("#FULLNAME").attr("style","color:red;");
 			$("#CERTID").css("color","red");
 		}

WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorAccountList.jsp

@@ -47,8 +47,8 @@
 	}else{
 		sButtons=new String[][] {
 		{temp,"All","Button","新增","新增","newRecord()","","","","btn_icon_add",""},
-		//{temp,"","Button","详情","查看/修改详情","view()","","","","btn_icon_detail"},
 		{temp,"","Button","修改","修改","viewAndEdit()","","","","btn_icon_detail",""},
+		{temp,"","Button","详情","查看/修改详情","view()","","","","btn_icon_detail"},
 	  	//{"true","All","Button","删除","删除","if(confirm('确实要删除吗?'))as_delete(0)","","","","btn_icon_delete",""},
 		{temp,"All","Button","删除","删除","if(confirm('确实要删除吗?'))as_delete(0)","","","","btn_icon_delete",""},
 		};
@@ -61,7 +61,7 @@
 		 var sUrl = "/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorAccountInfo.jsp";
 		 var sPara ="flowunid=<%=sFlowUnid%>";
 		 /* AsControl.OpenView(sUrl,'','_self',''); */
-		AsDialog.PopView(sUrl,sPara,"dialogWidth=800px;dialogHeight=200px;resizable=no;scrollbars=no;status:yes;maximize:no;help:no;",function(){
+		AsDialog.PopView(sUrl,sPara,"dialogWidth=900px;dialogHeight=200px;resizable=no;scrollbars=no;status:yes;maximize:no;help:no;",function(){
 	reloadSelf();
 		 },"新增");
 
@@ -75,10 +75,22 @@
 			alert("参数不能为空！");
 			return ;
 		 }
- 	AsDialog.PopView(sUrl,"id="+sPara+"&flowunid="+"<%=sFlowUnid%>","dialogWidth=800px;dialogHeight=200px;resizable=no;scrollbars=no;status:yes;maximize:no;help:no;",function(){
+ 	AsDialog.PopView(sUrl,"id="+sPara+"&flowunid="+"<%=sFlowUnid%>","dialogWidth=900px;dialogHeight=200px;resizable=no;scrollbars=no;status:yes;maximize:no;help:no;",function(){
  		reloadSelf();
 		 },"修改");
  	
 	}
+	
+	function view(){
+		 var sUrl = "/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorAccountInfo.jsp";
+		 var sPara = getItemValue(0,getRow(0),'id');
+		 if(typeof(sPara)=="undefined" || sPara.length==0 ){
+			alert("参数不能为空！");
+			return ;
+		 }
+	     AsDialog.PopView(sUrl,"id="+sPara+"&flowunid="+"<%=sFlowUnid%>"+"&RightType=ReadOnly","dialogWidth=900px;dialogHeight=200px;resizable=no;scrollbars=no;status:yes;maximize:no;help:no;",function(){
+			reloadSelf();
+		 },"详情");
+	}
 </script>
 <%@ include file="/Frame/resources/include/include_end.jspf"%>

WebContent/Tenwa/Lease/DistributorManage/DistributorChange/LDistributorAccountList.jsp

@@ -31,7 +31,7 @@
 		 var sUrl = "/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorAccountInfo.jsp";
 		 var sPara ="flowunid=<%=sFlowUnid%>";
 		 /* AsControl.OpenView(sUrl,'','_self',''); */
-         AsDialog.PopView(sUrl,sPara,"dialogWidth=800px;dialogHeight=200px;resizable=no;scrollbars=no;status:yes;maximize:no;help:no;",function(){
+         AsDialog.PopView(sUrl,sPara,"dialogWidth=900px;dialogHeight=200px;resizable=no;scrollbars=no;status:yes;maximize:no;help:no;",function(){
 	     reloadSelf();
 		 },"新增");
 	}
@@ -43,7 +43,7 @@
 			alert("参数不能为空！");
 			return ;
 		 }
- 	     AsDialog.PopView(sUrl,"id="+sPara+"&flowunid="+"<%=sFlowUnid%>"+"&RightType=ReadOnly","dialogWidth=800px;dialogHeight=200px;resizable=no;scrollbars=no;status:yes;maximize:no;help:no;",function(){
+ 	     AsDialog.PopView(sUrl,"id="+sPara+"&flowunid="+"<%=sFlowUnid%>"+"&RightType=ReadOnly","dialogWidth=900px;dialogHeight=200px;resizable=no;scrollbars=no;status:yes;maximize:no;help:no;",function(){
  			reloadSelf();
 		 },"详情");
 	}
@@ -56,9 +56,9 @@
 			alert("参数不能为空！");
 			return ;
 		 }
-	     AsDialog.PopView(sUrl,"id="+sPara+"&flowunid="+"<%=sFlowUnid%>","dialogWidth=800px;dialogHeight=200px;resizable=no;scrollbars=no;status:yes;maximize:no;help:no;",function(){
+	     AsDialog.PopView(sUrl,"id="+sPara+"&flowunid="+"<%=sFlowUnid%>","dialogWidth=900px;dialogHeight=200px;resizable=no;scrollbars=no;status:yes;maximize:no;help:no;",function(){
 			reloadSelf();
-		 },"ÏêÇé");
+		 },"ÐÞ¸Ä");
 	}
 </script>
 <%@ include file="/Frame/resources/include/include_end.jspf"%>

WebContent/Tenwa/Lease/DistributorManage/DistributorChange/LDistributorChangeAccountHis.jsp

@@ -37,7 +37,7 @@
 			alert("参数不能为空！");
 			return ;
 		 }
- 	     AsDialog.PopView(sUrl,"id="+sPara,"dialogWidth=800px;dialogHeight=200px;resizable=no;scrollbars=no;status:yes;maximize:no;help:no;",function(){
+ 	     AsDialog.PopView(sUrl,"id="+sPara+"&RightType=ReadOnly","dialogWidth=900px;dialogHeight=200px;resizable=no;scrollbars=no;status:yes;maximize:no;help:no;",function(){
  		//reloadSelf();
 		 },"详情");
 	}

WebContent/Tenwa/Lease/DistributorManage/DistributorChange/LDistributorInfo.jsp

@@ -6,6 +6,7 @@
         History Log: 
     */
     String sFlowUnid = CurPage.getParameter("FlowUnid");//流程编号
+    String RightType=CurPage.getParameter("RightType");
     if(sFlowUnid == null) sFlowUnid="";
     
     ASObjectModel temp = new ASObjectModel("LDistributorChangeInfoHis"); //获取法人原始信息
@@ -31,9 +32,11 @@
 	ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request);
 	dwTemp.Style = "2";//freeform
 	//dwTemp.ReadOnly = "1";//只读模式
+	if("ReadOnly".equals(RightType)){
 	doTemp.setColInnerBtEvent("PROVINCES", "");
 	doTemp.setColInnerBtEvent("DISTRIBUTOR_ADDRESSNAME", "");
 	doTemp.setColInnerBtEvent("SUBSIDIARY_COMPANY", "");
+	}
 	ASDataObject ado = dwTemp.getDataObject();
 	ado.setHtmlEvent("LIMIT_APPROVAL_DATE", "onchange", "getenddate");
 	ado.setHtmlEvent("LIMIT_EFFECTIVE_DATE", "onchange", "getenddate");

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

@@ -9,24 +9,26 @@
     
     String plan_date = DateAssistant.getToday();
 	ASObjectModel doTemp = new ASObjectModel("ViLcReviewAuditRentPlanList");
-	doTemp.setJboWhere(" O.AUDIT_STATE = 'Y'");
+	doTemp.setJboWhere(" O.AUDIT_STATE = 'N'");
 	//默认预查询
-    doTemp.setJboWhereWhenNoFilter(" and O.PLAN_DATE = '"+plan_date+"' and O.COLLECT_STATUS in ('未收款','部分收款') ");
+   //只有计划日期未收款的都可以收款
+doTemp.setJboWhereWhenNoFilter(" and O.PLAN_DATE <= '"+plan_date+"' and O.COLLECT_STATUS in ('未收款','部分收款') ");
+   doTemp.setJboWhereWhenNoFilter(" and O.COLLECT_STATUS in ('未收款','部分收款') ");
 	ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
 	dwTemp.Style="1";      	     //--设置为Grid风格--
 	dwTemp.MultiSelect = true;	 //多选
 	dwTemp.ReadOnly = "1";	 //只读模式
-	dwTemp.setPageSize(10);
 	dwTemp.ShowSummary = "1"; //显示小计
+	dwTemp.setPageSize(pageSize==null?10:Integer.parseInt(pageSize));
 	dwTemp.genHTMLObjectWindow("");
 
 	//0、是否展示 1、	权限控制  2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码	6、	7、	8、	9、图标，CSS层叠样式 10、风格
 	String sButtons[][] = {
 		{"true","All","Button","批量扣款","批量扣款","batchCollect()","","","","btn_icon_add",""},
 		//{"true","All","Button","实时扣款","实时扣款","timelyCollect()","","","","btn_icon_add",""},
-		//{"true","All","Button","手工扣款","手工扣款","afterCollectManage()","","","","btn_icon_add",""},
+		{"true","All","Button","手工扣款","手工扣款","afterCollectManage()","","","","btn_icon_add",""},
 		{"true","All","Button","手动刷新","手动刷新","queryBatchCollect()","","","","btn_icon_add",""},
-		{"true","","Button","退回","审核未通过,退回初审","if(confirm('确定要退回吗?')){viewAndEdit()}","","","","btn_icon_detail",""},
+		//{"true","","Button","退回","审核未通过,退回初审","if(confirm('确定要退回吗?')){viewAndEdit()}","","","","btn_icon_detail",""},
 	};
 %><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
 <script type="text/javascript">

WebContent/Tenwa/Lease/Flow/Comm/LBContractEnd/LBContractDevolutionInfo.jsp

@@ -34,13 +34,13 @@
 	BizObjectManager bom=JBOFactory.getBizObjectManager(LB_UNION_LESSEE.CLASS_NAME);
 	BizObject cust=bom.createQuery("contract_id=:contract_id and is_main='Y'").setParameter("contract_id", contractid).getSingleResult(false);
 	String custname=cust.getAttribute("customer_name").toString();;//主承租人
-	String planinformation=ProductParamUtil.getProductParameterValue(product_id,"PRD0314","planinformation");//·½°¸ÀàÐÍ
+// 	String planinformation=ProductParamUtil.getProductParameterValue(product_id,"PRD0314","planinformation");//·½°¸ÀàÐÍ
 	String money="";//留购价
-	if("SinglePlan".equals(planinformation)){
+// 	if("SinglePlan".equals(planinformation)){
-		BizObjectManager bom1=JBOFactory.getBizObjectManager(LC_CALC_CONDITION.CLASS_NAME);
+// 		BizObjectManager bom1=JBOFactory.getBizObjectManager(LC_CALC_CONDITION.CLASS_NAME);
-		BizObject condition=bom1.createQuery("contract_id=:contract_id ").setParameter("contract_id", contractid).getSingleResult(false);
+// 		BizObject condition=bom1.createQuery("contract_id=:contract_id ").setParameter("contract_id", contractid).getSingleResult(false);
-		money=condition.getAttribute("NOMINAL_PRICE").toString();
+// 		money=condition.getAttribute("NOMINAL_PRICE").toString();
-	}
+// 	}
 	String ishistory=CurPage.getParameter("IsHistory");
 	String nodeNo=CurPage.getParameter("NodeNo");
 	String RightType = CurPage.getParameter("RightType");//选择模式
@@ -76,7 +76,7 @@
 	
 	dwTemp.genHTMLObjectWindow(sFlowUnid);//得到的参数
 	CurPage.getCurComp().setAttribute("RightType",RightType);
-	dwTemp.replaceColumn("devolution", "<iframe type='iframe' id='frame_list_knowing' name=\"frame_list_knowing\" width=\"100%\" height=\"200px\" frameborder=\"0\" src=\""+sWebRootPath+"/Tenwa/Lease/Flow/Comm/LBContractEnd/QuotationList.jsp?CompClientID="+compClientID+"&flowunid="+sFlowUnid+"&IsHistory="+ishistory+"&NodeNo="+nodeNo+"&RightType="+RightType+"\"></iframe>", CurPage.getObjectWindowOutput());
+	dwTemp.replaceColumn("devolution", "<iframe type='iframe' id='frame_list_knowing' name=\"frame_list_knowing\" width=\"100%\" height=\"200px\" frameborder=\"0\" src=\""+sWebRootPath+"/Tenwa/Lease/Flow/Comm/LBContractEnd/QuotationList.jsp?CompClientID="+compClientID+"&flowunid="+sFlowUnid+"&IsHistory="+ishistory+"&NodeNo="+nodeNo+"&RightType="+RightType+"&docname=transfer"+"\"></iframe>", CurPage.getObjectWindowOutput());
 %>
 <%/*~END~*/%>
 
@@ -115,7 +115,8 @@
 			var sparam="";
 			
 			//模板号
-			param["templateNo"]="e1fc3afacfbc46fea0a881ac20de23cc";
+			//param["templateNo"]="e1fc3afacfbc46fea0a881ac20de23cc";
+			param["templateNo"]="a9335f5624124b6db29f0d721fc8b61c";
 			
 			//生成文件关联关系
 			tempParam["OBJECTTYPE"]="产权转移单";
@@ -133,9 +134,10 @@
 				  if(sparam.length>0){sparam+=",";}
 				   sparam+=key+"="+param[key];
 			}
-			var deleteparam ="PROJECT_PLAN_NUMBER="+"<%=contractid%>";
+			var deleteparam ="PROJECT_PLAN_NUMBER="+"<%=contractid%>"+",objecttype=²úȨתÒƵ¥";
 			var deleteresult=RunJavaMethodTrans("com.tenwa.officetempalte.controller.QutationAction","deletedevtion",deleteparam);
 			var result=RunJavaMethodTrans("com.tenwa.officetempalte.action.CreateOfficeAction","createOfficeByTemplate",sparam);
+			RunJavaMethodTrans("com.tenwa.channelportal.action.ContractSignAction","wordToPdfAnnex","contract_id=<%=contractid%>,PLAN_LIST=transfer");
 		if(bIsInsert)
 		{
 			beforeInsert();

WebContent/Tenwa/Lease/Flow/Comm/LBContractEnd/QuotationList.jsp

@@ -16,6 +16,12 @@
 		String ishistory = CurPage.getParameter("ishistory");
 		String nodeNo=CurPage.getParameter("NodeNo");
 		String RightType = CurPage.getParameter("RightType");
+		String docname = CurPage.getParameter("docname");
+		if("settle".equals(docname)){
+			docname = "써헌친겼";
+		}else if("transfer".equals(docname)){
+			docname = "끓홈瘻盧聯蝎";
+		};
 		String sTempletNo = CurPage.getParameter("TempletNo");//模板号
 			sTempletNo = "DevolutionList";
 		String userName = CurUser.getUserName();
@@ -28,7 +34,7 @@
 		dwTemp.Style = "1"; //--设置为Grid风格--
 		dwTemp.ReadOnly = "1";
 		dwTemp.setPageSize(50);
-		dwTemp.genHTMLObjectWindow(contract_id);
+		dwTemp.genHTMLObjectWindow(docname+","+contract_id);
 
 		//0、是否展示 1、	权限控制  2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码	6、	7、	8、	9、图标，CSS层叠样式 10、风格
 		String sButtons[][] = null;

WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/Change.jsp

@@ -0,0 +1,15 @@
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/IncludeBegin.jsp"%><%
+ 	/*
+        Author: undefined 2018-07-30
+        Content: 
+        History Log: 
+    */
+%><%@include file="/Resources/CodeParts/Frame02.jsp"%>
+<script type="text/javascript">	
+	AsControl.OpenView("/Tenwa/Lease/Flow/Comm/LBDebitCard/DebitCardInfoForm.jsp","","rightup","");
+	AsControl.OpenView("/Tenwa/Lease/Flow/Comm/LBDebitCard/DebitCardInfo.jsp","","rightdown","");
+	setTitle("±ä¸üÇ°",true);
+	setTitle("±ä¸üºó",false);
+</script>	
+<%@ include file="/IncludeEnd.jsp"%>

WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/DebitCardInfo.jsp

@@ -76,13 +76,21 @@
 			alert("预留手机号不能为空!");
 			return false;
 		}
-		if(CheckPhoneCode(mobile)){
+		var phone = /^[1][3,4,5,7,8][0-9]{9}$/;
+		if(phone.test(mobile)){
+			setErrorTips("MOBILE","");
+			return true;
+		}else{
+			setErrorTips("MOBILE","手机号格式不正确!");
+			return false;
+		}
+		/* if(CheckPhoneCode(mobile)){
 			return true;
 		}else{
 			//setErrorTips("mobile","手机号格式不正确!");
 			alert("预留手机号格式不正确!");
 			return false;
-		}
+		} */
 	}
 	
 	function save(){
@@ -90,46 +98,34 @@
 		if(TelRes==false){
 			return;
 		}
-		
-		/* var MobileRes = checkMobile();
-		if(MobileRes=="10"){//手机号不属于申请人、共同人、担保人
-			setItemValue(0,0,"MOBILE","");//清空预留手机号
-			return;
-		} */
-		
 		setItemValue(0,0,"flowunid","<%=FlowUnid%>");
 		setItemValue(0,0,"acc_type","Debit");
 		 var res=true;
-	     res = RunJavaMethodTrans("com.tenwa.comm.customerfilterlist.DebitCardAction", "getCustIdByFlowunid", "FlowUnid=<%=FlowUnid%>");
+		 debugger;
-		 var strarry=res.split(",");
+		 if('BusinessApplyApply'=='<%=ApplyType%>'){
-		 var customerid=strarry[0];
+		     res = RunJavaMethodTrans("com.tenwa.comm.customerfilterlist.DebitCardAction", "getCustIdByFlowunid", "FlowUnid=<%=FlowUnid%>");
-		 var projectid=strarry[1];
+			 var strarry=res.split(",");
-		 var contractid=strarry[2];
+			 var customerid=strarry[0];
-		 //setItemValue(0,0,"customerid",customerid);
+			 var projectid=strarry[1];
-		 if(res=="false"){
+			 var contractid=strarry[2];
-			alert("请先填写个人基本信息！");
+			 if(res=="false"){
-			return;
+				alert("请先填写个人基本信息！");
-	}
+				return;
-	 var contract_id= getItemValue(0,0,"contract_id");
+			 }
-	 if(null!=contract_id&&contract_id!=""){
+		 }
-		 contractid=contract_id;
+		 var contract_id= getItemValue(0,0,"contract_id");
-	 }
+		 if(null!=contract_id&&contract_id!=""){
-	 setItemValue(0,0,"customerid",customerid);
+			 contractid=contract_id;
-	 setItemValue(0,0,"project_id",projectid);
+		 }
-	 if(contractid==""||contractid=="null"||contractid==null){
+		 setItemValue(0,0,"customerid",customerid);
-		 setItemValue(0,0,"contract_id","");
+		 setItemValue(0,0,"project_id",projectid);
-	 }else{
+		 if(contractid==""||contractid=="null"||contractid==null){
-		 setItemValue(0,0,"contract_id",contractid);
+			 setItemValue(0,0,"contract_id","");
-	 }
+		 }else{
-	
+			 setItemValue(0,0,"contract_id",contractid);
-	 
+		 }
-	iV_all("0");
+		iV_all("0");
-	 
+		as_save("0","re");
-		//if(frame_list.window.save(customerid,projectid,contractid)&&frame_lists.window.save(customerid,projectid,contractid)){ 
-			as_save("0","re");
-			
-		//}
-		//reloadSelf();
 	}	
 	function re(){
 		var  param="CompClientID=<%=sCompClientID%>&FlowUnid=<%=FlowUnid%>&RightType=<%=RightType%>&ishistory=<%=ishistory%>";

WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/DebitCardInfoForm.jsp

@@ -0,0 +1,31 @@
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_info.jspf"%><%
+	/*
+        Author: undefined 2018-07-30
+        Content: 示例详情页面
+        History Log: 
+    */
+    String ContractId = CurPage.getParameter("ContractId");
+	String sPrevUrl = CurPage.getParameter("PrevUrl");
+	if(sPrevUrl == null) sPrevUrl = "";
+
+	String sTempletNo = "DebitCardInfoForm";//--模板号--
+	ASObjectModel doTemp = new ASObjectModel(sTempletNo);
+// 	doTemp.setColTips("", "测试");
+	ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request);
+	dwTemp.Style = "2";//freeform
+	dwTemp.ReadOnly = "-2";//只读模式
+	dwTemp.genHTMLObjectWindow(ContractId);
+	
+	String sButtons[][] = {
+		{"true","All","Button","保存","保存所有修改","as_save(0)","","","",""},
+		{String.valueOf(!com.amarsoft.are.lang.StringX.isSpace(sPrevUrl)),"All","Button","返回","返回列表","returnList()","","","",""}
+	};
+	sButtonPosition = "south";
+%><%@ include file="/Frame/resources/include/ui/include_info.jspf"%>
+<script type="text/javascript">
+	function returnList(){
+		 AsControl.OpenView("<%=sPrevUrl%>", "","_self","");
+	}
+</script>
+<%@ include file="/Frame/resources/include/include_end.jspf"%>

WebContent/Tenwa/Lease/Flow/Comm/LBGuaranteeUnit/LBGuaranteePerUnitInfo.jsp

@@ -84,13 +84,22 @@
 			alert("手机号不能为空!");
 			return false;
 		}
-		if(CheckPhoneCode(mobile)){
+		var phone = /^[1][3,4,5,7,8][0-9]{9}$/;
+		if(phone.test(mobile)){
+			setErrorTips("mobile","");
+			return true;
+		}else{
+			setErrorTips("mobile","手机号格式不正确!");
+			//alert("手机号格式不正确!");
+			return false;
+		}
+		/* if(CheckPhoneCode(mobile)){
 			return true;
 		}else{
 			//setErrorTips("mobile","手机号格式不正确!");
 			alert("手机号格式不正确!");
 			return false;
-		}
+		} */
 	}
 	
 	function checkWorkTel(){//校验担保人单位电话格式
@@ -115,9 +124,13 @@
 		var sParams = "mobile="+mobile+",customerType="+customerType+",flowunid="+"<%=sFlowUnid%>";
 		var sReturnInfo = RunJavaMethodTrans("com.tenwa.lease.flow.project.businessapply.CustomerInfoCheck","checkMobileRepeat",sParams);
 		if(sReturnInfo=="8"){
-			alert("该手机号已重复!");
+			/* alert("该手机号已重复!");
-			setItemValue(0,0,"MOBILE","");
+			setItemValue(0,0,"MOBILE",""); */
-			return;
+			setErrorTips("MOBILE","该手机号已重复!");
+			return false;
+		}else{
+			setErrorTips("MOBILE","");
+			return true;
 		}
 	}
 	
@@ -130,6 +143,10 @@
 		if(TelResult==false){
 			return;
 		}
+		var falgs = checkMobileRepeat();
+		if(falgs==false){
+			return;
+		}
 // 		var WorkTelResult = checkWorkTel();
 // 		if(WorkTelResult==false){
 // 			return;

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

@@ -0,0 +1,209 @@
+<%@page import="jbo.app.tenwa.calc.LC_CALC_CONDITION"%>
+<%@page import="jbo.com.tenwa.lease.comm.LB_UNION_LESSEE"%>
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_info.jspf"%>
+<%@ page import="com.amarsoft.app.lc.workflow.action.GetFlowAction" %>
+<%@ page import="com.amarsoft.app.util.*"  %>
+<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=Info00;Describe=注释区;]~*/%>
+	
+<%/*~END~*/%>  
+
+
+
+
+<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=Info01;Describe=定义页面属性;]~*/%>
+	<%
+	String PG_TITLE = "结清证明"; // 浏览器窗口标题 <title> PG_TITLE </title>
+	%>
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=Info02;Describe=定义变量，获取参数;]~*/%>
+<%
+
+
+	String sFlowUnid = CurPage.getParameter("FlowUnid");//流程编号
+	if(sFlowUnid == null) sFlowUnid = "";
+	BizObject flow=GetFlowAction.getFlowBussinessObject(sFlowUnid);
+	String product_id=flow.getAttribute("productId").toString();
+	String contractid=flow.getAttribute("contract_id").toString();
+	String projectid=flow.getAttribute("proj_id").toString();
+	String contract_number=flow.getAttribute("flow_key").toString();//业务合同号
+	BizObjectManager bom=JBOFactory.getBizObjectManager(LB_UNION_LESSEE.CLASS_NAME);
+	BizObject cust=bom.createQuery("contract_id=:contract_id and is_main='Y'").setParameter("contract_id", contractid).getSingleResult(false);
+	String custname=cust.getAttribute("customer_name").toString();;//主承租人
+// 	String planinformation=ProductParamUtil.getProductParameterValue(product_id,"PRD0314","planinformation");//方案类型
+	String money="";//留购价
+// 	if("SinglePlan".equals(planinformation)){
+// 		BizObjectManager bom1=JBOFactory.getBizObjectManager(LC_CALC_CONDITION.CLASS_NAME);
+// 		BizObject condition=bom1.createQuery("contract_id=:contract_id ").setParameter("contract_id", contractid).getSingleResult(false);
+// 		money=condition.getAttribute("NOMINAL_PRICE").toString();
+// 	}
+	String ishistory=CurPage.getParameter("IsHistory");
+	String nodeNo=CurPage.getParameter("NodeNo");
+// 	String RightType = CurPage.getParameter("RightType");//选择模式
+	String RightType =null;//选择模式
+	String sTempletNo = "LBContractTermainateTemp";//模板号
+%>
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=Info03;Describe=定义数据对象;]~*/%>
+<%
+	ASObjectModel doTemp = new ASObjectModel(sTempletNo);
+	doTemp.setDefaultValue("accept_person", custname);
+	doTemp.setDefaultValue("contract_id", contractid);
+	doTemp.setDefaultValue("project_id", projectid);
+	doTemp.setDefaultValue("flowunid", sFlowUnid);
+	doTemp.setDefaultValue("RESERVE_PRICE", money);
+	if(null!=ishistory&&ishistory.equals("true")){
+	 doTemp.setDataQueryClass("com.tenwa.flow.flowHistory.FlowDataInfoHistory");//如果是历史则新显示历史数据
+	}
+	CurPage.getCurComp().setAttribute("RightType", null);
+	ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request);
+	dwTemp.Style = "2";//freeform
+	if((null!=RightType&&RightType.equals("ReadOnly"))||(null!=ishistory&&ishistory.equals("true"))){
+		dwTemp.ReadOnly = "-2";//只读模式
+		isShowButton=false;
+	}else{
+		isShowButton=true;
+	}
+	String compClientID = request.getParameter("CompClientID");
+	
+	dwTemp.genHTMLObjectWindow(sFlowUnid);//得到的参数
+	CurPage.getCurComp().setAttribute("RightType",RightType);
+	dwTemp.replaceColumn("devolution", "<iframe type='iframe' id='frame_list_knowing' name=\"frame_list_knowing\" width=\"100%\" height=\"200px\" frameborder=\"0\" src=\""+sWebRootPath+"/Tenwa/Lease/Flow/Comm/LBContractEnd/QuotationList.jsp?CompClientID="+compClientID+"&flowunid="+sFlowUnid+"&IsHistory="+ishistory+"&NodeNo="+nodeNo+"&RightType="+RightType+"&docname=settle"+"\"></iframe>", CurPage.getObjectWindowOutput());
+%>
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=Info04;Describe=定义按钮;]~*/%>
+	<%
+	String sButtons[][] = {
+			{"true","All","Button","结清证明","保存所有修改","saveRecord()","","","","btn_icon_save"},
+			{"true","All","Button","公司盖章","公司盖章","stamp()","","","",""},
+		};
+	sButtonPosition = "north";
+	%>
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~不可编辑区~[Editable=false;CodeAreaID=Info05;Describe=主体页面;]~*/%>
+<%@ include file="/Frame/resources/include/ui/include_info.jspf"%>
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~可编辑区~[Editable=false;CodeAreaID=Info06;Describe=定义按钮事件;]~*/%>
+<script type="text/javascript">
+
+	var bIsInsert = false;
+	/*~[Describe=保存;InputParam=无;OutPutParam=无;]~*/
+	function saveRecord()
+	{
+		debugger;
+			var param={};
+			var tempParam={};
+			var sparam="";
+			
+			//模板号
+			param["templateNo"]="dc3a7c204da74515bc6d27771928a95d";
+			
+			//生成文件关联关系
+			tempParam["OBJECTTYPE"]="提前结清证明";
+			tempParam["FLOW_UNID"]="<%=sFlowUnid%>";
+			tempParam["PROJ_ID"]="<%=projectid%>";
+			tempParam["CONTRACT_ID"]="<%=contractid%>";
+			tempParam["contract_number"]="<%=contract_number%>";
+			//生成模板固定参数
+			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 deleteparam ="PROJECT_PLAN_NUMBER="+"<%=contractid%>"+",objecttype=提前结清证明";
+			var deleteresult=RunJavaMethodTrans("com.tenwa.officetempalte.controller.QutationAction","deletedevtion",deleteparam);
+			var result=RunJavaMethodTrans("com.tenwa.officetempalte.action.CreateOfficeAction","createOfficeByTemplate",sparam);
+			RunJavaMethodTrans("com.tenwa.channelportal.action.ContractSignAction","wordToPdfAnnex","contract_id=<%=contractid%>,PLAN_LIST=settle");
+		if(bIsInsert)
+		{
+			beforeInsert();
+		}
+		beforeUpdate();
+		as_save("myiframe0");
+		reloadSelf();
+	}
+
+	function stamp(){
+		var contractID = "<%=contractid%>";
+		var result=RunJavaMethodTrans("com.tenwa.channelportal.action.ContractSignAction","collectionSignA","contract_id="+contractID+",flagType=settle");
+		if("success"==result){
+			alert("盖章成功！！！");
+			location.reload();
+		}else{
+			alert("盖章失败！！！");
+		}
+	}
+</script>
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~可编辑区~[Editable=false;CodeAreaID=Info07;Describe=自定义函数;]~*/%>
+	<script type="text/javascript">
+	<%/*~[Describe=执行插入操作前执行的代码;]~*/%>
+	function beforeInsert()
+	{
+		setItemValue(0,0,"InputUserID","<%=CurUser.getUserID()%>");
+		setItemValue(0,0,"InputOrgID","<%=CurUser.getOrgID()%>");
+		setItemValue(0,0,"InputTime","<%=StringFunction.getTodayNow()%>");
+		bIsInsert = false;
+	}
+	
+	
+	<%/*~[Describe=执行更新操作前执行的代码;]~*/%>
+	function beforeUpdate()
+	{
+		setItemValue(0,0,"UpdateUserID","<%=CurUser.getUserID()%>");
+		setItemValue(0,0,"UpdateOrgID","<%=CurUser.getOrgID()%>");
+		setItemValue(0,0,"UpdateTime","<%=StringFunction.getTodayNow()%>");
+	}
+	</script>
+<%/*~END~*/%>
+
+ 
+
+
+<%/*~BEGIN~可编辑区~[Editable=false;CodeAreaID=Info08;Describe=页面装载时，进行初始化;]~*/%>
+<script type="text/javascript">	
+	function initRow(){
+		if (getRowCount(0) == 0) //如果没有找到对应记录，则新增一条，并设置字段默认值
+		{ 
+			setItemValue(0,0,"FlowUnid","<%=sFlowUnid%>");
+			//设置自动获取日期为当前日期
+			setItemValue(0,0,"Accept_Date","<%=StringFunction.getToday()%>");  
+			bIsInsert = true;
+		}
+	}
+	initRow();
+</script>	
+<%/*~END~*/%>
+
+
+
+
+<%@ include file="/Frame/resources/include/include_end.jspf"%>

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

@@ -72,20 +72,42 @@
 			setItemValue(0,getRow(),"INTEREST_HANDLING_CHARGE",remaininterest);
 			//商定利息默认等于未到期利息
 			setItemValue(0,getRow(),"AGREED_INTEREST",remaininterest);
-			//¼ÆËãºÏͬծȯ×ܼÆ
-			setItemValue(0,getRow(),"CONTRACT_TOTAL",getContractBondTotal());
 			//回购比例 默认100
 			setItemValue(0,getRow(),"REPURCHASE_RATIO","100");
 			//回购本金
 			setItemValue(0,getRow(),"REPURCHASE_MONEY",remaincorpus);
 			
 			setItemValue(0,getRow(),"FIST_RENT",terminateInfo.fist_rent);
+			setItemValue(0,getRow(),"FIST_CORPUS",terminateInfo.fist_corpus);
+			setItemValue(0,getRow(),"HANDLING_CHARGE",Number(terminateInfo.fist_corpus*0.05).toFixed(2));
+			setItemValue(0,getRow(),"REPAYMENT_INTEREST",terminateInfo.REPAYMENT_INTEREST);
+			
+			setItemValue(0,getRow(),"SDNOMINAL_PRICE","0");
+			setItemValue(0,getRow(),"SDHANDLING_CHARGE","0");
+			
+			//¼ÆËãºÏͬծȯ×ܼÆ
+			setItemValue(0,getRow(),"CONTRACT_TOTAL",getContractBondTotal());
 
 		}
 	}
+	//¼ÆËãծȯ×ܼÆ
+	function getContractBondTotal(){
+		var  dunrent = getItemValue(0,getRow(),"DUN_RENT");
+		var  dunPenalty = getItemValue(0,getRow(),"DUN_PENALTY");
+		var  fistRent = getItemValue(0,getRow(),"FIST_RENT");
+		var  fistCorpus = getItemValue(0,getRow(),"FIST_CORPUS");
+		var  handlingCharge = getItemValue(0,getRow(),"HANDLING_CHARGE");
+		var  otherin = getItemValue(0,getRow(),"OTHER_IN");
+		var  otherout = getItemValue(0,getRow(),"OTHER_OUT");
+		var  nominalPrice=getItemValue(0,getRow(),"NOMINAL_PRICE");
+		var  repaymentInterest=getItemValue(0,getRow(),"REPAYMENT_INTEREST");
+		return Number(dunrent ?  dunrent : 0 ) + Number(dunPenalty ?  dunPenalty : 0 ) + Number(fistRent ?  fistRent : 0 )
+		+ Number(fistCorpus ?  fistCorpus : 0 ) + Number(handlingCharge ?  handlingCharge : 0 ) + Number(otherin ?  otherin : 0 )
+		- Number(otherout ?  otherout : 0 ) +  Number(nominalPrice ?  nominalPrice : 0 ) + Number(repaymentInterest ?  repaymentInterest : 0 );
+	}
 	
 	//计算债券总计
-	function  getContractBondTotal(){
+/* 	function  getContractBondTotal(){
 		var  dunrent = getItemValue(0,getRow(),"DUN_RENT");
 		var  corpusoverage = getItemValue(0,getRow(),"CORPUS_OVERAGE");
 		var  corpusinterest = 0;
@@ -97,7 +119,7 @@
 		return Number(otherin ?  otherin : 0 ) - Number(otherout ?  otherout : 0 ) + Number(dunrent ?  dunrent : 0 )
 		+ Number(corpusoverage ?  corpusoverage : 0 ) + Number(corpusinterest ?  corpusinterest : 0 ) + Number(agreedinterest ?  agreedinterest : 0 )
 		+ Number(agreepenalty ?  agreepenalty : 0 ) +  Number(dunpenalty ?  dunpenalty : 0 ) ;
-	}
+	} */
 	
 	function cancelChange(){
 		openDWDialog();

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

@@ -15,7 +15,7 @@
 	String taskno=CurPage.getParameter("TaskNo");
 	String RightType= CurPage.getParameter("RightType");
 	String customerType= CurPage.getParameter("CustomerType");
-	
+	String flowstate =  CurPage.getParameter("flowstate");
 	String flowunid = CurPage.getParameter("FlowUnid");
 	String clean_lease_money = Sqlca.getString("select CLEAN_LEASE_MONEY from LC_CALC_CONDITION_TEMP where flowunid='"+flowunid+"'");
 	//int money = Integer.parseInt(clean_lease_money);
@@ -25,7 +25,7 @@
 	double money = Double.parseDouble(clean_lease_money);
 	CurPage.getCurComp().setAttribute("RightType", null);
 	
-	String sTempletNo = "VI_BUSINESS_APPROVAL";//--Ä£°åºÅ--
+	String sTempletNo = "VI_PROJECTINFO_APPROVAL";//--Ä£°åºÅ--
 	ASObjectModel doTemp = new ASObjectModel(sTempletNo);
 	if("01".equals(customerType)){
 		doTemp.setVisible("SEX",false);//如果是法人客户隐藏性别字段
@@ -50,6 +50,15 @@
 		dwTemp.getDataObject().setRequired("firstchoice", true);
 		dwTemp.getDataObject().setRequired("firstopinion", true);
 		dwTemp.setGroupHidden("0030,0040,0050");
+		if("BACK".equals(flowstate)||"ANYBACK".equals(flowstate)){
+			dwTemp.getDataObject().setVisible("secondchoice", true);
+			dwTemp.getDataObject().setVisible("secondopinion", true);
+			dwTemp.getDataObject().setReadOnly("secondchoice", true);
+			dwTemp.getDataObject().setReadOnly("secondopinion", true);
+			dwTemp.getDataObject().setVisible("InterOpinion2", true);
+			dwTemp.getDataObject().setReadOnly("InterOpinion2", true);
+			dwTemp.setGroupHidden("0040,0050");
+		}
 	}else if("0040".equals(phaseNo)){//复审
 		dwTemp.getDataObject().setVisible("firstchoice", true);
 		dwTemp.getDataObject().setVisible("firstopinion", true);
@@ -59,7 +68,16 @@
 		dwTemp.getDataObject().setVisible("secondopinion", true);
 		dwTemp.getDataObject().setRequired("secondchoice", true);
 		dwTemp.getDataObject().setRequired("secondopinion", true);
-		dwTemp.setGroupHidden("0040,0050");
+		dwTemp.setGroupHidden("0040");
+		if("BACK".equals(flowstate)||"ANYBACK".equals(flowstate)){
+			dwTemp.getDataObject().setVisible("thirdchoice", true);
+			dwTemp.getDataObject().setVisible("thirdopinion", true);
+			dwTemp.getDataObject().setReadOnly("thirdchoice", true);
+			dwTemp.getDataObject().setReadOnly("thirdopinion", true);
+			dwTemp.getDataObject().setVisible("INTEROPINION3", true);
+			dwTemp.getDataObject().setReadOnly("INTEROPINION3", true);
+			dwTemp.setGroupHidden("0050");
+		}
 	}else if("0050".equals(phaseNo)){//信审
 		if(!"true".equals(ishistory)){
 			dwTemp.getDataObject().setVisible("firstchoice", true);
@@ -123,6 +141,11 @@
 			$("#A_div_1240").attr("style","display:none;");
 			$("#A_div_1250").attr("style","display:none;");
 			$("#A_div_1260").attr("style","display:none;");
+			if("BACK"=="<%=flowstate%>"||"ANYBACK"=="<%=flowstate%>"){
+				$("#A_div_1230").attr("style","display:block;");
+				$("#A_div_1240").attr("style","display:block;");
+				$("#A_div_1260").attr("style","display:block;");
+		    }
 			_user_validator[0]['rules']['FIRSTCHOICE']['required0'] = true;
 			_user_validator[0]['messages']['FIRSTCHOICE']['required0'] = '请输入初审意见';
 			_user_validator[0]['rules']['FIRSTOPINION']['required0'] = true;
@@ -136,7 +159,10 @@
 			$("#FIRSTOPINION").attr("disabled","disabled");//审批意见
 			$("#INTEROPINION1").attr("disabled","disabled");//初审内部意见
 			$("#DISTRIOPINION1").attr("disabled","disabled");//初审经销商意见
-			
+			if("BACK"=="<%=flowstate%>"||"ANYBACK"=="<%=flowstate%>"){
+				$("#A_div_1250").attr("style","display:block;");
+				$("#A_div_1260").attr("style","display:block;");
+		    }
 			_user_validator[0]['rules']['SECONDCHOICE']['required0'] = true;
 			_user_validator[0]['messages']['SECONDCHOICE']['required0'] = '请输入复审意见';
 			_user_validator[0]['rules']['SECONDOPINION']['required0'] = true;
@@ -219,6 +245,7 @@
 			setItemValue(0,0,"firstopinion","");
 			$("#FIRSTOPINION").attr("disabled","disabled");
 		}
+		
 	})
 	
 	function checkCertId(){//校验证件号
@@ -234,6 +261,7 @@
 	function changeFirstChoice(){//根据初审意见，遍历相应的下拉选项
 		setItemValue(0,0,"firstopinion","");
 		var firstchoice = getItemValue(0,0,"firstchoice");
+		var attribute1="";
 		if(firstchoice==""){
 			setItemRequired(0,"InterOpinion1",false);
 			setItemRequired(0,"DistriOpinion1",false);
@@ -244,33 +272,46 @@
 			setItemRequired(0,"InterOpinion1",false);
 			setItemRequired(0,"DistriOpinion1",true);
 			$("#FIRSTOPINION").removeAttr("disabled");
-			var obj=document.getElementById('FIRSTOPINION'); 
+/* 			var obj=document.getElementById('FIRSTOPINION'); 
 			for(var i=0;i<7;i++){
 				obj.options[i].style.display = "block"; 
 			}
-			obj.options[7].style.display = "none"; 
+			obj.options[7].style.display = "none";  */
+			attribute1="1";
 		}
 		if(firstchoice=="0020"){
 			setItemRequired(0,"InterOpinion1",true);
 			setItemRequired(0,"DistriOpinion1",false);
 			$("#FIRSTOPINION").removeAttr("disabled");
-			var obj=document.getElementById('FIRSTOPINION');
+/* 			var obj=document.getElementById('FIRSTOPINION');
 			for(var i=0;i<7;i++){
 				obj.options[i].style.display = "none"; 
 			}
-			obj.options[7].style.display = "block"; 
+			obj.options[7].style.display = "block";  */
+			attribute1="2";
 		}
 		if(firstchoice=="0030"){
 			setItemRequired(0,"InterOpinion1",false);
 			setItemRequired(0,"DistriOpinion1",true);
+			setItemRequired(0,"FIRSTOPINION",false);
 			setItemValue(0,0,"firstopinion","");
 			$("#FIRSTOPINION").attr("disabled","disabled");
+			attribute1="";
 		}
+		AsControl.RunJsp('/Tenwa/Lease/Flow/Project/BusinessApplication/GetApplyName.jsp','codeno=disagreeOP&attribute1='+attribute1,function(sReturn){
+			if("FALSE"!=allTrim(sReturn)){
+				var sReturn = lTrim(sReturn);
+				sReturn = rTrim(sReturn);
+				$('#FIRSTOPINION').children().remove();
+				$('#FIRSTOPINION').append(sReturn);
+			}
+		});
 	}
 	
 	function changeSecondChoice(){//根据复审意见，遍历相应的下拉选项
 		setItemValue(0,0,"secondopinion","");
 		var secondchoice = getItemValue(0,0,"secondchoice");
+		var attribute1="";
 		if(secondchoice==""){
 			setItemRequired(0,"InterOpinion2",false);
 			//setItemRequired(0,"DistriOpinion2",false);
@@ -281,10 +322,11 @@
 			//setItemRequired(0,"DistriOpinion2",false);
 			$("#SECONDOPINION").removeAttr("disabled");
 			var obj=document.getElementById('SECONDOPINION');
-			for(var i=0;i<7;i++){
+	/* 		for(var i=0;i<7;i++){
 				obj.options[i].style.display = "none"; 
 			}
-			obj.options[7].style.display = "block"; 
+			obj.options[7].style.display = "block";  */
+			attribute1="2";
 		}
 		if(secondchoice=="0010"){
 			setItemRequired(0,"A_div_1240",true);
@@ -292,10 +334,11 @@
 			//setItemRequired(0,"DistriOpinion2",true);
 			$("#SECONDOPINION").removeAttr("disabled");
 			var obj=document.getElementById('SECONDOPINION'); 
-			for(var i=0;i<7;i++){
+	/* 		for(var i=0;i<7;i++){
 				obj.options[i].style.display = "block"; 
 			}
-			obj.options[7].style.display = "none"; 
+			obj.options[7].style.display = "none";  */
+			attribute1="1";
 		}
  		if(secondchoice=="0030"){
  			setItemRequired(0,"InterOpinion2",false);
@@ -303,18 +346,29 @@
 			setItemRequired(0,"secondopinion",false);
 			setItemValue(0,0,"secondopinion","");
 			$("#SECONDOPINION").attr("disabled","disabled");
+			attribute1="";
 		} 
 		if(secondchoice=="0040"){
 			setItemRequired(0,"InterOpinion2",false);
 			//setItemRequired(0,"DistriOpinion2",true);
 			setItemValue(0,0,"secondopinion","");
 			$("#SECONDOPINION").attr("disabled","disabled");
+			attribute1="";
 		}
+		AsControl.RunJsp('/Tenwa/Lease/Flow/Project/BusinessApplication/GetApplyName.jsp','codeno=disagreeOP&attribute1='+attribute1,function(sReturn){
+			if("FALSE"!=allTrim(sReturn)){
+				var sReturn = lTrim(sReturn);
+				sReturn = rTrim(sReturn);
+				$('#SECONDOPINION').children().remove();
+				$('#SECONDOPINION').append(sReturn);
+			}
+		});
 	}
 	
 	function changeThirdChoice(){//根据信审意见，遍历相应的下拉选项
 		setItemValue(0,0,"thirdopinion","");
 		var thirdchoice = getItemValue(0,0,"thirdchoice");
+		var attribute1="";
 		if(thirdchoice==""){
 			setItemRequired(0,"InterOpinion3",false);
 			//setItemRequired(0,"DistriOpinion3",false);
@@ -326,20 +380,22 @@
 			//setItemRequired(0,"DistriOpinion3",true);
 			$("#THIRDOPINION").removeAttr("disabled");
 			var obj=document.getElementById('THIRDOPINION'); 
-			for(var i=0;i<7;i++){
+/* 			for(var i=0;i<7;i++){
 				obj.options[i].style.display = "block"; 
 			}
-			obj.options[7].style.display = "none"; 
+			obj.options[7].style.display = "none"; */
+			attribute1="1";
 		}
 		if(thirdchoice=="0020"){
 			setItemRequired(0,"InterOpinion3",true);
 			//setItemRequired(0,"DistriOpinion3",false);
 			$("#THIRDOPINION").removeAttr("disabled");
 			var obj=document.getElementById('THIRDOPINION');
-			for(var i=0;i<7;i++){
+		/* 	for(var i=0;i<7;i++){
 				obj.options[i].style.display = "none"; 
 			}
-			obj.options[7].style.display = "block"; 
+			obj.options[7].style.display = "block";  */
+			attribute1="2";
 		}
 		if(thirdchoice=="0030"){
 			setItemRequired(0,"InterOpinion3",false);
@@ -347,13 +403,23 @@
 			setItemRequired(0,"thirdopinion",false);
 			setItemValue(0,0,"thirdopinion","");
 			$("#THIRDOPINION").attr("disabled","disabled");
+			attribute1="";
 		}
 		if(thirdchoice=="0040"){
 			setItemRequired(0,"InterOpinion3",false);
 			//setItemRequired(0,"DistriOpinion3",true);
 			setItemValue(0,0,"thirdopinion","");
 			$("#THIRDOPINION").attr("disabled","disabled");
+			attribute1="";
 		}
+		AsControl.RunJsp('/Tenwa/Lease/Flow/Project/BusinessApplication/GetApplyName.jsp','codeno=disagreeOP&attribute1='+attribute1,function(sReturn){
+			if("FALSE"!=allTrim(sReturn)){
+				var sReturn = lTrim(sReturn);
+				sReturn = rTrim(sReturn);
+				$('#THIRDOPINION').children().remove();
+				$('#THIRDOPINION').append(sReturn);
+			}
+		});
 	}
 	
 	function save(){

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

@@ -15,6 +15,8 @@
 	doTemp.setColTips("", "");
 	doTemp.setDefaultValue("project_id", ProjectId);
 	doTemp.setHtmlEvent("tel","onChange","checkTelRepeat");
+	doTemp.setHtmlEvent("certId","onChange","checkCertId");
+	doTemp.setHtmlEvent("suphone","onChange","checkSuphone");
 	ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request);
 	dwTemp.Style = "2";//freeform
 	//dwTemp.ReadOnly = "-2";//只读模式
@@ -41,21 +43,19 @@
 <script type="text/javascript">
 	function checkCertId(){//校验共同申请人证件号格式
 		var certId = getItemValue(0,getRow(0),"certid");
-		if(certId.length!=18){
-			alert("身份证必须是18位！"); 
-			return false;
-		}
 		if(certId==""){
-			//setErrorTips("certId","证件号不能为空!");
+			setErrorTips("certId","证件号不能为空!");
-			alert("证件号不能为空!");
+			return false;
+		}
+		if(certId.length!=18){
+			setErrorTips("certid","身份证必须是18位！"); 
 			return false;
 		}
-
 		if(CheckLicense(certId)){
+			setErrorTips("certid",""); 
 			return true;
 		}else{
-			//setErrorTips("certId","身份证格式不正确!");
+			setErrorTips("certId","身份证格式不正确!");
-			alert("身份证格式错误！"); 
 			return false;
 		}
 
@@ -64,31 +64,42 @@
 	function checkTel(){//校验共同申请人手机号格式
 		var tel = getItemValue(0,getRow(0),"tel");
 		if(tel==""){
-			//setErrorTips("mobile","手机号不能为空!");
+			setErrorTips("tel","手机号不能为空!");
-			alert("手机号不能为空!");
+			//alert("手机号不能为空!");
 			return false;
 		}
-		if(CheckPhoneCode(tel)){
+		var phone = /^[1][3,4,5,7,8][0-9]{9}$/;
+		if(phone.test(tel)){
+			setErrorTips("tel","");
 			return true;
 		}else{
-			//setErrorTips("mobile","手机号格式不正确!");
+			setErrorTips("tel","手机号格式不正确!");
-			alert("手机号格式不正确!");
+			//alert("手机号格式不正确!");
 			return false;
 		}
+		/* if(CheckPhoneCode(tel)){
+			setErrorTips("tel","");
+			return true;
+		}else{
+			setErrorTips("tel","手机号格式不正确!");
+			//alert("手机号格式不正确!");
+			return false;
+		} */
 	}
 	
 	function checkSuphone(){//校验单位电话格式和不为空
 		var suphone = getItemValue(0,getRow(0),"suphone");
 		if(suphone==""){
-			//setErrorTips("mobile","手机号不能为空!");
+			setErrorTips("suphone","单位电话不能为空!");
-			alert("单位电话不能为空!");
+			//alert("单位电话不能为空!");
 			return false;
 		}
 		if(CheckPhoneCode(suphone)){
+			setErrorTips("suphone","");
 			return true;
 		}else{
-			//setErrorTips("mobile","手机号格式不正确!");
+			setErrorTips("suphone","单位电话格式不正确!");
-			alert("单位电话格式不正确!");
+			//alert("单位电话格式不正确!");
 			return false;
 		}
 	}
@@ -99,9 +110,12 @@
 		var sParams = "mobile="+tel+",customerType="+customerType+",flowunid="+"<%=FlowUnid%>";
 		var sReturnInfo = RunJavaMethodTrans("com.tenwa.lease.flow.project.businessapply.CustomerInfoCheck","checkMobileRepeat",sParams);
 		if(sReturnInfo=="8"){
-			alert("该手机号已重复!");
+			setErrorTips("tel","该手机号已重复!");
-			setItemValue(0,0,"tel","");
+			//alert("该手机号已重复!");
-			return;
+			return false;
+		}else{
+			setErrorTips("tel","");
+			return true;
 		}
 	}
 	
@@ -146,14 +160,18 @@
 		if(SuphoneResult==false){
 			return;
 		}
-// 		var ID = getItemValue(0,getRow(0),'ID');
+		var falgs = checkTelRepeat();
-// 		if("undefined"==ID||""==ID || null==ID){
+		if(falgs==false){
-// 			AsDebug.showMessage("提示","请选中一条数据！","","",true);
+			return;
-// 			return;
+		}
-// 		}
+		/*var ID = getItemValue(0,getRow(0),'ID');
-// 		var sUrl = "/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerFamilyJoinTempInfo.jsp";
+		if("undefined"==ID||""==ID || null==ID){
-// 		var sparam = 'ID='+ID;
+			AsDebug.showMessage("提示","请选中一条数据！","","",true);
-// 		AsControl.OpenView(sUrl,sparam,"_self","");
+			return;
+		}
+		var sUrl = "/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerFamilyJoinTempInfo.jsp";
+		var sparam = 'ID='+ID;
+		AsControl.OpenView(sUrl,sparam,"_self","");
 		var name = getItemValue(0,0,"name");
 		var certid = getItemValue(0,0,"certid");
 		var tel = getItemValue(0,0,"tel");
@@ -165,14 +183,14 @@
 		if(name=="" || certid=="" || tel==""){
 			alert("请输入共同申请人信息!");
 			return;
-		}else{
+		}else{ */
 			var flowunid = getItemValue(0,0,"flowunid");
 			if(null==flowunid||""==flowunid){
 				setItemValue(0, 0, "flowunid", "<%=FlowUnid%>");
 				setItemValue(0, 0, "Partner_", "Y");
 			}
 			as_save(0);
-		}
+// 		}
 	}
 	function returnList(){
 		 AsControl.OpenView("<%=sPrevUrl%>", "","_self","");

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

@@ -89,10 +89,14 @@
 	
 	function checkRepeat(mobile){//校验申请人一个手机号和配偶手机号是否重复
 		var tel = getItemValue(0,getRow(),"tel");
-		if(mobile!=tel){
+		if(typeof(mobile)!=undefined && mobile != ''&&typeof(tel)!=undefined && tel != ''){
-			return "true";
+			if(mobile!=tel){
+				return "true";
+			}else{
+				return "false";
+			}
 		}else{
-			return "false";
+			return "true";
 		}
 	}
 	
@@ -137,7 +141,7 @@
  	}
 	
 	function save(){//保存配偶信息
-
+	    var marriage=parent.getItemValue(0,0,"MARRIAGE");
 		var status = getItemValue(0,0,"status");//获取父页面婚姻状况
 		var name = getItemValue(0,0,"name");
 		var certid = getItemValue(0,0,"certid");
@@ -231,19 +235,36 @@
 					parent.parent.autoCloseDWDialog();
 				}
 			}
-			var sResult = RunJavaMethodTrans("com.tenwa.lease.flow.project.businessapply.CustomerInfoManage","saveCustomerFamily",
+			if("01"==marriage){
-					  "relative=01,status=valid,customerid=<%=customerid%>,flowunid=<%=flowunid%>,projectId=<%=projectId%>,certid="+getItemValue(0,0,"certid")+",name="+getItemValue(0,0,"name")+",tel="+getItemValue(0,0,"tel")+",suname="+getItemValue(0,0,"suname")+",partner="+getItemValue(0,getRow(0),"Partner_")+",sposition="+getItemValue(0,getRow(0),"sposition")+",suphone="+getItemValue(0,getRow(0),"suphone")+",smincome="+getItemValue(0,getRow(0),"smincome")+",shukou="+getItemValue(0,getRow(0),"shukou")+",workunit="+getItemValue(0,getRow(0),"workunit"));
+				var sResult = RunJavaMethodTrans("com.tenwa.lease.flow.project.businessapply.CustomerInfoManage","saveCustomerFamily",
-			if(sResult == "SUCCESS"){
+						  "relative=01,status=valid,customerid=<%=customerid%>,flowunid=<%=flowunid%>,projectId=<%=projectId%>,certid="+getItemValue(0,0,"certid")+",name="+getItemValue(0,0,"name")+",tel="+getItemValue(0,0,"tel")+",suname="+getItemValue(0,0,"suname")+",partner="+getItemValue(0,getRow(0),"Partner_")+",sposition="+getItemValue(0,getRow(0),"sposition")+",suphone="+getItemValue(0,getRow(0),"suphone")+",smincome="+getItemValue(0,getRow(0),"smincome")+",shukou="+getItemValue(0,getRow(0),"shukou")+",workunit="+getItemValue(0,getRow(0),"workunit"));
-				reloadSelf();
+				if(sResult == "SUCCESS"){
+					reloadSelf();
+				}
+			}else{
+				var sResult = RunJavaMethodTrans("com.tenwa.lease.flow.project.businessapply.CustomerInfoManage","deleteCustomerFamily",
+				  "customerid=<%=customerid%>,flowunid=<%=flowunid%>");
+				if(sResult == "SUCCESS"){
+					reloadSelf();
+				}
 			}
 		}
 		if(name==null||name==""){
+           
 			setItemValue(0,0,"certid","");
 			setItemValue(0,0,"tel","");
-			var sResult = RunJavaMethodTrans("com.tenwa.lease.flow.project.businessapply.CustomerInfoManage","saveCustomerFamily",
+			if("01"==marriage){
-					  "relative=01,status=valid,customerid=<%=customerid%>,flowunid=<%=flowunid%>,projectId=<%=projectId%>,certid="+getItemValue(0,0,"certid")+",name="+getItemValue(0,0,"name")+",tel="+getItemValue(0,0,"tel"));
+				var sResult = RunJavaMethodTrans("com.tenwa.lease.flow.project.businessapply.CustomerInfoManage","saveCustomerFamily",
-			if(sResult == "SUCCESS"){
+						  "relative=01,status=valid,customerid=<%=customerid%>,flowunid=<%=flowunid%>,projectId=<%=projectId%>,certid="+getItemValue(0,0,"certid")+",name="+getItemValue(0,0,"name")+",tel="+getItemValue(0,0,"tel"));
-				reloadSelf();
+				if(sResult == "SUCCESS"){
+					reloadSelf();
+				}
+			}else{
+				var sResult = RunJavaMethodTrans("com.tenwa.lease.flow.project.businessapply.CustomerInfoManage","deleteCustomerFamily",
+						  "customerid=<%=customerid%>,flowunid=<%=flowunid%>");
+				if(sResult == "SUCCESS"){
+					reloadSelf();
+				}
 			}
 		}
 		return true;

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

@@ -360,13 +360,22 @@
 			alert("手机号不能为空!");
 			return false;
 		}
-		if(CheckPhoneCode(mobile)){
+		var phone = /^[1][3,4,5,7,8][0-9]{9}$/;
+		if(phone.test(mobile)){
+			setErrorTips("mobile","");
+			return true;
+		}else{
+			setErrorTips("mobile","手机号格式不正确!");
+			//alert("手机号格式不正确!");
+			return false;
+		}
+		/* if(CheckPhoneCode(mobile)){
 			return true;
 		}else{
 			//setErrorTips("mobile","手机号格式不正确!");
 			alert("手机号格式不正确!");
 			return false;
-		}
+		} */
 	}
 	
 	function saveRecord(leasfrom,projectSource){//保存
@@ -377,23 +386,25 @@
 		//校验申请人手机号和配偶手机号是否重复
 		var RepeatReault = "";
 		//RepeatReault = frame_list.window.checkRepeat(mobile,emergencyTel,remark);//传参基本信息校验三个手机号
-		RepeatReault = frame_list.window.checkRepeat(mobile);//传参校验基本信息手机号和配偶是否重复
+		RepeatReault = frame_list.checkRepeat(mobile);//传参校验基本信息手机号和配偶是否重复
 		if(RepeatReault=="false"){
 			alert("手机号有重复!");
 			return;
 		}
 		
 		var mobileResult = checkTel();
-		if(mobileResult=="false"){
+		if(mobileResult==false){
 			return;
 		}
 		
 		//校验公司电话区号
 		var workTel = getItemValue(0,0,"WORKTEL");
-		var result = RunJavaMethodTrans("com.tenwa.lease.flow.project.businessapply.CheckCustomerInfo","CheckWorkTelInfo","workTel="+workTel);
+		if(typeof(workTel)!=undefined && mobile != ''){
-		if(result=="false"){
+			var result = RunJavaMethodTrans("com.tenwa.lease.flow.project.businessapply.CheckCustomerInfo","CheckWorkTelInfo","workTel="+workTel);
-			alert("公司电话格式不正确!请输入区号-固定电话号!");
+			if(result=="false"){
-			return;
+				alert("公司电话格式不正确!请输入区号-固定电话号!");
+				return;
+			}
 		}
 		
 	<%--   var idexpiry=getItemValue(0,getRow(),"IDEXPIRY");

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

@@ -0,0 +1,20 @@
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/IncludeBeginMDAJAX.jsp"%><%
+		String codeno = CurPage.getParameter("codeno");
+        String attribute1 = CurPage.getParameter("attribute1");
+		try{
+			String sql =  "select c.itemno,c.itemname from code_library c where c.codeno='"+codeno+"' and  c.attribute1="+attribute1;
+			ASResultSet res = Sqlca.getASResultSet(new SqlObject(sql));
+			StringBuilder sb = new StringBuilder();
+			sb.append("<option value selected>---ÇëÑ¡Ôñ---</option>");
+			while(res.next()){
+				sb.append("<option value='"+res.getString("itemno")+"'>"+res.getString("itemname")+"</option>");
+			}
+			if(sb.length()>0){
+				out.print(sb.toString());
+			}
+		}catch(Exception e){
+			e.printStackTrace();
+			out.print("FALSE");
+		}
+%><%@ include file="/IncludeEndAJAX.jsp"%>

WebContent/Tenwa/Lease/Flow/Rent/CautionMoneyDeduction/ContractInfoPay.jsp

@@ -24,5 +24,18 @@
 	sButtonPosition = "south";
 %><%@ include file="/Frame/resources/include/ui/include_info.jspf"%>
 <script type="text/javascript">
+window.onload = function(){ 
+		var type = getItemValue(0,0,"customertype");
+		if(type=="03"||type==""||type==null){
+			hideItem(0,"CERTTYPE_CC");
+			hideItem(0,"CERTID_CC");
+			hideItem(0,"TEL_CC");
+		}else if(type=="01"){
+			hideItem(0,"SEX_CP");
+			hideItem(0,"CERTTYPE_CP");
+			hideItem(0,"CERTID_CP");
+			hideItem(0,"MOBILE_CP");
+		} 
+}
 </script>
 <%@ include file="/Frame/resources/include/include_end.jspf"%>

WebContent/Tenwa/Lease/Flow/RentNotify/RentNotifyList.jsp

@@ -1,3 +1,4 @@
+<%@page import="org.apache.catalina.User"%>
 <%@page import="jbo.app.tenwa.calc.LC_CALC_CONDITION_TEMP"%>
 <%@ page contentType="text/html; charset=GBK"%>
 <%@ include file="/Frame/resources/include/include_begin_list.jspf"%>
@@ -11,8 +12,11 @@
         History Log: 
     */
  
-	
+	String userId = CurUser.getUserID();
-	
+	String falg = "true";
+	if(userId.indexOf("8006")>-1){
+		falg = "false";
+	}
 	String compClientID = request.getParameter("CompClientID");
 	ASObjectModel doTemp = new ASObjectModel("RentNotify");
 	ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
@@ -25,9 +29,9 @@
 	//0、是否展示 1、	权限控制  2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码	6、	7、	8、	9、图标，CSS层叠样式 10、风格
 	String sButtons[][] =null;
 		sButtons=new String[][]{
-				{"true","All","Button","生成租金通知书","生成租金通知书","generateQuotation()","","","","btn_icon_generate"},
+				{falg,"All","Button","生成租金通知书","生成租金通知书","generateQuotation()","","","","btn_icon_generate"},
 				{"true","All","Button","批量下载","批量下载","lotdown()","","","","btn_icon_down"},
-				{"true","All","Button","公司盖章","公司盖章","stamp()","","","",""},
+				{falg,"All","Button","公司盖章","公司盖章","stamp()","","","",""},
 		}; 
 	
 %><%@include file="/Frame/resources/include/ui/include_list.jspf"%>

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

@@ -310,6 +310,7 @@
 			    <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="FIST_CORPUS" label="一年内未剩余本金" type="DOUBLE" length="22" scale="2"/>
 			    <attribute name="REPAYMENT_INTEREST" label="还款日差利息" type="DOUBLE" length="22" scale="2"/>
 			   
 			</attributes>
@@ -357,6 +358,7 @@
 			    <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="FIST_CORPUS" label="一年内未剩余本金" type="DOUBLE" length="22" scale="2"/>
 			    <attribute name="REPAYMENT_INTEREST" label="还款日差利息" type="DOUBLE" length="22" scale="2"/>
 			</attributes>
 			<manager>

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

@@ -680,7 +680,7 @@
 				<attribute name="ID" label="标识" type="STRING" length="32"/>
 				<attribute name="DISTRIBUTOR_ID" label="经销商ID" type="STRING" length="32"/>
 				<attribute name="CAUTION_MONEY" label="保证金金额" type="DOUBLE" length="22" scale="2"/>
-				<attribute name="REFUND_PERSON" label="退款人" type="STRING" length="20"/>
+				<attribute name="REFUND_PERSON" label="退款人" type="STRING" length="220"/>
 				<attribute name="RECV_OBJECT" label="退款对象" type="STRING" length="20"/>
 				<attribute name="RECV_WAY" label="退款方向" type="STRING" length="50"/>
 				<attribute name="RECV_TIME" label="退款时间" type="STRING" length="50"/>
@@ -709,7 +709,7 @@
 				<attribute name="FLOWUNID" label="FLOWUNID" type="STRING" length="32"/>
 				<attribute name="DISTRIBUTOR_ID" label="经销商ID" type="STRING" length="32"/>
 				<attribute name="CAUTION_MONEY" label="保证金金额" type="DOUBLE" length="22" scale="2"/>
-				<attribute name="REFUND_PERSON" label="退款人" type="STRING" length="20"/>
+				<attribute name="REFUND_PERSON" label="退款人" type="STRING" length="220"/>
 				<attribute name="RECV_OBJECT" label="退款对象" type="STRING" length="20"/>
 				<attribute name="RECV_WAY" label="退款方向" type="STRING" length="50"/>
 				<attribute name="RECV_TIME" label="退款时间" type="STRING" length="50"/>

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

@@ -1013,7 +1013,8 @@
 				<attribute name="ORGID" label="部门编号" type="STRING" length="32"/>
 				<attribute name="PROVINCES" label="省份" type="STRING" length="32"/>
 				<attribute name="DISTRIBUTOR_CODING" label="经销商编号" type="STRING" length="32"/>
-				<attribute name="TOTAL" label="总额" type="STRING" length="32"/>
+				<attribute name="TOTAL" label="额度" type="STRING" length="32"/>
+				<attribute name="SUMS" label="总额" type="STRING" length="64"/>
 			</attributes>
 			<manager>
 				<managerProperties>
@@ -1305,7 +1306,8 @@
 				<attribute name="ORGID" label="部门编号" type="STRING" length="32"/>
 				<attribute name="PROVINCES" label="省份" type="STRING" length="32"/>
 				<attribute name="DISTRIBUTOR_CODING" label="经销商编码" type="STRING" length="32"/>
-				<attribute name="TOTAL" label="总额" type="STRING" length="32"/>
+				<attribute name="TOTAL" label="额度" type="STRING" length="32"/>
+				<attribute name="SUMS" label="总额" type="STRING" length="64"/>
 			</attributes>
 			<manager>
 				<managerProperties>
@@ -2531,7 +2533,9 @@
 				<attribute name="sposition" label="职位—配偶" type="STRING" length="32"/>
 				<attribute name="smincome" label="月收入——配偶" type="DOUBLE" length="22" scale="2"/>
 				<attribute name="contract_id" label="合同编号" type="STRING" length="32"/>
-				<attribute name="project_id" label="项目编号" type="STRING" length="32"/>
+				<attribute name="project_id" label="项目编号" type="STRING" length="32"/>
+				<attribute name="ASSURE_RELATION" label="关系" type="STRING" length="32"/>
+				<attribute name="SEX" label="性别" type="STRING" length="32"/>
 			</attributes>
 			<manager>
 				<managerProperties>
@@ -2570,7 +2574,9 @@
 				<attribute name="sposition" label="职位—配偶" type="STRING" length="32"/>
 				<attribute name="smincome" label="月收入——配偶" type="DOUBLE" length="22" scale="2"/>
 				<attribute name="contract_id" label="合同编号" type="STRING" length="32"/>
-				<attribute name="project_id" label="项目编号" type="STRING" length="32"/>
+				<attribute name="project_id" label="项目编号" type="STRING" length="32"/>
+				<attribute name="ASSURE_RELATION" label="关系" type="STRING" length="32"/>
+				<attribute name="SEX" label="性别" type="STRING" length="32"/>
 			</attributes>
 			<manager>
 				<managerProperties>
@@ -2607,7 +2613,9 @@
 				<attribute name="sposition" label="职位—配偶" type="STRING" length="32"/>
 				<attribute name="smincome" label="月收入——配偶" type="DOUBLE" length="22" scale="2"/>
 				<attribute name="contract_id" label="合同编号" type="STRING" length="32"/>
-				<attribute name="project_id" label="项目编号" type="STRING" length="32"/>
+				<attribute name="project_id" label="项目编号" type="STRING" length="32"/>
+				<attribute name="ASSURE_RELATION" label="关系" type="STRING" length="32"/>
+				<attribute name="SEX" label="性别" type="STRING" length="32"/>
 			</attributes>
 			<manager>
 				<managerProperties>

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

@@ -710,6 +710,9 @@
 				<attribute name="MORTGAGE_AGENT" label="抵押代理人" type="STRING" length="32"/>
 				<attribute name="VERSIONID" label="版本号" type="STRING" length="64"/>
 				<attribute name="distributor_id" label="distributor_id" type="STRING" length="32"/>
+				<attribute name="BUSINESSTYPE" label="业务类型" type="STRING" length="64"/>
+				<attribute name="AREA_CODE" label="车牌号对应所在区号" type="STRING" length="32"/>
+				<attribute name="CAR_TYPE" label="车辆类型" type="STRING" length="64"/>
 			</attributes>
 			<manager>
 				<managerProperties>
@@ -943,6 +946,9 @@
 				<attribute name="SEAL_TYPE" label="印章类型" type="STRING" length="32"/>
 				<attribute name="MORTGAGE_AGENT" label="抵押代理人" type="STRING" length="32"/>
 				<attribute name="VERSIONID" label="版本号" type="STRING" length="64"/>
+				<attribute name="BUSINESSTYPE" label="业务类型" type="STRING" length="64"/>
+				<attribute name="AREA_CODE" label="车牌号对应所在区号" type="STRING" length="32"/>
+				<attribute name="CAR_TYPE" label="车辆类型" type="STRING" length="64"/>
 			</attributes>
 			<manager>
 				<managerProperties>
@@ -1062,6 +1068,48 @@
 				</managerProperties>
 			</manager>
 		</class>
+		<class name="VI_PROJECTINFO_APPROVAL" label="审批表（承租人基本信息）" keyAttributes="">
+			<attributes>
+			    <attribute name="FLOWUNID" label="流程编号" type="STRING"/>
+				<attribute name="FULLNAME" label="姓名" type="STRING"/>
+				<attribute name="SEX" label="性别" type="STRING"/>
+				<attribute name="CERTTYPE" label="证件类型" type="STRING"/>
+				<attribute name="CERTID" label="证件号码" type="STRING"/>
+				<attribute name="WORKCORP" label="单位名称" type="STRING"/>
+				<attribute name="WORKADD" label="单位地址" type="STRING"/>
+				<attribute name="ENTRYTIME" label="入职时间" type="STRING"/>
+				<attribute name="FORMALEMP" label="是否是正式员工" type="STRING"/>
+				<attribute name="PRODUCTNAME" label="产品" type="STRING"/>
+				<attribute name="CLEANLEASEMONEY" label="融资金额" type="STRING"/>
+				<attribute name="LEASETERM" label="融资期限（月）" type="STRING"/>
+				<attribute name="INCOMENUMBERYEAR" label="还款方式" type="STRING"/>
+				<attribute name="firstchoice" label="初审意见" type="STRING"/>
+				<attribute name="firstopinion" label="审批意见" type="STRING"/>
+				<attribute name="secondchoice" label="复审意见" type="STRING"/>
+				<attribute name="secondopinion" label="审批意见" type="STRING"/>
+				<attribute name="thirdchoice" label="部门负责人意见" type="STRING"/>
+				<attribute name="thirdopinion" label="审批意见" type="STRING"/>
+				<attribute name="fourchoice" label="总经理意见" type="STRING"/>
+				<attribute name="fouropinion" label="审批意见" type="STRING"/>
+				<attribute name="project_no" label="项目编号" type="STRING"/>
+				<attribute name="car_type" label="车类型" type="STRING"/>
+				<attribute name="LEAS_FORM" label="租赁方式" type="STRING"/>
+				<attribute name="InterOpinion1" label="内部意见1" type="STRING"/>
+				<attribute name="DistriOpinion1" label="经销商意见1" type="STRING"/>
+				<attribute name="InterOpinion2" label="内部意见2" type="STRING"/>
+				<attribute name="DistriOpinion2" label="经销商意见2" type="STRING"/>
+				<attribute name="InterOpinion3" label="内部意见3" type="STRING"/>
+				<attribute name="DistriOpinion3" label="经销商意见3" type="STRING"/>
+				<attribute name="InterOpinion4" label="内部意见4" type="STRING"/>
+				<attribute name="DistriOpinion4" label="经销商意见4" type="STRING"/>
+     		</attributes>
+			<manager>
+				<managerProperties>
+					<property name="table" value="VI_PROJECTINFO_APPROVAL" />
+					<property name="createKey" value="true" />
+				</managerProperties>
+			</manager>
+		</class>
 		<class name="LB_MEETING_RECODE" label="会议记录" keyAttributes="ID">
 			<attributes>
 				<attribute name="ID" label="标识" type="STRING" length="32"/>
@@ -4023,6 +4071,75 @@
 				</managerProperties>
 			</manager>
 		</class>
+		<class name="INVOICE_INTERFACE" label="" keyAttributes="ID">
+			<attributes>
+				<attribute name="ID" label="标识" type="STRING" length="32"/>
+				<attribute name="invoice_id" label="关联id" type="STRING" length="32"/>
+				<attribute name="appid" label="应用代码" type="STRING" length="32"/>
+				<attribute name="sid" label="交易流水id" type="STRING" length="32"/>
+				<attribute name="yylxdm" label="应用类型代码" type="STRING" length="32"/>
+				<attribute name="fplxdm" label="发票类型代码" type="STRING" length="32"/>
+				<attribute name="kplx" label="开票类型" type="STRING" length="32"/>
+				<attribute name="tspz" label="特殊票种标识" type="STRING" length="32"/>
+				<attribute name="xhdwdzdh" label="销货单位地址电话" type="STRING" length="32"/>
+				<attribute name="xhdwyhzh" label="销货单位银行帐号" type="STRING" length="32"/>
+				<attribute name="ghdwsbh" label="购货单位识别号" type="STRING" length="32"/>
+				<attribute name="ghdwmc" label="购货单位名称" type="STRING" length="32"/>
+				<attribute name="ghdwdzdh" label="购货单位地址电话" type="STRING" length="32"/>
+				<attribute name="ghdwyhzh" label="购货单位银行帐号" type="STRING" length="32"/>
+				<attribute name="hsslbs" label="含税税率标识" type="STRING" length="32"/>
+				<attribute name="fyxm" label="费用项目" type="STRING" length="32"/>
+				<attribute name="fphxz" label="发票行性质" type="STRING" length="32"/>
+				<attribute name="spmc" label="商品名称" type="STRING" length="32"/>
+				<attribute name="spsm" label="商品税目" type="STRING" length="32"/>
+				<attribute name="ggxh" label="规格型号" type="STRING" length="32"/>
+				<attribute name="dw" label="单位" type="STRING" length="32"/>
+				<attribute name="spsl" label="商品数量" type="STRING" length="32"/>
+				<attribute name="dj" label="单价" type="STRING" length="32"/>
+				<attribute name="je" label="金额" type="STRING" length="32"/>
+				<attribute name="sl" label="税率" type="STRING" length="32"/>
+				<attribute name="se" label="税额" type="STRING" length="32"/>
+				<attribute name="hsbz" label="含税标志" type="STRING" length="32"/>
+				<attribute name="spbm" label="商品编码" type="STRING" length="32"/>
+				<attribute name="zxbm" label="纳税人自行编码" type="STRING" length="32"/>
+				<attribute name="yhzcbs" label="优惠政策标识" type="STRING" length="32"/>
+				<attribute name="slbs" label="0税率标识" type="STRING" length="32"/>
+				<attribute name="zzstsgl" label="增值税特殊管理" type="STRING" length="32"/>
+				<attribute name="zhsl" label="综合税率" type="STRING" length="32"/>
+				<attribute name="hjje" label="合计金额" type="STRING" length="32"/>
+				<attribute name="hjse" label="合计税额" type="STRING" length="32"/>
+				<attribute name="jshj" label="价税合计" type="STRING" length="32"/>
+				<attribute name="bz" label="备注" type="STRING" length="32"/>
+				<attribute name="skr" label="收款人" type="STRING" length="32"/>
+				<attribute name="fhr" label="复核人" type="STRING" length="32"/>
+				<attribute name="kpr" label="开票人" type="STRING" length="32"/>
+				<attribute name="zyspmc" label="主要商品名称" type="STRING" length="32"/>
+				<attribute name="ssyf" label="所属月份" type="STRING" length="32"/>
+				<attribute name="tzdbh" label="通知单编号" type="STRING" length="32"/>
+				<attribute name="yfphm" label="原发票号码" type="STRING" length="32"/>
+				<attribute name="yfpdm" label="原发票代码" type="STRING" length="32"/>
+				<attribute name="GMF_DZYX" label="收票人电子邮箱" type="STRING" length="32"/>
+				<attribute name="GMF_SJHM" label="收票人手机号码" type="STRING" length="32"/>
+				<attribute name="GMF_SJOPENID" label="收票人微信" type="STRING" length="32"/>
+				<attribute name="FIELD1" label="备用字段1" type="STRING" length="32"/>
+				<attribute name="FIELD2" label="FIELD2" type="STRING" length="32"/>
+				<attribute name="FIELD3" label="FIELD3" type="STRING" length="32"/>
+				<attribute name="FIELD4" label="FIELD4" type="STRING" length="32"/>
+				<attribute name="FIELD5" label="FIELD5" type="STRING" length="32"/>
+				<attribute name="INPUTUSERID" label="INPUTUSERID" type="STRING" length="32"/>
+				<attribute name="INPUTORGID" label="INPUTORGID" type="STRING" length="32"/>
+				<attribute name="INPUTTIME" label="INPUTTIME" type="STRING" length="32"/>
+				<attribute name="UPDATEUSERID" label="UPDATEUSERID" type="STRING" length="32"/>
+				<attribute name="UPDATEORGID" label="UPDATEORGID" type="STRING" length="32"/>
+				<attribute name="UPDATETIME" label="UPDATETIME" type="STRING" length="32"/>
+			</attributes>
+			<manager>
+				<managerProperties>
+					<property name="table" value="invoice_interface" />
+					<property name="createKey" value="true" />
+				</managerProperties>
+			</manager>
+		</class>
 	</package>
 	<package name="jbo.com.tenwa.lease.carbrand" >
 	<class name="LB_CLAIMS_BOOK_DETAIL" label="索赔申请书详情表" keyAttributes="ID">
@@ -4284,6 +4401,5 @@
 				</managerProperties>
 			</manager>
 		</class>
-	
 	</package>
 </jbo>

calc/com/tenwa/flow/CopyDChargeTempToFormal.java

@@ -30,11 +30,11 @@ public class CopyDChargeTempToFormal extends BaseBussiness{
 		DataOperatorUtil.copySingleJBO(D_DEPOSITCHARGE_INFO_TEMP.CLASS_NAME, fromCondtion, D_DEPOSITCHARGE_INFO.CLASS_NAME, null, otherProperty, Sqlca);		
 		BizObject dibo = JBOFactory.getBizObjectManager(DISTRIBUTOR_INFO_TEMP.CLASS_NAME, Sqlca).createQuery("flowunid=:flowunid").setParameter("flowunid",flowunid).getSingleResult(false);
 		BizObject deit = JBOFactory.createBizObjectQuery(D_DEPOSITCHARGE_INFO_TEMP.CLASS_NAME, "flowunid=:flowunid").setParameter("flowunid",flowunid).getSingleResult(false);
-		String num = dibo.getAttribute("TOTAL")==null?"0":dibo.getAttribute("TOTAL").getString();//.getString();
+		String num = dibo.getAttribute("SUMS")==null?"0":dibo.getAttribute("SUMS").getString();//.getString();
-		BigDecimal total = new BigDecimal("".equals(num)?"0":num);
+		BigDecimal sums = new BigDecimal("".equals(num)?"0":num);
 		BigDecimal cautionMoney = new BigDecimal(deit.getAttribute(D_DEPOSITRETURN_INFO_TEMP.CAUTION_MONEY).getString());
-		double num1 = total.add(cautionMoney).doubleValue();
+		double num1 = sums.add(cautionMoney).doubleValue();
-		JBOFactory.getBizObjectManager(DISTRIBUTOR_INFO.CLASS_NAME,Sqlca).createQuery("update o set TOTAL='"+num1+"' where distributor_no='"+DistributorNo+"'").executeUpdate();
+		JBOFactory.getBizObjectManager(DISTRIBUTOR_INFO.CLASS_NAME,Sqlca).createQuery("update o set SUMS='"+num1+"' where distributor_no='"+DistributorNo+"'").executeUpdate();
 		
 		return "true";
 	}

calc/com/tenwa/flow/CopyDReturnTempToFormal.java

@@ -37,10 +37,10 @@ public class CopyDReturnTempToFormal extends BaseBussiness {
 		
 		DataOperatorUtil.copySingleJBO(D_DEPOSITRETURN_INFO_TEMP.CLASS_NAME, fromCondtion, D_DEPOSITRETURN_INFO.CLASS_NAME, null, otherProperty, Sqlca);
 		//Ð޸ľ­ÏúÉÌ×ܶî
-		BigDecimal total = new BigDecimal(dst.getAttribute(DISTRIBUTOR_INFO_TEMP.TOTAL).getString());
+		BigDecimal sums = new BigDecimal(dst.getAttribute(DISTRIBUTOR_INFO_TEMP.SUMS).getString());
 		BigDecimal cautionMoney = new BigDecimal(deit.getAttribute(D_DEPOSITRETURN_INFO_TEMP.CAUTION_MONEY).getString());
-		double num = total.subtract(cautionMoney).doubleValue();
+		double num = sums.subtract(cautionMoney).doubleValue();
-		JBOFactory.getBizObjectManager(DISTRIBUTOR_INFO.CLASS_NAME,Sqlca).createQuery("update o set TOTAL='"+num+"' where distributor_no='"+disStatus+"'").executeUpdate();
+		JBOFactory.getBizObjectManager(DISTRIBUTOR_INFO.CLASS_NAME,Sqlca).createQuery("update o set SUMS='"+num+"' where distributor_no='"+disStatus+"'").executeUpdate();
 		return "true";
 	}
 }

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

@@ -1,5 +1,6 @@
 package com.tenwa.reckon.executor;
 
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -7,6 +8,7 @@ import java.util.Map;
 import jbo.app.tenwa.calc.LC_CALC_CONDITION;
 import jbo.app.tenwa.calc.LC_RENT_INCOME;
 import jbo.app.tenwa.calc.LC_RENT_PLAN;
+import jbo.com.tenwa.entity.comm.flow.FLOW_BUSSINESS_OBJECT;
 
 import com.amarsoft.app.awe.config.InitDBType;
 import com.amarsoft.are.jbo.BizObject;
@@ -19,6 +21,7 @@ import com.amarsoft.are.util.json.JSONEncoder;
 import com.amarsoft.are.util.json.JSONObject;
 import com.tenwa.reckon.util.Conn;
 import com.tenwa.reckon.util.DateUtil;
+import com.tenwa.reckon.util.DateUtils;
 /**
  * ºÏͬÖÐ;ÖÐÖ¹
  * @author tenwapc
@@ -136,13 +139,16 @@ public class RentCalHelper {
 		JBOTransaction tx=null;
 		try{
 			tx=JBOFactory.createJBOTransaction();
+			BizObjectManager bm = JBOFactory.getBizObjectManager(LC_CALC_CONDITION.CLASS_NAME);
 			Conn conn = new Conn(tx);
 			String sql = "select sum(case when  DATE_FORMAT(t.plandate,'%Y/%m/%d') >  DATE_FORMAT('"+this.paydayAdjust+"','%Y/%m/%d')  then t.remaincorpus else 0 end ) remaincorpus,"
 			 + " 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,min(t.rent*(12-t.cou))  fist_rent "
+			 +" 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 t.cou< t.planlist and t.planlist-t.cou<=12-t.cou then t.rent  else 0 end) fist_rent,"
-			 + "       from ("
+			 + " sum(case when t.cou< t.planlist and  t.planlist-t.cou>12-t.cou then t.corpus else 0 end)  fist_corpus,"
+			 + " max( case when DATE_FORMAT(t.plandate, '%Y/%m/%d') < DATE_FORMAT('"+this.paydayAdjust+"','%Y/%m/%d')  then t.plandate else '0'  end) plandate"
+			 + "  from ("
 	         + "       select "
 	         + "          t1.corpus-ifnull(t2.sumincomecorpus,0) remaincorpus,"
 	         + "          t1.interestbusiness - ifnull(t2.sumincomeinterest,0) remaininterest,"
@@ -179,11 +185,19 @@ public class RentCalHelper {
 				sql=sql.replaceAll("ifnull", "nvl");
 			}
 			List<Map<String, String>> results =  conn.executeQuery(sql, this.contractId,this.getPaymentnumber(),this.contractId,this.getPaymentnumber());
-			Map<String, String> detailInfo =  results.get(0);	
+			Map<String, String> detailInfo =  results.get(0);
 			for(String key : detailInfo.keySet()){
 				jsonObject.appendElement(key, detailInfo.get(key));
 			}
-			System.out.println(jsonObject.toString());
+			if(detailInfo.size()>0){
+				String planDate=detailInfo.get("plandate");
+				BigDecimal fistCorpus= new BigDecimal(detailInfo.get("fist_corpus"));
+				long numberDay=DateUtils.DateDays(this.paydayAdjust, planDate);
+				BizObject bo=bm.createQuery(" select * from O where contract_id=:contract_id").setParameter("contract_id", this.contractId).getSingleResult(false);
+				BigDecimal yearRate= new BigDecimal(bo!=null?bo.getAttribute(LC_CALC_CONDITION.YEAR_RATE).toString():"");
+				BigDecimal repaymentInterest=fistCorpus.multiply(yearRate).divide(new BigDecimal(360), 20, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(numberDay));
+				jsonObject.appendElement("REPAYMENT_INTEREST", repaymentInterest.setScale(2, BigDecimal.ROUND_HALF_UP).toString());
+			}
 			return JSONEncoder.encode(jsonObject);
 		}catch(Exception e){
 			tx.rollback();

src/com/tenwa/channelportal/action/ContractSignAction.java

@@ -1464,6 +1464,10 @@ public void wordToPdfJar(JBOTransaction tx){
 			BizObject DOCRELATIVE = null;
 			if("null".equals(PLAN_LIST)){
 				 DOCRELATIVE=bom.createQuery("plan_number=:plan_number").setParameter("plan_number",PAYMENT_NUMBER).getSingleResult(false);
+			}else if("transfer".equals(PLAN_LIST)){
+				DOCRELATIVE = bom.createQuery("CONTRACT_ID=:CONTRACT_ID and objecttype='끓홈瘻盧데'").setParameter("CONTRACT_ID",contract_id).getSingleResult(false);
+			}else if("settle".equals(PLAN_LIST)){
+				DOCRELATIVE = bom.createQuery("CONTRACT_ID=:CONTRACT_ID and objecttype='瓊품써헌聯츠'").setParameter("CONTRACT_ID",contract_id).getSingleResult(false);
 			}else{
 				DOCRELATIVE=bom.createQuery("plan_number=:plan_number and plan_list=:plan_list").setParameter("plan_number",PAYMENT_NUMBER).setParameter("plan_list", PLAN_LIST).getSingleResult(false);
 			}
@@ -2004,7 +2008,7 @@ public String claimSign(JBOTransaction tx) throws Exception {
 
 	
 	/**
-	 * 打印租金通知书并发短信给客户
+	 * 닭澗변맨무鱇覽
 	 * @param tx
 	 * @return
 	 * @throws Exception
@@ -2013,7 +2017,12 @@ public String claimSign(JBOTransaction tx) throws Exception {
 		requestService = (HttpRequestAppService) factory.create(HttpRequestAppService.class, this.getConfigRequestUrl());
 		String libraryid="";
 		BizObjectManager bom=JBOFactory.getBizObjectManager(jbo.app.tenwa.doc.LB_DOCRELATIVE.CLASS_NAME);
-		BizObject DOCRELATIVE=bom.createQuery("plan_number=:plan_number and objecttype LIKE '%打印催款函%' ").setParameter("plan_number",PAYMENT_NUMBER).getSingleResult(false);
+		BizObject DOCRELATIVE = null;
+		if("settle".equals(flagType)){
+			DOCRELATIVE=bom.createQuery("CONTRACT_ID=:contractid and objecttype='瓊품써헌聯츠' ").setParameter("contractid",contract_id).getSingleResult(false);
+		}else{
+			DOCRELATIVE=bom.createQuery("plan_number=:plan_number and objecttype LIKE '%댔丹닭운변%' ").setParameter("plan_number",PAYMENT_NUMBER).getSingleResult(false);
+		}
 		if (DOCRELATIVE != null) {
 			String DOCRELATIVEid=DOCRELATIVE.getAttribute("id").toString();
 			BizObjectManager bom1=JBOFactory.getBizObjectManager(jbo.app.tenwa.doc.LB_DOCLIBRARY.CLASS_NAME);

src_core/com/tenwa/officetempalte/controller/QutationAction.java

@@ -24,6 +24,7 @@ import com.tenwa.officetempalte.util.FileOperatorUtil;
 public class QutationAction {
 	String PROJECT_PLAN_NUMBER;
 	String CONTRACT_PLAN_NUMBER;
+	String objecttype;
 	
 	
 	public String getPROJECT_PLAN_NUMBER() {
@@ -44,6 +45,15 @@ public class QutationAction {
 	public void setCONTRACT_PLAN_NUMBER(String cONTRACT_PLAN_NUMBER) {
 		CONTRACT_PLAN_NUMBER = cONTRACT_PLAN_NUMBER;
 	}
+	
+	public String getObjecttype() {
+		return objecttype;
+	}
+
+
+	public void setObjecttype(String objecttype) {
+		this.objecttype = objecttype;
+	}
 
 
 	//根据前台参数生成文档
@@ -77,6 +87,6 @@ public class QutationAction {
 }
 	public void deletedevtion(JBOTransaction tx) throws Exception{
 		 BizObjectManager bom=JBOFactory.getBizObjectManager(jbo.app.tenwa.doc.LB_DOCRELATIVE.CLASS_NAME);
-		 bom.createQuery("delete from O where CONTRACT_ID=:CONTRACT_ID and objecttype='끓홈瘻盧데'").setParameter("CONTRACT_ID",PROJECT_PLAN_NUMBER).executeUpdate();
+		 bom.createQuery("delete from O where CONTRACT_ID=:CONTRACT_ID and objecttype=:objecttype ").setParameter("CONTRACT_ID",PROJECT_PLAN_NUMBER).setParameter("objecttype", objecttype).executeUpdate();
 	}
 }

src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherContractOnhireChange.java

@@ -92,12 +92,12 @@ public class CreateVoucherContractOnhireChange {
         	param.put("BUSINESSTYPE",BUSINESSTYPE);
         	//param.put("CARID",CARID);
         	//param.put("CARMODEL",CARMODEL);
-        	if(BUSINESSTYPE=="1"){
+        	if("1".equals(BUSINESSTYPE)){
         		param.put("LEASFORMASSET", "04"); // ÈÚ×Ê×âÁÞ×ʲú
             	param.put("DEPT", "02"); // ²¿ÃÅ
-            	if(CUSTOMERTYPE=="03"){ // 如果是个人业务
+            	if("03".equals(CUSTOMERTYPE)){ // 如果是个人业务
             		param.put("LEASINCOMEFORM", "02"); // C¶Ë
-            	}else if(CUSTOMERTYPE=="01"){
+            	}else if("01".equals(CUSTOMERTYPE)){
             		param.put("LEASINCOMEFORM", "01"); // B¶Ë
             	}
             }

src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherContractTerminate.java

@@ -97,12 +97,12 @@ public class CreateVoucherContractTerminate {
         	param.put("CUSTOMERTYPE",CUSTOMERTYPE);
         	param.put("BUSINESSTYPE",BUSINESSTYPE);
         	
-        	if(BUSINESSTYPE=="1"){
+        	if("1".equals(BUSINESSTYPE)){
         		param.put("LEASFORMASSET", "04"); // ÈÚ×Ê×âÁÞ×ʲú
             	param.put("DEPT", "02"); // ²¿ÃÅ
-            	if(CUSTOMERTYPE=="03"){ // 如果是个人业务
+            	if("03".equals(CUSTOMERTYPE)){ // 如果是个人业务
             		param.put("LEASINCOMEFORM", "02"); // C¶Ë
-            	}else if(CUSTOMERTYPE=="01"){
+            	}else if("01".equals(CUSTOMERTYPE)){
             		param.put("LEASINCOMEFORM", "01"); // B¶Ë
             	}
             }

src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherCustCautionMoneyIncome.java

@@ -42,9 +42,11 @@ public class CreateVoucherCustCautionMoneyIncome extends BaseBussiness{
 		param.clear();
 		map.put("FlowUnid", FlowUnid);
 		map.put("FEE_TYPE", FeeType);
+		if("PZ2018073100000062".equals(VOUCHERNO)){
+			sql="SELECT LFIT.FACT_MONEY AS MONEY,LFIT.FACT_MONEY/1.06 AS MONEYNOTAX,(LFIT.FACT_MONEY-LFIT.FACT_MONEY/1.06) AS MONEYTAX,DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS FACT_DATE,LFIT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,LEC.ID AS CARID,LEC.MODEL ,CIF.CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE FROM LC_FUND_INCOME_TEMP LFIT LEFT JOIN LB_CONTRACT_INFO LCI ON LFIT.CONTRACT_ID=LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO=LCI.DISTRIBUTOR_ID LEFT JOIN LB_EQUIPMENT_CAR LEC ON LEC.CONTRACT_ID=LCI.ID LEFT JOIN lb_union_lessee lul ON lul.contract_id=lci.id LEFT JOIN customer_info cif ON cif.customerid=lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE  LFIT.FEE_TYPE in ('feetype20','feetype21','feetype22','feetype23') AND LFIT.FLOWUNID=:FLOWUNID ";
+		}else{
 		sql= "SELECT LFIT.FACT_MONEY AS MONEY,LFIT.FACT_MONEY/1.06 AS MONEYNOTAX,(LFIT.FACT_MONEY-LFIT.FACT_MONEY/1.06) AS MONEYTAX,DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS FACT_DATE,LFIT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,LEC.ID AS CARID,LEC.MODEL ,CIF.CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE FROM LC_FUND_INCOME_TEMP LFIT LEFT JOIN LB_CONTRACT_INFO LCI ON LFIT.CONTRACT_ID=LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO=LCI.DISTRIBUTOR_ID LEFT JOIN LB_EQUIPMENT_CAR LEC ON LEC.CONTRACT_ID=LCI.ID LEFT JOIN lb_union_lessee lul ON lul.contract_id=lci.id LEFT JOIN customer_info cif ON cif.customerid=lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE  LFIT.FEE_TYPE=:FEE_TYPE AND LFIT.FLOWUNID=:FLOWUNID ";
-		
+		}
-		
 		List<Map<String,String>> dataList=DataOperatorUtil.getDataBySql(Sqlca, sql, map);
 
 		CreateVoucherServiceImpl vs=new CreateVoucherServiceImpl();
@@ -90,12 +92,12 @@ public class CreateVoucherCustCautionMoneyIncome extends BaseBussiness{
         	param.put("CUSTOMERTYPE",CUSTOMERTYPE);
         	param.put("BUSINESSTYPE",BUSINESSTYPE);
         	
-        	if(BUSINESSTYPE=="1"){
+        	if("1".equals(BUSINESSTYPE)){
         		param.put("LEASFORMASSET", "04"); // ÈÚ×Ê×âÁÞ×ʲú
             	param.put("DEPT", "02"); // ²¿ÃÅ
-            	if(CUSTOMERTYPE=="03"){ // 如果是个人业务
+            	if("03".equals(CUSTOMERTYPE)){ // Èç¹ûÊǸöÈËÒµÎñ
             		param.put("LEASINCOMEFORM", "02"); // C¶Ë
-            	}else if(CUSTOMERTYPE=="01"){
+            	}else if("01".equals(CUSTOMERTYPE)){
             		param.put("LEASINCOMEFORM", "01"); // B¶Ë
             	}
             }

src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherCustomerRentOrFee.java

@@ -112,12 +112,12 @@ public String CreateVoucher(String FlowUnid,String VOUCHERNO) throws Exception {
         	param.put("CUSTOMERTYPE",CUSTOMERTYPE);
         	param.put("BUSINESSTYPE",BUSINESSTYPE);
         	
-        	if(BUSINESSTYPE=="1"){
+        	if("1".equals(BUSINESSTYPE)){
         		param.put("LEASFORMASSET", "04"); // ÈÚ×Ê×âÁÞ×ʲú
             	param.put("DEPT", "02"); // ²¿ÃÅ
-            	if(CUSTOMERTYPE=="03"){ // 如果是个人业务
+            	if("03".equals(CUSTOMERTYPE)){ // 如果是个人业务
             		param.put("LEASINCOMEFORM", "02"); // C¶Ë
-            	}else if(CUSTOMERTYPE=="01"){
+            	}else if("01".equals(CUSTOMERTYPE)){
             		param.put("LEASINCOMEFORM", "01"); // B¶Ë
             	}
             }

src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherDistCautionMoneyRe.java

@@ -39,7 +39,7 @@ public String CreateVoucher(String FlowUnid,String VOUCHERNO) throws Exception {
 		sql= "SELECT DDIT.CAUTION_MONEY,DATE_FORMAT(SYSDATE(),'%Y/%m/%d') "
 				+ "AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS FACT_DATE,"
 				+ "DDIT.REFUND_PERSON,DIF.DISTRIBUTOR_CODING DISTRIBUTOR_NO,DIF.DISTRIBUTOR_NAME FROM D_DEPOSITRETURN_INFO_TEMP"
-				+ " DDIT LEFT JOIN DISTRIBUTOR_INFO DIF ON DIF.ID=DDIT.DISTRIBUTOR_ID "
+				+ " DDIT LEFT JOIN DISTRIBUTOR_INFO DIF ON DIF.DISTRIBUTOR_NO=DDIT.DISTRIBUTOR_ID "
 				+ "WHERE DDIT.FLOWUNID=:FLOWUNID";
 		}
 		if("PZ2018072100000032".equals(VOUCHERNO)){
@@ -48,7 +48,7 @@ public String CreateVoucher(String FlowUnid,String VOUCHERNO) throws Exception {
 				+ "AS FACT_DATE,DDIT.payer,DIF.DISTRIBUTOR_CODING DISTRIBUTOR_NO,"
 				+ "DIF.DISTRIBUTOR_NAME FROM D_DEPOSITCHARGE_INFO_TEMP "
 				+ "DDIT LEFT JOIN DISTRIBUTOR_INFO DIF ON "
-				+ "DIF.ID=DDIT.DISTRIBUTOR_ID WHERE DDIT.FLOWUNID=:FLOWUNID";
+				+ "DIF.DISTRIBUTOR_NO=DDIT.DISTRIBUTOR_ID WHERE DDIT.FLOWUNID=:FLOWUNID";
 		}
 		List<Map<String,String>> dataList=DataOperatorUtil.getDataBySql(Sqlca, sql, map);
 
@@ -72,8 +72,15 @@ public String CreateVoucher(String FlowUnid,String VOUCHERNO) throws Exception {
         	param.put("LEAS_FORM",leas_form);
         	param.put("DISTRIBUTOR_ID",DISTRIBUTOR_ID);
         	param.put("DISTRIBUTOR_NAME",DISTRIBUTOR_NAME);
-        	
+        	param.put("CUSTID",DISTRIBUTOR_ID);
+        	param.put("CUSTNAME",DISTRIBUTOR_NAME);
         	param.put("FlowUnid", FlowUnid);
+        	
+        		//param.put("LEASFORMASSET", "04"); // ÈÚ×Ê×âÁÞ×ʲú
+            	param.put("DEPT", "02"); // ²¿ÃÅ
+            
+            //param.put("FUNDTYPE", "01"); // Ö÷ÓªÀàÐÍ
+            //param.put("BUSINESSTYPE", "06");
         	map.clear();
         	map.put("PROJ_TYPE", leas_form);
         	map.put("VOUCHER_NO", VOUCHERNO);

src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherHandlingMoney.java

@@ -92,12 +92,12 @@ public String CreateVoucher(String FlowUnid,String VOUCHERNO) throws Exception {
         	param.put("CUSTOMERTYPE",CUSTOMERTYPE);
         	param.put("BUSINESSTYPE",BUSINESSTYPE);
         	
-        	if(BUSINESSTYPE=="1"){
+        	if("1".equals(BUSINESSTYPE)){
         		param.put("LEASFORMASSET", "04"); // ÈÚ×Ê×âÁÞ×ʲú
             	param.put("DEPT", "02"); // ²¿ÃÅ
-            	if(CUSTOMERTYPE=="03"){ // 如果是个人业务
+            	if("03".equals(CUSTOMERTYPE)){ // 如果是个人业务
             		param.put("LEASINCOMEFORM", "02"); // C¶Ë
-            	}else if(CUSTOMERTYPE=="01"){
+            	}else if("01".equals(CUSTOMERTYPE)){
             		param.put("LEASINCOMEFORM", "01"); // B¶Ë
             	}
             }

src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoanDistributor.java

@@ -43,9 +43,11 @@ public class CreateVoucherLoanDistributor {
 		String moneyDataSource="";
 		param.clear();
 		map.put("FlowUnid", FlowUnid);
+		//起租-给经销商放款-车款全款
 		if("PZ2018070900000002".equals(VOUCHERNO)||"PZ2018072400000060".equals(VOUCHERNO)){
 			moneyDataSource="LCCT.EQUIP_AMT";
 		}
+		//起租-经销商支付的预付款(首付)
 		if("PZ2018070900000003".equals(VOUCHERNO)){
 			moneyDataSource="LCCT.FIRST_PAYMENT";
 		}
@@ -99,12 +101,12 @@ public class CreateVoucherLoanDistributor {
         	param.put("CUSTOMERTYPE",CUSTOMERTYPE);
         	param.put("BUSINESSTYPE",BUSINESSTYPE);
         	
-        	if(BUSINESSTYPE=="1"){
+        	if("1".equals(BUSINESSTYPE)){
         		param.put("LEASFORMASSET", "04"); // ÈÚ×Ê×âÁÞ×ʲú
             	param.put("DEPT", "02"); // ²¿ÃÅ
-            	if(CUSTOMERTYPE=="03"){ // 如果是个人业务
+            	if("03".equals(CUSTOMERTYPE)){ // 如果是个人业务
             		param.put("LEASINCOMEFORM", "02"); // C¶Ë
-            	}else if(CUSTOMERTYPE=="01"){
+            	}else if("01".equals(CUSTOMERTYPE)){
             		param.put("LEASINCOMEFORM", "01"); // B¶Ë
             	}
             }

src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/IncomeVoucher.java

@@ -16,11 +16,14 @@ public class IncomeVoucher extends BaseBussiness {
 		cvci.CreateVoucher(FlowUnid, "PZ2018071100000012", "feetype2");//收到客户保证金
 		cvci.CreateVoucher(FlowUnid, "PZ2018072100000023", "feetype1");//按月分摊的保证金
 		cvci.CreateVoucher(FlowUnid, "PZ2018072100000031", "feetype4");//都到留购价款
+		cvci.CreateVoucher(FlowUnid, "PZ2018072100000028", "feetype27");//ÌùÏ¢
+		cvci.CreateVoucher(FlowUnid, "PZ2018073100000062", null);//¹ºÖÃË°+±£ÏÕ+×°ÊÎ
+		cvci.CreateVoucher(FlowUnid, "PZ2018073100000061", "feetype24");//GPS
 		
-		CreateVoucherRentIncome cvri=new CreateVoucherRentIncome();
+		/*CreateVoucherRentIncome cvri=new CreateVoucherRentIncome();
 		cvri.CreateVoucher(FlowUnid, "PZ2018072100000024");//收到租金
 		cvri.CreateVoucher(FlowUnid, "PZ2018072100000025");//收到逾期利息
-		
+*/		
 		
 		return "true";
 	}

src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMonthSettlement.java

@@ -97,12 +97,12 @@ public class CreateVoucherMonthSettlement{
         	param.put("CUSTOMERTYPE",CUSTOMERTYPE);
         	param.put("BUSINESSTYPE",BUSINESSTYPE);
         	
-        	if(BUSINESSTYPE=="1"){
+        	if("1".equals(BUSINESSTYPE)){
         		param.put("LEASFORMASSET", "04"); // ÈÚ×Ê×âÁÞ×ʲú
             	param.put("DEPT", "02"); // ²¿ÃÅ
-            	if(CUSTOMERTYPE=="03"){ // 如果是个人业务
+            	if("03".equals(CUSTOMERTYPE)){ // 如果是个人业务
             		param.put("LEASINCOMEFORM", "02"); // C¶Ë
-            	}else if(CUSTOMERTYPE=="01"){
+            	}else if("01".equals(CUSTOMERTYPE)){
             		param.put("LEASINCOMEFORM", "01"); // B¶Ë
             	}
             }

src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRentIncome.java

@@ -7,6 +7,7 @@ import java.util.Map;
 import jbo.voucher.LV_VOUCHER_CONFIG;
 
 import com.amarsoft.are.jbo.BizObject;
+import com.amarsoft.are.jbo.JBOException;
 import com.amarsoft.awe.util.Transaction;
 import com.amarsoft.dict.als.cache.CacheLoaderFactory;
 import com.tenwa.comm.util.jboutil.DataOperatorUtil;
@@ -14,13 +15,16 @@ import com.tenwa.voucher.serviceImp.CreateVoucherServiceImpl;
 
 public class CreateVoucherRentIncome {
 
-	public String CreateVoucher(String FlowUnid,String VOUCHERNO) throws Exception {
+	public void CreateVoucher(String VOUCHERNO){
 		
 		Transaction Sqlca =null;
+		try{
 		Map<String,String> map=new HashMap<String, String>();
 		Map<String,String> param=new HashMap<String, String>();
 		Sqlca =  Transaction.createTransaction(CacheLoaderFactory.getDataSource());
 		String MONEY=null;
+		String MONEYNOTAX=null;
+		String MONEYTAX=null;
 		String ACCOUNT_DATE=null;
 		String FACT_DATE=null;
 		String CONTRACT_ID=null;
@@ -37,12 +41,11 @@ public class CreateVoucherRentIncome {
 		String BUSINESSTYPE=null;
 		String sql="";
 		param.clear();
-		map.put("FLOWUNID", FlowUnid);
 		if("PZ2018072100000024".equals(VOUCHERNO)){
-		sql= "SELECT LRIT.rent AS MONEY,DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS FACT_DATE,LrIT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,LrIT.FLOWUNID,CIF.CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE FROM LC_rent_INCOME_TEMP LrIT LEFT JOIN LB_CONTRACT_INFO LCI ON LrIT.CONTRACT_ID=LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO=LCI.DISTRIBUTOR_ID LEFT JOIN LB_EQUIPMENT_CAR LEC ON LEC.CONTRACT_ID=LCI.ID LEFT JOIN lb_union_lessee lul ON lul.contract_id=lci.id LEFT JOIN customer_info cif ON cif.customerid=lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE  LrIT.FLOWUNID=:FLOWUNID";
+		sql= "SELECT LRIT.rent AS MONEY,0 as MONEYNOTAX,0 as MONEYTAX, DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS FACT_DATE,LrIT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,LrIT.FLOWUNID,CIF.CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE FROM LC_rent_INCOME LrIT LEFT JOIN LB_CONTRACT_INFO LCI ON LrIT.CONTRACT_ID=LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO=LCI.DISTRIBUTOR_ID LEFT JOIN LB_EQUIPMENT_CAR LEC ON LEC.CONTRACT_ID=LCI.ID LEFT JOIN lb_union_lessee lul ON lul.contract_id=lci.id LEFT JOIN customer_info cif ON cif.customerid=lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE DATE_FORMAT(LrIT.hire_date,'%Y/%m/%d')=DATE_FORMAT(sysdate(),'%Y/%m/%d') ";
 		}
 		if("PZ2018072100000025".equals(VOUCHERNO)){
-			sql= "SELECT LrIT.penalty AS MONEY,DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS FACT_DATE,LrIT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,LrIT.FLOWUNID,CIF.CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE FROM LC_rent_INCOME_TEMP LrIT LEFT JOIN LB_CONTRACT_INFO LCI ON LrIT.CONTRACT_ID=LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO=LCI.DISTRIBUTOR_ID LEFT JOIN LB_EQUIPMENT_CAR LEC ON LEC.CONTRACT_ID=LCI.ID LEFT JOIN lb_union_lessee lul ON lul.contract_id=lci.id LEFT JOIN customer_info cif ON cif.customerid=lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE  LrIT.FLOWUNID=:FLOWUNID";
+			sql= "SELECT LrIT.penalty AS MONEY,ROUND(LrIT.penalty/1.06,2) AS MONEYNOTAX,LrIT.penalty-ROUND(LrIT.penalty/1.06,2) AS MONEYTAX,DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS FACT_DATE,LrIT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,LrIT.FLOWUNID,CIF.CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE FROM LC_rent_INCOME LrIT LEFT JOIN LB_CONTRACT_INFO LCI ON LrIT.CONTRACT_ID=LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO=LCI.DISTRIBUTOR_ID LEFT JOIN LB_EQUIPMENT_CAR LEC ON LEC.CONTRACT_ID=LCI.ID LEFT JOIN lb_union_lessee lul ON lul.contract_id=lci.id LEFT JOIN customer_info cif ON cif.customerid=lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE  DATE_FORMAT(LrIT.hire_date,'%Y/%m/%d')=DATE_FORMAT(SYSDATE(),'%Y/%m/%d')";
 		}
 		List<Map<String,String>> dataList=DataOperatorUtil.getDataBySql(Sqlca, sql, map);
 
@@ -53,7 +56,9 @@ public class CreateVoucherRentIncome {
 			MONEY=dataList.get(i).get("MONEY").toString();
 			if("".equals(MONEY)||MONEY==null) MONEY="0.00";
 			double mon=Double.parseDouble(MONEY);
-			if(mon>0){
+			if(Math.abs(mon)>0){
+				MONEYNOTAX=dataList.get(i).get("MONEYNOTAX").toString();
+				MONEYTAX=dataList.get(i).get("MONEYTAX").toString();
 			ACCOUNT_DATE=dataList.get(i).get("ACCOUNT_DATE").toString();
 			FACT_DATE =dataList.get(i).get("FACT_DATE").toString();
 			CONTRACT_ID=dataList.get(i).get("CONTRACT_ID").toString();
@@ -70,6 +75,8 @@ public class CreateVoucherRentIncome {
 			BUSINESSTYPE=dataList.get(i).get("BUSINESSTYPE");
 			
 			param.put("FACT_MONEY",MONEY);
+			param.put("INTERESTNOTAX",MONEYNOTAX);
+			param.put("TAX",MONEYTAX);
         	param.put("ACCOUNT_DATE",ACCOUNT_DATE);
         	param.put("FACT_DATE",FACT_DATE);
         	param.put("CONTRACT_ID",CONTRACT_ID);
@@ -85,19 +92,18 @@ public class CreateVoucherRentIncome {
         	param.put("CUSTOMERTYPE",CUSTOMERTYPE);
         	param.put("BUSINESSTYPE",BUSINESSTYPE);
         	
-        	if(BUSINESSTYPE=="1"){
+        	if("1".equals(BUSINESSTYPE)){
         		param.put("LEASFORMASSET", "04"); // ÈÚ×Ê×âÁÞ×ʲú
             	param.put("DEPT", "02"); // ²¿ÃÅ
-            	if(CUSTOMERTYPE=="03"){ // Èç¹ûÊǸöÈËÒµÎñ
+            	if("03".equals(CUSTOMERTYPE)){ // Èç¹ûÊǸöÈËÒµÎñ
             		param.put("LEASINCOMEFORM", "02"); // C¶Ë
-            	}else if(CUSTOMERTYPE=="01"){
+            	}else if("01".equals(CUSTOMERTYPE)){
             		param.put("LEASINCOMEFORM", "01"); // B¶Ë
             	}
             }
             //param.put("FUNDTYPE", ""); // Ö÷ÓªÀàÐÍ
             param.put("BUSINESSTYPE", "06");
         	
-        	param.put("FlowUnid", FlowUnid);
         	map.clear();
         	map.put("PROJ_TYPE", leas_form);
         	map.put("VOUCHER_NO", VOUCHERNO);
@@ -112,7 +118,17 @@ public class CreateVoucherRentIncome {
 			Sqlca.commit();
 		}
 		
-        String sMessage="true"; 
+	}catch (Exception e){
-		return sMessage;
+		e.printStackTrace();
+	}finally{
+		if(Sqlca!=null){
+	        try {
+				Sqlca.disConnect();
+			} catch (JBOException e) {
+				e.printStackTrace();
+			}
+	        Sqlca = null;
+	    }
+	}
 	}
 }

src_core/com/tenwa/voucher/CreateVoucherProcess/auxiliaryInfo/auxiliaryContractOrg.java

@@ -13,10 +13,8 @@ public class auxiliaryContractOrg implements VoucherJavaParamService {
 public Map<String, String> getJavaParam(JBOTransaction tx,
 		Map<String, String> param) throws BusinessException {
 	Map<String,String>returnValue=new HashMap<String,String>();
-	String ORGID=param.get("ORGID");
+	String DEPT=param.get("DEPT");
-	String ORGNAME=param.get("ORGNAME");
+	returnValue.put("DEPT",DEPT);
-	returnValue.put("ORGID",ORGID);
-	returnValue.put("ORGNAME",ORGNAME);
 	return returnValue;
 }
 }

src_core/com/tenwa/voucher/serviceImp/VoucherToV8Impl.java

@@ -129,10 +129,10 @@ public class VoucherToV8Impl implements VoucherService {
 				d.put("F61",list.get(i).get("CUSTNAME"));
 				d.put("F72",list.get(i).get("DISTRIBUTOR_ID"));
 				d.put("F66",list.get(i).get("DISTRIBUTOR_NAME"));
-				d.put("F64","汽车");
+				d.put("F64",list.get(i).get("LEASFORMASSET"));
-				d.put("F63","业务二部");
+				d.put("F63",list.get(i).get("DEPT"));
 				d.put("F73",list.get(i).get("LEASINCOMEFORM"));
-				d.put("F75",list.get(i).get("FUNDTYPE"));
+				d.put("F74",list.get(i).get("FUNDTYPE"));
 				d.put("F75",list.get(i).get("BUSINESSTYPE"));
 				
 				d.put("inputuserid",user.getAttribute("userid").getString());

src_sys/com/tenwa/flow/action/comm/SelectBalance.java

@@ -42,7 +42,7 @@ public class SelectBalance {
 		Map<String,String> params= new HashMap<String,String>();
 		params.put("distributor_id", distributor_no);
 		//params.put("caution_money", caution_money);
-		String sql="SELECT O.total AS money "
+		String sql="SELECT O.sums AS money "
 				+ "FROM DISTRIBUTOR_INFO O WHERE "
 				+ "O.distributor_no=:distributor_id";
 		List<Map<String,String>> getSql = DataOperatorUtil.getDataBySql(scql, sql, params);

src_tenwa/com/tenwa/controller/LAElementConfigController.java

@@ -1,6 +1,7 @@
 package com.tenwa.controller;
 
 import jbo.com.tenwa.lease.comm.VI_BUSINESS_APPROVAL;
+import jbo.com.tenwa.lease.comm.VI_PROJECTINFO_APPROVAL;
 import jbo.com.tenwa.limit.LA_LIMIT_ELEMENT;
 
 import com.amarsoft.are.jbo.BizObject;
@@ -61,17 +62,17 @@ public class LAElementConfigController {
 	}
 	public String queryBusinessApproval(JBOTransaction tx)throws Exception {
 		String meagess="";
-		BizObjectManager lleManager =  JBOFactory.getBizObjectManager(VI_BUSINESS_APPROVAL.CLASS_NAME,tx);
+		BizObjectManager lleManager =  JBOFactory.getBizObjectManager(VI_PROJECTINFO_APPROVAL.CLASS_NAME,tx);
 		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.firstopinion).toString():"false";
+			meagess=bo!=null?bo.getAttribute(VI_PROJECTINFO_APPROVAL.firstopinion).toString():"false";
 			break;
 	    case "0040":
-	    	meagess=meagess=bo!=null?bo.getAttribute(VI_BUSINESS_APPROVAL.secondopinion).toString():"false";;
+	    	meagess=meagess=bo!=null?bo.getAttribute(VI_PROJECTINFO_APPROVAL.secondopinion).toString():"false";;
 			break;
 	    case "0050":
-	    	meagess=meagess=bo!=null?bo.getAttribute(VI_BUSINESS_APPROVAL.thirdopinion).toString():"false";;
+	    	meagess=meagess=bo!=null?bo.getAttribute(VI_PROJECTINFO_APPROVAL.thirdopinion).toString():"false";;
 	 		break;
 		default:
 			meagess="false";

src_tenwa/com/tenwa/customer/cache/CustomerInfoCache.java

@@ -109,7 +109,7 @@ public class CustomerInfoCache {
 		   while(rs.next()){
 			   custtype += rs.getStringValue("custtype")+",";
 		   }
-		   custtype=custtype.substring(0, custtype.length()-1);
+		   if(custtype.length()>0)custtype=custtype.substring(0, custtype.length()-1);
 		   String[] type=custtype.split(",");
 		   custtype="";
 		   for(int i=0;i<type.length;i++){

src_tenwa/com/tenwa/lease/app/invoicemanager/InvoiceManagerController.java

@@ -174,10 +174,10 @@ public class InvoiceManagerController extends BaseTable{
 	public String submitOrNoInvoiceRentPlanInvoice(JBOTransaction tx) throws Exception{
 		BizObjectManager lriiManager = JBOFactory.getBizObjectManager(LI_RENT_INVOICE_INFO.CLASS_NAME);
 		BizObjectManager lrpManager= JBOFactory.getBizObjectManager(LC_RENT_PLAN.CLASS_NAME);
-		BizObjectManager lcitManager= JBOFactory.getBizObjectManager(LB_CONTRACT_INVOICE_TYPE.CLASS_NAME);
+		//BizObjectManager lcitManager= JBOFactory.getBizObjectManager(LB_CONTRACT_INVOICE_TYPE.CLASS_NAME);
 		tx.join(lriiManager);
 		tx.join(lrpManager);
-		tx.join(lcitManager);
+		//tx.join(lcitManager);
 		String[] rentPlanIds = PlanList.split("@");
 		for(int i=0;i<rentPlanIds.length;i+=3){
 			BizObject lrii = lriiManager.createQuery("PLAN_ID=:planid and TAX_TYPE=:taxtype and bill_type='invoice' ").setParameter("planid",rentPlanIds[i]).setParameter("taxtype",rentPlanIds[i+1]).getSingleResult(false);
@@ -185,19 +185,19 @@ public class InvoiceManagerController extends BaseTable{
 			String contractId=lrp.getAttribute("CONTRACT_ID").getString();
 			BizObject lriiNew = lriiManager.newObject();
 			if(lrii==null){
-				BizObject lcit = lcitManager.createQuery("CONTRACT_ID=:contractid and IS_MAIN='Y' ").setParameter("contractid",contractId).getSingleResult(false);
+				//BizObject lcit = lcitManager.createQuery("CONTRACT_ID=:contractid and IS_MAIN='Y' ").setParameter("contractid",contractId).getSingleResult(false);
-				lriiNew.setAttributesValue(lcit);
+				//lriiNew.setAttributesValue(lcit);
 				lriiNew.setAttributeValue("ID", null);
 				lriiNew.setAttributeValue("INVOICE_STATUS", InvoiceStatus);
 				lriiNew.setAttributeValue("BILL_TYPE", "invoice");
-				if(lcit.getAttribute("TAX_REG_TYPE").getString().equals("tax_payercategory1")){
+				/*if(lcit.getAttribute("TAX_REG_TYPE").getString().equals("tax_payercategory1")){
 					lriiNew.setAttributeValue("INVOICE_TYPE", "invoice_type01");
 				}else{
 					lriiNew.setAttributeValue("INVOICE_TYPE", "invoice_type02");
-				}
+				}*/
 				lriiNew.setAttributeValue("INVOICE_MONEY", lrp.getAttribute(rentPlanIds[i+1].toUpperCase()).getString());
 				lriiNew.setAttributeValue("TAX_TYPE", rentPlanIds[i+1]);
-				lriiNew.setAttributeValue("INVOICE_RATE", rentPlanIds[i+2]);
+				//lriiNew.setAttributeValue("INVOICE_RATE", rentPlanIds[i+2]);
 				lriiNew.setAttributeValue("TEMPORARY_NOINVOICE", "0.00");
 				lriiNew.setAttributeValue("NOINVOICE", "0.00");
 				lriiNew.setAttributeValue("PLAN_ID",lrp.getAttribute("ID").getString());
@@ -224,10 +224,10 @@ public class InvoiceManagerController extends BaseTable{
 	public String submitOrNoInvoiceCorpusOneInvoice(JBOTransaction tx) throws Exception{
 		BizObjectManager lriiManager = JBOFactory.getBizObjectManager(LI_RENT_INVOICE_INFO.CLASS_NAME);
 		BizObjectManager lccManager = JBOFactory.getBizObjectManager(LC_CALC_CONDITION.CLASS_NAME);
-		BizObjectManager lcitManager= JBOFactory.getBizObjectManager(LB_CONTRACT_INVOICE_TYPE.CLASS_NAME);
+		//BizObjectManager lcitManager= JBOFactory.getBizObjectManager(LB_CONTRACT_INVOICE_TYPE.CLASS_NAME);
 		tx.join(lriiManager);
 		tx.join(lccManager);
-		tx.join(lcitManager);
+		//tx.join(lcitManager);
 		String[] paymentLists = PaymentList.split("@");
 		for(int i=0;i<paymentLists.length;i+=2){
 			BizObject lrii = lriiManager.createQuery("PAYMENT_NUMBER=:paymentnumber and bill_type='invoice' ").setParameter("paymentnumber",paymentLists[i]).getSingleResult(false);
@@ -235,19 +235,19 @@ public class InvoiceManagerController extends BaseTable{
 			String contractId=lcc.getAttribute("CONTRACT_ID").getString();
 			BizObject lriiNew = lriiManager.newObject();
 			if(lrii==null){
-				BizObject lcit = lcitManager.createQuery("CONTRACT_ID=:contractid and IS_MAIN='Y' ").setParameter("contractid",contractId).getSingleResult(false);
+				//BizObject lcit = lcitManager.createQuery("CONTRACT_ID=:contractid and IS_MAIN='Y' ").setParameter("contractid",contractId).getSingleResult(false);
-				lriiNew.setAttributesValue(lcit);
+				//lriiNew.setAttributesValue(lcit);
 				lriiNew.setAttributeValue("ID", null);
 				lriiNew.setAttributeValue("INVOICE_STATUS", InvoiceStatus);
 				lriiNew.setAttributeValue("BILL_TYPE", "invoice");
-				if(lcit.getAttribute("TAX_REG_TYPE").getString().equals("tax_payercategory1")){
+				/*if(lcit.getAttribute("TAX_REG_TYPE").getString().equals("tax_payercategory1")){
 					lriiNew.setAttributeValue("INVOICE_TYPE", "invoice_type01");
 				}else{
 					lriiNew.setAttributeValue("INVOICE_TYPE", "invoice_type02");
-				}
+				}*/
 				lriiNew.setAttributeValue("INVOICE_MONEY", lcc.getAttribute("EQUIP_AMT").getDouble()-lcc.getAttribute("FIRST_PAYMENT").getDouble());
 				lriiNew.setAttributeValue("TAX_TYPE", "corpusone");
-				lriiNew.setAttributeValue("INVOICE_RATE", paymentLists[i+1]);
+				//lriiNew.setAttributeValue("INVOICE_RATE", paymentLists[i+1]);
 				lriiNew.setAttributeValue("TEMPORARY_NOINVOICE", "0.00");
 				lriiNew.setAttributeValue("NOINVOICE", "0.00");
 				lriiNew.setAttributeValue("PAYMENT_NUMBER",paymentLists[i]);
@@ -275,29 +275,29 @@ public class InvoiceManagerController extends BaseTable{
 	public String submitOrNoInvoicePenaltyIncomeInvoice(JBOTransaction tx) throws Exception{
 		BizObjectManager lriiManager = JBOFactory.getBizObjectManager(LI_RENT_INVOICE_INFO.CLASS_NAME);
 		BizObjectManager lriManager= JBOFactory.getBizObjectManager(LC_RENT_INCOME.CLASS_NAME);
-		BizObjectManager lcitManager= JBOFactory.getBizObjectManager(LB_CONTRACT_INVOICE_TYPE.CLASS_NAME);
+		//BizObjectManager lcitManager= JBOFactory.getBizObjectManager(LB_CONTRACT_INVOICE_TYPE.CLASS_NAME);
 		tx.join(lriiManager);
 		tx.join(lriManager);
-		tx.join(lcitManager);
+		//tx.join(lcitManager);
 		String[] rentIncomeIds = IncomeList.split("@");
 		for(int i=0;i<rentIncomeIds.length;i+=3){
 			BizObject lrii = lriiManager.createQuery("INCOME_ID=:incomeid and TAX_TYPE='penalty' and bill_type='invoice' ").setParameter("incomeid",rentIncomeIds[i]).getSingleResult(false);
 			BizObject lri = lriManager.createQuery("ID=:id ").setParameter("id",rentIncomeIds[i]).getSingleResult(false);
 			BizObject lriiNew = lriiManager.newObject();
 			if(lrii==null){
-				BizObject lcit = lcitManager.createQuery("ID=:id ").setParameter("id",rentIncomeIds[i+2]).getSingleResult(false);
+				//BizObject lcit = lcitManager.createQuery("ID=:id ").setParameter("id",rentIncomeIds[i+2]).getSingleResult(false);
-				lriiNew.setAttributesValue(lcit);
+				//lriiNew.setAttributesValue(lcit);
 				lriiNew.setAttributeValue("ID", null);
 				lriiNew.setAttributeValue("INVOICE_STATUS", InvoiceStatus);
 				lriiNew.setAttributeValue("BILL_TYPE", "invoice");
-				if(lcit.getAttribute("TAX_REG_TYPE").getString().equals("tax_payercategory1")){
+				/*if(lcit.getAttribute("TAX_REG_TYPE").getString().equals("tax_payercategory1")){
 					lriiNew.setAttributeValue("INVOICE_TYPE", "invoice_type01");
 				}else{
 					lriiNew.setAttributeValue("INVOICE_TYPE", "invoice_type02");
-				}
+				}*/
 				lriiNew.setAttributeValue("INVOICE_MONEY", lri.getAttribute("PENALTY").getString());
 				lriiNew.setAttributeValue("TAX_TYPE", "penalty");
-				lriiNew.setAttributeValue("INVOICE_RATE", rentIncomeIds[i+1]);
+				//lriiNew.setAttributeValue("INVOICE_RATE", rentIncomeIds[i+1]);
 				lriiNew.setAttributeValue("TEMPORARY_NOINVOICE", "0.00");
 				lriiNew.setAttributeValue("NOINVOICE", "0.00");
 				lriiNew.setAttributeValue("INCOME_ID",rentIncomeIds[i]);

src_tenwa/com/tenwa/lease/app/quartzmession/AutoBuckle.java

@@ -0,0 +1,43 @@
+package com.tenwa.lease.app.quartzmession;
+
+import java.util.List;
+
+import jbo.com.tenwa.lease.comm.VI_LC_AUDIT_RENT_PLAN;
+
+import org.quartz.Job;
+import org.quartz.JobExecutionContext;
+import org.quartz.JobExecutionException;
+
+import com.amarsoft.are.jbo.BizObject;
+import com.amarsoft.are.jbo.JBOFactory;
+import com.amarsoft.are.jbo.JBOTransaction;
+import com.amarsoft.awe.Configure;
+import com.tenwa.collectaudit.cache.CollectAuditInfoCache;
+import com.tenwa.comm.util.date.DateAssistant;
+
+public class AutoBuckle implements Job{
+
+	@Override
+	public void execute(JobExecutionContext arg0) throws JobExecutionException {
+		CollectAuditInfoCache ca = new CollectAuditInfoCache();
+		JBOTransaction tx;
+		String plan_date = DateAssistant.getToday();
+		try {
+			tx = JBOFactory.createJBOTransaction();
+			//and (O.rent<>'' or O.rent<>'0' or O.rent<>'0.0')
+			List<BizObject> bos = JBOFactory.getBizObjectManager(VI_LC_AUDIT_RENT_PLAN.CLASS_NAME, tx).createQuery("O.COLLECT_STATUS IN ('δÊÕ¿î', '²¿·ÖÊÕ¿î') and O.PLAN_DATE <= '"+plan_date+"' and O.BATCH_STATUS<>'process' ").getResultList(true);
+			StringBuffer ids = new StringBuffer();
+			for (BizObject bo : bos) {
+				ids.append(bo.getAttribute("id").getString()+"@");
+			}
+			ca.setId(ids.toString().substring(0, ids.toString().length()-1));
+			Configure CurConfig = Configure.getInstance();
+			ca.setFileSavePath(CurConfig.getConfigure("InterfaceFileSavePath"));
+			ca.setInputuserid("system");
+			ca.setInputorgid("system");
+			ca.batchCollectManage(tx);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+}

src_tenwa/com/tenwa/lease/app/quartzmession/AutoRefresh.java

@@ -0,0 +1,42 @@
+package com.tenwa.lease.app.quartzmession;
+
+import java.util.List;
+
+import jbo.com.tenwa.lease.comm.VI_LC_AUDIT_RENT_PLAN;
+
+import org.quartz.Job;
+import org.quartz.JobExecutionContext;
+import org.quartz.JobExecutionException;
+
+import com.amarsoft.are.jbo.BizObject;
+import com.amarsoft.are.jbo.JBOFactory;
+import com.amarsoft.are.jbo.JBOTransaction;
+import com.amarsoft.awe.Configure;
+import com.tenwa.collectaudit.cache.CollectAuditInfoCache;
+import com.tenwa.comm.util.date.DateAssistant;
+
+public class AutoRefresh implements Job{
+
+	@Override
+	public void execute(JobExecutionContext arg0) throws JobExecutionException {
+		CollectAuditInfoCache ca = new CollectAuditInfoCache();
+		JBOTransaction tx;
+		String plan_date = DateAssistant.getToday();
+		try {
+			tx = JBOFactory.createJBOTransaction();
+			List<BizObject> bos = JBOFactory.getBizObjectManager(VI_LC_AUDIT_RENT_PLAN.CLASS_NAME, tx).createQuery("O.COLLECT_STATUS IN ('δÊÕ¿î', '²¿·ÖÊÕ¿î') and O.PLAN_DATE <= '"+plan_date+"'").getResultList(true);
+			StringBuffer ids = new StringBuffer();
+			for (BizObject bo : bos) {
+				ids.append(bo.getAttribute("id").getString()+"@");
+			}
+			ca.setId(ids.toString().substring(0, ids.toString().length()-1));
+			Configure CurConfig = Configure.getInstance();
+			ca.setFileSavePath(CurConfig.getConfigure("InterfaceFileSavePath"));
+			ca.setInputuserid("system");
+			ca.setInputorgid("system");
+			ca.queryBatchCollectStatus(tx);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+}

src_tenwa/com/tenwa/lease/app/quartzmession/CreateVoucherRentIncomeMission.java

@@ -0,0 +1,19 @@
+package com.tenwa.lease.app.quartzmession;
+
+import org.quartz.Job;
+import org.quartz.JobExecutionContext;
+import org.quartz.JobExecutionException;
+
+import com.tenwa.voucher.CreateVoucherProcess.CreateVoucherMonthSettlement;
+import com.tenwa.voucher.CreateVoucherProcess.CreateVoucherRentIncome;
+
+public class CreateVoucherRentIncomeMission implements Job {
+
+	@Override
+	public void execute(JobExecutionContext arg0) throws JobExecutionException {
+		CreateVoucherRentIncome cvri=new CreateVoucherRentIncome();
+		cvri.CreateVoucher("PZ2018072100000024");//ÊÕµ½×â½ð
+		cvri.CreateVoucher("PZ2018072100000025");//ÊÕµ½ÓâÆÚÀûÏ¢
+	}
+
+}

src_tenwa/com/tenwa/lease/flow/project/businessapply/BusinessApproveManager.java

@@ -143,8 +143,8 @@ public class BusinessApproveManager {
 	public String saveApproveOpinion(JBOTransaction tx){
 		try{
 			BizObjectManager bomFT = JBOFactory.getBizObjectManager(FLOW_TASK.CLASS_NAME,tx);
-			BizObject boFT = bomFT.createQuery("objectno=:flowunid and phaseno=:phaseNo and serialno=:serialno  and relativeobjectno is not null")
+			BizObject boFT = bomFT.createQuery("objectno=:flowunid and phaseno=:phaseNo  and relativeobjectno is not null")
-									.setParameter("flowunid", flowunid).setParameter("phaseNo", phaseNo).setParameter("serialno", serialNo).getSingleResult(true);
+									.setParameter("flowunid", flowunid).setParameter("phaseNo", phaseNo).getSingleResult(true);
 			BizObjectManager bomFO = JBOFactory.getBizObjectManager(FLOW_OPINION.CLASS_NAME,tx);
 			BizObject bo = bomFO.createQuery("serialno='"+serialNo+"'").getSingleResult(true);
 			if(boFT != null){
@@ -154,7 +154,7 @@ public class BusinessApproveManager {
 				bomFT.createQuery("update O set relativeobjectno='"+serialNo+"' where serialno='"+serialNo+"'").executeUpdate();
 				bo.setAttributeValue(FLOW_OPINION.phaseopinion, phaseOpinion);
 				bo.setAttributeValue(FLOW_OPINION.phasechoice, phaseChoice);
-				bo.setAttributeValue(FLOW_OPINION.phaseopinion1, InterOpinion1);
+				bo.setAttributeValue(FLOW_OPINION.InterOpinion1, InterOpinion1);
 				bo.setAttributeValue(FLOW_OPINION.DistriOpinion1, DistriOpinion1);
 				bo.setAttributeValue("InterOpinion2", InterOpinion2);
 				bo.setAttributeValue("DistriOpinion2", DistriOpinion2);

src_tenwa/com/tenwa/lease/flow/project/businessapply/CustomerInfoManage.java

@@ -297,6 +297,17 @@ public class CustomerInfoManage {
 		}
 		return "SUCCESS";
 	}
+	public String deleteCustomerFamily(JBOTransaction tx){
+		try{
+			BizObjectManager bom = JBOFactory.getBizObjectManager(CUSTOMER_FAMILY_TEMP.CLASS_NAME,tx);
+			BizObject bo = bom.createQuery("flowunid=:flowunid and customerid=:customerid and Spouse_<>'Y' ").setParameter("flowunid", flowunid).setParameter("customerid", customerid).getSingleResult(true);
+			bom.deleteObject(bo);
+		}catch(Exception e){
+			e.printStackTrace();
+			return "ERROR";
+		}
+		return "SUCCESS";
+	}
 	
 	public String saveCertInfo(JBOTransaction tx){
 		try{

src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBCustomerAccountChangeToFormalBusiness.java

@@ -0,0 +1,44 @@
+package com.tenwa.lease.flow.project.commbusiness;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import jbo.app.tenwa.customer.CUSTOMER_ACCOUNT;
+import jbo.app.tenwa.customer.CUSTOMER_ACCOUNT_TEMP;
+import jbo.app.tenwa.customer.CUSTOMER_FAMILY;
+import jbo.app.tenwa.customer.CUSTOMER_FAMILY_TEMP;
+import jbo.com.tenwa.entity.comm.flow.FLOW_BUSSINESS_OBJECT;
+import jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO;
+import jbo.com.tenwa.lease.comm.LB_EQUIPMENT;
+import jbo.com.tenwa.lease.comm.LB_EQUIPMENT_TEMP;
+import jbo.com.tenwa.lease.comm.LB_GUARANTEE_UNIT;
+import jbo.com.tenwa.lease.comm.LB_GUARANTEE_UNIT_TEMP;
+import jbo.com.tenwa.lease.comm.LB_UNION_LESSEE_TEMP;
+
+import com.amarsoft.are.jbo.BizObject;
+import com.amarsoft.awe.util.Transaction;
+import com.tenwa.comm.util.jboutil.DataOperatorUtil;
+import com.tenwa.flow.baseBussion.BaseBussiness;
+import com.tenwa.lease.flow.comm.service.LeaseFlowBaseService;
+import com.tenwa.lease.flow.comm.service.ServiceOperatorEnum;
+import com.tenwa.lease.flow.comm.serviceImp.LeaseFlowBaseServiceImp;
+import com.tenwa.lease.flow.project.businessapply.CustomerCompare;
+
+public class LBCustomerAccountChangeToFormalBusiness extends BaseBussiness{
+	@Override
+	public Object run(Transaction Sqlca) throws Exception {
+		this.initBussinessParam(Sqlca);
+		String flowunid = this.getAttribute("ObjectNo").toString();
+		String ContractId = this.getAttribute("ContractId").toString();
+		Map<String,String> fromCondtion = new HashMap<String, String>();
+		fromCondtion.put("flowunid", flowunid);
+		Map<String,String> toCondtion = new HashMap<String, String>();
+		toCondtion.put(CUSTOMER_ACCOUNT.contract_id, ContractId);	
+		Map<String,String> other = new HashMap<String, String>();
+		other.put(CUSTOMER_ACCOUNT.sign_status, "N");
+		DataOperatorUtil.copySingleJBO(CUSTOMER_ACCOUNT_TEMP.CLASS_NAME, fromCondtion, CUSTOMER_ACCOUNT.CLASS_NAME, toCondtion, other, Sqlca);
+	    String sMessage="true"; 
+		return sMessage;
+	}
+}

src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBCustomerAccountFormalToChangeBusiness.java

@@ -0,0 +1,42 @@
+package com.tenwa.lease.flow.project.commbusiness;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import jbo.app.tenwa.customer.CUSTOMER_ACCOUNT;
+import jbo.app.tenwa.customer.CUSTOMER_ACCOUNT_TEMP;
+import jbo.app.tenwa.customer.CUSTOMER_FAMILY;
+import jbo.app.tenwa.customer.CUSTOMER_FAMILY_TEMP;
+import jbo.com.tenwa.entity.comm.flow.FLOW_BUSSINESS_OBJECT;
+import jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO;
+import jbo.com.tenwa.lease.comm.LB_EQUIPMENT;
+import jbo.com.tenwa.lease.comm.LB_EQUIPMENT_TEMP;
+import jbo.com.tenwa.lease.comm.LB_GUARANTEE_UNIT;
+import jbo.com.tenwa.lease.comm.LB_GUARANTEE_UNIT_TEMP;
+import jbo.com.tenwa.lease.comm.LB_UNION_LESSEE_TEMP;
+
+import com.amarsoft.are.jbo.BizObject;
+import com.amarsoft.awe.util.Transaction;
+import com.tenwa.comm.util.jboutil.DataOperatorUtil;
+import com.tenwa.flow.baseBussion.BaseBussiness;
+import com.tenwa.lease.flow.comm.service.LeaseFlowBaseService;
+import com.tenwa.lease.flow.comm.service.ServiceOperatorEnum;
+import com.tenwa.lease.flow.comm.serviceImp.LeaseFlowBaseServiceImp;
+import com.tenwa.lease.flow.project.businessapply.CustomerCompare;
+
+public class LBCustomerAccountFormalToChangeBusiness extends BaseBussiness{
+	@Override
+	public Object run(Transaction Sqlca) throws Exception {
+		this.initBussinessParam(Sqlca);
+		String flowunid = this.getAttribute("ObjectNo").toString();
+		String ContractId = this.getAttribute("ContractId").toString();
+		Map<String,String> fromCondtion = new HashMap<String, String>();
+		Map<String,String> other = new HashMap<String, String>();
+		other.put("flowunid",flowunid);
+		fromCondtion.put(CUSTOMER_ACCOUNT.contract_id, ContractId);	
+		DataOperatorUtil.copySingleJBO(CUSTOMER_ACCOUNT.CLASS_NAME, fromCondtion, CUSTOMER_ACCOUNT_TEMP.CLASS_NAME, null, other, Sqlca);
+	    String sMessage="true"; 
+		return sMessage;
+	}
+}

src_tenwa/com/tenwa/lease/flow/project/commcheck/ApprovalOpinionCheck.java

@@ -22,34 +22,41 @@ public class ApprovalOpinionCheck extends DefaultBussinessCheck{
 		String flowunid=this.getAttribute("ObjectNo").toString();
 		String phaseno=this.getAttribute("PhaseNo").toString();
 		boolean flag = true;
-		SqlObject so = new SqlObject("select ft.serialno,fo.phasechoice,fo.phaseopinion from flow_task ft left join flow_opinion fo on ft.relativeobjectno=fo.serialno where ft.objectno='"+flowunid+"' and ft.phaseno='"+phaseno+"' and ft.relativeobjectno is not null");
+		String sql="select case when ft.phaseno='0030' then case when fo.phasechoice is not null then  1 else 0 end when ft.phaseno='0040' then case when fo.phasechoice is not null  then 1 else 0 end when ft.phaseno='0050' then case when fo.phasechoice is not null then 1 else 0 end else 99 end phasechoice,case when ft.phaseno='0030' then case when fo.phaseopinion is not null then 1 else 0 end when ft.phaseno='0040' then case when fo.phaseopinion is not null then 1 else 0 end when ft.phaseno='0050' then case when fo.phaseopinion is not null then 1 else 0 end else 99 end phaseopinion   from flow_task ft left join flow_opinion fo on ft.relativeobjectno = fo.serialno "
-		ASResultSet result = Sqlca.getASResultSet(so);
+				+" where ft.objectno = '"+flowunid+"' and ft.phaseno = '"+phaseno+"' and  ft.serialno='"+serialno+"' and ft.relativeobjectno is not null";
+		SqlObject so = new SqlObject(sql);
+		ASResultSet result = Sqlca.getASResultSet(so);		
+		String phasechoice = "";
+		String phaseopinion = "";
+		while(result.next()){
+			phasechoice = result.getString("phasechoice");
+			phaseopinion = result.getString("phaseopinion");
+		}
 		String message = "";
 		switch(phaseno){
 			case "0030":
-				message = "初审意见未填写！";
+				if(!"1".equals(phasechoice)){
+					message = "初审意见未填写！"; 
+					flag = false;
+				}
 				break;
 			case "0040":
-				message = "复审意见未填写！";
+				if(!"1".equals(phasechoice)){
+					message = "复审意见未填写！"; flag = false;
+				}
 				break;
 			case "0050":
-				message = "部门负责人意见未填写！";
+				if(!"1".equals(phasechoice)){
+					message = "部门负责人意见未填写！"; flag = false;
+				}
 				break;
 //			case "0050":
 //				message = "总经理意见未填写！";
 //				break;
 		}
-		String phasechoice = "";
-		String phaseopinion = "";
-		String deleteSerialno = "";
-		while(result.next()){
-			deleteSerialno = result.getString("serialno");
-			phasechoice = result.getString("phasechoice");
-			phaseopinion = result.getString("phaseopinion");
-		}
 		result.close();
-		String thisResult = "";
+		//String thisResult = "";
-		if(!"".equals(deleteSerialno)){
+/*		if(!"".equals(deleteSerialno)){
 			thisResult = Sqlca.getString("select case when count(*)>0 then 'true' else 'false' end from flow_task where serialno='"+serialno+"' and phaseno='"+phaseno+"' and relativeobjectno is not null");
 			if("false".equals(thisResult)){
 				ASResultSet ars = Sqlca.getASResultSet(new SqlObject("select userid,orgid from flow_task where serialno='"+serialno+"'"));
@@ -69,13 +76,10 @@ public class ApprovalOpinionCheck extends DefaultBussinessCheck{
 			}
 		}else{
 			flag = false;
-		}
+		}*/
-		if(flag && "true".equals(thisResult)){
+		if(flag ){
 			putMsg("验证通过！");
 			setPass(true);
-		}else if(flag && "false".equals(thisResult)){
-			putMsg("验证通过！但是意见使用的是退回前的意见！");
-			setPass(true);
 		}else{
 			putMsg(message);
 			setPass(false);