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 4ee41645..dd57ed3c 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 @@ -125,6 +125,11 @@ public class ProcessStep4After implements TaskListener { lawsUserInfoService.modPlan(esRevisePlanDTO); }else if ("4".equals(object.getString("type"))){ EsRevisePlanDTO esRevisePlanDTO=new EsRevisePlanDTO(); + String bussSort = object.getString("bussSort"); + if (bussSort.contains("[")) { + bussSort = bussSort.substring(2, bussSort.length() - 2); + } + esRevisePlanDTO.setBussSort(bussSort); esRevisePlanDTO.setEsName(object.getString("renameEs")); esRevisePlanDTO.setId(object.getString("esId")); lawsUserInfoService.modPlan(esRevisePlanDTO); @@ -255,25 +260,6 @@ public class ProcessStep4After implements TaskListener { } // throw new ActivitiException("fa"); - // 处理 oaFlag 为待办 - //1合并 2延期 3取消 4更名 5立项 - if ("5".equals(type) || "1".equals(type)){ - - // 新增新的 计划和流程关联关系 - esPrcRelationService.addEsPrcRelation(nowEsId, null, delegateTask.getProcessInstanceId()); - - } else { - List esPrcRelationList = esPrcRelationService.list(object.getString("esId")); - if (esPrcRelationList != null && !esPrcRelationList.isEmpty()) { - // 修改 计划和流程关联关系 - esPrcRelationService.modifyEsPrcRelation(object.getString("esId"), null , "0", delegateTask.getProcessInstanceId()); - - } else { - // 新增新的 计划和流程关联关系 - esPrcRelationService.addEsPrcRelation(object.getString("esId"), null, delegateTask.getProcessInstanceId()); - } - } - // 撤回对应的计划管控流程 //1合并 2延期 3取消 4更名 5立项 if (StringUtils.isNotBlank(type)) { @@ -290,6 +276,15 @@ public class ProcessStep4After implements TaskListener { if ("技术标准起草".equals(nowTaskInfo1)) { // 删除正在运行中的流程根据流程实例ID runtimeService.deleteProcessInstance(prcIdGk1, ""); + + String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); + QueryWrapper queryWrapperGk1 = new QueryWrapper(); + queryWrapperGk1.eq("PRC_ID", prcIdGk1); + BusProcessName oneGk = busProcessNameService.getOne(queryWrapperGk1); + if (oneGk != null) { + oneGk.setOverTime(OVERTIME); + busProcessNameService.saveOrUpdate(oneGk); + } } } else { String prcId1 = esPrcRelationList1.get(0).getPrcId(); @@ -310,6 +305,15 @@ public class ProcessStep4After implements TaskListener { if ("技术标准起草".equals(nowTaskInfo2)) { // 删除正在运行中的流程根据流程实例ID runtimeService.deleteProcessInstance(prcIdGk2, ""); + + String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); + QueryWrapper queryWrapperGk2 = new QueryWrapper(); + queryWrapperGk2.eq("PRC_ID", prcIdGk2); + BusProcessName twoGk = busProcessNameService.getOne(queryWrapperGk2); + if (twoGk != null) { + twoGk.setOverTime(OVERTIME); + busProcessNameService.saveOrUpdate(twoGk); + } } } else { String prcId2 = esPrcRelationList2.get(0).getPrcId(); @@ -336,6 +340,15 @@ public class ProcessStep4After implements TaskListener { if ("技术标准起草".equals(nowTaskInfo)) { // 删除正在运行中的流程根据流程实例ID runtimeService.deleteProcessInstance(prcIdGk, ""); + + String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); + QueryWrapper queryWrapperGk = new QueryWrapper(); + queryWrapperGk.eq("PRC_ID", prcIdGk); + BusProcessName one = busProcessNameService.getOne(queryWrapperGk); + if (one != null) { + one.setOverTime(OVERTIME); + busProcessNameService.saveOrUpdate(one); + } } } else { String prcId = esPrcRelationList.get(0).getPrcId(); @@ -350,5 +363,23 @@ public class ProcessStep4After implements TaskListener { } } + // 处理 oaFlag 为待办 + //1合并 2延期 3取消 4更名 5立项 + if ("5".equals(type) || "1".equals(type)){ + + // 新增新的 计划和流程关联关系 + esPrcRelationService.addEsPrcRelation(nowEsId, null, delegateTask.getProcessInstanceId()); + + } else { + List esPrcRelationList = esPrcRelationService.list(object.getString("esId")); + if (esPrcRelationList != null && !esPrcRelationList.isEmpty()) { + // 修改 计划和流程关联关系 + esPrcRelationService.modifyEsPrcRelation(object.getString("esId"), null , "0", delegateTask.getProcessInstanceId()); + + } else { + // 新增新的 计划和流程关联关系 + esPrcRelationService.addEsPrcRelation(object.getString("esId"), null, delegateTask.getProcessInstanceId()); + } + } } }