修改问题:联锁详细页面缺少仪表状态字段

jeecg-module-interlock/src/main/java/org/jeecg/modules/detail/mapper/xml/InterlockDetailMapper.xml

@@ -11,6 +11,7 @@
         h2.control_system_status_name as input_status_name,
         h3.control_system_status_name as output_status_name,
         h4.bypass_name,
+        h5.instrument_status_name,
         h.instrument_status_normal, h.bypass_yes, h.interlock_status_ty, h.control_system_status_normal
         from interlock_detail d
         left join interlock_summary s on d.summaryid = s.id
@@ -18,6 +19,7 @@
         left join interlock_base_hy h2 on h2.control_system_status = d.input_status and h2.interlock_system_id = s.interlock_system_id
         left join interlock_base_hy h3 on h3.control_system_status = d.output_status and h3.interlock_system_id = s.interlock_system_id
         left join interlock_base_hy h4 on h4.bypass = d.bypass and h4.interlock_system_id = s.interlock_system_id
+        left join interlock_base_hy h5 on h5.instrument_status = d.instrument_status and h5.interlock_system_id = s.interlock_system_id
         left join interlock_base h on h.id = s.interlock_system_id
         <where>
             <if test="dto.summaryid != null and dto.summaryid != ''"> and d.summaryid = #{dto.summaryid}</if>
@@ -25,6 +27,29 @@
         </where>
         order by d.create_time desc
     </select>
+    <!-- 联锁详细信息表分页列表查询   sl修改之前版本-->
+<!--    <select id="getPage2" parameterType="org.jeecg.modules.detail.dto.InterlockDetailQueryDTO" resultType="org.jeecg.modules.detail.vo.InterlockDetailQueryVO">-->
+<!--        select d.id, d.summaryid, d.interlockname, d.interlock_condition, d.interlock_condition_tag, d.description,-->
+<!--        d.instrument_status, d.interlock_set_value, d.bypass, d.input_status, d.output_status,-->
+<!--        d.mp_status, s.ljgx, s.interlock_out_value,-->
+<!--        h1.control_system_status_name as mp_status_name,-->
+<!--        h2.control_system_status_name as input_status_name,-->
+<!--        h3.control_system_status_name as output_status_name,-->
+<!--        h4.bypass_name,-->
+<!--        h.instrument_status_normal, h.bypass_yes, h.interlock_status_ty, h.control_system_status_normal-->
+<!--        from interlock_detail d-->
+<!--        left join interlock_summary s on d.summaryid = s.id-->
+<!--        left join interlock_base_hy h1 on h1.control_system_status = d.mp_status and h1.interlock_system_id = s.interlock_system_id-->
+<!--        left join interlock_base_hy h2 on h2.control_system_status = d.input_status and h2.interlock_system_id = s.interlock_system_id-->
+<!--        left join interlock_base_hy h3 on h3.control_system_status = d.output_status and h3.interlock_system_id = s.interlock_system_id-->
+<!--        left join interlock_base_hy h4 on h4.bypass = d.bypass and h4.interlock_system_id = s.interlock_system_id-->
+<!--        left join interlock_base h on h.id = s.interlock_system_id-->
+<!--        <where>-->
+<!--            <if test="dto.summaryid != null and dto.summaryid != ''"> and d.summaryid = #{dto.summaryid}</if>-->
+<!--            <if test="dto.interlockConditionTag != null and dto.interlockConditionTag != ''"> and d.interlock_condition_tag like concat('%',#{dto.interlockConditionTag},'%')</if>-->
+<!--        </where>-->
+<!--        order by d.create_time desc-->
+<!--    </select>-->
 
     <!-- 联锁总表-分页列表查询（各种逻辑状态）-->
     <select id="getPage" parameterType="org.jeecg.modules.summary.vo.InterlockSummaryVO" resultType="org.jeecg.modules.summary.vo.InterlockSummaryVO">

jeecg-module-interlock/src/main/java/org/jeecg/modules/detail/vo/InterlockDetailQueryVO.java

@@ -92,4 +92,12 @@ public class InterlockDetailQueryVO {
     private java.lang.String controlSystemStatusNormal;
     private java.lang.String interlockStatusTy;
     private java.lang.String bypassYes;
+
+    /**修改联锁详细表中没有仪表状态*/
+    /**仪表状态*/
+    @Excel(name = "仪表状态", width = 15,dicCode="instrument_status")
+    @ApiModelProperty(value = "仪表状态")
+//    @Dict(dicCode = "instrument_status")
+    private java.lang.String instrumentStatus;
+    private java.lang.String instrumentStatusName;
 }

jeecg-module-interlock/src/main/java/org/jeecg/modules/history/mapper/xml/InterlockDetailHistoryMapper.xml

@@ -11,6 +11,7 @@
                h2.control_system_status_name as input_status_name,
                h3.control_system_status_name as output_status_name,
                h4.bypass_name,
+               h5.instrument_status_name,
         h.instrument_status_normal, h.bypass_yes, h.interlock_status_ty, h.control_system_status_normal
         from interlock_detail_history d
         left join interlock_summary_history s on d.summaryid = s.id
@@ -18,6 +19,7 @@
         left join interlock_base_hy h2 on h2.control_system_status = d.input_status and h2.interlock_system_id = s.interlock_system_id
         left join interlock_base_hy h3 on h3.control_system_status = d.output_status and h3.interlock_system_id = s.interlock_system_id
         left join interlock_base_hy h4 on h4.bypass = d.bypass and h4.interlock_system_id = s.interlock_system_id
+        left join interlock_base_hy h5 on h5.instrument_status = d.instrument_status and h5.interlock_system_id = s.interlock_system_id
         left join interlock_base h on h.id = s.interlock_system_id
         <where>
             <if test="dto.summaryid != null and dto.summaryid != ''"> and d.summaryid = #{dto.summaryid}</if>
@@ -27,6 +29,31 @@
         order by d.create_time desc
     </select>
 
+<!--    &lt;!&ndash;联锁历史数据详细信息-分页查询   sl修改之前版本&ndash;&gt;-->
+<!--    <select id="getPage2" parameterType="org.jeecg.modules.detail.dto.InterlockDetailQueryDTO" resultType="org.jeecg.modules.history.vo.InterlockDetailHistoryQueryVO">-->
+<!--        select d.id, d.summaryid, d.interlockname, d.interlock_condition, d.interlock_condition_tag, d.description,-->
+<!--        d.instrument_status, d.interlock_set_value, d.current_value, d.if_bypass, d.bypass, d.input_status,-->
+<!--        d.output_status, d.mp_status, s.ljgx, s.interlock_out_value, s.tag_time, d.summary_origin_id,-->
+<!--        h1.control_system_status_name as mp_status_name,-->
+<!--        h2.control_system_status_name as input_status_name,-->
+<!--        h3.control_system_status_name as output_status_name,-->
+<!--        h4.bypass_name,-->
+<!--        h.instrument_status_normal, h.bypass_yes, h.interlock_status_ty, h.control_system_status_normal-->
+<!--        from interlock_detail_history d-->
+<!--        left join interlock_summary_history s on d.summaryid = s.id-->
+<!--        left join interlock_base_hy h1 on h1.control_system_status = d.mp_status and h1.interlock_system_id = s.interlock_system_id-->
+<!--        left join interlock_base_hy h2 on h2.control_system_status = d.input_status and h2.interlock_system_id = s.interlock_system_id-->
+<!--        left join interlock_base_hy h3 on h3.control_system_status = d.output_status and h3.interlock_system_id = s.interlock_system_id-->
+<!--        left join interlock_base_hy h4 on h4.bypass = d.bypass and h4.interlock_system_id = s.interlock_system_id-->
+<!--        left join interlock_base h on h.id = s.interlock_system_id-->
+<!--        <where>-->
+<!--            <if test="dto.summaryid != null and dto.summaryid != ''"> and d.summaryid = #{dto.summaryid}</if>-->
+<!--            <if test="dto.summaryOriginId != null and dto.summaryOriginId != ''"> and d.summary_origin_id = #{dto.summaryOriginId}</if>-->
+<!--            <if test="dto.interlockConditionTag != null and dto.interlockConditionTag != ''"> and d.interlock_condition_tag like concat('%',#{dto.interlockConditionTag},'%')</if>-->
+<!--        </where>-->
+<!--        order by d.create_time desc-->
+<!--    </select>-->
+
     <!-- 联锁总历史数据表-分页列表查询（各种逻辑状态）-->
     <select id="getPage" parameterType="org.jeecg.modules.history.dto.InterlockHistoryQueryDTO" resultType="org.jeecg.modules.history.vo.InterlockSummaryHistoryVO">
         select d.id, d.summaryid, d.interlockname, d.interlock_condition, d.interlock_condition_tag, d.instrument_status, d.control_system_status,

jeecg-module-interlock/src/main/java/org/jeecg/modules/history/vo/InterlockDetailHistoryQueryVO.java

@@ -97,4 +97,12 @@ public class InterlockDetailHistoryQueryVO {
     private java.lang.String interlockStatusTy;
     private java.lang.String bypassYes;
 
+    /**修改联锁详细表中没有仪表状态*/
+    /**仪表状态*/
+    @Excel(name = "仪表状态", width = 15,dicCode="instrument_status")
+    @ApiModelProperty(value = "仪表状态")
+//    @Dict(dicCode = "instrument_status")
+    private java.lang.String instrumentStatus;
+    private java.lang.String instrumentStatusName;
+
 }