From 29d5dfdaea70f4a1a3e1c5810de70341ec0e9886 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Thu, 30 Dec 2021 10:59:09 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E8=AF=BB=E6=B5=81=E7=A8=8Bbug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../standardRead/DeptApplayAfter.java | 11 +++++++++- .../listener/standardRead/DeptZrAfter.java | 18 ++------------- .../listener/standardRead/ExpainAfter.java | 22 ++++++++++--------- .../listener/standardRead/ResolveAfter.java | 21 +++++++++--------- 4 files changed, 34 insertions(+), 38 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptApplayAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptApplayAfter.java index 2ef78195..49aef066 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptApplayAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptApplayAfter.java @@ -124,10 +124,19 @@ public class DeptApplayAfter implements TaskListener{ lawsUserInfoService.sarStandItemsSaveBatch(sarStandItems); lawsUserInfoService.SarInterpretationNationalStandardSaveBatch(standards); prcName=prcName+"-流程结束"; + if (null==delegateTask.getVariable("lastCount")){ + delegateTask.setVariable("lastCount",1); + }else { + delegateTask.setVariable("lastCount",delegateTask.getVariable("lastCount",Integer.class)+1); + } } else { delegateTask.setVariable("bzFlag", 2); prcName=prcName+"-填写解读分析"; } + + + + //截止时间 流程描述 创建人 String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); String user = object.getString("applyUserId"); @@ -137,7 +146,7 @@ public class DeptApplayAfter implements TaskListener{ queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if(one1!=null){ - if (!object.getString("gcApplyFlag").equals("1")) { + if (delegateTask.getVariable("lastCount",Integer.class)>=delegateTask.getVariable("zxUserList",List.class).size()) { one1.setOverTime(OVERTIME); } one1.setPrcType("9"); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptZrAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptZrAfter.java index 4a9b7a82..d60624c5 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptZrAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptZrAfter.java @@ -50,6 +50,7 @@ public class DeptZrAfter implements TaskListener{ JSONObject jsonObject = new JSONObject(); jsonObject.put("id",str); jsonObject.put("applyUserId",delegateTask.getAssignee()); + jsonObject.put("KEYS",str+delegateTask.getAssignee()); responUserList.add(jsonObject); } delegateTask.setVariable("zxUserList",responUserList); @@ -73,7 +74,6 @@ public class DeptZrAfter implements TaskListener{ queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if(one1!=null){ -// one1.setOverTime(OVERTIME); one1.setPrcType("9"); one1.setPrcName(prcName); one1.setCreatUser(user); @@ -97,23 +97,9 @@ public class DeptZrAfter implements TaskListener{ busBean.update(busProcessNew,updataWapper); if(nextUserList != null && !nextUserList.isEmpty()){ for(String nextUser : nextUserList){ //2次 -// if (null==delegateTask.getVariable("maps")){ -// Map stringMap=new HashMap<>(); -// String as= String.valueOf(UUID.randomUUID()); -// stringMap.put(nextUser,as); -// delegateTask.setVariable("maps",stringMap); -// object.put("wkKey",as); -// } -// else if (null!=delegateTask.getVariable("maps",Map.class).get(nextUser)){ -// String as= String.valueOf(UUID.randomUUID()); -// object.put("wkKey",as); -// }else { -// String as= String.valueOf(UUID.randomUUID()); -// object.put("wkKey",as); -// delegateTask.getVariable("maps",Map.class).put(nextUser,as); -// } List listRes = userGroupMap.get(nextUser); object.put("itemList", JSON.toJSONString(listRes)); + object.put("AOLIGEI",nextUser+delegateTask.getAssignee()); BusProcessNew busProcessNewNext = new BusProcessNew(); busProcessNewNext.setMsgType("clause"); busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ExpainAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ExpainAfter.java index abc8a166..a45890a6 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ExpainAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ExpainAfter.java @@ -81,16 +81,18 @@ public class ExpainAfter implements TaskListener{ if(responUserList != null){ for (Object obj:responUserList) { JSONObject object1 = (JSONObject)obj; - BusProcessNew busProcessNewNext = new BusProcessNew(); - busProcessNewNext.setMsgType("clause"); - busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); - busProcessNewNext.setMesg(object.toJSONString()); - busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); - busProcessNewNext.setFinishFlag("0"); - busProcessNewNext.setTaskInfo(delegateTask.getName()); - busProcessNewNext.setPrcName(prcName); - busProcessNewNext.setUserId(object1.getString("applyUserId")); - busBean.save(busProcessNewNext); + if (object.getString("AOLIGEI").equals(object1.getString("KEYS"))) { + BusProcessNew busProcessNewNext = new BusProcessNew(); + busProcessNewNext.setMsgType("clause"); + busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); + busProcessNewNext.setMesg(object.toJSONString()); + busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); + busProcessNewNext.setFinishFlag("0"); + busProcessNewNext.setTaskInfo(delegateTask.getName()); + busProcessNewNext.setPrcName(prcName); + busProcessNewNext.setUserId(object1.getString("applyUserId")); + busBean.save(busProcessNewNext); + } } } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ResolveAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ResolveAfter.java index 2b4cb602..cfa3a896 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ResolveAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ResolveAfter.java @@ -79,7 +79,6 @@ public class ResolveAfter implements TaskListener{ queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if(one1!=null){ -// one1.setOverTime(OVERTIME); one1.setPrcType("9"); one1.setPrcName(prcName); one1.setCreatUser(user); @@ -87,16 +86,16 @@ public class ResolveAfter implements TaskListener{ busProcessNameService.saveOrUpdate(one1); } // // 存储当前节点意见 -// BusProcessNew busProcessNew = new BusProcessNew(); -// busProcessNew.setMsgType("clause"); -// busProcessNew.setPId(delegateTask.getProcessInstanceId()); -// busProcessNew.setMesg(object.toJSONString()); -// busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); -// busProcessNew.setTaskId(delegateTask.getId()); -// busProcessNew.setCommitText(object.getString("commentText")); -// busProcessNew.setFinishFlag("0"); -// busProcessNew.setTaskInfo(delegateTask.getName()); -// busBean.save(busProcessNew); + BusProcessNew busProcessNew = new BusProcessNew(); + busProcessNew.setMsgType("clause"); + busProcessNew.setPId(delegateTask.getProcessInstanceId()); + busProcessNew.setMesg(object.toJSONString()); + busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); + busProcessNew.setTaskId(delegateTask.getId()); + busProcessNew.setCommitText(object.getString("commentText")); + busProcessNew.setFinishFlag("0"); + busProcessNew.setTaskInfo(delegateTask.getName()); + busBean.save(busProcessNew); if(nextUserList != null && !nextUserList.isEmpty()){ for(String nextUser : nextUserList){ //2次 List listRes = userGroupMap.get(nextUser);