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 6d8b1bdc..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,6 +26,9 @@ import java.util.Set; @RequestMapping("/") public interface LawsUserInfoService { + @GetMapping("/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); @@ -169,6 +172,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/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; } 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="企标制修订计划整改";