预案执行记录时间线调整

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

@@ -51,7 +51,10 @@ public class LabRiskPlanLevelController extends BaseController {
     @PreAuthorize(hasPermi = PerPrefix.LABORATORY_PLAN + PerFun.REMOVE)
     @DeleteMapping("/delete")
     public ResultData delete(@RequestBody LabRiskPlanLevel labRiskPlanLevel) {
-        return ResultData.result(labRiskPlanLevelService.deleteById(labRiskPlanLevel));
+        if (labRiskPlanLevelService.deleteById(labRiskPlanLevel)>0) {
+            return ResultData.success(null,"删除预案规则成功");
+        }
+        return ResultData.fail("删除预案规则失败");
     }
 
     /**

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

@@ -77,7 +77,7 @@ public class LabRiskPlanLevelServiceImpl extends ServiceImpl<LabRiskPlanLevelMap
             }
             labRiskPlanHardwareRelationService.saveBatch(riskPlanHardwareList);
         }
-        return ResultData.success(labRiskPlanLevel.getId());
+        return ResultData.success(labRiskPlanLevel.getId(),"预案规则新增成功");
     }
 
     @Override

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

@@ -1292,10 +1292,10 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
     }
 
 
-    public void insertPlanAbnormalLogByOver(LabRiskPlanAbnormalGroup groupVo, JSONArray allRiskPlanJson, SubFunction<SensorFunctionStatus> subFunction) {
+    public void insertPlanAbnormalLogByOver(LabRiskPlanAbnormalGroupVO groupVo, JSONArray allRiskPlanJson, SubFunction<SensorFunctionStatus> subFunction) {
         //将风险预案写入日志表
         LabRiskPlanAbnormalLog labRiskPlanAbnormalLog = new LabRiskPlanAbnormalLog();
-        labRiskPlanAbnormalLog.setRiskPlanId(groupVo.getId());
+        labRiskPlanAbnormalLog.setRiskPlanId(groupVo.getRiskPlanId());
         labRiskPlanAbnormalLog.setRiskPlanName("风险解除");
         labRiskPlanAbnormalLog.setSubjectId(subFunction.getSubId());
         labRiskPlanAbnormalLog.setCreateTime(new Date());

zd-modules/zd-modules-laboratory/src/main/resources/mapper/laboratory/LabRiskPlanAbnormalLogMapper.xml

@@ -190,7 +190,7 @@
         <where>
             <if test="groupId != null ">and pl.group_id = #{groupId}</if>
             <if test="riskPlanId != null ">and pl.risk_plan_id = #{riskPlanId}</if>
-            and pl.risk_status in(1,0,3)
+            and pl.risk_status in(1,0,3,2)
         </where>
         ORDER BY pl.`id` DESC,pl.create_time DESC
     </select>