Merge branch 'dev-szl' into 'dev'

道岔使用情况检查数据类除导入外接口 -shizhilong

See merge request !46

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/dto/RecordsMasterTurnoutInfoDTO.java

 package org.jeecg.modules.checkData.equipmentCheckData.dto;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -43,6 +44,9 @@ public class RecordsMasterTurnoutInfoDTO {
     @ApiModelProperty("设备检查记录主表id")
     private String recordsMasterId;
 
+    @ApiModelProperty("道岔编号")
+    private String switchCode;
+
     @ApiModelProperty("检查项目类型（1：轨距；2：水平；3：支距；4：轮缘槽；5：滑床板；6：顶铁；7：接头螺栓；8：护轨螺栓）")
     private String type;
 

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/entity/RecordsMasterTurnoutInfo.java

@@ -57,10 +57,15 @@ public class RecordsMasterTurnoutInfo implements Serializable {
     @TableField("records_master_id")
     private String recordsMasterId;
 
+    @ApiModelProperty("道岔编号")
+    @TableField("switch_code")
+    private String switchCode;
+
     @ApiModelProperty("检查项目类型（1：轨距；2：水平；3：支距；4：轮缘槽；5：滑床板；6：顶铁；7：接头螺栓；8：护轨螺栓）")
     @TableField("type")
     private String type;
 
+
     @ApiModelProperty("值1")
     @TableField("num_one")
     private String numOne;

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/mapper/xml/RecordsMasterCheckMapper.xml

@@ -11,6 +11,12 @@
             <if test="dto.ekCode != null and dto.ekCode != ''">
                 AND t1.ek_code like concat('%',#{dto.ekCode},'%')
             </if>
+            <if test="dto.workCode != null and dto.workCode != ''">
+                AND t1.work_code like concat('%',#{dto.workCode},'%')
+            </if>
+            <if test="dto.gaugeCode != null and dto.gaugeCode != ''">
+                AND t1.gauge_code like concat('%',#{dto.gaugeCode},'%')
+            </if>
             <if test="dto.subwaySectionId != null and dto.subwaySectionId != ''">
                 AND t1.subway_section_id = #{dto.subwaySectionId}
             </if>

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/vo/RecordsMasterTurnoutInfoVO.java

@@ -43,6 +43,9 @@ public class RecordsMasterTurnoutInfoVO {
     @ApiModelProperty("设备检查记录主表id")
     private String recordsMasterId;
 
+    @ApiModelProperty("道岔编号")
+    private String switchCode;
+
     @ApiModelProperty("检查项目类型（1：轨距；2：水平；3：支距；4：轮缘槽；5：滑床板；6：顶铁；7：接头螺栓；8：护轨螺栓）")
     private String type;