From b971de19398d8351ac6f10bf05d7814b6f2e2fa3 Mon Sep 17 00:00:00 2001 From: "396572590@qq.com" Date: Wed, 29 Jun 2022 15:47:26 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20=20?= =?UTF-8?q?=E6=94=B9=E6=94=B9=E6=94=B9=20=E4=BB=8E=E4=BC=81=E6=A0=87?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=BC=80=E5=A7=8B=20=E6=94=B9=E5=88=B0=20?= =?UTF-8?q?=E4=BC=81=E6=A0=87=E6=A0=87=E5=87=86=E5=85=A5=E5=BA=93=E5=8F=8A?= =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=BA=93=20=E6=94=B9=E8=87=B3=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E5=B7=B2=E7=A1=AE=E8=AE=A4=E5=85=B3=E8=81=94=E4=B9=8B?= =?UTF-8?q?=E5=A4=9A=E2=80=A6=E2=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ydw/bat/wkflow/business_auth/LawsUserInfoService.java | 3 +++ .../ProcessStep4After.java | 8 +++++++- 2 files changed, 10 insertions(+), 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 6d8b1bdc..7333f7e1 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 @@ -169,6 +169,9 @@ public interface LawsUserInfoService { @PostMapping("/esRevisePlan/es-revise-plan/modPlanByWk") public ResponseMessage modPlan(@RequestBody EsRevisePlanDTO esRevisePlan); + @PostMapping("/esRevisePlan/es-revise-plan/modPlanByProcess") + public ResponseMessage modStatePlan(@RequestBody EsRevisePlanDTO esRevisePlan); + @PostMapping("/esRevisePlan/es-revise-plan/addPlanByWk") public ResponseMessage addPlan(@RequestBody EsRevisePlanDTO esRevisePlan); 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 0145aae5..b0e17545 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 @@ -14,6 +14,7 @@ import com.ydw.bat.wkflow.util.SpringContextUtil; import org.activiti.engine.ActivitiException; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; +import org.apache.commons.lang.StringUtils; import java.text.SimpleDateFormat; import java.util.*; @@ -129,7 +130,12 @@ public class ProcessStep4After implements TaskListener { esRevisePlanDTO.setTechnologic(object.getString("technologic")); esRevisePlanDTO.setBussSort(object.getString("bussSort")); esRevisePlanDTO.setLxd(object.getString("LXD")); - lawsUserInfoService.addPlan(esRevisePlanDTO); + if(StringUtils.isNotBlank(object.getString("planId"))){ + esRevisePlanDTO.setId(object.getString("planId")); + lawsUserInfoService.modStatePlan(esRevisePlanDTO); + }else { + lawsUserInfoService.addPlan(esRevisePlanDTO); + } } }else { prcName="企标制修订计划整改"; From 288eb22af3fb2253a632b645740aa4d1efa17963 Mon Sep 17 00:00:00 2001 From: "396572590@qq.com" Date: Sat, 2 Jul 2022 22:31:00 +0800 Subject: [PATCH 2/3] =?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 3/3] =?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")