From 4bb06bcb4f6ba6ae4dbfcd627a4b5b37e9570868 Mon Sep 17 00:00:00 2001 From: liyawei Date: Tue, 22 Nov 2022 15:05:01 +0800 Subject: [PATCH] =?UTF-8?q?174-=E6=8E=A5=E5=8F=97=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datas/controller/EsPrcRelationController.java | 11 +++++++++++ .../datas/service/IEsPrcRelationService.java | 6 ++++++ .../service/impl/EsPrcRelationServiceImpl.java | 14 ++++++++++++++ .../ProcessStep4After.java | 12 +++++++++++- 4 files changed, 42 insertions(+), 1 deletion(-) 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 804e0d3e..9d7ff749 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 @@ -60,6 +60,17 @@ public class EsPrcRelationController { return esPrcRelationService.modifyEsPrcRelation(nowEsId, null, oaFlag, null); } + @ApiOperation(value = "判断是否已经接受任务") + @GetMapping("/judgeAcceptTask") + public Boolean judgeAcceptTask(String nowEsId, String oaFlag, String prcIdGk) { + + EsPrcRelation esPrcRelation = new EsPrcRelation(); + esPrcRelation.setEsId(nowEsId); + esPrcRelation.setOaFlag(oaFlag); + esPrcRelation.setPrcIdGk(prcIdGk); + return esPrcRelationService.listJudge(esPrcRelation); + } + @ApiOperation(value = "定时任务调试") @GetMapping("/testAcceptTack") public String testAcceptTack() { diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IEsPrcRelationService.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IEsPrcRelationService.java index d683ccf5..b3577bec 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IEsPrcRelationService.java +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IEsPrcRelationService.java @@ -13,6 +13,12 @@ public interface IEsPrcRelationService extends IService { */ List list(String esId); + /** + * + * @return + */ + Boolean listJudge(EsPrcRelation esPrcRelation); + /** * * @param esId 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 10407237..324b95ab 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 @@ -21,6 +21,20 @@ public class EsPrcRelationServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(EsPrcRelation::getEsId, esPrcRelation.getEsId()); + queryWrapper.lambda().eq(EsPrcRelation::getOaFlag, esPrcRelation.getOaFlag()); + queryWrapper.lambda().eq(EsPrcRelation::getPrcIdGk, esPrcRelation.getPrcIdGk()); + List list = this.baseMapper.selectList(queryWrapper); + if (list != null && !list.isEmpty()) { + return true; + } else { + return false; + } + } + @Override public int addEsPrcRelation(String esId, String prcId, String prcIdGk) { EsPrcRelation esPrcRelation = new EsPrcRelation(); 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 94c4fa3e..9f33d8cf 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 @@ -146,7 +146,6 @@ 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")); @@ -212,11 +211,17 @@ public class ProcessStep4After implements TaskListener { busBean.saveOrUpdate(busProcessNews); } } + if (nextUserList != null && !nextUserList.isEmpty()) { for (String nextUser : nextUserList) { BusProcessNew busProcessNewNext = new BusProcessNew(); busProcessNewNext.setMsgType("clause"); busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); + if ("5".equals(type) || "1".equals(type)) { + object.put("nowEsId", nowEsId); + } else { + object.put("nowEsId", object.getString("esId")); + } busProcessNewNext.setMesg(object.toJSONString()); busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setFinishFlag("0"); @@ -229,6 +234,11 @@ public class ProcessStep4After implements TaskListener { BusProcessNew busProcessNewNext = new BusProcessNew(); busProcessNewNext.setMsgType("clause"); busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); + if ("5".equals(type) || "1".equals(type)) { + object.put("nowEsId", nowEsId); + } else { + object.put("nowEsId", object.getString("esId")); + } busProcessNewNext.setMesg(object.toJSONString()); busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setFinishFlag("0");