From 03586f8bc86f02bd8101196e77ad9edde7d024a6 Mon Sep 17 00:00:00 2001 From: jianghongdong Date: Wed, 18 Jul 2018 14:21:22 +0800 Subject: [PATCH 01/15] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=90=88=E5=90=8C?= =?UTF-8?q?=E6=92=A4=E9=94=80=E9=85=8D=E7=BD=AE=E8=BF=87=E6=9C=9F=E5=A4=A9?= =?UTF-8?q?=E6=95=B0=E7=9B=B8=E5=85=B3=E8=A1=A8lb=5Fbusiness=5Foverdate?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebContent/WEB-INF/etc/jbo/jbo_lease.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml index 3fb035a3c..2d651813e 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml @@ -3930,6 +3930,22 @@ + + + + + + + + + + + + + + + + From 744d41c237bc8399aa8bbce6a64a1bde3a88d5a3 Mon Sep 17 00:00:00 2001 From: jianghongdong Date: Wed, 18 Jul 2018 14:31:59 +0800 Subject: [PATCH 02/15] =?UTF-8?q?=E6=B7=BB=E5=8A=A0inputtime=E7=AD=89?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebContent/WEB-INF/etc/jbo/jbo_lease.xml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml index 2d651813e..b7f02a8d2 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml @@ -3937,7 +3937,13 @@ - + + + + + + + From 333f9966a9cbbb8fbce6540fa9a03306ca99c3b3 Mon Sep 17 00:00:00 2001 From: user Date: Wed, 18 Jul 2018 14:44:16 +0800 Subject: [PATCH 03/15] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=EF=BC=8C=E6=89=A3=E6=AC=BE=E5=8D=A1=E4=BF=A1=E6=81=AF=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C=E8=87=AA=E7=84=B6=E4=BA=BA=E5=92=8C=E6=B3=95=E4=BA=BA?= =?UTF-8?q?=E7=9A=84=E9=A2=84=E7=95=99=E6=89=8B=E6=9C=BA=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Flow/Comm/LBDebitCard/DebitCardInfo.jsp | 34 +++++++++++++++++-- .../BusinessApplication/CustomerInfo.jsp | 2 +- .../businessapply/CustomerInfoCheck.java | 29 +++++++++++++--- 3 files changed, 58 insertions(+), 7 deletions(-) diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/DebitCardInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/DebitCardInfo.jsp index 315abaab8..ea2e6f311 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/DebitCardInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/DebitCardInfo.jsp @@ -11,6 +11,7 @@ String RightType=CurPage.getParameter("RightType"); String ishistory=CurPage.getParameter("IsHistory"); String FlowUnid=CurPage.getParameter("FlowUnid"); + String CustomerType=CurPage.getParameter("CustomerType"); String ApplyType=CurPage.getParameter("ApplyType"); String PhaseNo=CurPage.getParameter("PhaseNo"); /* System.out.print("\n\n\n\t--FlowUnid "+FlowUnid+"\t\n\n\n"); */ @@ -18,6 +19,7 @@ ASObjectModel doTemp = new ASObjectModel(sTempletNo); //doTemp.setColTips("", ""); doTemp.setHtmlEvent("acc_number", "onchange", "getNameOfBank"); + //doTemp.setHtmlEvent("MOBILE", "onchange", "checkMobile"); ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request); dwTemp.Style = "2";//freeform if(PhaseNo.equals("0020")||PhaseNo.equals("0030")||PhaseNo.equals("0040")||PhaseNo.equals("0050")){ @@ -45,6 +47,28 @@ %><%@ include file="/Frame/resources/include/ui/include_info.jspf"%> +<%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file diff --git a/WebContent/Tenwa/Apzl/BussinessCancel/LbBusinessOverdateList.jsp b/WebContent/Tenwa/Apzl/BussinessCancel/LbBusinessOverdateList.jsp new file mode 100644 index 000000000..983495413 --- /dev/null +++ b/WebContent/Tenwa/Apzl/BussinessCancel/LbBusinessOverdateList.jsp @@ -0,0 +1,37 @@ +<%@ page contentType="text/html; charset=GBK"%> +<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><% + /* + Author: undefined 2018-07-18 + Content: + History Log: + */ + ASObjectModel doTemp = new ASObjectModel("LbBusinessOverdateList"); + ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); + dwTemp.Style="1"; //--ΪGrid-- + dwTemp.ReadOnly = "1"; //ֻģʽ + dwTemp.setPageSize(10); + dwTemp.genHTMLObjectWindow(""); + + //0Ƿչʾ 1 Ȩ޿ 2 չʾ 3ťʾ 4ť 5ť¼ 6 7 8 9ͼ꣬CSSʽ 10 + String sButtons[][] = { + {"true","All","Button","","","newRecord()","","","","btn_icon_add",""}, + {"true","","Button","޸","޸","viewAndEdit()","","","","btn_icon_detail",""}, + {"true","","Button","ɾ","ɾ","if(confirm('ȷʵҪɾ?'))as_delete(0,'alert(getRowCount(0))')","","","","btn_icon_delete",""}, + }; +%><%@include file="/Frame/resources/include/ui/include_list.jspf"%> + +<%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file diff --git a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml index b7f02a8d2..a4c99ca3c 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml @@ -3930,6 +3930,7 @@ + @@ -3937,13 +3938,13 @@ - - - - - - - + + + + + + + From 1ecc0c4d468d64ae38b14c4a18d67f667e2148f7 Mon Sep 17 00:00:00 2001 From: liuz Date: Wed, 18 Jul 2018 15:40:04 +0800 Subject: [PATCH 06/15] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=BC=A0=E7=A3=8A?= =?UTF-8?q?=E8=A6=81=E6=B1=82=E7=9A=84=E4=B8=89=E5=BC=A0=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebContent/WEB-INF/etc/jbo/jbo_customer.xml | 145 -------------------- 1 file changed, 145 deletions(-) diff --git a/WebContent/WEB-INF/etc/jbo/jbo_customer.xml b/WebContent/WEB-INF/etc/jbo/jbo_customer.xml index 95b842cc5..3b4f3c6b1 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_customer.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_customer.xml @@ -2094,108 +2094,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2546,30 +2444,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -2738,25 +2612,6 @@ - - - - - - - - - - - - - - - - - - - From bf951854a67576ebbc527519b5102c2c6f3f52f6 Mon Sep 17 00:00:00 2001 From: user Date: Wed, 18 Jul 2018 16:11:05 +0800 Subject: [PATCH 07/15] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E6=B5=81=E7=A8=8B=E5=BC=80=E5=A7=8B?= =?UTF-8?q?=E6=96=B9=E6=B3=95=EF=BC=8C=E6=A0=B9=E6=8D=AE=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=EF=BC=8C=E7=94=9F=E6=88=90=E7=9B=B8=E5=BA=94?= =?UTF-8?q?=E7=9A=84=E9=A1=B9=E7=9B=AE=E7=BC=96=E5=8F=B7=E3=80=821?= =?UTF-8?q?=E6=98=AF=E6=B1=BD=E8=BD=A6=E4=B8=9A=E5=8A=A1=EF=BC=8C2?= =?UTF-8?q?=E6=98=AF=E4=BC=A0=E7=BB=9F=E4=B8=9A=E5=8A=A1=EF=BC=8C3?= =?UTF-8?q?=E6=98=AF=E6=B1=BD=E8=BD=A6=E4=BC=A0=E7=BB=9F=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectApprovalCreationInfo.jsp | 39 +++++++-------- src_core/com/tenwa/util/SerialNumberUtil.java | 4 +- .../BusinessApprovalStartAction.java | 50 +++++++++++-------- 3 files changed, 49 insertions(+), 44 deletions(-) diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp index ad2bce222..790151371 100644 --- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp @@ -94,25 +94,24 @@ { //ҳϻȡͻţƷ - var carAttributes = getItemValue(0,getRow(),"carAttributes"); - var leasehold = getItemValue(0,getRow(),"leasehold"); - var productModel =getItemValue(0,getRow(),"productModel"); - var carSeries = getItemValue(0,getRow(),"carSeries"); - var carSystem = getItemValue(0,getRow(),"carSystem"); - var productId = getItemValue(0,getRow(),"productId"); - var productname = getItemValue(0,getRow(),"productName"); - var custid = getItemValue(0,getRow(),"CustomerID"); - var custname = getItemValue(0,getRow(),"CustomerName"); - var customerType = getItemValue(0,getRow(),"Customer_type"); - var certtype = getItemValue(0,getRow(),"certtype"); - var certid = getItemValue(0,getRow(),"certid"); - var versionid = getItemValue(0,getRow(),"versionid"); - var modelid = getItemValue(0,getRow(),"modelid"); - var certid = getItemValue(0,getRow(),"certid"); - var businessType = "1"; - var price = getItemValue(0,getRow(),"price"); - var liter = getItemValue(0,getRow(),"liter"); - var geartype = getItemValue(0,getRow(),"geartype"); + var carAttributes = getItemValue(0,getRow(),"carAttributes");// + var leasehold = getItemValue(0,getRow(),"leasehold");//޷ʽ + var productModel =getItemValue(0,getRow(),"productModel");//Ʒ + var carSeries = getItemValue(0,getRow(),"carSeries");//ϵ + var carSystem = getItemValue(0,getRow(),"carSystem");// + var productId = getItemValue(0,getRow(),"productId");//ƷID + var productname = getItemValue(0,getRow(),"productName");//Ʒ + var custid = getItemValue(0,getRow(),"CustomerID");//ͻID + var custname = getItemValue(0,getRow(),"CustomerName");//ͻ + var customerType = getItemValue(0,getRow(),"Customer_type");//ͻ + var certtype = getItemValue(0,getRow(),"certtype");//֤ + var certid = getItemValue(0,getRow(),"certid");//֤ + var versionid = getItemValue(0,getRow(),"versionid");//汾ID + var modelid = getItemValue(0,getRow(),"modelid");//ID + var businessType = "1";//ҵͣ1ҵ2Ǵͳҵ3ͳҵ + var price = getItemValue(0,getRow(),"price");//ָ + var liter = getItemValue(0,getRow(),"liter");// + var geartype = getItemValue(0,getRow(),"geartype");//λ if(carAttributes==""){ alert("ѡ"); @@ -154,7 +153,7 @@ var sParams = "ApplyType=<%=sApplyType%>,CurUserID=<%=CurUser.getUserID()%>"; sParams =sParams+",ProductId="+productId+",ProductName="+productname+",CustomerType="+customerType+",carAttributes="+carAttributes+",leasehold="+leasehold+",carSystem="+carSystem+",custname="+custname+",certtype="+certtype+",certid="+certid+",productModel="+productModel+",carSeries="+carSeries+",versionid="+versionid+",modelid="+modelid+",businessType="+businessType+",price="+price+",liter="+liter+",geartype="+geartype; - var sReturnInfo = RunJavaMethodTrans("com.tenwa.lease.flow.project.projectapproval.BusinessApprovalStartAction","initFLow",sParams); + var sReturnInfo = RunJavaMethodTrans("com.tenwa.lease.flow.project.projectapproval.BusinessApprovalStartAction","initFLow",sParams);//ҪIJ if(typeof(sReturnInfo)=="undefined" || sReturnInfo=="" || sReturnInfo=="_CANCEL_" ) { doCancel(); diff --git a/src_core/com/tenwa/util/SerialNumberUtil.java b/src_core/com/tenwa/util/SerialNumberUtil.java index 06a8c6852..3996a22f3 100644 --- a/src_core/com/tenwa/util/SerialNumberUtil.java +++ b/src_core/com/tenwa/util/SerialNumberUtil.java @@ -123,8 +123,8 @@ public class SerialNumberUtil { return SerialNumberUtil.getSerialNumber("A{year}{maxOrderNumber}",7,null, "Ŀ"+orgId, null, tx); } - public static synchronized String getProjectSerialNumber2(JBOTransaction tx) throws Exception{ - return SerialNumberUtil.getSerialNumber("P{year}{maxOrderNumber}",7,null, "Ŀ", null, tx); + public static synchronized String getProjectSerialNumber2(String orgId,JBOTransaction tx) throws Exception{ + return SerialNumberUtil.getSerialNumber("T{year}{maxOrderNumber}",7,null, "Ŀ"+orgId, null, tx); } public static String getContractSerialNaumber(String dept,String area_code,JBOTransaction tx) throws Exception { diff --git a/src_tenwa/com/tenwa/lease/flow/project/projectapproval/BusinessApprovalStartAction.java b/src_tenwa/com/tenwa/lease/flow/project/projectapproval/BusinessApprovalStartAction.java index e7e7b2393..bc497950d 100644 --- a/src_tenwa/com/tenwa/lease/flow/project/projectapproval/BusinessApprovalStartAction.java +++ b/src_tenwa/com/tenwa/lease/flow/project/projectapproval/BusinessApprovalStartAction.java @@ -54,29 +54,35 @@ public class BusinessApprovalStartAction extends BaseFlowStartAction{ @Override public void customOperation(JBOTransaction tx,BizObject flowBussiness) throws Exception { String uuid = UUID.randomUUID().toString(); - this.FlowParam.put("ProjectId", UUID.randomUUID().toString().replaceAll("-", "")); - String projectNO=SerialNumberUtil.getProjectSerialNumber1(this.getAsUser().getOrgID(), tx); + this.FlowParam.put("ProjectId",uuid.replaceAll("-", ""));//ĿID + String projectNO = ""; + //ҵͣɲͬĿ + if(businessType.equals("1")){//1ҵ + projectNO=SerialNumberUtil.getProjectSerialNumber1(this.getAsUser().getOrgID(), tx);//Aͷ + }else if(businessType.equals("2")){//2Ǵͳҵ + projectNO=SerialNumberUtil.getProjectSerialNumber2(this.getAsUser().getOrgID(), tx);//Tͷ + } //String projectName=projectNO+"_"+this.FlowParam.get("CustName")+this.FlowParam.get("ProductName")+"Ŀ"; - this.FlowParam.put("ProjectNo", projectNO); - this.FlowParam.put("FlowKey", projectNO); - this.FlowParam.put("ProjectName", projectNO); - this.FlowParam.put("CustomerType", this.getCustomerType()); - this.FlowParam.put("carAttributes", this.getCarAttributes()); - this.FlowParam.put("leasehold", this.getLeasehold()); - this.FlowParam.put("carSystem", this.getCarSystem()); - this.FlowParam.put("custname", this.getCustname()); - this.FlowParam.put("certtype", this.getCerttype()); - this.FlowParam.put("certid", this.getCertid()); - this.FlowParam.put("productModel", this.getProductModel()); - this.FlowParam.put("carSeries", this.getCarSeries()); - this.FlowParam.put("versionid", this.getVersionid()); - this.FlowParam.put("modelid", this.getModelid()); - this.FlowParam.put("businessType", this.getBusinessType()); - this.FlowParam.put("price", this.getPrice()); - this.FlowParam.put("liter", this.getLiter()); - this.FlowParam.put("geartype", this.getGeartype()); - this.FlowParam.put("ProductName", this.getProductName()); - this.FlowParam.put("ProductId", this.getProductId()); + this.FlowParam.put("ProjectNo", projectNO);//Ŀ + this.FlowParam.put("FlowKey", projectNO);//̻ + this.FlowParam.put("ProjectName", projectNO);//Ŀ + this.FlowParam.put("carAttributes", this.getCarAttributes());// + this.FlowParam.put("leasehold", this.getLeasehold());//޷ʽ + this.FlowParam.put("productModel", this.getProductModel());//Ʒ + this.FlowParam.put("carSeries", this.getCarSeries());//ϵ + this.FlowParam.put("carSystem", this.getCarSystem());// + this.FlowParam.put("CustomerType", this.getCustomerType());//ͻ + this.FlowParam.put("custname", this.getCustname());//ͻ + this.FlowParam.put("certtype", this.getCerttype());//֤ + this.FlowParam.put("certid", this.getCertid());//֤ + this.FlowParam.put("versionid", this.getVersionid());//汾ID + this.FlowParam.put("modelid", this.getModelid());//ID + this.FlowParam.put("businessType", this.getBusinessType());//ҵͣ1ҵ2ͳҵ3ͳҵ + this.FlowParam.put("price", this.getPrice());//ָ + this.FlowParam.put("liter", this.getLiter());// + this.FlowParam.put("geartype", this.getGeartype());//λ + this.FlowParam.put("ProductName", this.getProductName());//Ʒ + this.FlowParam.put("ProductId", this.getProductId());//ƷID } From e7c45e6c5ae62cb0718e12f30ee8f3181ed997a2 Mon Sep 17 00:00:00 2001 From: user Date: Wed, 18 Jul 2018 17:02:26 +0800 Subject: [PATCH 08/15] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E7=94=9F=E6=88=90=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E7=BC=96=E5=8F=B7=E7=9A=84=E6=96=B9=E6=B3=95=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src_core/com/tenwa/util/SerialNumberUtil.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src_core/com/tenwa/util/SerialNumberUtil.java b/src_core/com/tenwa/util/SerialNumberUtil.java index 3996a22f3..3166a6545 100644 --- a/src_core/com/tenwa/util/SerialNumberUtil.java +++ b/src_core/com/tenwa/util/SerialNumberUtil.java @@ -120,11 +120,19 @@ public class SerialNumberUtil { } public static synchronized String getProjectSerialNumber1(String orgId,JBOTransaction tx) throws Exception{ - return SerialNumberUtil.getSerialNumber("A{year}{maxOrderNumber}",7,null, "Ŀ"+orgId, null, tx); + String currentDateTime = DateAssistant.getToday(); + String currentYear = currentDateTime.substring(0,4); + String currentMonth = currentDateTime.substring(5,7); + String currentDay = currentDateTime.substring(8,10); + return SerialNumberUtil.getSerialNumber("A"+currentYear+currentMonth+currentDay+"{maxOrderNumber}",4,null, "Ŀ"+orgId, null, tx); } public static synchronized String getProjectSerialNumber2(String orgId,JBOTransaction tx) throws Exception{ - return SerialNumberUtil.getSerialNumber("T{year}{maxOrderNumber}",7,null, "Ŀ"+orgId, null, tx); + String currentDateTime = DateAssistant.getToday(); + String currentYear = currentDateTime.substring(0,4); + String currentMonth = currentDateTime.substring(5,7); + String currentDay = currentDateTime.substring(8,10); + return SerialNumberUtil.getSerialNumber("T"+currentYear+currentMonth+currentDay+"{maxOrderNumber}",4,null, "Ŀ"+orgId, null, tx); } public static String getContractSerialNaumber(String dept,String area_code,JBOTransaction tx) throws Exception { From 17819f315b636313e9d201a187eba036bba735f0 Mon Sep 17 00:00:00 2001 From: zhulianghua Date: Wed, 18 Jul 2018 17:13:40 +0800 Subject: [PATCH 09/15] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BF=9D=E8=AF=81?= =?UTF-8?q?=E9=87=91=E5=8F=AA=E6=8A=B5=E6=89=A3=E6=9C=AB=E6=9C=9F=E7=A7=9F?= =?UTF-8?q?=E9=87=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../reckon/executor/FundFundPlanExecutor.java | 22 ++++++++++++++++--- .../tenwa/reckon/help/ConditionHelper.java | 4 ++++ 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/calc/com/tenwa/reckon/executor/FundFundPlanExecutor.java b/calc/com/tenwa/reckon/executor/FundFundPlanExecutor.java index 747a7567b..dbac9da29 100644 --- a/calc/com/tenwa/reckon/executor/FundFundPlanExecutor.java +++ b/calc/com/tenwa/reckon/executor/FundFundPlanExecutor.java @@ -32,7 +32,7 @@ public class FundFundPlanExecutor { public void run(ConditionBean cb , TabCalBean tcb,FundRentPlanBean rentPlan,JBOTransaction tx) throws Exception{ cb.setDocId(tcb.getDocId()); List fundPlanBeans=new ArrayList(); - if(Double.parseDouble(cb.getCautionMoney()) > 0 ){ + if(Double.parseDouble(cb.getCautionDeductionMoney()) > 0 ){ fundPlanBeans = splitFundFundPlan(rentPlan, cb, "", "feetype17","feetype16"); }else{ cb.setDeductionLastPlanDate(cb.getLastPlanDate());//ɱֿ֤ۼ˻ƻ @@ -209,6 +209,13 @@ public class FundFundPlanExecutor { private static List splitFundFundPlan(FundRentPlanBean planBean,ConditionBean cb,String custID,String remainType,String reduceType) throws Exception{ List planDates = planBean.getPlanDateList(); List rentPlans = planBean.getRentList(); + //߼ֻһ + BigDecimal lastRent = new BigDecimal(rentPlans.get(rentPlans.size() - 1)); + BigDecimal cautionMoneyDeduction = new BigDecimal(cb.getCautionDeductionMoney()); + if(lastRent.compareTo(cautionMoneyDeduction) < 0) { + cb.setCautionMoneyRemain(cautionMoneyDeduction.subtract(lastRent).toString()); + cb.setCautionDeductionMoney(lastRent.toString()); + } List newFundPlans = new ArrayList(); if(Double.parseDouble(cb.getCautionMoneyRemain()) > 0){//˻֤ FundPlanBean newFundPlan=new FundPlanBean(); @@ -223,7 +230,16 @@ public class FundFundPlanExecutor { } if(Double.parseDouble(cb.getCautionDeductionMoney()) > 0){//ֿ۱֤ BigDecimal planMoney=new BigDecimal(cb.getCautionDeductionMoney()); - int planList=0; + FundPlanBean newFundPlan=new FundPlanBean(); + newFundPlan.setFeeType(reduceType); + newFundPlan.setPlanList("1"); + newFundPlan.setSettleMethod("payfund6"); + newFundPlan.setPayType("pay_type_out"); + newFundPlan.setPlanMoney(planMoney.toString()); + newFundPlan.setPlanDate(planDates.get(planDates.size() - 1)); + newFundPlan.setPayCust(custID); + newFundPlans.add(newFundPlan); + /*int planList=0; for(int i = planDates.size()-1 ; i >= 0 ; i--){ planList++; BigDecimal rent=new BigDecimal(rentPlans.get(i)); @@ -258,7 +274,7 @@ public class FundFundPlanExecutor { cb.setDeductionLastPlanDate(planDates.get(i)); break; } - } + }*/ }else{ cb.setDeductionLastPlanDate(cb.getLastPlanDate()); } diff --git a/calc/com/tenwa/reckon/help/ConditionHelper.java b/calc/com/tenwa/reckon/help/ConditionHelper.java index 890c0e44e..eaceefc20 100644 --- a/calc/com/tenwa/reckon/help/ConditionHelper.java +++ b/calc/com/tenwa/reckon/help/ConditionHelper.java @@ -81,6 +81,10 @@ public class ConditionHelper { params.put("income_number", cb.getIncomeNumber() + ""); params.put("lease_term", cb.getLeaseTerm()+""); params.put("FIRST_PAYMENT_TOTAL",cb.getFirstPaymentTotal()); + + //±ֿ֤ + params.put("CAUTION_DEDUCTION_MONEY",cb.getCautionDeductionMoney()); + params.put("CAUTION_MONEY_REMAIN",cb.getCautionMoneyRemain()); this.updateCondition(bean, params); return params; } From 96c0ccb254063510c914af2c3c027eab411223fb Mon Sep 17 00:00:00 2001 From: zhulianghua Date: Wed, 18 Jul 2018 17:41:18 +0800 Subject: [PATCH 10/15] =?UTF-8?q?=E4=BF=AE=E6=94=B9GPS=E4=B8=8D=E5=8F=82?= =?UTF-8?q?=E4=B8=8E=E8=9E=8D=E8=B5=84=E7=94=9F=E6=88=90=E8=B5=84=E9=87=91?= =?UTF-8?q?=E8=AE=A1=E5=88=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../reckon/executor/FundFundPlanExecutor.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/calc/com/tenwa/reckon/executor/FundFundPlanExecutor.java b/calc/com/tenwa/reckon/executor/FundFundPlanExecutor.java index dbac9da29..3772c9435 100644 --- a/calc/com/tenwa/reckon/executor/FundFundPlanExecutor.java +++ b/calc/com/tenwa/reckon/executor/FundFundPlanExecutor.java @@ -99,7 +99,7 @@ public class FundFundPlanExecutor { ffcp.setSettleMethod("payfund6"); ffcp.setPayType(StringUtil.nullToString(param.get("CostType01")).length()>0?param.get("CostType01"):"pay_type_in"); if("NOMINAL_PRICE".equals(entry.getKey())){ - param.put("CostType02", "PaymentTime7"); + param.put("CostType02", "PaymentTime4"); } if("feetype5".equals(item.getItemNo()) && "".equals(StringUtil.nullToString(param.get("CostType02")))) { continue; @@ -110,11 +110,10 @@ public class FundFundPlanExecutor { if(StringUtil.nullToString(param.get("CostType03")).equals("cust")){ ffcp.setPayCust(custid); } - fundPlanBeans.add(ffcp); - if(StringUtil.nullToString(param.get("FINA")).equals("Y")){//ҪжǷ - if(con.getAttribute(entry.getKey()).getString().equals("N")) + if(StringUtil.nullToString(param.get("FINAN")).equals("Y")){//ҪжǷ + if(con.getAttribute(entry.getKey() + "_FINA").getString().equals("finatype01")) { - FundPlanBean ffcp2 = new FundPlanBean(); + /*FundPlanBean ffcp2 = new FundPlanBean(); ffcp2.setFeeType(item.getItemNo());// ffcp2.setPlanList("1"); ffcp2.setSettleMethod("payfund6"); @@ -124,8 +123,11 @@ public class FundFundPlanExecutor { if(StringUtil.nullToString(param.get("CostType03")).equals("cust")){ ffcp2.setPayCust(custid); } - fundPlanBeans.add(ffcp2); + fundPlanBeans.add(ffcp2);*/ + fundPlanBeans.add(ffcp); } + } else { + fundPlanBeans.add(ffcp); } } } From e82c721124281796edbe4ba79cd805de52a59cb2 Mon Sep 17 00:00:00 2001 From: liuz Date: Wed, 18 Jul 2018 18:36:49 +0800 Subject: [PATCH 11/15] =?UTF-8?q?=E4=BF=9D=E8=AF=81=E9=87=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CLMSDistributorList.jsp | 20 +++++++++---------- .../LDistributorAccountList.jsp | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/WebContent/Tenwa/ChannelPortal/DistributorManage/DistributorRegister/CLMSDistributorList.jsp b/WebContent/Tenwa/ChannelPortal/DistributorManage/DistributorRegister/CLMSDistributorList.jsp index 9712ce962..30590d44b 100644 --- a/WebContent/Tenwa/ChannelPortal/DistributorManage/DistributorRegister/CLMSDistributorList.jsp +++ b/WebContent/Tenwa/ChannelPortal/DistributorManage/DistributorRegister/CLMSDistributorList.jsp @@ -36,16 +36,6 @@ From 0b8a8716552fe73c1e25d2617e87d3655caaf6b6 Mon Sep 17 00:00:00 2001 From: tangfutang Date: Wed, 18 Jul 2018 19:03:59 +0800 Subject: [PATCH 12/15] =?UTF-8?q?=E8=B7=9F=E6=96=B0=E5=90=88=E5=90=8C?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Flow/Comm/LBContractTemplate/LBContractTemplateList.jsp | 4 +++- .../Lease/Flow/Comm/LBContractTemplate/contract_template.jsp | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBContractTemplate/LBContractTemplateList.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBContractTemplate/LBContractTemplateList.jsp index 090a0ae3e..4f7c91591 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBContractTemplate/LBContractTemplateList.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBContractTemplate/LBContractTemplateList.jsp @@ -15,6 +15,7 @@ String taskno=CurPage.getParameter("TaskNo"); String ishistory=CurPage.getParameter("IsHistory"); String nodeNo=CurPage.getParameter("NodeNo"); + String ProjectId=CurPage.getParameter("ProjectId"); String sContractId = "";//ͬ @@ -95,8 +96,9 @@ if(confirm('ȷʵҪɾ?')){ var files = getItemValueArray(0,"fileid"); var falg; + var ProjectId ="<%=ProjectId%>"; for(var i=0;i"; From dc30f170c5da57b852f7540d11428008a412a68c Mon Sep 17 00:00:00 2001 From: jianghongdong Date: Wed, 18 Jul 2018 19:48:34 +0800 Subject: [PATCH 13/15] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=90=88=E5=90=8C?= =?UTF-8?q?=E6=92=A4=E9=94=80=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../message/controller/BusinessCancelJob.java | 102 ++++++++++++++++++ 1 file changed, 102 insertions(+) create mode 100644 src_core/com/tenwa/comm/message/controller/BusinessCancelJob.java diff --git a/src_core/com/tenwa/comm/message/controller/BusinessCancelJob.java b/src_core/com/tenwa/comm/message/controller/BusinessCancelJob.java new file mode 100644 index 000000000..7e2ee2ebd --- /dev/null +++ b/src_core/com/tenwa/comm/message/controller/BusinessCancelJob.java @@ -0,0 +1,102 @@ +package com.tenwa.comm.message.controller; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; + +import jbo.com.tenwa.entity.comm.message.BT_BUSSINESS_MESSAGE_CONFIG; +import jbo.com.tenwa.lease.comm.LB_BUSINESS_OVERDATE; +import jbo.com.tenwa.lease.comm.LB_CANCLE_INFO; +import jbo.com.tenwa.lease.comm.LB_PROJECT_INFO; + +import org.quartz.Job; +import org.quartz.JobExecutionContext; +import org.quartz.JobExecutionException; + +import com.amarsoft.are.jbo.BizObject; +import com.amarsoft.are.jbo.BizObjectManager; +import com.amarsoft.are.jbo.JBOException; +import com.amarsoft.are.jbo.JBOFactory; +import com.amarsoft.are.jbo.JBOTransaction; +import com.amarsoft.are.util.StringFunction; +import com.tenwa.comm.util.jboutil.DataOperatorUtil; +/** + * ҵ󳬹ָʱδͬҵͬ + * ҵ + * @author jianghd + * + */ +public class BusinessCancelJob implements Job { + + private String overDate; + @Override + public void execute(JobExecutionContext arg0) throws JobExecutionException { + JBOTransaction tx=null; + try { + tx= JBOFactory.createJBOTransaction(); + this.executeMessage(tx); + tx.commit(); + } catch (Exception e) { + try { + if(tx!=null){ + tx.rollback(); + } + } catch (JBOException e1) { + e1.printStackTrace(); + } + e.printStackTrace(); + } + } + /** + * ȡϺͬĿϢ + * @param tx + * @return + * @throws Exception + */ + public List> loadMessageNo(JBOTransaction tx ) throws Exception{ + //1.ȡõijʱ + String sql1 = "SELECT max(INPUTTIME) inputtime,over_date FROM lb_business_overdate where inputtime is not null and over_date>0 group by INPUTTIME"; + List> ds = DataOperatorUtil.getDataBySql(tx, sql1, null); + overDate = ""; + if(ds.size()>0){ + overDate = ds.get(0).get("over_date"); + } + if(overDate ==""||Integer.parseInt(overDate)==0){ + return null; + } + //2.ȡʱδͬҵ¼ + String sql="select ID from lb_project_info O where O.project_status='13'"+ + " and not EXISTS (select 1 from flow_bussiness_object fbo where fbo.proj_id=O.id and fbo.flow_name='ͬ')"+ + " and not EXISTS (select 1 from lb_contract_info_temp lci where lci.project_id=O.id)"+ + " and TO_DAYS(SYSDATE())-TO_DAYS(O.end_date)>"+overDate; + ds = DataOperatorUtil.getDataBySql(tx, sql, null); + if(ds.size()>0){ + return ds; + } + return null; + } + public void executeMessage( JBOTransaction tx ) throws Exception{ + List> ds=this.loadMessageNo(tx); + BizObjectManager lpibom = JBOFactory.getBizObjectManager(LB_PROJECT_INFO.CLASS_NAME, tx); + BizObjectManager lcibom = JBOFactory.getBizObjectManager(LB_CANCLE_INFO.CLASS_NAME, tx); + if(ds!=null){ + for (Map map : ds) { + //1.Ŀ״̬Ϊ104 + lpibom.createQuery("update O set project_status='104' where id=:id").setParameter("ID", map.get("ID")).executeUpdate(); + //2.ĿӦ + BizObject lcibo = lcibom.newObject(); + lcibo.setAttributeValue(LB_CANCLE_INFO.CANCLE_DATE, StringFunction.getTodayNow()); + lcibo.setAttributeValue(LB_CANCLE_INFO.CANCLE_RESON,"ϵͳ⵽ҵ񳬹ͬȴʱ:"+overDate+"죬Զҵ"); + lcibo.setAttributeValue(LB_CANCLE_INFO.INPUTTIME,StringFunction.getTodayNow()); + lcibo.setAttributeValue(LB_CANCLE_INFO.INPUTUSERID,"system"); + lcibo.setAttributeValue(LB_CANCLE_INFO.INPUTORGID,"system"); + lcibo.setAttributeValue(LB_CANCLE_INFO.PROJECT_ID,map.get("ID")); +// lcibo.setAttributeValue(LB_CANCLE_INFO.CANCLE_TYPE,""); + lcibom.saveObject(lcibo); + } + } + } + +} From 8c311c65be39acfcb797b515683503e185f6c92e Mon Sep 17 00:00:00 2001 From: tangfutang Date: Wed, 18 Jul 2018 19:50:37 +0800 Subject: [PATCH 14/15] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A7=9F=E9=87=91?= =?UTF-8?q?=E9=80=9A=E7=9F=A5=E4=B9=A6=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Lease/Flow/RentNotify/RentNotifyList.jsp | 7 ++++--- .../channelportal/action/ContractSignAction.java | 16 ++++++++++++++-- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/WebContent/Tenwa/Lease/Flow/RentNotify/RentNotifyList.jsp b/WebContent/Tenwa/Lease/Flow/RentNotify/RentNotifyList.jsp index e84dbb8ba..da3617b53 100644 --- a/WebContent/Tenwa/Lease/Flow/RentNotify/RentNotifyList.jsp +++ b/WebContent/Tenwa/Lease/Flow/RentNotify/RentNotifyList.jsp @@ -63,8 +63,8 @@ var tempParam={}; var sparam=""; //ģ - debugger; - param["templateNo"]="ceaa18f72b0e4bbaa6e66dcfd7e32c87"; +// param["templateNo"]="ceaa18f72b0e4bbaa6e66dcfd7e32c87"; + param["templateNo"]="2ef0d0fa5dfb4fe2bf3ff6d4487dc22a"; //ļϵ tempParam["OBJECTTYPE"]="֪ͨ"; @@ -124,7 +124,8 @@ for(var i=0;i map=new HashMap(); bo = contBom.createQuery("library_id=:libraryid").setParameter("libraryid", libraryid).getSingleResult(true); if(bo != null){ @@ -1799,7 +1811,7 @@ public String claimSign(JBOTransaction tx) throws Exception { throw new RuntimeException("Ҫȡļ"); } con.setInputfile(BASE64.encodeImgageToBase64(file)); - map.put(id, con); + map.put(info, con); Map resultMap = null; //Ľӿ // doc_name = bo.getAttribute("doc_name").toString(); From 548674a4e89d3c9ee3bc60fc6a23bc6b07cd5cbd Mon Sep 17 00:00:00 2001 From: user Date: Wed, 18 Jul 2018 20:01:55 +0800 Subject: [PATCH 15/15] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E4=B8=9A=E5=8A=A1=E5=AE=A1=E6=89=B9?= =?UTF-8?q?=E8=A1=A8=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusinessApplication/ApprovalForm.jsp | 35 ++++++++++++++++--- 1 file changed, 31 insertions(+), 4 deletions(-) diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp index de02ec92f..8ea763f41 100644 --- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp +++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp @@ -90,6 +90,7 @@ dwTemp.getDataObject().setRequired("thirdopinion", false); dwTemp.getDataObject().setReadOnly("thirdchoice", false); dwTemp.getDataObject().setReadOnly("thirdopinion", false); + dwTemp.getDataObject().setReadOnly("InterOpinion1", true); dwTemp.setGroupHidden("0030,0040,0050"); } dwTemp.genHTMLObjectWindow(flowunid); @@ -113,13 +114,19 @@ _user_validator[0]['rules']['FIRSTOPINION']['required0'] = true; _user_validator[0]['messages']['FIRSTOPINION']['required0'] = ""; break; - case '0030': + case '0030':// //$("#A_div_1210").attr("style","display:none;"); //$("#A_div_1220").attr("style","display:none;"); //$("#A_div_1230").attr("style","display:none;"); //$("#A_div_1240").attr("style","display:none;"); $("#A_div_1250").attr("style","display:none;"); $("#A_div_1260").attr("style","display:none;"); + + $("#FIRSTCHOICE").attr("disabled","disabled");// + $("#FIRSTOPINION").attr("disabled","disabled");// + $("#INTEROPINION1").attr("disabled","disabled");//ڲ + $("#DISTRIOPINION1").attr("disabled","disabled");// + _user_validator[0]['rules']['SECONDCHOICE']['required0'] = true; _user_validator[0]['messages']['SECONDCHOICE']['required0'] = '븴'; _user_validator[0]['rules']['SECONDOPINION']['required0'] = true; @@ -132,6 +139,16 @@ //$("#A_div_1240").attr("style","display:none;"); //$("#A_div_1250").attr("style","display:none;"); //$("#A_div_1260").attr("style","display:none;"); + + $("#FIRSTCHOICE").attr("disabled","disabled");// + $("#FIRSTOPINION").attr("disabled","disabled");// + $("#INTEROPINION1").attr("disabled","disabled");//ڲ + $("#DISTRIOPINION1").attr("disabled","disabled");// + $("#SECONDCHOICE").attr("disabled","disabled");// + $("#SECONDOPINION").attr("disabled","disabled");// + $("#INTEROPINION2").attr("disabled","disabled");//ڲ + $("#DISTRIOPINION2").attr("disabled","disabled");// + _user_validator[0]['rules']['THIRDCHOICE']['required0'] = true; _user_validator[0]['messages']['THIRDCHOICE']['required0'] = '벿Ÿ'; _user_validator[0]['rules']['THIRDOPINION']['required0'] = true; @@ -144,6 +161,16 @@ $("#A_div_1240").attr("style","display:none;"); $("#A_div_1250").attr("style","display:none;"); $("#A_div_1260").attr("style","display:none;"); + + $("#FIRSTCHOICE").attr("disabled","disabled");// + $("#FIRSTOPINION").attr("disabled","disabled");// + $("#INTEROPINION1").attr("disabled","disabled");//ڲ + $("#DISTRIOPINION1").attr("disabled","disabled");// + $("#SECONDCHOICE").attr("disabled","disabled");// + $("#SECONDOPINION").attr("disabled","disabled");// + $("#INTEROPINION2").attr("disabled","disabled");//ڲ + $("#DISTRIOPINION2").attr("disabled","disabled");// + _user_validator[0]['rules']['FOURCHOICE']['required0'] = true; _user_validator[0]['messages']['FOURCHOICE']['required0'] = 'ܾ'; _user_validator[0]['rules']['FOUROPINION']['required0'] = true; @@ -159,13 +186,13 @@ if(firstchoice==""){ setItemRequired(0,"InterOpinion1",false); setItemRequired(0,"DistriOpinion1",false); - $("#FIRSTOPINION").removeAttr("disabled"); + $("#FIRSTOPINION").attr("disabled",""); } if(firstchoice=="0010"){ setItemRequired(0,"A_div_1220",true); setItemRequired(0,"InterOpinion1",false); setItemRequired(0,"DistriOpinion1",true); - $("#FIRSTOPINION").removeAttr("disabled"); + $("#FIRSTOPINION").attr("disabled",""); var obj=document.getElementById('FIRSTOPINION'); for(var i=0;i<7;i++){ obj.options[i].style.display = "block"; @@ -175,7 +202,7 @@ if(firstchoice=="0020"){ setItemRequired(0,"InterOpinion1",true); setItemRequired(0,"DistriOpinion1",false); - $("#FIRSTOPINION").removeAttr("disabled"); + $("#FIRSTOPINION").attr("disabled",""); var obj=document.getElementById('FIRSTOPINION'); for(var i=0;i<7;i++){ obj.options[i].style.display = "none";