diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/ApprovalAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/ApprovalAfter.java index 841f0e39..f914b11f 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/ApprovalAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/ApprovalAfter.java @@ -37,25 +37,21 @@ public class ApprovalAfter implements TaskListener { delegateTask.setVariable("objectJson",object); //截止时间 流程描述 创建人 // String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); - String user = object.getString("prcCreateUser"); - delegateTask.setVariable("createUser",user); - String username = object.getString("prcCreateUserName"); - delegateTask.setVariable("createUserName",username); - String standName = object.getString("listName"); - delegateTask.setVariable("listName",standName); + String user = delegateTask.getVariable("createUser", String.class); + String username = delegateTask.getVariable("createUserName", String.class); String prcName=""; List nextUserList = new ArrayList(); if("1".equals(object.getString("shyFlag"))){ delegateTask.setVariable("shyFlag", "1"); - prcName = standName + "-政策课题组会后流程"; + prcName = "政策课题组会后流程"; }else{ delegateTask.setVariable("shyFlag", "0"); if(StringUtils.isNotBlank(object.getString("revisionId"))){ delegateTask.setVariable("revision", object.getString("revisionId")); nextUserList.add(object.getString("revisionId")); - prcName = standName + "-政策课题组会后流程-申请人修订申请信息"; + prcName = "政策课题组会后流程-申请人修订申请信息"; } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/InputInformationAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/InputInformationAfter.java index 6ffc001b..de6b391e 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/InputInformationAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/InputInformationAfter.java @@ -44,14 +44,16 @@ public class InputInformationAfter implements TaskListener { //截止时间 流程描述 创建人 // String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); - String user = object.getString("prcCreateUser"); - delegateTask.setVariable("createUser",user); - String username = object.getString("prcCreateUserName"); - delegateTask.setVariable("createUserName",username); - String standName = object.getString("listName"); - delegateTask.setVariable("listName",standName); +// String user = object.getString("prcCreateUser"); +// delegateTask.setVariable("createUser",user); +// String username = object.getString("prcCreateUserName"); +// delegateTask.setVariable("createUserName",username); +// String standName = object.getString("listName"); +// delegateTask.setVariable("listName",standName); + String user = delegateTask.getVariable("createUser", String.class); + String username = delegateTask.getVariable("createUserName", String.class); String prcName=""; - prcName = standName + "-政策课题组会后流程-审核员批准"; + prcName = "政策课题组会后流程-审核员批准"; // if(object.getString("signFlag").equals("1")) { // prcName = standName + "-标准法规清单申请-会签"; // }else { diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/PRGAMStartAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/PRGAMStartAfter.java index 2f3cdb66..f1c7a6a7 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/PRGAMStartAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/PRGAMStartAfter.java @@ -44,13 +44,11 @@ public class PRGAMStartAfter implements TaskListener { //截止时间 流程描述 创建人 // String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); - String user = object.getString("prcCreateUser"); + String user = object.getString("revisionId"); delegateTask.setVariable("createUser",user); - String username = object.getString("prcCreateUserName"); + String username = object.getString("revisionIdName"); delegateTask.setVariable("createUserName",username); - String standName = object.getString("listName"); - delegateTask.setVariable("listName",standName); - String prcName=standName + "-政策课题组会后流程-申请人填写表单"; + String prcName= "政策课题组会后流程-申请人填写表单"; QueryWrapper queryWrapper2 = new QueryWrapper(); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/RevisionInformationAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/RevisionInformationAfter.java index a0e5e9ca..4a0bbcd3 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/RevisionInformationAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/RevisionInformationAfter.java @@ -44,13 +44,9 @@ public class RevisionInformationAfter implements TaskListener { //截止时间 流程描述 创建人 // String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); - String user = object.getString("prcCreateUser"); - delegateTask.setVariable("createUser",user); - String username = object.getString("prcCreateUserName"); - delegateTask.setVariable("createUserName",username); - String standName = object.getString("listName"); - delegateTask.setVariable("listName",standName); - String prcName=""; + String user = delegateTask.getVariable("createUser",String.class); + String username = delegateTask.getVariable("createUserName",String.class); + String prcName="政策课题组会后流程-审核员审核"; // if(object.getString("signFlag").equals("1")) { // prcName = standName + "-标准法规清单申请-会签"; // }else { diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/MinisterApprovalAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/MinisterApprovalAfter.java index 6f3447e4..82f2599a 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/MinisterApprovalAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/MinisterApprovalAfter.java @@ -37,12 +37,12 @@ public class MinisterApprovalAfter implements TaskListener { delegateTask.setVariable("objectJson",object); //截止时间 流程描述 创建人 // String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); - String user = object.getString("prcCreateUser"); - delegateTask.setVariable("createUser",user); - String username = object.getString("prcCreateUserName"); - delegateTask.setVariable("createUserName",username); - String standName = object.getString("listName"); - delegateTask.setVariable("listName",standName); +// String user = object.getString("prcCreateUser"); +// delegateTask.setVariable("createUser",user); +// String username = object.getString("prcCreateUserName"); +// delegateTask.setVariable("createUserName",username); + String user = delegateTask.getVariable("createUser",String.class); + String username = delegateTask.getVariable("createUserName",String.class); String prcName=""; List nextUserList = new ArrayList(); @@ -52,18 +52,18 @@ public class MinisterApprovalAfter implements TaskListener { if (StringUtils.isNotBlank(object.getString("presidentId"))){ nextUserList.add(object.getString("presidentId")); delegateTask.setVariable("presidentApproval", object.getString("presidentId")); - prcName = standName + "-政策课题组参会流程-公司副总批准"; + prcName = "政策课题组参会流程-公司副总批准"; } }else if ("0".equals(object.getString("fgfbz"))){ delegateTask.setVariable("fgfbz", "0"); if (StringUtils.isNotBlank(object.getString("revisionId"))){ nextUserList.add(object.getString("revisionId")); delegateTask.setVariable("revision", object.getString("revisionId")); - prcName = standName + "-政策课题组参会流程-修订参会信息"; + prcName = "政策课题组参会流程-修订参会信息"; } }else{ delegateTask.setVariable("fgfbz", "2"); - prcName = standName + "-政策课题组参会流程"; + prcName = "政策课题组参会流程"; } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/PRGAMStartAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/PRGAMStartAfter.java index 699b9939..a96ecdf3 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/PRGAMStartAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/PRGAMStartAfter.java @@ -44,18 +44,16 @@ public class PRGAMStartAfter implements TaskListener { //截止时间 流程描述 创建人 // String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); - String user = object.getString("prcCreateUser"); + String user = object.getString("revisionId"); delegateTask.setVariable("createUser",user); - String username = object.getString("prcCreateUserName"); + String username = object.getString("revisionIdName"); delegateTask.setVariable("createUserName",username); - String standName = object.getString("listName"); - delegateTask.setVariable("listName",standName); String prcName = ""; - prcName= standName + "-政策课题组参会流程-法规认证部副部长审核"; + prcName= "政策课题组参会流程-法规认证部副部长审核"; // if(object.getString("signFlag").equals("1")) { // prcName = standName + "-标准法规清单申请-会签"; // }else { -// prcName = standName + "-标准法规清单申请-经理审批"; +// prcName = standName + "标准法规清单申请-经理审批"; // } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/PresidentApprovalAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/PresidentApprovalAfter.java index 0a2de37c..75960693 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/PresidentApprovalAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/PresidentApprovalAfter.java @@ -38,25 +38,23 @@ public class PresidentApprovalAfter implements TaskListener { //截止时间 流程描述 创建人 // String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); - String user = object.getString("prcCreateUser"); - delegateTask.setVariable("createUser",user); - String username = object.getString("prcCreateUserName"); - delegateTask.setVariable("createUserName",username); - String standName = object.getString("listName"); - delegateTask.setVariable("listName",standName); +// String user = object.getString("prcCreateUser"); +// delegateTask.setVariable("createUser",user); + String user = delegateTask.getVariable("createUser",String.class); + String username = delegateTask.getVariable("createUserName",String.class); String prcName=""; List nextUserList = new ArrayList(); if("1".equals(object.getString("gsfz"))){ delegateTask.setVariable("gsfz", "1"); - prcName = standName + "-政策课题组参会流程"; + prcName = "政策课题组参会流程"; }else{ delegateTask.setVariable("gsfz", "0"); if (StringUtils.isNotBlank(object.getString("revisionId"))){ nextUserList.add(object.getString("revisionId")); delegateTask.setVariable("revision", object.getString("revisionId")); - prcName = standName + "-政策课题组参会流程-修订参会信息"; + prcName = "政策课题组参会流程-修订参会信息"; } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/RevisionInformationAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/RevisionInformationAfter.java index 1fdc43b8..5ae077f5 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/RevisionInformationAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/RevisionInformationAfter.java @@ -37,19 +37,21 @@ public class RevisionInformationAfter implements TaskListener { delegateTask.setVariable("objectJson",object); //截止时间 流程描述 创建人 // String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); - String user = object.getString("prcCreateUser"); - delegateTask.setVariable("createUser",user); - String username = object.getString("prcCreateUserName"); - delegateTask.setVariable("createUserName",username); - String standName = object.getString("listName"); - delegateTask.setVariable("listName",standName); +// String user = object.getString("prcCreateUser"); +// delegateTask.setVariable("createUser",user); +// String username = object.getString("prcCreateUserName"); +// delegateTask.setVariable("createUserName",username); +// String standName = object.getString("listName"); +// delegateTask.setVariable("listName",standName); + String user = delegateTask.getVariable("createUser",String.class); + String username = delegateTask.getVariable("createUserName",String.class); String prcName=""; List nextUserList = new ArrayList(); if (StringUtils.isNotBlank(object.getString("ministerId"))){ nextUserList.add(object.getString("ministerId")); delegateTask.setVariable("ministerApproval", object.getString("ministerId")); - prcName = standName + "-政策课题组参会流程-法规认证部副部长审核"; + prcName = "政策课题组参会流程-法规认证部副部长审核"; } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PGREPresidentApprovalAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PGREPresidentApprovalAfter.java index 3d0fd47c..dcf8ac40 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PGREPresidentApprovalAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PGREPresidentApprovalAfter.java @@ -41,28 +41,24 @@ public class PGREPresidentApprovalAfter implements TaskListener { JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); delegateTask.setVariable("objectJson", object); - String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); - String user = object.getString("prcCreateUser"); - delegateTask.setVariable("createUser",user); - String username = object.getString("prcCreateUserName"); - delegateTask.setVariable("createUserName",username); - String standName = object.getString("listName"); - delegateTask.setVariable("listName",standName); - String prcName=standName; + String user = delegateTask.getVariable("createUser", String.class); + String username = delegateTask.getVariable("createUserName", String.class); + String prcName=""; + List nextUserList = new ArrayList(); if ("1".equals(object.getString("gsfz"))) { delegateTask.setVariable("gsfz", "1"); - prcName += "-政策课题组入会流程"; + prcName = "政策课题组入会流程"; } else { delegateTask.setVariable("gsfz", "0"); if (StringUtils.isNotBlank(object.getString("revisionId"))) { delegateTask.setVariable("revisionInformation", object.getString("revisionId")); nextUserList.add(object.getString("revisionId")); } - prcName += "-政策课题组入会流程-修订入会信息"; + prcName = "政策课题组入会流程-修订入会信息"; } // 存储当前节点意见 if (null != object.getString("commentText")) { diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEInspectorApprovalAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEInspectorApprovalAfter.java index 92d4a779..730f633f 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEInspectorApprovalAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEInspectorApprovalAfter.java @@ -42,13 +42,8 @@ public class PRGEInspectorApprovalAfter implements TaskListener { JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); delegateTask.setVariable("objectJson", object); - String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); - String user = object.getString("prcCreateUser"); - delegateTask.setVariable("createUser",user); - String username = object.getString("prcCreateUserName"); - delegateTask.setVariable("createUserName",username); - String standName = object.getString("listName"); - delegateTask.setVariable("listName",standName); + String user = delegateTask.getVariable("createUser", String.class); + String username = delegateTask.getVariable("createUserName", String.class); String prcName=""; List nextUserList = new ArrayList(); @@ -58,17 +53,17 @@ public class PRGEInspectorApprovalAfter implements TaskListener { delegateTask.setVariable("presidentApproval", object.getString("presidentId")); nextUserList.add(object.getString("presidentId")); } - prcName = standName + "-政策课题组入会流程-公司副总批准"; + prcName = "政策课题组入会流程-公司副总批准"; } else if ("0".equals(object.getString("fgfzj"))) { delegateTask.setVariable("fgfzj", "0"); if (StringUtils.isNotBlank(object.getString("revisionId"))){ delegateTask.setVariable("revisionInformation", object.getString("revisionId")); nextUserList.add(object.getString("revisionId")); } - prcName = standName + "-政策课题组入会流程-修订入会信息"; + prcName = "政策课题组入会流程-修订入会信息"; }else{ delegateTask.setVariable("fgfzj", "2"); - prcName = standName + "-政策课题组入会流程"; + prcName = "政策课题组入会流程"; } // 存储当前节点意见 diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEMinisterConfirmAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEMinisterConfirmAfter.java index 8287679c..ad64a474 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEMinisterConfirmAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEMinisterConfirmAfter.java @@ -43,13 +43,8 @@ public class PRGEMinisterConfirmAfter implements TaskListener { JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); delegateTask.setVariable("objectJson",object); //截止时间 流程描述 创建人 - String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); - String user = object.getString("prcCreateUser"); - delegateTask.setVariable("createUser",user); - String username = object.getString("prcCreateUserName"); - delegateTask.setVariable("createUserName",username); - String standName = object.getString("listName"); - delegateTask.setVariable("listName",standName); + String user = delegateTask.getVariable("createUser",String.class); + String username = delegateTask.getVariable("createUserName",String.class); String prcName=""; @@ -62,14 +57,14 @@ public class PRGEMinisterConfirmAfter implements TaskListener { delegateTask.setVariable("inspectorApproval", object.getString("inspectorId")); nextUserList.add(object.getString("inspectorId")); } - prcName = standName + "-政策课题组入会流程-法规认证部副总监批准"; + prcName = "政策课题组入会流程-法规认证部副总监批准"; }else{ delegateTask.setVariable("fgfbz","0"); if (StringUtils.isNotBlank(object.getString("revisionId"))){ delegateTask.setVariable("revisionInformation", object.getString("revisionId")); nextUserList.add(object.getString("revisionId")); } - prcName = standName + "-政策课题组入会流程-修订入会信息"; + prcName = "政策课题组入会流程-修订入会信息"; } // 存储当前节点意见 diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEStartAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEStartAfter.java index 5d515efe..b09a0ffa 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEStartAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEStartAfter.java @@ -57,10 +57,8 @@ public class PRGEStartAfter implements TaskListener { delegateTask.setVariable("createUser",user); String username = object.getString("revisionIdName"); delegateTask.setVariable("createUserName",username); - String standName = object.getString("listName"); - delegateTask.setVariable("listName",standName); String prcName=""; - prcName = standName + "-标准化活动入会流程-法规认证部副部长审核"; + prcName = "标准化活动入会流程-法规认证部副部长审核"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/RevisonInformationAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/RevisonInformationAfter.java index 606191b2..7b43394c 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/RevisonInformationAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/RevisonInformationAfter.java @@ -50,15 +50,10 @@ public class RevisonInformationAfter implements TaskListener { // delegateTask.setVariable("ministerConfirm", object.getString("ministerId")); } - String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); - String user = object.getString("prcCreateUser"); - delegateTask.setVariable("createUser",user); - String username = object.getString("prcCreateUserName"); - delegateTask.setVariable("createUserName",username); - String standName = object.getString("listName"); - delegateTask.setVariable("listName",standName); + String user = delegateTask.getVariable("createUser", String.class); + String username = delegateTask.getVariable("createUserName", String.class); String prcName=""; - prcName = standName + "-政策课题组入会流程-法规认证部副部长审核"; + prcName = "政策课题组入会流程-法规认证部副部长审核"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());