174-接受任务回显

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() {

src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IEsPrcRelationService.java

@@ -13,6 +13,12 @@ public interface IEsPrcRelationService extends IService<EsPrcRelation> {
      */
     List<EsPrcRelation> list(String esId);
 
+    /**
+     *
+     * @return
+     */
+    Boolean listJudge(EsPrcRelation esPrcRelation);
+
     /**
      *
      * @param esId

src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/EsPrcRelationServiceImpl.java

@@ -21,6 +21,20 @@ public class EsPrcRelationServiceImpl extends ServiceImpl<EsPrcRelationMapper, E
         return this.baseMapper.selectList(queryWrapper);
     }
 
+    @Override
+    public Boolean listJudge(EsPrcRelation esPrcRelation) {
+        QueryWrapper<EsPrcRelation> 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<EsPrcRelation> 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();

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<EsRevisePlanDTO> 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");