无交叉线岔 修改

railway-admin/src/main/java/com/railway/web/controller/business/catenary/BusJcbJcxcController.java

@@ -6,6 +6,7 @@ import com.railway.common.core.controller.BaseController;
 import com.railway.common.core.domain.AjaxResult;
 import com.railway.common.core.page.TableDataInfo;
 import com.railway.common.utils.StringUtils;
+import com.railway.common.utils.poi.EasyExcelUtil;
 import com.railway.common.utils.poi.WordUtils;
 import com.railway.system.service.ISysFileService;
 import io.swagger.annotations.Api;
@@ -147,4 +148,15 @@ public class BusJcbJcxcController extends BaseController {
         return sysFileService.uploadFile(localFilePath);
     }
 
+    @ApiOperation(value = "导出excel")
+    @GetMapping(value = "exportExcel")
+    public AjaxResult exportExcel(BusJcbJcxc busJcbJcxc) {
+        List<BusJcbJcxc> list = busJcbJcxcService.getList(busJcbJcxc);
+        Map<String, Object> params = new HashMap<>();
+        String fileName = "交叉线岔检测（修）记录.xls";
+        String templateFileName = "excel/template/交叉线岔检测（修）记录.xls";
+        String localFilePath = new EasyExcelUtil().getExcel(params, list, templateFileName, fileName);
+        return sysFileService.uploadFile(localFilePath);
+    }
+
 }

railway-admin/src/main/java/com/railway/web/controller/business/catenary/BusJcbWjcxcController.java

@@ -113,8 +113,9 @@ public class BusJcbWjcxcController extends BaseController {
             params.put("month", jcrqArr.getMonthValue());
             params.put("day", jcrqArr.getDayOfMonth());
         }
-        params.put("lbjzt", StringUtils.yesOrNo(info.getLbjzt()));
+        params.put("jxdxzt", StringUtils.yesOrNo(info.getJcdxzt()));
         params.put("hdxjzt", StringUtils.yesOrNo(info.getHdxjzt()));
+        params.put("wxjqzt", StringUtils.yesOrNo(info.getWxjqzt()));
         params.put("dljzt", StringUtils.yesOrNo(info.getDljzt()));
         params.put("azzxlcz", info.getAzzxlcz().toString());
         params.put("azzxdg", info.getAzzxdg().toString());
@@ -131,6 +132,7 @@ public class BusJcbWjcxcController extends BaseController {
         params.put("zxlcz", info.getZxlcz().toString());
         params.put("zxdg", info.getZxdg().toString());
         params.put("cxlcz", info.getCxlcz().toString());
+        params.put("ljcdxjj", info.getLjcdxjj().toString());
         params.put("cxdg", info.getCxdg().toString());
         params.put("sbzt", StringUtils.YES_VALUE.equals(info.getSbzt()) ? "合格" : "不合格");
         params.put("jcr", info.getCheckUser());

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

@@ -24,13 +24,37 @@ public class BusJcbWjcxc extends BusJcab{
     @ApiModelProperty(value = "线岔号")
     private String xch;
 
-    @ApiModelProperty(value = "零部件状态是否良好")
-    @Length(min = 1, max = 1, message = "【零部件状态是否良好】长度必须介于 {min} 和 {max} 之间")
-    private String lbjzt;
+    @ApiModelProperty(value = "交叉吊弦状态是否良好")
+    @Length(min = 1, max = 1, message = "【交叉吊弦状态是否良好】长度必须介于 {min} 和 {max} 之间")
+    private String jcdxzt;
 
-    @ApiModelProperty(value = "零部件状态-故障描述")
-    @Length(min = 1, max = 100, message = "【零部件状态-故障描述】长度必须介于 {min} 和 {max} 之间")
-    private String lbjztGzms;
+    @ApiModelProperty(value = "交叉吊弦状态-故障描述")
+    @Length(min = 1, max = 100, message = "【交叉吊弦状态-故障描述】长度必须介于 {min} 和 {max} 之间")
+    private String jcdxztGzms;
+
+    @ApiModelProperty(value = "无线夹区状态是否良好")
+    @Length(min = 1, max = 1, message = "【无线夹区状态是否良好】长度必须介于 {min} 和 {max} 之间")
+    private String wxjqzt;
+
+    @ApiModelProperty(value = "无线夹区状态-故障描述")
+    @Length(min = 1, max = 100, message = "【无线夹区状态-故障描述】长度必须介于 {min} 和 {max} 之间")
+    private String wxjqztGzms;
+
+    @ApiModelProperty(value = "滑动线夹状态是否良好")
+    @Length(min = 1, max = 1, message = "【滑动线夹状态是否良好】长度必须介于 {min} 和 {max} 之间")
+    private String hdxjzt;
+
+    @ApiModelProperty(value = "滑动线夹状态-故障描述")
+    @Length(min = 1, max = 100, message = "【滑动线夹状态-故障描述】长度必须介于 {min} 和 {max} 之间")
+    private String hdxjztGzms;
+
+    @ApiModelProperty(value = "电连接状态是否良好")
+    @Length(min = 1, max = 1, message = "【电连接状态是否良好】长度必须介于 {min} 和 {max} 之间")
+    private String dljzt;
+
+    @ApiModelProperty(value = "电连接状态-故障描述")
+    @Length(min = 1, max = 100, message = "【电连接状态-故障描述】长度必须介于 {min} 和 {max} 之间")
+    private String dljztGzms;
 
     @ApiModelProperty(value = "正线线夹对侧线拉出值")
     private Integer zxlcz;
@@ -44,13 +68,14 @@ public class BusJcbWjcxc extends BusJcab{
     @ApiModelProperty(value = "侧线线夹对正线导高")
     private Integer cxdg;
 
-    @ApiModelProperty(value = "滑动线夹状态")
-    @Length(min = 1, max = 1, message = "【滑动线夹状态】长度必须介于 {min} 和 {max} 之间")
-    private String hdxjzt;
+    @ApiModelProperty(value = "两交叉吊弦间距")
+    private Integer ljcdxjj;
 
-    @ApiModelProperty(value = "滑动线夹状态-故障描述")
-    @Length(min = 1, max = 100, message = "【滑动线夹状态-故障描述】长度必须介于 {min} 和 {max} 之间")
-    private String hdxjztGzms;
+    @ApiModelProperty(value = "正线上的无线夹区有无")
+    private String zxwxjqzt;
+
+    @ApiModelProperty(value = "侧线上的无线夹区有无")
+    private String cxwxjqzt;
 
     @ApiModelProperty(value = "正线上的无线夹区")
     private Integer zxwxjq;
@@ -58,14 +83,6 @@ public class BusJcbWjcxc extends BusJcab{
     @ApiModelProperty(value = "侧线上的无线夹区")
     private Integer cxwxjq;
 
-    @ApiModelProperty(value = "电连接状态")
-    @Length(min = 1, max = 1, message = "【电连接状态】长度必须介于 {min} 和 {max} 之间")
-    private String dljzt;
-
-    @ApiModelProperty(value = "电连接状态-故障描述")
-    @Length(min = 1, max = 100, message = "【电连接状态-故障描述】长度必须介于 {min} 和 {max} 之间")
-    private String dljztGzms;
-
     @ApiModelProperty(value = "a柱正线拉出值")
     private Integer azzxlcz;
 

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

@@ -15,8 +15,10 @@
     <result column="xch" property="xch"/>
     <result column="temperature" property="temperature"/>
     <result column="check_date" property="checkDate"/>
-    <result column="lbjzt" property="lbjzt"/>
-    <result column="lbjzt_gzms" property="lbjztGzms"/>
+    <result column="jcdxzt" property="jcdxzt"/>
+    <result column="jcdxzt_gzms" property="jcdxztGzms"/>
+    <result column="wxjqzt" property="wxjqzt"/>
+    <result column="wxjqzt_gzms" property="wxjqztGzms"/>
     <result column="zxlcz" property="zxlcz"/>
     <result column="zxdg" property="zxdg"/>
     <result column="cxlcz" property="cxlcz"/>
@@ -25,6 +27,8 @@
     <result column="hdxjzt_gzms" property="hdxjztGzms"/>
     <result column="zxwxjq" property="zxwxjq"/>
     <result column="cxwxjq" property="cxwxjq"/>
+    <result column="zxwxjqzt" property="zxwxjqzt"/>
+    <result column="cxwxjqzt" property="cxwxjqzt"/>
     <result column="dljzt" property="dljzt"/>
     <result column="dljzt_gzms" property="dljztGzms"/>
     <result column="azzxlcz" property="azzxlcz"/>
@@ -39,6 +43,7 @@
     <result column="czzxdg" property="czzxdg"/>
     <result column="czcxlcz" property="czcxlcz"/>
     <result column="czcxdg" property="czcxdg"/>
+    <result column="ljcdxjj" property="ljcdxjj"/>
     <result column="sbzt" property="sbzt"/>
     <result column="check_user" property="checkUser"/>
     <result column="confirm_user" property="confirmUser"/>
@@ -64,8 +69,10 @@
     t.xch,
     t.temperature,
     t.check_date,
-    t.lbjzt,
-    t.lbjzt_gzms,
+    t.jcdxzt,
+    t.jcdxzt_gzms,
+    t.wxjqzt,
+    t.wxjqzt_gzms,
     t.zxlcz,
     t.zxdg,
     t.cxlcz,
@@ -74,6 +81,8 @@
     t.hdxjzt_gzms,
     t.zxwxjq,
     t.cxwxjq,
+    t.zxwxjqzt,
+    t.cxwxjqzt,
     t.dljzt,
     t.dljzt_gzms,
     t.azzxlcz,
@@ -88,6 +97,7 @@
     t.czzxdg,
     t.czcxlcz,
     t.czcxdg,
+    t.ljcdxjj,
     t.sbzt,
     t.check_user,
     t.confirm_user,
@@ -122,11 +132,17 @@
       <if test='null != checkDate'>
         check_date,
       </if>
-      <if test='null != lbjzt'>
-        lbjzt,
+      <if test='null != jcdxzt'>
+        jcdxzt,
       </if>
-      <if test='null != lbjztGzms'>
-        lbjzt_gzms,
+      <if test='null != jcdxztGzms'>
+        jcdxzt_gzms,
+      </if>
+      <if test='null != wxjqzt'>
+        wxjqzt,
+      </if>
+      <if test='null != wxjqztGzms'>
+        wxjqzt_gzms,
       </if>
       <if test='null != zxlcz'>
         zxlcz,
@@ -140,6 +156,9 @@
       <if test='null != cxdg'>
         cxdg,
       </if>
+      <if test='null != ljcdxjj'>
+        ljcdxjj,
+      </if>
       <if test='null != hdxjzt'>
         hdxjzt,
       </if>
@@ -152,6 +171,12 @@
       <if test='null != cxwxjq'>
         cxwxjq,
       </if>
+      <if test='null != zxwxjqzt'>
+        zxwxjqzt,
+      </if>
+      <if test='null != cxwxjqzt'>
+        cxwxjqzt,
+      </if>
       <if test='null != dljzt'>
         dljzt,
       </if>
@@ -244,11 +269,17 @@
       <if test='null != checkDate'>
         #{checkDate},
       </if>
-      <if test='null != lbjzt'>
-        #{lbjzt},
+      <if test='null != jcdxzt'>
+        #{jcdxzt},
+      </if>
+      <if test='null != jcdxztGzms'>
+        #{jcdxztGzms},
       </if>
-      <if test='null != lbjztGzms'>
-        #{lbjztGzms},
+      <if test='null != wxjqzt'>
+        #{wxjqzt},
+      </if>
+      <if test='null != wxjqztGzms'>
+        #{wxjqztGzms},
       </if>
       <if test='null != zxlcz'>
         #{zxlcz},
@@ -262,6 +293,9 @@
       <if test='null != cxdg'>
         #{cxdg},
       </if>
+      <if test='null != ljcdxjj'>
+        #{ljcdxjj},
+      </if>
       <if test='null != hdxjzt'>
         #{hdxjzt},
       </if>
@@ -274,6 +308,12 @@
       <if test='null != cxwxjq'>
         #{cxwxjq},
       </if>
+      <if test='null != zxwxjqzt'>
+        #{zxwxjqzt},
+      </if>
+      <if test='null != cxwxjqzt'>
+        #{cxwxjqzt},
+      </if>
       <if test='null != dljzt'>
         #{dljzt},
       </if>
@@ -364,16 +404,21 @@
       <if test='null != xch'>xch = #{xch},</if>
       <if test='null != temperature'>temperature = #{temperature},</if>
       <if test='null != checkDate'>check_date = #{checkDate},</if>
-      <if test='null != lbjzt'>lbjzt = #{lbjzt},</if>
-      <if test='null != lbjztGzms'>lbjzt_gzms = #{lbjztGzms},</if>
+      <if test='null != jcdxzt'>jcdxzt = #{jcdxzt},</if>
+      <if test='null != jcdxztGzms'>jcdxzt_gzms = #{jcdxztGzms},</if>
+      <if test='null != wxjqzt'>wxjqzt = #{wxjqzt},</if>
+      <if test='null != wxjqztGzms'>wxjqzt_gzms = #{wxjqztGzms},</if>
       <if test='null != zxlcz'>zxlcz = #{zxlcz},</if>
       <if test='null != zxdg'>zxdg = #{zxdg},</if>
       <if test='null != cxlcz'>cxlcz = #{cxlcz},</if>
       <if test='null != cxdg'>cxdg = #{cxdg},</if>
+      <if test='null != ljcdxjj'>cxdg = #{ljcdxjj},</if>
       <if test='null != hdxjzt'>hdxjzt = #{hdxjzt},</if>
       <if test='null != hdxjztGzms'>hdxjzt_gzms = #{hdxjztGzms},</if>
       <if test='null != zxwxjq'>zxwxjq = #{zxwxjq},</if>
       <if test='null != cxwxjq'>cxwxjq = #{cxwxjq},</if>
+      <if test='null != zxwxjqzt'>zxwxjqzt = #{zxwxjqzt},</if>
+      <if test='null != cxwxjqzt'>cxwxjqzt = #{cxwxjqzt},</if>
       <if test='null != dljzt'>dljzt = #{dljzt},</if>
       <if test='null != dljztGzms'>dljzt_gzms = #{dljztGzms},</if>
       <if test='null != azzxlcz'>azzxlcz = #{azzxlcz},</if>
@@ -453,11 +498,17 @@
       <if test="checkDate!=null">
         and t.check_date=#{checkDate}
       </if>
-      <if test="lbjzt!=null and lbjzt!=''">
-        and t.lbjzt=#{lbjzt}
+      <if test="jcdxzt!=null and jcdxzt!=''">
+        and t.jcdxzt=#{jcdxzt}
+      </if>
+      <if test="jcdxztGzms!=null and jcdxztGzms!=''">
+        and t.jcdxzt_gzms=#{jcdxztGzms}
+      </if>
+      <if test="wxjqzt!=null and wxjqzt!=''">
+        and t.wxjqzt=#{wxjqzt}
       </if>
-      <if test="lbjztGzms!=null and lbjztGzms!=''">
-        and t.lbjzt_gzms=#{lbjztGzms}
+      <if test="wxjqztGzms!=null and wxjqztGzms!=''">
+        and t.wxjqzt_gzms=#{wxjqztGzms}
       </if>
       <if test="zxlcz!=null and zxlcz!=''">
         and t.zxlcz=#{zxlcz}
@@ -471,6 +522,9 @@
       <if test="cxdg!=null and cxdg!=''">
         and t.cxdg=#{cxdg}
       </if>
+      <if test="ljcdxjj!=null and ljcdxjj!=''">
+        and t.ljcdxjj=#{ljcdxjj}
+      </if>
       <if test="hdxjzt!=null and hdxjzt!=''">
         and t.hdxjzt=#{hdxjzt}
       </if>
@@ -483,6 +537,12 @@
       <if test="cxwxjq!=null and cxwxjq!=''">
         and t.cxwxjq=#{cxwxjq}
       </if>
+      <if test="zxwxjqzt!=null and zxwxjqzt!=''">
+        and t.zxwxjqzt=#{zxwxjqzt}
+      </if>
+      <if test="cxwxjqzt!=null and cxwxjqzt!=''">
+        and t.cxwxjqzt=#{cxwxjqzt}
+      </if>
       <if test="dljzt!=null and dljzt!=''">
         and t.dljzt=#{dljzt}
       </if>