From 1524c59e34c9737a45d926d38c2d7110f73c4b96 Mon Sep 17 00:00:00 2001 From: qk <1005180704@qq。com> Date: Thu, 19 May 2022 09:26:17 +0800 Subject: [PATCH 1/2] =?UTF-8?q?update=EF=BC=9Abug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../NonConformanceRectification/DockingApprovalAfter.java | 5 ++++- .../NonConformanceRectification/SelectDockUserAfter.java | 6 +++++- .../SelectResponUserAfter.java | 7 +++++-- .../NonConformanceRectification/UploadCommentAfter.java | 8 ++++++-- .../listener/StandardCommentNewProcess/Step10After.java | 4 ++-- .../listener/StandardCommentNewProcess/Step1After.java | 2 +- .../listener/StandardCommentNewProcess/Step2After.java | 2 +- .../listener/StandardCommentNewProcess/Step3After.java | 2 +- .../listener/StandardCommentNewProcess/Step4After.java | 4 ++-- .../listener/StandardCommentNewProcess/Step5After.java | 4 ++-- .../listener/StandardCommentNewProcess/Step7After.java | 4 ++-- .../listener/StandardCommentNewProcess/Step8After.java | 6 +++--- .../listener/StandardCommentNewProcess/Step9After.java | 4 ++-- .../listener/projectEvaluationNewProcess/Step4After.java | 2 +- .../listener/projectEvaluationNewProcess/Step5After.java | 2 +- .../listener/projectEvaluationNewProcess/Step6After.java | 2 +- .../listener/projectEvaluationNewProcess/Step7After.java | 2 +- .../listener/projectEvaluationNewProcess/Step8After.java | 2 +- .../listener/projectEvaluationNewProcess/Step9After.java | 2 +- 19 files changed, 42 insertions(+), 28 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/NonConformanceRectification/DockingApprovalAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/NonConformanceRectification/DockingApprovalAfter.java index e1a46ce7..8101c192 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/NonConformanceRectification/DockingApprovalAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/NonConformanceRectification/DockingApprovalAfter.java @@ -52,7 +52,10 @@ public class DockingApprovalAfter implements TaskListener { String username = object.getString("prcCreateUserName"); // object.getString("standName") String standName = delegateTask.getVariable("number",String.class); - String prcName = standName + "-未符合项整改"; + JSONObject jsonArray=JSONArray.parseObject(object.getString("info")); + JSONArray jsonArray1=JSONArray.parseArray(jsonArray.getString("fileDataList")); + JSONObject object111=JSONObject.parseObject(String.valueOf(jsonArray1.get(0))); + String prcName = standName+"-"+object111.getString("standName")+"-未符合项整改"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/NonConformanceRectification/SelectDockUserAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/NonConformanceRectification/SelectDockUserAfter.java index 0c455ee6..969e33cd 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/NonConformanceRectification/SelectDockUserAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/NonConformanceRectification/SelectDockUserAfter.java @@ -75,7 +75,11 @@ public class SelectDockUserAfter implements TaskListener { String user = object.getString("prcCreateUser"); String username = object.getString("prcCreateUserName"); String standName = delegateTask.getVariable("number",String.class); - String prcName = standName+"-未符合项整改"; +// JSONArray jsonArray=JSONArray.parseArray(object.getString("standardInfoList")); + JSONArray jsonArray=JSONArray.parseArray(object.getString("dockUserList")); + JSONArray jsonArray1 = JSONObject.parseArray(jsonArray.getJSONObject(0).getString("standardInfoList")); + JSONObject object1=JSONObject.parseObject(String.valueOf(jsonArray1.get(0))); + String prcName = standName+"-"+object1.getString("standName")+"-未符合项整改"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/NonConformanceRectification/SelectResponUserAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/NonConformanceRectification/SelectResponUserAfter.java index 32198322..c73456d2 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/NonConformanceRectification/SelectResponUserAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/NonConformanceRectification/SelectResponUserAfter.java @@ -97,7 +97,10 @@ public class SelectResponUserAfter implements TaskListener { String username = object.getString("prcCreateUserName"); // object.getString("standName") String standName = delegateTask.getVariable("number",String.class); - String prcName = standName + "-未符合项整改"; + JSONArray jsonArray=JSONArray.parseArray(object.getString("responUserList")); + JSONArray jsonArray1 = JSONObject.parseArray(jsonArray.getJSONObject(0).getString("standardInfoList")); + JSONObject object1=JSONObject.parseObject(String.valueOf(jsonArray1.get(0))); + String prcName = standName+"-"+object1.getString("standName")+"-未符合项整改"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); @@ -182,4 +185,4 @@ public class SelectResponUserAfter implements TaskListener { } } -} \ No newline at end of file +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/NonConformanceRectification/UploadCommentAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/NonConformanceRectification/UploadCommentAfter.java index 9f16126b..394339f0 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/NonConformanceRectification/UploadCommentAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/NonConformanceRectification/UploadCommentAfter.java @@ -83,7 +83,11 @@ public class UploadCommentAfter implements TaskListener { String username = object.getString("prcCreateUserName"); // object.getString("standName") String standName = delegateTask.getVariable("number",String.class); - String prcName = standName+"-未符合项整改"; + String name = delegateTask.getVariable("name",String.class); + JSONObject jsonArray=JSONArray.parseObject(object.getString("info")); + JSONArray jsonArray1=JSONArray.parseArray(jsonArray.getString("fileDataList")); + JSONObject object1=JSONObject.parseObject(String.valueOf(jsonArray1.get(0))); + String prcName = standName+"-"+object1.getString("standName")+"-未符合项整改"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); @@ -125,4 +129,4 @@ public class UploadCommentAfter implements TaskListener { busProcessNewNext.setPrcName(prcName); busBean.save(busProcessNewNext); } -} \ No newline at end of file +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step10After.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step10After.java index f0df90d0..843037e8 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step10After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step10After.java @@ -75,11 +75,11 @@ public class Step10After implements TaskListener { }); } lawsUserInfoService.savePublicIdeaBatch(sarPublicIdeaAlls); - prcName=delegateTask.getVariable("cid")+"-标准征求意见流程-流程结束"; + prcName=delegateTask.getVariable("cid")+"-征求意见"; }else { delegateTask.setVariable("presidentFlag","1"); nextUserList.add(delegateTask.getVariable("bzfgIdSum",String.class)); - prcName =delegateTask.getVariable("cid")+"-标准征求意见流程-标准法规工程师汇总"; + prcName =delegateTask.getVariable("cid")+"-征求意见"; } nextUserList.add(object.getString("presidentUser")); delegateTask.setVariable("presidentUser",object.getString("presidentUser")); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step1After.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step1After.java index de6d6dc3..e452af39 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step1After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step1After.java @@ -71,7 +71,7 @@ public class Step1After implements TaskListener { String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); String user = delegateTask.getVariable("user",String.class); String username = delegateTask.getVariable("userName",String.class); - String prcName = delegateTask.getVariable("cid")+"-标准征求意见流程-责任人反馈"; + String prcName = delegateTask.getVariable("cid")+"-征求意见"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step2After.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step2After.java index 5397fb30..636fba4d 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step2After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step2After.java @@ -67,7 +67,7 @@ public class Step2After implements TaskListener { String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); String user = delegateTask.getVariable("user",String.class); String username = delegateTask.getVariable("userName",String.class); - String prcName = delegateTask.getVariable("cid")+"-标准征求意见流程-责任部门对接人汇总并选择审批人"; + String prcName = delegateTask.getVariable("cid")+"-征求意见"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step3After.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step3After.java index 2c735d72..3eec053d 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step3After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step3After.java @@ -46,7 +46,7 @@ public class Step3After implements TaskListener { //截止时间 流程描述 创建人 String user = delegateTask.getVariable("user",String.class); String username = delegateTask.getVariable("userName",String.class); - String prcName = delegateTask.getVariable("cid")+"-标准征求意见流程-审批人审批"; + String prcName = delegateTask.getVariable("cid")+"-征求意见"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step4After.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step4After.java index 57b240a4..bd09e2f7 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step4After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step4After.java @@ -42,12 +42,12 @@ public class Step4After implements TaskListener { if ("0".equals(object.getString("spFlag"))) { nextUserList.add(object.getString("bzfgId")); delegateTask.setVariable("bzfgId", object.getString("bzfgId")); - prcName = delegateTask.getVariable("cid")+"-标准征求意见流程-标准法规工程师分线审核"; + prcName = delegateTask.getVariable("cid")+"-征求意见"; delegateTask.setVariable("spFlag","0"); }else { delegateTask.setVariable("zrUserId1",object.getString("SKS")); nextUserList.add(object.getString("SKS")); - prcName = delegateTask.getVariable("cid")+"-标准征求意见流程-责任部门对接人汇总并选择审批人"; + prcName = delegateTask.getVariable("cid")+"-征求意见"; delegateTask.setVariable("spFlag","1"); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step5After.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step5After.java index 70e1b238..185180c9 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step5After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step5After.java @@ -67,11 +67,11 @@ public class Step5After implements TaskListener { nextUserList.add(delegateTask.getVariable("user",String.class)); delegateTask.setVariable("bzfgIdSum",delegateTask.getVariable("user",String.class)); delegateTask.setVariable("bzFlag","0"); - prcName = delegateTask.getVariable("cid")+"-标准征求意见流程-标准法规工程师汇总"; + prcName = delegateTask.getVariable("cid")+"-征求意见"; }else { delegateTask.setVariable("zrUserId1",object.getString("SKS")); nextUserList.add(object.getString("SKS")); - prcName = delegateTask.getVariable("cid")+"-标准征求意见流程-责任部门对接人汇总并选择审批人"; + prcName = delegateTask.getVariable("cid")+"-征求意见"; delegateTask.setVariable("bzFlag","1"); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step7After.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step7After.java index 2cedcf83..86e733da 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step7After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step7After.java @@ -37,7 +37,7 @@ public class Step7After implements TaskListener { List nextUserList = new ArrayList(); - String prcName =delegateTask.getVariable("cid")+"-标准征求意见流程"; + String prcName =delegateTask.getVariable("cid")+"-征求意见"; if (null==delegateTask.getVariable("hqCount")){ delegateTask.setVariable("hqCount",1); @@ -74,7 +74,7 @@ public class Step7After implements TaskListener { }); delegateTask.setVariable("hqFlag","0"); } else { - prcName =delegateTask.getVariable("cid")+"-标准征求意见流程-标准法规工程师汇总"; + prcName =delegateTask.getVariable("cid")+"-征求意见"; delegateTask.setVariable("hqFlag","1"); } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step8After.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step8After.java index 403a5596..4271c1cf 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step8After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step8After.java @@ -36,7 +36,7 @@ public class Step8After implements TaskListener { List nextUserList = new ArrayList(); - String prcName =delegateTask.getVariable("cid")+"-标准征求意见流程"; + String prcName =delegateTask.getVariable("cid")+"-征求意见"; List user1=new ArrayList<>(); delegateTask.setVariable("user7",user1); @@ -60,10 +60,10 @@ public class Step8After implements TaskListener { } if (delegateTask.getVariable("bdCount",Integer.class)==delegateTask.getVariable("userList",List.class).size()) { if (0 == delegateTask.getVariable("bdMark", Integer.class)) { - prcName =delegateTask.getVariable("cid")+"-标准征求意见流程-技术委员会相关专委会主任/研究总院职能部门领导，技术管理中心主任审定"; + prcName =delegateTask.getVariable("cid")+"-征求意见"; delegateTask.setVariable("bdFlag","0"); } else { - prcName =delegateTask.getVariable("cid")+"-标准征求意见流程-标准法规工程师汇总"; + prcName =delegateTask.getVariable("cid")+"-征求意见"; delegateTask.setVariable("bdFlag","1"); } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step9After.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step9After.java index 297570fa..81a4896c 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step9After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step9After.java @@ -86,14 +86,14 @@ public class Step9After implements TaskListener { if (delegateTask.getVariable("9Counnt", Integer.class) >= delegateTask.getVariable("directorUserList",List.class).size()) { if ("true".equals(delegateTask.getVariable("9Mark"))){ delegateTask.setVariable("directorFlag", "0"); - prcName = delegateTask.getVariable("cid") + "-标准征求意见流程-工程研究总院院长批准"; + prcName = delegateTask.getVariable("cid") + "-征求意见"; nextUserList.add(object.getString("presidentUser")); delegateTask.setVariable("presidentUser", object.getString("presidentUser")); }else { delegateTask.setVariable("9Counnt", 0); delegateTask.setVariable("directorFlag", "1"); nextUserList.add(delegateTask.getVariable("bzfgIdSum", String.class)); - prcName = delegateTask.getVariable("cid") + "-标准征求意见流程-标准法规工程师汇总"; + prcName = delegateTask.getVariable("cid") + "-征求意见"; } if (nextUserList != null && !nextUserList.isEmpty()) { for (String nextUser : nextUserList) { diff --git a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step4After.java b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step4After.java index 3015f0fe..ac7fc6b0 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step4After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step4After.java @@ -111,7 +111,7 @@ public class Step4After implements TaskListener { String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); String user = delegateTask.getVariable("prcCreateUser", String.class); String username = delegateTask.getVariable("prcCreateUserName", String.class); - String prcName = delegateTask.getVariable("stands",String.class)+"-标准项目合规评估-合规评估（专业技术人员）"; + String prcName = object.getString("standNumber")+"-"+object.getString("standName") + "-合规标准"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step5After.java b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step5After.java index f0f19ca6..bf2e00f7 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step5After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step5After.java @@ -50,7 +50,7 @@ public class Step5After implements TaskListener { String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); String user = delegateTask.getVariable("prcCreateUser", String.class); String username = delegateTask.getVariable("prcCreateUserName", String.class); - String prcName = delegateTask.getVariable("stands",String.class)+"-标准项目合规评估-审核（项目经理）"; + String prcName = object.getString("standNumber")+"-"+object.getString("standName") + "-合规标准"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step6After.java b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step6After.java index 2a968b40..7208717d 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step6After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step6After.java @@ -89,7 +89,7 @@ public class Step6After implements TaskListener { String user = delegateTask.getVariable("prcCreateUser", String.class); String username = delegateTask.getVariable("prcCreateUserName", String.class); - String prcName = delegateTask.getVariable("stands",String.class)+"-标准项目合规评估-审定（项目群负责人）"; + String prcName = object.getString("standNumber")+"-"+object.getString("standName") + "-合规标准"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step7After.java b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step7After.java index c5d1cc79..7bdca6c7 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step7After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step7After.java @@ -59,7 +59,7 @@ public class Step7After implements TaskListener { //截止时间 流程描述 创建人 String user = delegateTask.getVariable("prcCreateUser", String.class); String username = delegateTask.getVariable("prcCreateUserName", String.class); - String prcName = delegateTask.getVariable("stands",String.class)+"-标准项目合规评估-批准（标准法规部高级经理）"; + String prcName = object.getString("standNumber")+"-"+object.getString("standName") + "-合规标准"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step8After.java b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step8After.java index d0b781c5..9777a1d9 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step8After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step8After.java @@ -126,7 +126,7 @@ public class Step8After implements TaskListener { String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); String user = delegateTask.getVariable("prcCreateUser", String.class); String username = delegateTask.getVariable("prcCreateUserName", String.class); - String prcName = delegateTask.getVariable("stands",String.class)+"-标准项目合规评估-标准法规部领导审批"; + String prcName = object.getString("standNumber")+"-"+object.getString("standName") + "-合规标准"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step9After.java b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step9After.java index eeec03c7..370e361b 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step9After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step9After.java @@ -61,7 +61,7 @@ public class Step9After implements TaskListener { delegateTask.setVariable("prcCreateUser", user); delegateTask.setVariable("prcCreateUserName", username); delegateTask.setVariable("stands",object.getString("standNumber")); - String prcName = String.valueOf(object.getString("standNumber"))+"-标准项目合规评估流程-审核（标准法规业务经理）"; + String prcName = object.getString("standNumber")+"-"+object.getString("standName") + "-合规标准"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); From 4208a25fa51ddf5c4cbaf2dfcb061adbb9f6f702 Mon Sep 17 00:00:00 2001 From: qk <1005180704@qq。com> Date: Fri, 20 May 2022 09:00:14 +0800 Subject: [PATCH 2/2] =?UTF-8?q?update=EF=BC=9Abug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProcessStep1After.java | 13 ++++++++++--- .../ProcessStep2After.java | 12 ++++++++++++ .../ProcessStep3After.java | 13 ++++++++++++- .../ProcessStep4After.java | 12 ++++++++++++ .../ProcessStep5After.java | 14 +++++++++++++- .../bat/wkflow/listener/qbzxdlxjh/Step2After.java | 2 +- 6 files changed, 60 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep1After.java b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep1After.java index 5ca7f279..d5169344 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep1After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep1After.java @@ -54,10 +54,17 @@ public class ProcessStep1After implements TaskListener { String user = delegateTask.getVariable("prcCreateUser",String.class); String username = delegateTask.getVariable("prcCreateUserName", String.class); String prcName = ""; - if ("0".equals(object.getString("passFlag"))) { - prcName = "企标制修订计划-部门中心主任会签"; + String type=object.getString("type"); + if ("5".equals(type)){ + prcName=object.getString("bussSort")+"-"+object.getString("esName")+"-计划立项"; + }else if ("2".equals(type)){ + prcName=object.getJSONArray("bussSort").get(0).toString()+"-"+object.getString("esName")+"-计划延期"; + }else if ("1".equals(type)){ + prcName=object.getString("bussSort")+"-"+object.getString("esName")+"-计划合并"; + }else if ("3".equals(type)){ + prcName=object.getJSONArray("bussSort").get(0).toString()+"-"+object.getString("esName")+"-计划取消"; }else { - prcName = "企标制修订计划-企标制修订计划整改"; + prcName=object.getJSONArray("bussSort").get(0).toString()+"-"+object.getString("renameEs")+"-计划更名"; } QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep2After.java b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep2After.java index 583c10cb..b10d9b10 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep2After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep2After.java @@ -59,6 +59,18 @@ public class ProcessStep2After implements TaskListener { delegateTask.setVariable("count",null); } } + String type=object.getString("type"); + if ("5".equals(type)){ + prcName=object.getString("bussSort")+"-"+object.getString("esName")+"-计划立项"; + }else if ("2".equals(type)){ + prcName=object.getJSONArray("bussSort").get(0).toString()+"-"+object.getString("esName")+"-计划延期"; + }else if ("1".equals(type)){ + prcName=object.getString("bussSort")+"-"+object.getString("esName")+"-计划合并"; + }else if ("3".equals(type)){ + prcName=object.getJSONArray("bussSort").get(0).toString()+"-"+object.getString("esName")+"-计划取消"; + }else { + prcName=object.getJSONArray("bussSort").get(0).toString()+"-"+object.getString("renameEs")+"-计划更名"; + } //截止时间 流程描述 创建人 String user = delegateTask.getVariable("prcCreateUser", String.class); String username = delegateTask.getVariable("prcCreateUserName", String.class); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep3After.java b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep3After.java index 3b946012..df00e63a 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep3After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep3After.java @@ -50,7 +50,18 @@ public class ProcessStep3After implements TaskListener { delegateTask.setVariable("deptCenterFlag", "1"); delegateTask.setVariable("count",null); } - + String type=object.getString("type"); + if ("5".equals(type)){ + prcName=object.getString("bussSort")+"-"+object.getString("esName")+"-计划立项"; + }else if ("2".equals(type)){ + prcName=object.getJSONArray("bussSort").get(0).toString()+"-"+object.getString("esName")+"-计划延期"; + }else if ("1".equals(type)){ + prcName=object.getString("bussSort")+"-"+object.getString("esName")+"-计划合并"; + }else if ("3".equals(type)){ + prcName=object.getJSONArray("bussSort").get(0).toString()+"-"+object.getString("esName")+"-计划取消"; + }else { + prcName=object.getJSONArray("bussSort").get(0).toString()+"-"+object.getString("renameEs")+"-计划更名"; + } //截止时间 流程描述 创建人 String user = delegateTask.getVariable("prcCreateUser",String.class); String username = delegateTask.getVariable("prcCreateUserName", String.class); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep4After.java b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep4After.java index 5a40f8b3..f3a7fb55 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep4After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep4After.java @@ -136,6 +136,18 @@ public class ProcessStep4After implements TaskListener { delegateTask.setVariable("deptCenterFlag", "1"); delegateTask.setVariable("count",null); } + String type=object.getString("type"); + if ("5".equals(type)){ + prcName=object.getString("bussSort")+"-"+object.getString("esName")+"-计划立项"; + }else if ("2".equals(type)){ + prcName=object.getJSONArray("bussSort").get(0).toString()+"-"+object.getString("esName")+"-计划延期"; + }else if ("1".equals(type)){ + prcName=object.getString("bussSort")+"-"+object.getString("esName")+"-计划合并"; + }else if ("3".equals(type)){ + prcName=object.getJSONArray("bussSort").get(0).toString()+"-"+object.getString("esName")+"-计划取消"; + }else { + prcName=object.getJSONArray("bussSort").get(0).toString()+"-"+object.getString("renameEs")+"-计划更名"; + } //截止时间 流程描述 创建人 String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep5After.java b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep5After.java index d58aba60..19fee69f 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep5After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep5After.java @@ -35,7 +35,19 @@ public class ProcessStep5After implements TaskListener { delegateTask.setVariable("objectJson", object); //标准法规部业务经理Id List nextUserList = new ArrayList(); - String prcName = "企标制修订计划-部门高级经理审批"; + String prcName = ""; + String type=object.getString("type"); + if ("5".equals(type)){ + prcName=object.getString("bussSort")+"-"+object.getString("esName")+"-计划立项"; + }else if ("2".equals(type)){ + prcName=object.getJSONArray("bussSort").get(0).toString()+"-"+object.getString("esName")+"-计划延期"; + }else if ("1".equals(type)){ + prcName=object.getString("bussSort")+"-"+object.getString("esName")+"-计划合并"; + }else if ("3".equals(type)){ + prcName=object.getJSONArray("bussSort").get(0).toString()+"-"+object.getString("esName")+"-计划取消"; + }else { + prcName=object.getJSONArray("bussSort").get(0).toString()+"-"+object.getString("renameEs")+"-计划更名"; + } //根据意见选择 企标状态并对企标信息进行修改 bzfgId nextUserList.add(delegateTask.getVariable("topmanagerId",String.class)); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/qbzxdlxjh/Step2After.java b/src/main/java/com/ydw/bat/wkflow/listener/qbzxdlxjh/Step2After.java index 31e85301..f210aed3 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/qbzxdlxjh/Step2After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/qbzxdlxjh/Step2After.java @@ -42,7 +42,7 @@ public class Step2After implements TaskListener { String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); String user = delegateTask.getVariable("prcCreateUser", String.class); String username = delegateTask.getVariable("prcCreateUserName", String.class); - String prcName = delegateTask.getVariable("stId", String.class) + "-项目合规评估流程-标准法规部部长审核"; + String prcName = object.getString("processName"); QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);