Merge branch 'dev' of http://192.168.1.43:3000/v2/zd-parents into dev

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

@@ -1134,7 +1134,7 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
             //将风险预案写入日志表
             LabRiskPlanAbnormalLog labRiskPlanAbnormalLog = new LabRiskPlanAbnormalLog();
             labRiskPlanAbnormalLog.setRiskPlanId(labRiskPlanLevel.getRiskPlanId());
-            labRiskPlanAbnormalLog.setRiskPlanName(labRiskPlanLevel.getRiskName());
+            labRiskPlanAbnormalLog.setRiskPlanName("发生预案："+labRiskPlanLevel.getRiskName());
             labRiskPlanAbnormalLog.setCreateTime(new Date());
             labRiskPlanAbnormalLog.setSensorJson(riskPlanJson.toString());
             labRiskPlanAbnormalLog.setRiskStatus(riskStatus);
@@ -1192,6 +1192,18 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
                         //这里调用旧预案结束动作的方法
                         overRiskPlanAction(checkLog.getRiskPlanId(), checkLog.getSubjectId());
                         groupId = labRiskPlanAbnormalGroup.getId();
+                        if (labRiskPlanLevel.getRiskPlanId().equals(checkLog.getRiskPlanId())){
+                            if (labRiskPlanLevel.getRiskPlanLevel()>checkLog.getRiskPlanLevel()){
+                                //升级
+                                labRiskPlanAbnormalLog.setRiskPlanName("预案升级："+labRiskPlanAbnormalLog.getRiskPlanName().substring(labRiskPlanAbnormalLog.getRiskPlanName().indexOf(":")));
+                            }
+                            if (labRiskPlanLevel.getRiskPlanLevel()>checkLog.getRiskPlanLevel()){
+                                //降级
+                                labRiskPlanAbnormalLog.setRiskPlanName("预案降级："+labRiskPlanAbnormalLog.getRiskPlanName().substring(labRiskPlanAbnormalLog.getRiskPlanName().indexOf(":")));
+                            }
+                        }else {
+                            labRiskPlanAbnormalLog.setRiskPlanName("预案变更："+labRiskPlanAbnormalLog.getRiskPlanName().substring(labRiskPlanAbnormalLog.getRiskPlanName().indexOf(":")));
+                        }
                         //插入风险日志
                         labRiskPlanAbnormalLogMapper.insertLabRiskPlanAbnormalLog(labRiskPlanAbnormalLog);
                         try {