【CHG】检查表-隔离开关新增字段。

railway-business/src/main/java/com/railway/business/catenary/domain/BusJcbGlkg.java

@@ -233,6 +233,22 @@ public class BusJcbGlkg extends BusJcab{
     @Length(min = 1, max = 10, message = "【开关机构箱接地状态-电阻值】长度必须介于 {min} 和 {max} 之间")
     private String kgjgxjdztDzz;
 
+    @ApiModelProperty(value = "分闸状态")
+    @Length(min = 1, max = 1, message = "【分闸状态】长度必须介于 {min} 和 {max} 之间")
+    private String fzzt;
+
+    @ApiModelProperty(value = "分闸状态-描述")
+    @Length(min = 1, max = 100, message = "【分闸状态-描述】长度必须介于 {min} 和 {max} 之间")
+    private String fzztDesc;
+
+    @ApiModelProperty(value = "合闸状态")
+    @Length(min = 1, max = 1, message = "【合闸状态】长度必须介于 {min} 和 {max} 之间")
+    private String hzzt;
+
+    @ApiModelProperty(value = "合闸状态-描述")
+    @Length(min = 1, max = 100, message = "【合闸状态-描述】长度必须介于 {min} 和 {max} 之间")
+    private String hzztDesc;
+
     @ApiModelProperty(value = "设备状态-描述")
     @Length(min = 1, max = 100, message = "【设备状态-描述】长度必须介于 {min} 和 {max} 之间")
     private String sbztDesc;

railway-business/src/main/resources/mapper/catenary/BusJcbGlkgMapper.xml

@@ -67,6 +67,10 @@
     <result column="kgjgxjdzt_a" property="kgjgxjdztA"/>
     <result column="kgjgxjdzt_a_desc" property="kgjgxjdztADesc"/>
     <result column="kgjgxjdzt_dzz" property="kgjgxjdztDzz"/>
+    <result column="fzzt" property="fzzt"/>
+    <result column="fzzt_desc" property="fzztDesc"/>
+    <result column="hzzt" property="hzzt"/>
+    <result column="hzzt_desc" property="hzztDesc"/>
     <result column="sbzt" property="sbzt"/>
     <result column="sbzt_desc" property="sbztDesc"/>
     <result column="check_user" property="checkUser"/>
@@ -143,6 +147,10 @@
     t.kgjgxjdzt_a,
     t.kgjgxjdzt_a_desc,
     t.kgjgxjdzt_dzz,
+    t.fzzt,
+    t.fzzt_desc,
+    t.hzzt,
+    t.hzzt_desc,
     t.sbzt,
     t.sbzt_desc,
     t.check_user,
@@ -333,6 +341,18 @@
       <if test='null != kgjgxjdztDzz'>
         kgjgxjdzt_dzz,
       </if>
+      <if test ='null != fzzt'>
+        fzzt,
+      </if>
+      <if test ='null != fzztDesc'>
+        fzzt_desc,
+      </if>
+      <if test ='null != hzzt'>
+        hzzt,
+      </if>
+      <if test ='null != hzztDesc'>
+        hzzt_desc,
+      </if>
       <if test='null != sbzt'>
         sbzt,
       </if>
@@ -539,6 +559,18 @@
       <if test='null != kgjgxjdztDzz'>
         #{kgjgxjdztDzz},
       </if>
+      <if test ='null != fzzt'>
+        #{fzzt},
+      </if>
+      <if test ='null != fzztDesc'>
+        #{fzztDesc},
+      </if>
+      <if test ='null != hzzt'>
+        #{hzzt},
+      </if>
+      <if test ='null != hzztDesc'>
+        #{hzztDesc},
+      </if>
       <if test='null != sbzt'>
         #{sbzt},
       </if>
@@ -641,6 +673,10 @@
       <if test='null != kgjgxjdztA'>kgjgxjdzt_a = #{kgjgxjdztA},</if>
       <if test='null != kgjgxjdztADesc'>kgjgxjdzt_a_desc = #{kgjgxjdztADesc},</if>
       <if test='null != kgjgxjdztDzz'>kgjgxjdzt_dzz = #{kgjgxjdztDzz},</if>
+      <if test='null != fzzt'>fzzt = #{fzzt},</if>
+      <if test='null != fzztDesc'>fzzt_desc = #{fzztDesc},</if>
+      <if test='null != hzzt'>hzzt = #{hzzt},</if>
+      <if test='null != hzztDesc'>hzzt_desc = #{hzztDesc},</if>
       <if test='null != sbzt'>sbzt = #{sbzt},</if>
       <if test='null != sbztDesc'>sbzt_desc = #{sbztDesc},</if>
       <if test='null != checkUser'>check_user = #{checkUser},</if>
@@ -852,6 +888,18 @@
       <if test="kgjgxjdztDzz!=null and kgjgxjdztDzz!=''">
         and t.kgjgxjdzt_dzz=#{kgjgxjdztDzz}
       </if>
+      <if test="fzzt!=null and fzzt!=''">
+        and t.fzzt=#{fzzt}
+      </if>
+      <if test="fzztDesc!=null and fzztDesc!=''">
+        and t.fzzt_desc=#{fzztDesc}
+      </if>
+      <if test="hzzt!=null and hzzt!=''">
+        and t.hzzt=#{hzzt}
+      </if>
+      <if test="hzztDesc!=null and hzztDesc!=''">
+        and t.hzzt_desc=#{hzztDesc}
+      </if>
       <if test="sbzt!=null and sbzt!=''">
         and t.sbzt=#{sbzt}
       </if>