From 60b71d99ed1a58e8b01e2d28626353109ebc594f Mon Sep 17 00:00:00 2001 From: tangfutang Date: Thu, 17 Sep 2020 16:21:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9app=E7=94=B5=E5=AD=90?= =?UTF-8?q?=E7=AD=BE=E7=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectApprovalCreationInfo.jsp | 10 +++ .../service/impl/ContractMakeServiceImpl.java | 80 ++++++++++++++----- .../LBProjectIntoTempInitCarBusiness.java | 2 + 3 files changed, 74 insertions(+), 18 deletions(-) diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp index 1e9b2f430..14310a9f4 100644 --- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp @@ -206,6 +206,16 @@ if("BAIC_MOTOR"==operationType){ sParams = sParams+",distributorNo="+getItemValue(0,getRow(),"distributorNo")+",distributorName="+getItemValue(0,getRow(),"distributorName"); } + //如果是个人，将对应的性别参数参数到流程中 + if("03"==customerType){ + var sex = certid.substring(16,17); + sex = parseInt(sex); + if(sex%2==0){//奇男偶女 + sParams = sParams+",sex=2"; + }else{ + sParams = sParams+",sex=1"; + } + } var sReturnInfo = RunJavaMethodTrans("com.tenwa.lease.flow.project.projectapproval.BusinessApprovalStartAction","initFLow",sParams);//定义流程中需要的参数 if(typeof(sReturnInfo)=="undefined" || sReturnInfo=="" || sReturnInfo=="_CANCEL_" ) { diff --git a/src_app_fresh/apx/com/amarsoft/als/apzl/apply/contract/make/service/impl/ContractMakeServiceImpl.java b/src_app_fresh/apx/com/amarsoft/als/apzl/apply/contract/make/service/impl/ContractMakeServiceImpl.java index 2423633f8..edbf30d85 100644 --- a/src_app_fresh/apx/com/amarsoft/als/apzl/apply/contract/make/service/impl/ContractMakeServiceImpl.java +++ b/src_app_fresh/apx/com/amarsoft/als/apzl/apply/contract/make/service/impl/ContractMakeServiceImpl.java @@ -30,6 +30,7 @@ import com.base.util.ReturnMapUtil; import com.tenwa.action.channelportal.businesshanding.contractaward.ContractAward; import com.tenwa.app.baseFileTemplate.handle.FileTemplateUtil; import com.tenwa.channelportal.action.ContractSignAction; +import com.tenwa.channelportal.action.ContractSignActionTwo; import com.tenwa.comm.util.jboutil.DataOperatorUtil; import com.tenwa.makeContract.util.MakeOneCodeAndContractModel; import com.tenwa.officetempalte.action.CreateContractOfficeAction; @@ -164,7 +165,17 @@ public class ContractMakeServiceImpl implements ContractMakeService{ modc.pdfAndMark(outPdfFile, path, contractId,flowParms.get("leasform"), sqlca); // //判断是否自动盖章sealType signType if(("01".equals(flowParms.get("customertype"))&&"Auto".equals(flowParms.get("sealType")) )||("Auto".equals(flowParms.get("sealType")) && "Hand".equals(flowParms.get("signType")) )){ - modc.compnySignIng(contractId,flowParms.get("SubjectId"), sqlca); + String operationType = flowParms.get("operationType"); + if("LHZL".equals(operationType) || "SQSYC".equals(operationType)){ + ContractSignActionTwo csat = new ContractSignActionTwo(); + csat.setFlowUnid(flowUnid); + csat.setProjectId(projectId); + csat.setOperationType(operationType); + csat.setSubjectId(flowParms.get("SubjectId")); + csat.compnySignIng(tx); + }else{ + modc.compnySignIng(contractId,flowParms.get("SubjectId"), sqlca); + } } body.put("status", "00"); body.put("message", ""); @@ -254,10 +265,22 @@ public class ContractMakeServiceImpl implements ContractMakeService{ body.put("status", "01"); body.put("message", checkFile); }else{ - csa.setCurUserID(userid); - csa.setFlowUnid(flowParms.get("FlowUnid")); - csa.setSubjectId(flowParms.get("SubjectId")); - String signIng = csa.signIng(tx); + String signIng = ""; + String operationType = flowParms.get("operationType"); + if("LHZL".equals(operationType) || "SQSYC".equals(operationType)){ + ContractSignActionTwo csat = new ContractSignActionTwo(); + csat.setFlowUnid(flowUnid); + csat.setProjectId(flowParms.get("ProjectId")); + csat.setOperationType(operationType); + csat.setSubjectId(flowParms.get("SubjectId")); + signIng = csat.signIng(tx); + }else{ + csa.setCurUserID(userid); + csa.setFlowUnid(flowParms.get("FlowUnid")); + csa.setSubjectId(flowParms.get("SubjectId")); + signIng = csa.signIng(tx); + } + String[] signStatus = signIng.split("@"); if("success".equals(signStatus[0])){ body.put("status", "00"); @@ -314,10 +337,22 @@ public class ContractMakeServiceImpl implements ContractMakeService{ body.put("status", "01"); body.put("message", checkSign); }else{ - ContractSignAction csa = new ContractSignAction(); - csa.setProjectId(flowParms.get("ProjectId")); - csa.setSubjectId(flowParms.get("SubjectId")); - String sendMessageAgain = csa.sendMessageAgain(tx); + String sendMessageAgain = ""; + String operationType = flowParms.get("operationType"); + if("LHZL".equals(operationType) || "SQSYC".equals(operationType)){ + ContractSignActionTwo csat = new ContractSignActionTwo(); + csat.setFlowUnid(flowUnid); + csat.setProjectId(flowParms.get("ProjectId")); + csat.setOperationType(operationType); + csat.setSubjectId(flowParms.get("SubjectId")); + sendMessageAgain = csat.sendMessageAgain(tx); + }else{ + ContractSignAction csa = new ContractSignAction(); + csa.setProjectId(flowParms.get("ProjectId")); + csa.setSubjectId(flowParms.get("SubjectId")); + sendMessageAgain = csa.sendMessageAgain(tx); + } + if("success".equals(sendMessageAgain)){ body.put("status", "00"); body.put("message", "短信发送成功！"); @@ -351,13 +386,24 @@ public class ContractMakeServiceImpl implements ContractMakeService{ body.put("status", "01"); body.put("message", checkSign); }else{ - ContractSignAction csa = new ContractSignAction(); - csa.setProjectId(flowParms.get("ProjectId")); - csa.setCustomerType(flowParms.get("customertype")); - csa.setFlowUnid(flowUnid); - csa.setCurUserID(userid); - csa.setSubjectId(flowParms.get("SubjectId")); - String contractSignStatus = csa.contractSignStatus(tx); + String contractSignStatus = ""; + String operationType = flowParms.get("operationType"); + if("LHZL".equals(operationType) || "SQSYC".equals(operationType)){ + ContractSignActionTwo csat = new ContractSignActionTwo(); + csat.setFlowUnid(flowUnid); + csat.setProjectId(flowParms.get("ProjectId")); + csat.setOperationType(operationType); + csat.setSubjectId(flowParms.get("SubjectId")); + contractSignStatus = csat.contractSignStatus(tx); + }else{ + ContractSignAction csa = new ContractSignAction(); + csa.setProjectId(flowParms.get("ProjectId")); + csa.setCustomerType(flowParms.get("customertype")); + csa.setFlowUnid(flowUnid); + csa.setCurUserID(userid); + csa.setSubjectId(flowParms.get("SubjectId")); + contractSignStatus = csa.contractSignStatus(tx); + } if("已经完成电子签约".equals(contractSignStatus)){ body.put("status", "00"); body.put("message",contractSignStatus); @@ -384,8 +430,6 @@ public class ContractMakeServiceImpl implements ContractMakeService{ String status = result[0]; if("true".equals(result[3])){ message = "请先生成pdf版的合同！！！"; - }else if( status!=null && !status.equals("null") && status.length()>0 && new Integer(status) < 2 ){ - message = "请生成合同,在电子签约"; }else if(status!=null && !status.equals("null") && status.length()>0 && new Integer(status) > 4 &&new Integer(status) < 7 ){ message = "合同状态为:"+result[1]+"不可以电子签章"; }else if (("sendMessageAgain".equals(signType)||"queryAgain".equals(signType)) && new Integer(status) == 2){ diff --git a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProjectIntoTempInitCarBusiness.java b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProjectIntoTempInitCarBusiness.java index 2b4bc6e08..17192e3b0 100644 --- a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProjectIntoTempInitCarBusiness.java +++ b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProjectIntoTempInitCarBusiness.java @@ -32,6 +32,7 @@ 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.amarsoft.awe.dw.ui.page.body.imp.Integer; import com.amarsoft.awe.util.SqlObject; import com.amarsoft.awe.util.Transaction; import com.amarsoft.context.ASUser; @@ -268,6 +269,7 @@ public class LBProjectIntoTempInitCarBusiness extends BaseBussiness { boCRT.setAttributeValue("MOBILE", this.getAttribute("mobile"));//手机号 boCRT.setAttributeValue("NATIVEPLACE", this.getAttribute("nativeplace"));//户籍地址 } + boCRT.setAttributeValue("SEX", this.getAttribute("sex"));//手机号 } bomC.saveObject(boCRT); } catch (Exception e) {