联锁各种状态分页查询加上旁路状态

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

@@ -18,7 +18,7 @@ order by d.summaryid
     <!-- 联锁总表-分页列表查询（各种逻辑状态）-->
     <select id="getPage" parameterType="org.jeecg.modules.summary.vo.InterlockSummaryVO" resultType="org.jeecg.modules.summary.vo.InterlockSummaryVO">
         select d.id, d.summaryid, d.interlockname, d.interlock_condition, d.interlock_condition_tag, d.instrument_status, d.control_system_status,
-               s.interlock_status, s.loop_health_level
+               s.interlock_status, s.loop_health_level, d.bypass
         from interlock_detail d left join interlock_summary s on d.summaryid = s.id
         <where>
             <if test="interlockSummaryVO.interlockname != null and interlockSummaryVO.interlockname != ''"> and d.interlockname like concat('%', #{interlockSummaryVO.interlockname}, '%')</if>

jeecg-module-interlock/src/main/java/org/jeecg/modules/summary/vo/InterlockSummaryVO.java

@@ -57,5 +57,9 @@ public class InterlockSummaryVO {
     @Excel(name = "回路健康级别", width = 15)
     @ApiModelProperty(value = "回路健康级别")
     private java.lang.String loopHealthLevel;
+    /**旁路状态*/
+    @Dict(dicCode = "bypass")
+    @ApiModelProperty(value = "旁路状态")
+    private java.lang.String bypass;
 
 }