From 288eb22af3fb2253a632b645740aa4d1efa17963 Mon Sep 17 00:00:00 2001 From: "396572590@qq.com" Date: Sat, 2 Jul 2022 22:31:00 +0800 Subject: [PATCH 1/4] =?UTF-8?q?feat:=20=E4=BC=81=E6=A0=87=E9=A1=BA?= =?UTF-8?q?=E5=BA=8F=E5=8F=B7=E7=94=9F=E6=88=90=E5=85=B3=E8=81=94=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../task/TodoTaskController.java | 17 +++++++++++++++++ .../business_auth/LawsUserInfoService.java | 3 +++ .../datas/entity/BusProcessNew.java | 4 ++++ 3 files changed, 24 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 0fc9b90d..33399637 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 @@ -582,6 +582,7 @@ public class TodoTaskController extends BaseAction { public BusProcessNew inboundLiaisonDetail(String taskIds, String pId) { List taskIdList = new ArrayList<>(Arrays.asList(taskIds.split(","))); + List list = iBusProcessNewService.findNoExecuteBusProcessNewForEnd(taskIdList); if (list.isEmpty()) { return null; @@ -589,6 +590,14 @@ public class TodoTaskController extends BaseAction { BusProcessNew processNew = new BusProcessNew(); BeanUtils.copyProperties(list.get(0), processNew); + if(StringUtils.isNotBlank(pId)){ + List list2 = taskService.createTaskQuery().processInstanceId(pId).active().list(); + if(!list2.isEmpty()){ + processNew.setNowTaskInfo(list2.get(0).getName()); + } + } + + JSONObject object3 = JSONObject.parseObject(list.get(0).getMesg()); JSONArray arr2 = new JSONArray(); object3.put("taskBreak", arr2); @@ -2334,6 +2343,9 @@ public class TodoTaskController extends BaseAction { @ApiOperation(value = "强制撤回", notes = "强制撤回") @GetMapping("/forceRecall") public Wrapper forceRecall(String prcId) { + + List list2 = taskService.createTaskQuery().processInstanceId(prcId).active().list(); + QueryWrapper wrapper=new QueryWrapper<>(); wrapper.eq("PRC_ID",prcId); List busProcessNames=iBusProcessNameService.list(wrapper); @@ -2347,6 +2359,10 @@ public class TodoTaskController extends BaseAction { JSONObject object=JSONObject.parseObject(list.get(0).getMesg()); lawsUserInfoService.deletePublicIdea(object.getString("uniques")); } + }else if("buss1".equals(busProcessName.getPrcType()) || "buss2".equals(busProcessName.getPrcType())){ + if(!list2.isEmpty() && "发布".equals(list2.get(0).getName())){ + lawsUserInfoService.modSnByProcess(list2.get(0).getId()); + } } } @@ -2354,6 +2370,7 @@ public class TodoTaskController extends BaseAction { if(StringUtils.isNotBlank(prcId)){ webServiceOAService.deleteOAByPid(prcId); } + Map map = new HashMap(); map.put("P_ID", prcId); iBusProcessNewService.removeByMap(map); 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 7333f7e1..00cc483e 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 @@ -26,6 +26,9 @@ import java.util.Set; @RequestMapping("/") public interface LawsUserInfoService { + @PostMapping("/sarBussStandSn/sar-buss-stand-sn/modSnByProcess") + public ResponseMessage modSnByProcess(@RequestParam("taskId") String taskId); + @GetMapping("sys/org/getManagerByOrgId") public ResponseMessage> getManagerByOrgId(@RequestParam("roleName") String currentUsrId, @RequestParam("orgId") String orgId); 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 99a569f5..21efa8f1 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 @@ -116,4 +116,8 @@ public class BusProcessNew implements Serializable { @TableField( exist = false) @ApiModelProperty(value = "提交状态 0 提交 其它 接受 ") private long commitStatus; + + @TableField( exist = false) + @ApiModelProperty(value = "当前节点信息") + private String nowTaskInfo; } From 98168622d152b8fa8844c7161f6e8d3d6cd5b312 Mon Sep 17 00:00:00 2001 From: "396572590@qq.com" Date: Mon, 4 Jul 2022 09:47:27 +0800 Subject: [PATCH 2/4] =?UTF-8?q?feat:=20=E4=BC=81=E6=A0=87=E9=A1=BA?= =?UTF-8?q?=E5=BA=8F=E5=8F=B7=E7=94=9F=E6=88=90=E5=85=B3=E8=81=94=E9=80=BB?= =?UTF-8?q?=E8=BE=91=20get=E2=80=A6=E2=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 00cc483e..f107dd14 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 @@ -26,7 +26,7 @@ import java.util.Set; @RequestMapping("/") public interface LawsUserInfoService { - @PostMapping("/sarBussStandSn/sar-buss-stand-sn/modSnByProcess") + @GetMapping("/sarBussStandSn/sar-buss-stand-sn/modSnByProcess") public ResponseMessage modSnByProcess(@RequestParam("taskId") String taskId); @GetMapping("sys/org/getManagerByOrgId") From 3cd81e3179ddd3796e9d22bdef0b0925fd778741 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Mon, 4 Jul 2022 17:07:53 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E8=B0=83=E7=A0=94=20=E6=89=B9=E5=87=86?= =?UTF-8?q?=E8=8A=82=E7=82=B9=E9=A9=B3=E5=9B=9E=20=E4=BC=9A=E5=87=BA?= =?UTF-8?q?=E7=8E=B0=E5=AE=8C=E6=88=90=E6=97=A5=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../listener/StandardCommentProcess/PresidentSignAfter.java | 4 +++- .../wkflow/listener/StandardSurvey/PresidentSignAfter.java | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/PresidentSignAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/PresidentSignAfter.java index 06c404a4..832bcf82 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/PresidentSignAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/PresidentSignAfter.java @@ -49,7 +49,9 @@ public class PresidentSignAfter implements TaskListener { queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if (one1 != null) { - one1.setOverTime(OVERTIME); + if (!"1".equals(object.getString("actionFlag"))) { + one1.setOverTime(OVERTIME); + } one1.setPrcType("3"); // one1.setPrcName(prcName); one1.setCreatUser(user); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/PresidentSignAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/PresidentSignAfter.java index be3928d2..1df95167 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/PresidentSignAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/PresidentSignAfter.java @@ -50,7 +50,9 @@ public class PresidentSignAfter implements TaskListener { queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if (one1 != null) { - one1.setOverTime(OVERTIME); + if (!"1".equals(object.getString("actionFlag"))) { + one1.setOverTime(OVERTIME); + } one1.setPrcType("2"); // one1.setPrcName(prcName); one1.setCreatUser(user); From 893a7f8fb5c9726e3e3b706dc73247f7b55c65f9 Mon Sep 17 00:00:00 2001 From: "396572590@qq.com" Date: Tue, 5 Jul 2022 14:24:27 +0800 Subject: [PATCH 4/4] =?UTF-8?q?feat:=20bug=20#55926=20=E6=A0=87=E5=87=86?= =?UTF-8?q?=E5=90=88=E8=A7=84=E8=AF=84=E4=BC=B0=EF=BC=8C=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=88=86=E5=8F=91=E8=8A=82=E7=82=B9=E7=9A=84=E6=A0=87=E9=A2=98?= =?UTF-8?q?=E5=BA=94=E8=AF=A5=E6=98=BE=E7=A4=BA=20=E6=A0=87=E5=87=86?= =?UTF-8?q?=E5=8F=B7-=E6=A0=87=E5=87=86=E5=90=8D=E7=A7=B0-=E5=90=88?= =?UTF-8?q?=E8=A7=84=E8=AF=84=E4=BC=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wkflow/listener/projectEvaluationNewProcess/Step3After.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step3After.java b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step3After.java index 7108a9ba..80587a91 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step3After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step3After.java @@ -89,7 +89,7 @@ public class Step3After 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);