From 3cb56ffd62d5b4714d0061296fc17697337acf89 Mon Sep 17 00:00:00 2001 From: tangfutang Date: Wed, 13 Jun 2018 09:36:08 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=B5=E5=AD=90=E7=AD=BE=E7=BA=A6=E5=88=A4?= =?UTF-8?q?=E6=96=AD=E6=98=AF=E5=90=A6=E6=98=AF=E8=87=AA=E7=84=B6=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ContractApproval/ContractApprovalApplyList.jsp | 3 +-- src/com/amarsoft/app/flow/FlowAction.java | 3 ++- src_core/com/tenwa/util/SerialNumberUtil.java | 4 ++-- src_sys/com/tenwa/flow/action/comm/FlowBussionAction.java | 8 ++++++++ .../contractapproval/ContractApprovalStartAction.java | 3 ++- 5 files changed, 15 insertions(+), 6 deletions(-) diff --git a/WebContent/Tenwa/Lease/Flow/Contract/ContractApproval/ContractApprovalApplyList.jsp b/WebContent/Tenwa/Lease/Flow/Contract/ContractApproval/ContractApprovalApplyList.jsp index be2876198..62f782565 100644 --- a/WebContent/Tenwa/Lease/Flow/Contract/ContractApproval/ContractApprovalApplyList.jsp +++ b/WebContent/Tenwa/Lease/Flow/Contract/ContractApproval/ContractApprovalApplyList.jsp @@ -16,7 +16,6 @@ //alert(getHtmlMessage('1'));//请选择一条信息！ return; } - debugger; sReturn = sReturn.split("@"); var id=sReturn[0]; var product_id=sReturn[1]; @@ -24,7 +23,7 @@ var project_name = sReturn[3]; var customertype = sReturn[4]; var sParams = "ApplyType=<%=sApplyType%>,CurUserID=<%=CurUser.getUserID()%>"; - sParams =sParams+",ProductId="+product_id+",ProjectId="+id+",ProjectNo="+project_id+",ProjectName="+project_name+",ApplyType=<%=sApplyType%>"; + sParams =sParams+",ProductId="+product_id+",ProjectId="+id+",ProjectNo="+project_id+",customertype="+customertype+",ProjectName="+project_name+",ApplyType=<%=sApplyType%>"; var sReturnInfo = RunJavaMethodTrans("com.tenwa.lease.flow.contract.contractapproval.ContractApprovalStartAction","initFLow",sParams); if(typeof(sReturnInfo)=="undefined" || sReturnInfo=="" || sReturnInfo=="_CANCEL_") return; diff --git a/src/com/amarsoft/app/flow/FlowAction.java b/src/com/amarsoft/app/flow/FlowAction.java index 748ed9b8a..a5d792869 100644 --- a/src/com/amarsoft/app/flow/FlowAction.java +++ b/src/com/amarsoft/app/flow/FlowAction.java @@ -44,7 +44,8 @@ import com.amarsoft.biz.workflow.FlowTask; import com.amarsoft.biz.workflow.TaskDataObject; import com.amarsoft.context.ASUser; import com.amarsoft.dict.als.manage.NameManager; -import com.base.util.DateUtil; +//import com.base.util.DateUtil; +import com.tenwa.reckon.util.DateUtil; import com.tenwa.app.manage.constant.PushMessageConstant; import com.tenwa.app.manage.util.PushMessageUtil; import com.tenwa.comm.util.jboutil.DataOperatorUtil; diff --git a/src_core/com/tenwa/util/SerialNumberUtil.java b/src_core/com/tenwa/util/SerialNumberUtil.java index 00860dd66..4a5cf8375 100644 --- a/src_core/com/tenwa/util/SerialNumberUtil.java +++ b/src_core/com/tenwa/util/SerialNumberUtil.java @@ -127,7 +127,7 @@ public class SerialNumberUtil { return SerialNumberUtil.getSerialNumber("P{year}{maxOrderNumber}",7,null, "项目编号", null, tx); } - public static String getContractSerialNaumber(String dept,JBOTransaction tx) throws Exception { + public static String getContractSerialNaumber(String dept,String area_code,JBOTransaction tx) throws Exception { String currentDateTime = DateAssistant.getToday(); String currentYear = currentDateTime.substring(0,4); String currentMonth = currentDateTime.substring(5,7); @@ -135,7 +135,7 @@ public class SerialNumberUtil { int year = Integer.parseInt(currentYear); int month = Integer.parseInt(currentMonth); int day = Integer.parseInt(currentDay); - return SerialNumberUtil.getSerialNumberByDay("zlzl"+dept+"{year}{month}{day}{maxOrderNumber}",3,null, "", year,month,day, tx); + return SerialNumberUtil.getSerialNumberByDay("zlzl"+dept+"{year}{month}{day}"+area_code+"{maxOrderNumber}",3,null, "", year,month,day, tx); } /*public static String getContractSerialNaumber(String sSerialType,JBOTransaction tx) throws Exception { diff --git a/src_sys/com/tenwa/flow/action/comm/FlowBussionAction.java b/src_sys/com/tenwa/flow/action/comm/FlowBussionAction.java index a3eb801db..556fdce9d 100644 --- a/src_sys/com/tenwa/flow/action/comm/FlowBussionAction.java +++ b/src_sys/com/tenwa/flow/action/comm/FlowBussionAction.java @@ -35,6 +35,7 @@ public class FlowBussionAction extends CommonAction { private String FlowKey; private String ProductId; private String FixedFlowParam; + public String customertype; public List FlowMutexConfig; public Map FlowParam = new HashMap(); @@ -213,4 +214,11 @@ public class FlowBussionAction extends CommonAction { public void setFlowMutexConfig(List flowMutexConfig) { FlowMutexConfig = flowMutexConfig; } + public String getCustomertype() { + return customertype; + } + public void setCustomertype(String customertype) { + this.customertype = customertype; + } + } diff --git a/src_tenwa/com/tenwa/lease/flow/contract/contractapproval/ContractApprovalStartAction.java b/src_tenwa/com/tenwa/lease/flow/contract/contractapproval/ContractApprovalStartAction.java index a1431d601..8cf0bc4eb 100644 --- a/src_tenwa/com/tenwa/lease/flow/contract/contractapproval/ContractApprovalStartAction.java +++ b/src_tenwa/com/tenwa/lease/flow/contract/contractapproval/ContractApprovalStartAction.java @@ -58,7 +58,8 @@ public class ContractApprovalStartAction extends BaseFlowStartAction{ contractno=SerialNumberUtil.getContractSerialNaumber(dept,area_code, tx); } this.FlowParam.put("ContractNo", contractno); - this.FlowParam.put("FlowKey", contractno); + this.FlowParam.put("FlowKey", contractno); + this.FlowParam.put("customertype", customertype); this.FlowParam.put("IsMakeContract", "yes"); } }