From 1f061f7590f62773b8615310e60a6537fd968a00 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Fri, 3 Sep 2021 11:28:46 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=90=8D=E7=A7=B0=E5=9B=9E?= =?UTF-8?q?=E6=98=BE=20=20=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wkflow/business_activiti/task/TodoTaskController.java | 5 +++++ .../bat/wkflow/business_main/datas/entity/BusProcessNew.java | 4 ++++ .../NonConformanceRectification/DockingApprovalAfter.java | 1 + .../NonConformanceRectification/SelectDockUserAfter.java | 2 ++ .../NonConformanceRectification/SelectResponUserAfter.java | 3 +++ .../NonConformanceRectification/StartSurveyAfter.java | 2 ++ .../NonConformanceRectification/UploadCommentAfter.java | 1 + .../listener/itemlistvalidationprocess/confirmAfter.java | 1 + .../itemlistvalidationprocessStartAfter.java | 1 + 9 files changed, 20 insertions(+) diff --git a/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java b/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java index c62da5c8..daa0dfaa 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java +++ b/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java @@ -154,6 +154,11 @@ public class TodoTaskController extends BaseAction { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); String data = sdf.format(entry.getValue().get(0).get("createTime")); res.setAcceptTime(data); + QueryWrapper queryWrapper1=new QueryWrapper<>(); + queryWrapper1.eq("P_ID",res.getPrcId()); + queryWrapper1.eq("TASK_ID",res.getTaskIds()); + BusProcessNew busProcessNew=iBusProcessNewService.getOne(queryWrapper1); + res.setPrcName(busProcessNew.getPrcName()); todoList.add(res); } } diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/entity/BusProcessNew.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/entity/BusProcessNew.java index 2b315f98..b9470655 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/entity/BusProcessNew.java +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/entity/BusProcessNew.java @@ -84,4 +84,8 @@ public class BusProcessNew implements Serializable { @ApiModelProperty(value = "子流程ID") @TableField("SUB_ID") private String subId; + + @ApiModelProperty(value = "流程名称") + @TableField("PRC_NAME") + private String prcName; } 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 cd4f0d89..4fc004ca 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 @@ -98,6 +98,7 @@ public class DockingApprovalAfter implements TaskListener { busProcessNewNext.setMesg(object.toJSONString()); busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setTaskInfo("责任人上传调研结果"); + busProcessNewNext.setPrcName(prcName); busProcessNewNext.setUserId(delegateTask.getVariable("responUser",JSONObject.class).getString("id")); busBean.save(busProcessNewNext); } 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 411880b5..34e9408b 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 @@ -111,6 +111,7 @@ public class SelectDockUserAfter implements TaskListener { busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setTaskInfo(delegateTask.getName()); busProcessNewNext.setUserId(nextUser); + busProcessNewNext.setPrcName(prcName); busProcessNews.add(busProcessNewNext); } busBean.saveBatch(busProcessNews); @@ -121,6 +122,7 @@ public class SelectDockUserAfter implements TaskListener { busProcessNewNext.setMesg(object.toJSONString()); busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setTaskInfo("下发至标准法规工程师"); + busProcessNewNext.setPrcName(prcName); busProcessNewNext.setUserId(delegateTask.getVariable("engineer",String.class)); busBean.save(busProcessNewNext); } 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 86750b5d..9167b7dd 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 @@ -144,6 +144,7 @@ public class SelectResponUserAfter implements TaskListener { busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setTaskInfo("下发至标准法规工程师"); busProcessNewNext.setUserId(delegateTask.getVariable("engineer", String.class)); + busProcessNewNext.setPrcName(prcName); busBean.save(busProcessNewNext); } else { @@ -161,6 +162,7 @@ public class SelectResponUserAfter implements TaskListener { busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setTaskInfo(delegateTask.getName()); busProcessNewNext.setUserId(responUser.getString("id")); + busProcessNewNext.setPrcName(prcName); busProcessNews.add(busProcessNewNext); } busBean.saveBatch(busProcessNews); @@ -174,6 +176,7 @@ public class SelectResponUserAfter implements TaskListener { busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setTaskInfo("下发至标准法规工程师"); busProcessNewNext.setUserId(delegateTask.getVariable("engineer", String.class)); + busProcessNewNext.setPrcName(prcName); busBean.save(busProcessNewNext); } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/NonConformanceRectification/StartSurveyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/NonConformanceRectification/StartSurveyAfter.java index d66bc1d4..0edcb0ff 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/NonConformanceRectification/StartSurveyAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/NonConformanceRectification/StartSurveyAfter.java @@ -89,6 +89,7 @@ public class StartSurveyAfter implements TaskListener { busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setTaskInfo(delegateTask.getName()); busProcessNewNext.setUserId(nextUser); + busProcessNewNext.setPrcName(prcName); busBean.save(busProcessNewNext); } }else{ @@ -98,6 +99,7 @@ public class StartSurveyAfter implements TaskListener { busProcessNewNext.setMesg(object.toJSONString()); busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setTaskInfo("下发至标准法规工程师"); + busProcessNewNext.setPrcName(prcName); busProcessNewNext.setUserId(delegateTask.getVariable("engineer",String.class)); busBean.save(busProcessNewNext); } 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 7e903fda..792f917b 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 @@ -122,6 +122,7 @@ public class UploadCommentAfter implements TaskListener { busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setTaskInfo("下发至标准法规工程师"); busProcessNewNext.setUserId(delegateTask.getVariable("responUser",JSONObject.class).getString("dockUser")); + busProcessNewNext.setPrcName(prcName); busBean.save(busProcessNewNext); } } \ No newline at end of file diff --git a/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/confirmAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/confirmAfter.java index c35de570..85842f12 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/confirmAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/confirmAfter.java @@ -74,6 +74,7 @@ public class confirmAfter implements TaskListener { busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setTaskInfo(delegateTask.getName()); busProcessNewNext.setUserId(nextUser); + busProcessNewNext.setPrcName(prcName); busBean.save(busProcessNewNext); } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/itemlistvalidationprocessStartAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/itemlistvalidationprocessStartAfter.java index af787bf1..c260d73f 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/itemlistvalidationprocessStartAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/itemlistvalidationprocessStartAfter.java @@ -62,6 +62,7 @@ public class itemlistvalidationprocessStartAfter implements TaskListener { busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setTaskInfo(delegateTask.getName()); busProcessNewNext.setUserId(nextUser); + busProcessNewNext.setPrcName(prcName); busBean.save(busProcessNewNext); } }