修改根据实验室id查询预案触发楼层

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/mapper/LabRiskPlanMapper.java

@@ -71,7 +71,7 @@ public interface LabRiskPlanMapper extends BaseMapper<LabRiskPlan> {
 
     List<LabRiskPlan> selectLabRiskPlanBySubjectList(LabRiskPlanVO labRiskPlanVo);
 
-    LabRiskPlan selectLabRiskPlanByRiskPlanId(@Param("riskPlanId") Long riskPlanId);
+    LabRiskPlan selectLabRiskPlanByRiskPlanId(@Param("subId") Long subId);
     /**
      * 查询实验室详情预案统计
      * @param subId 实验室ID

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

@@ -1036,17 +1036,20 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
             log.error("触发预案信息：{}",labRiskPlanLevel.toString());
             //获取通知配置信息
             List<LabNoticeconfig> noticeconfigList = labNoticeconfigMapper.selectLabNoticeconfigList(new LabNoticeconfig());
-            LabNoticeconfig labNoticeconfig = noticeconfigList.get(0);
-            StringBuffer radioStr = new StringBuffer();
-            radioStr.append(noticeconfigList.get(0).getRiskRadio());
-            labRiskPlanLevel.setMessage(labNoticeconfig.getRiskMessage());
-            labRiskPlanLevel.setVoicebroadcast(labNoticeconfig.getRiskVoice());
-            labRiskPlanLevel.setInformation(labNoticeconfig.getRiskPhone());
+            if (!noticeconfigList.isEmpty()) {
+                LabNoticeconfig labNoticeconfig = noticeconfigList.get(0);
+                StringBuffer radioStr = new StringBuffer();
+                radioStr.append(noticeconfigList.get(0).getRiskRadio());
+                labRiskPlanLevel.setMessage(labNoticeconfig.getRiskMessage());
+                labRiskPlanLevel.setVoicebroadcast(labNoticeconfig.getRiskVoice());
+                labRiskPlanLevel.setInformation(labNoticeconfig.getRiskPhone());
+            }
+
             log.error("触发预案1");
             //记录是否为火灾预案
             labRiskPlanLevel.setRiskAttribute(riskAttribute);
 
-            LabRiskPlan labRiskPlan = labRiskPlanMapper.selectLabRiskPlanByRiskPlanId(labRiskPlanLevel.getRiskPlanId());
+            LabRiskPlan labRiskPlan = labRiskPlanMapper.selectLabRiskPlanByRiskPlanId(subFunction.getSubId());
             labRiskPlanLevel.setFloorId(labRiskPlan.getFloorId());
             labRiskPlanLevel.setTopName(labRiskPlan.getTopName());
 

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

@@ -535,34 +535,12 @@
         </where>
     </select>
     <select id="selectLabRiskPlanByRiskPlanId" resultType="com.zd.laboratory.domain.LabRiskPlan">
-            SELECT DISTINCT p.id,
-                        p.name,
-                        p.hazard_id,
-                        p.container_id,
-                        p.dept_id,
-                        p.create_time,
-                        p.dept_name,
-                        p.user_id,
-                        p.create_by,
-                        p.update_time,
-                        p.update_by,
-                        p.remark,
-                        p.message,
-                        p.voicebroadcast,
-                        p.information,
-                        p.level,
-                        p.evacuation,
-                        p.if_check,
-                        (CONCAT(d.dept_class_name, d.`dept_name`, s.`name`)) topName,
-                        s.`floor_id`                                         floorId
-        FROM lab_risk_plan p
-                     INNER JOIN lab_risk_planjoinsub rp ON p.`id` = rp.`risk_plan_id`
-                     INNER JOIN lab_subject s ON s.`id` = rp.`subject_id`
-                     INNER JOIN sys_dept d ON d.dept_id = s.build_id
-        <where>
-            <if test="riskPlanId != null">
-                and p.`id` = #{riskPlanId}
-            </if>
-        </where>
+            SELECT DISTINCT
+                (CONCAT( d.dept_class_name, d.`dept_name`, s.`name` )) topName,
+                s.`floor_id` floorId
+            FROM lab_subject s
+                INNER JOIN sys_dept d ON d.dept_id = s.build_id
+            WHERE
+	            s.`id` = #{subId}
      </select>
 </mapper>