From 3527a1bdc064ebc3187f6405ab0870e8fea8a220 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Mon, 10 Jan 2022 14:51:31 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=BE=81=E6=B1=82=E6=84=8F=E8=A7=81?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E8=87=AA=E9=80=89=E5=AE=A1=E6=A0=B8=E9=A2=86?= =?UTF-8?q?=E5=AF=BC=E5=B9=B6=E5=8E=BB=E9=87=8D=20=E9=9C=80=E6=B1=82?= =?UTF-8?q?=E5=8F=98=E6=9B=B4=E5=AE=9E=E7=8E=B0=EF=BC=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../listener/StandardCommentNewProcess/Step7After.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) 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 257ce4c7..703c9598 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 @@ -45,6 +45,14 @@ public class Step7After implements TaskListener { delegateTask.setVariable("hqCount",delegateTask.getVariable("hqCount",Integer.class)+1); } + if (null==delegateTask.getVariable("user7")){ + List user=new ArrayList<>(); + user.add(object.getString("user7")); + delegateTask.setVariable("user7",user); + }else { + if (!delegateTask.getVariable("user7",List.class).contains(object.getString("user7"))) + delegateTask.getVariable("user7",List.class).add(object.getString("user7")); + } //整备数据 if ("0".equals(object.getString("hqFlag"))) { delegateTask.setVariable("hqMark",delegateTask.getVariable("hqMark",Integer.class)); @@ -58,7 +66,7 @@ public class Step7After implements TaskListener { if (delegateTask.getVariable("hqCount",Integer.class)==delegateTask.getVariable("responUserList",List.class).size()) { if (0 == delegateTask.getVariable("hqMark", Integer.class)) { prcName =delegateTask.getVariable("cid")+"-标准征求意见流程-部长+对接人审批"; - List strings=delegateTask.getVariable("zrUserIdList",List.class); + List strings=delegateTask.getVariable("user7",List.class); strings.forEach(s -> { if (!nextUserList.contains(s)){ nextUserList.add(s); From 239c723a83620b64fcb3a338d9c96bc567acebbd Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Mon, 10 Jan 2022 14:53:58 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=BE=81=E6=B1=82=E6=84=8F=E8=A7=81?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=20bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wkflow/listener/StandardCommentNewProcess/Step8After.java | 3 +++ 1 file changed, 3 insertions(+) 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 c12862ed..fabf8c00 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 @@ -38,6 +38,9 @@ public class Step8After implements TaskListener { String prcName =delegateTask.getVariable("cid")+"-标准征求意见流程"; + List user1=new ArrayList<>(); + delegateTask.setVariable("user7",user1); + if (null==delegateTask.getVariable("bdCount")){ delegateTask.setVariable("bdCount",1); }else { From afaad3f69e5f9c1553b93073a4998ce54bb3ac88 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Mon, 10 Jan 2022 18:26:45 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=85=AC=E5=BC=80=E5=BE=81=E6=B1=82?= =?UTF-8?q?=E6=84=8F=E8=A7=81=E6=B5=81=E7=A8=8B=20=E6=96=B0=E9=9C=80?= =?UTF-8?q?=E6=B1=82=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bat/wkflow/business_auth/LawsUserInfoService.java | 2 +- .../wkflow/business_slrs/dao/SarPublicIdeaAll.java | 3 +++ .../StandardCommentNewProcess/Step10After.java | 11 +++++++++-- .../StandardCommentNewProcess/Step7After.java | 2 +- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java b/src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java index 00507757..efaa98b5 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java +++ b/src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java @@ -103,7 +103,7 @@ public interface LawsUserInfoService { @PostMapping("slrs/sar-public-idea/addSarPublicIdea") public com.ydw.bat.wkflow.util.http.ResponseMessage addSarPublicIdea(@RequestBody SarPublicIdea sarPublicIdea); - @PostMapping("slrs/sar-public-idea-all/saveBatch") + @PostMapping("slrs/sar-public-idea-all/saveBatchByWk") public com.ydw.bat.wkflow.util.http.ResponseMessage savePublicIdeaBatch(@RequestBody List sarPublicIdea); diff --git a/src/main/java/com/ydw/bat/wkflow/business_slrs/dao/SarPublicIdeaAll.java b/src/main/java/com/ydw/bat/wkflow/business_slrs/dao/SarPublicIdeaAll.java index 146f1bee..6c4474fc 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_slrs/dao/SarPublicIdeaAll.java +++ b/src/main/java/com/ydw/bat/wkflow/business_slrs/dao/SarPublicIdeaAll.java @@ -72,4 +72,7 @@ public class SarPublicIdeaAll { @TableField("state") private String state; + @TableField("cause") + private String cause; + } 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 7b91b8be..265be02d 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 @@ -51,7 +51,11 @@ public class Step10After implements TaskListener { JSONObject object1=JSONObject.parseObject(o.toString()); if ("1".equals(object1.getString("state")) || "2".equals(object1.getString("state"))) { SarPublicIdeaAll sarPublicIdeaAll = new SarPublicIdeaAll(); - sarPublicIdeaAll.setId(String.valueOf(UUID.randomUUID())); + if (null!=object1.get("id")){ + sarPublicIdeaAll.setId(object1.getString("id")); + }else { + sarPublicIdeaAll.setId(String.valueOf(UUID.randomUUID())); + } sarPublicIdeaAll.setChapterName(object1.getString("chapterName")); sarPublicIdeaAll.setOldText(object1.getString("oldText")); sarPublicIdeaAll.setNewText(object1.getString("newText")); @@ -61,9 +65,12 @@ public class Step10After implements TaskListener { sarPublicIdeaAll.setCid(object.getString("cid")); sarPublicIdeaAll.setUserName(object1.getString("responUserName")); sarPublicIdeaAll.setUserId(object1.getString("responUser")); - sarPublicIdeaAll.setWkFlag("1"); + if ("1".equals(object1.getString("source"))) { + sarPublicIdeaAll.setWkFlag("1"); + } sarPublicIdeaAll.setIdeaId(delegateTask.getVariable("YJID", String.class)); sarPublicIdeaAll.setState(object1.getString("state")); + sarPublicIdeaAll.setCause(object1.getString("cause")); sarPublicIdeaAlls.add(sarPublicIdeaAll); } }); 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 703c9598..a74552b1 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 @@ -68,7 +68,7 @@ public class Step7After implements TaskListener { prcName =delegateTask.getVariable("cid")+"-标准征求意见流程-部长+对接人审批"; List strings=delegateTask.getVariable("user7",List.class); strings.forEach(s -> { - if (!nextUserList.contains(s)){ + if (null!=s &&!nextUserList.contains(s)){ nextUserList.add(s); } }); From 9cecf33eb256be967d01b9adf39a4b3a023839d5 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Mon, 10 Jan 2022 23:24:11 +0800 Subject: [PATCH 4/4] feat: There is no way the, --- .../ydw/bat/wkflow/listener/bussLibrary/BussLibrary5After.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary5After.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary5After.java index 17045bc9..585a4937 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary5After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary5After.java @@ -46,7 +46,7 @@ public class BussLibrary5After implements TaskListener{ ideaList=new JSONArray(); } - ideaList.addAll(object.getJSONArray("infoList")); + ideaList.addAll(object.getJSONArray("modelData")); delegateTask.setVariable("ideaList",ideaList); if(StringUtils.isNotBlank(object.getString("xdUserId"))){