【编辑】 返回参数更新

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabRiskPlanAbnormalGroupController.java

@@ -53,8 +53,8 @@ public class LabRiskPlanAbnormalGroupController extends BaseController {
     @GetMapping("/addRiskExeRecord")
     @ApiOperation(value = "查询预案执行记录")
     public ResultData addRiskExeRecord(String riskPlanName, long subjectId, String subjectName, Integer riskAttribute, String riskReason, int riskLevel) {
-        boolean bool = labRiskPlanAbnormalGroupService.addRiskExeRecord(riskPlanName, subjectId, subjectName, riskAttribute, riskReason, riskLevel);
-        if (bool) {
+        long id = labRiskPlanAbnormalGroupService.addRiskExeRecord(riskPlanName, subjectId, subjectName, riskAttribute, riskReason, riskLevel);
+        if (id > 0) {
             return ResultData.success();
         }
         return ResultData.fail();

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/ILabRiskPlanAbnormalGroupService.java

@@ -47,7 +47,7 @@ public interface ILabRiskPlanAbnormalGroupService {
      * @param riskLevel 预案风险等级
      * @return
      */
-    boolean addRiskExeRecord(String riskPlanName, long subjectId, String subjectName, Integer riskAttribute, String riskReason, int riskLevel);
+    long addRiskExeRecord(String riskPlanName, long subjectId, String subjectName, Integer riskAttribute, String riskReason, int riskLevel);
 
     /**
      * 预案执行完成调用更新完成状态

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/LabRiskPlanAbnormalGroupServiceImpl.java

@@ -142,7 +142,7 @@ public class LabRiskPlanAbnormalGroupServiceImpl implements ILabRiskPlanAbnormal
     }
 
     @Override
-    public boolean addRiskExeRecord(String riskPlanName, long subjectId, String subjectName, Integer riskAttribute, String riskReason, int riskLevel) {
+    public long addRiskExeRecord(String riskPlanName, long subjectId, String subjectName, Integer riskAttribute, String riskReason, int riskLevel) {
         LabRiskPlanAbnormalGroup group = new LabRiskPlanAbnormalGroup();
         group.setGroupName(riskPlanName);
         group.setSubjectId(subjectId);
@@ -161,10 +161,10 @@ public class LabRiskPlanAbnormalGroupServiceImpl implements ILabRiskPlanAbnormal
                 internalPerson = users.stream().map(SysUser::getUserName).collect(Collectors.joining(","));
             }
             if(labRiskPlanAbnormalDescService.addLabRiskPlanAbnormalDesc(group.getId(), riskReason, riskLevel, internalPerson) > 0){
-                return true;
+                return group.getId();
             }
         }
-        return false;
+        return 0;
     }
 
     @Override