From 592027a78621f40f47da7a3ba18507e53f40239f Mon Sep 17 00:00:00 2001 From: liyawei Date: Mon, 21 Nov 2022 19:46:59 +0800 Subject: [PATCH] =?UTF-8?q?174-=E7=AE=A1=E6=8E=A7=E6=B5=81=E7=A8=8B,?= =?UTF-8?q?=E6=89=B9=E5=87=86=E8=8A=82=E7=82=B9=E8=8E=B7=E5=8F=96=E4=BC=81?= =?UTF-8?q?=E6=A0=87=E8=AE=A1=E5=88=92ID=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business_auth/LawsUserInfoService.java | 2 +- .../controller/EsPrcRelationController.java | 2 +- .../impl/EsPrcRelationServiceImpl.java | 6 +-- .../bat/wkflow/config/ScheduledJobEsPlan.java | 2 +- .../bussLibrary/BLApplicantAfter.java | 2 +- .../ProcessStep4After.java | 41 ++++++++++++++++--- .../ProcessStep6After.java | 14 +------ .../ProcessstartAfter.java | 7 ++++ 8 files changed, 52 insertions(+), 24 deletions(-) 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 fd8ac659..cb33c47a 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 @@ -212,5 +212,5 @@ public interface LawsUserInfoService { public ResponseMessage insertNewsFeed(NewsFeed newsFeed); @GetMapping("/esRevisePlan/es-revise-plan/getAllPlansByWk") - public List getAllPlansByWk(); + public List getAllPlansByWk(@RequestParam("esName") String esName); } diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/controller/EsPrcRelationController.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/controller/EsPrcRelationController.java index a27f4dd5..804e0d3e 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/controller/EsPrcRelationController.java +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/controller/EsPrcRelationController.java @@ -67,7 +67,7 @@ public class EsPrcRelationController { IEsPrcRelationService esPrcRelationService = SpringContextUtil.getBean(IEsPrcRelationService.class); TaskService taskService = SpringContextUtil.getBean(TaskService.class); - List esRevisePlanDTOList = lawsUserInfoService.getAllPlansByWk(); // 查询 制定中，修订中的企标计划 + List esRevisePlanDTOList = lawsUserInfoService.getAllPlansByWk(null); // 查询 制定中，修订中的企标计划 // 计划标准初稿时间前一个月的企标计划 SimpleDateFormat sdfQuery = new SimpleDateFormat("yyyy-MM-dd"); Calendar calendar = Calendar.getInstance(); diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/EsPrcRelationServiceImpl.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/EsPrcRelationServiceImpl.java index 62cd75e5..10407237 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/EsPrcRelationServiceImpl.java +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/EsPrcRelationServiceImpl.java @@ -25,7 +25,7 @@ public class EsPrcRelationServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); queryWrapper.lambda().eq(EsPrcRelation::getEsId, esPrcRelation.getEsId()); diff --git a/src/main/java/com/ydw/bat/wkflow/config/ScheduledJobEsPlan.java b/src/main/java/com/ydw/bat/wkflow/config/ScheduledJobEsPlan.java index 7bd978fe..4eb726c9 100644 --- a/src/main/java/com/ydw/bat/wkflow/config/ScheduledJobEsPlan.java +++ b/src/main/java/com/ydw/bat/wkflow/config/ScheduledJobEsPlan.java @@ -38,7 +38,7 @@ public class ScheduledJobEsPlan { IEsPrcRelationService esPrcRelationService = SpringContextUtil.getBean(IEsPrcRelationService.class); TaskService taskService = SpringContextUtil.getBean(TaskService.class); - List esRevisePlanDTOList = lawsUserInfoService.getAllPlansByWk(); // 查询 制定中，修订中的企标计划 + List esRevisePlanDTOList = lawsUserInfoService.getAllPlansByWk(null); // 查询 制定中，修订中的企标计划 // 计划标准初稿时间前一个月的企标计划 SimpleDateFormat sdfQuery = new SimpleDateFormat("yyyy-MM-dd"); Calendar calendar = Calendar.getInstance(); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BLApplicantAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BLApplicantAfter.java index 7a229f17..6fbe21b9 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BLApplicantAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BLApplicantAfter.java @@ -174,7 +174,7 @@ public class BLApplicantAfter implements TaskListener{ } } - // 删除旧的 计划和流程关联关系 + // 删除旧的 计划和流程关联关系， 因为 一条计划只对应一条企标制修订流程 esPrcRelationService.delEsPrcRelation(esId1); esPrcRelationService.delEsPrcRelation(esId2); 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 25812940..94c4fa3e 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 @@ -3,13 +3,11 @@ package com.ydw.bat.wkflow.listener.enterpriseStandardSystemRevisionPlan; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; -import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName; -import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; -import com.ydw.bat.wkflow.business_main.datas.entity.Datas; -import com.ydw.bat.wkflow.business_main.datas.entity.EsRevisePlanDTO; +import com.ydw.bat.wkflow.business_main.datas.entity.*; import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService; import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; import com.ydw.bat.wkflow.business_main.datas.service.IDatasService; +import com.ydw.bat.wkflow.business_main.datas.service.IEsPrcRelationService; import com.ydw.bat.wkflow.util.SpringContextUtil; import net.sf.json.JSONArray; import net.sf.json.util.JSONTokener; @@ -38,6 +36,8 @@ public class ProcessStep4After implements TaskListener { LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); + IEsPrcRelationService esPrcRelationService = SpringContextUtil.getBean(IEsPrcRelationService.class); + //根据流程id找到流程信息 QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); @@ -47,6 +47,7 @@ public class ProcessStep4After implements TaskListener { //标准法规部业务经理Id List nextUserList = new ArrayList(); String prcName = ""; + String nowEsId = ""; //根据意见选择 企标状态并对企标信息进行修改 bzfgId if ("0".equals(object.getString("bzfgbzFlag"))){ prcName = "企标制修订计划-流程结束"; @@ -98,7 +99,12 @@ public class ProcessStep4After implements TaskListener { esRevisePlanDTO.setRqbJson(object.getString("rqbJson")); esRevisePlanDTO.setTechnologic(object.getString("technologic")); esRevisePlanDTO.setBussSort(object.getString("bussSort")); - lawsUserInfoService.addPlan(esRevisePlanDTO); + + List esRevisePlanDTOS = lawsUserInfoService.getAllPlansByWk(object.getString("esName")); + if (esRevisePlanDTOS != null && !esRevisePlanDTOS.isEmpty()) { + nowEsId = esRevisePlanDTOS.get(0).getId(); + } + }else if ("2".equals(object.getString("type"))){ EsRevisePlanDTO esRevisePlanDTO=new EsRevisePlanDTO(); esRevisePlanDTO.setId(object.getString("esId")); @@ -140,8 +146,13 @@ public class ProcessStep4After implements TaskListener { if(StringUtils.isNotBlank(object.getString("planId"))){ esRevisePlanDTO.setId(object.getString("planId")); lawsUserInfoService.modStatePlan(esRevisePlanDTO); + object.getString("planId"); }else { lawsUserInfoService.addPlan(esRevisePlanDTO); + List esRevisePlanDTOS = lawsUserInfoService.getAllPlansByWk(object.getString("esName")); + if (esRevisePlanDTOS != null && !esRevisePlanDTOS.isEmpty()) { + nowEsId = esRevisePlanDTOS.get(0).getId(); + } } } }else { @@ -226,5 +237,25 @@ public class ProcessStep4After implements TaskListener { busBean.save(busProcessNewNext); } // 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()); + } + } + } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep6After.java b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep6After.java index 54849eca..0c2431ef 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep6After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep6After.java @@ -72,18 +72,8 @@ public class ProcessStep6After implements TaskListener { } // 处理 oaFlag 为已办 - //1合并 2延期 3取消 4更名 5立项 - String type=object.getString("type"); - // 删除 进行中的 旧流程 - if ("2".equals(type) || "3".equals(type) || "4".equals(type)) { - - // 修改 计划和流程关联关系 - esPrcRelationService.modifyEsPrcRelation(object.getString("nowEsId"), null , "0", delegateTask.getProcessInstanceId()); - } else { - - // 新增新的 计划和流程关联关系 - esPrcRelationService.addEsPrcRelation(object.getString("nowEsId"), null, delegateTask.getProcessInstanceId()); - } + // 修改 计划和流程关联关系 + esPrcRelationService.modifyEsPrcRelation(object.getString("nowEsId"), null , "0", delegateTask.getProcessInstanceId()); } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessstartAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessstartAfter.java index c8414504..3070959a 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessstartAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessstartAfter.java @@ -8,6 +8,7 @@ import com.ydw.bat.wkflow.business_main.datas.entity.Datas; import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService; import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; import com.ydw.bat.wkflow.business_main.datas.service.IDatasService; +import com.ydw.bat.wkflow.business_main.datas.service.IEsPrcRelationService; import com.ydw.bat.wkflow.util.SpringContextUtil; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; @@ -32,6 +33,8 @@ public class ProcessstartAfter implements TaskListener { //流程信息 IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class); + IEsPrcRelationService esPrcRelationService = SpringContextUtil.getBean(IEsPrcRelationService.class); + //根据流程id找到流程信息 QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); @@ -54,6 +57,10 @@ public class ProcessstartAfter implements TaskListener { nextUserList.add(object.getString("prcCreateUser")); delegateTask.setVariable("createUser",object.getString("prcCreateUser")); // 技术标准起草人员 delegateTask.setVariable("addFlag", object.getString("addFlag")); + + // 处理 oaFlag 为待办 + // 新增新的 计划和流程关联关系 + esPrcRelationService.addEsPrcRelation(object.getString("nowEsId"), null, delegateTask.getProcessInstanceId()); }