修改bug

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/JyjcOpeningApplicationServiceImpl.java

@@ -170,7 +170,8 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
                 map.put("sequenceNbr",model.getSequenceNbr());
                 map.put("op", "0");
                 map.put("comments", "提交");
-                execueFlow(map);
+                JyjcOpeningApplication jyjcOpeningApplication = execueFlow(map);
+                model.setNextTaskId(jyjcOpeningApplication.getNextTaskId());
 //                TaskResultDTO dto = new TaskResultDTO();
 //                dto.setResultCode("approvalStatus");
 //                dto.setTaskId(model.getNextTaskId());
@@ -521,7 +522,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
     /**
      * 接收/驳回通知检验单
      */
-    public void execueFlow(Map<String, Object> params) {
+    public JyjcOpeningApplication execueFlow(Map<String, Object> params) {
         ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
         Long sequenceNbr = Long.parseLong(params.get("sequenceNbr") + "");
         String op = params.get("op").toString();
@@ -574,6 +575,11 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
             }
         }
         jyjcOpeningApplicationMapper.updateById(data);
+        // 已完成 作废逻辑
+        if (String.valueOf(FlowStatusEnum.TO_BE_FINISHED.getCode()).equals(data.getStatus())){
+            doDiscard(data.getUnitCode(), data.getSequenceNbr());
+        }
+        return data;
     }