Merge branch 'dev-szl' into 'dev'

解决bug--shizhilong

See merge request !30

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

@@ -23,6 +23,8 @@ import java.util.Date;
 public class UseTurnoutRecordCheckDTO {
 
     private static final long serialVersionUID = 1L;
+    @ApiModelProperty("批次编码")
+    private String ekCode;
 
     @ApiModelProperty("道岔编码")
     private String turnoutCode;

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

@@ -26,6 +26,7 @@
         FROM
             t_ek_curve_wear_record t1
                 LEFT JOIN t_ek_records_master_check t2 ON t1.records_master_check_id = t2.id
+                left join t_sn_light_rail t3 on t2.light_rail_id = t3.id
         WHERE t1.del_flag = '0'
         <if test="dto.ekCode != null and dto.ekCode != ''">
             AND t2.ek_code like concat('%',#{dto.ekCode},'%')
@@ -36,6 +37,7 @@
         <if test="dto.endTime != null">
             AND t2.check_time <![CDATA[  <=  ]]> #{dto.endTime}
         </if>
+            AND t3.status = 1
         GROUP BY t1.curve_code
     </select>
     <select id="getDetail"

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

@@ -25,6 +25,7 @@
         FROM
             t_ek_rail_wear_record t1
         LEFT JOIN t_ek_records_master_check t2 ON t1.records_master_check_id = t2.id and t2.del_flag = '0'
+        left join t_sn_light_rail t3 on t2.light_rail_id = t3.id
         WHERE t1.del_flag = '0'
         <if test="dto.ekCode != null and dto.ekCode != ''">
             AND t2.ek_code like concat('%',#{dto.ekCode},'%')
@@ -35,6 +36,7 @@
         <if test="dto.endTime != null">
             AND t2.check_time <![CDATA[  <=  ]]> #{dto.endTime}
         </if>
+            AND t3.status = 1
     </select>
     <select id="getDetail"
             resultType="org.jeecg.modules.checkData.equipmentCheckData.vo.RailWearRecordDetailVO">

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

@@ -5,12 +5,18 @@
         SELECT
         t1.*
         FROM
-        t_xd_record_patrol_master t1
+        t_xd_record_patrol_master t1 left join t_sn_light_rail t2 on t1.light_rail_id = t2.id
         <where>
             1=1
             <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.checkBy != null and dto.checkBy != ''">
+                AND t1.check_by like concat('%',#{dto.checkBy},'%')
+            </if>
             <if test="dto.lightRailId != null and dto.lightRailId != ''">
                 AND t1.light_rail_id = #{dto.lightRailId}
             </if>
@@ -18,6 +24,7 @@
                 AND t1.line_alias_id = #{dto.lineAliasId}
             </if>
                 AND t1.del_flag = '0'
+                AND t2.status = 1
             order by t1.create_time desc
         </where>
     </select>

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

@@ -5,7 +5,7 @@
         SELECT
             t1.*
         FROM
-        t_ek_records_master_check t1
+        t_ek_records_master_check t1 left join t_sn_light_rail t2 on t1.light_rail_id = t2.id
         <where>
             AND t1.del_flag = '0'
             <if test="dto.ekCode != null and dto.ekCode != ''">
@@ -26,7 +26,7 @@
             <if test="dto.endTime != null">
                 AND t1.check_time <![CDATA[  <=  ]]> #{dto.endTime}
             </if>
-
+                AND t2.status = 1
             order by t1.create_time desc
         </where>
     </select>

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

@@ -28,16 +28,22 @@
             t_ek_use_turnout_record_check t1
             LEFT JOIN t_ek_records_master_check t2 ON t1.records_master_check_id = t2.id and t2.del_flag = '0'
             LEFT JOIN t_sn_train_station t3 ON t1.station_id = t3.id
+            LEFT JOIN t_sn_light_rail t4 on t2.light_rail_id = t4.id
+            AND t3.light_rail_id = t4.id
         WHERE t1.del_flag = '0'
         <if test="dto.turnoutCode != null and dto.turnoutCode != ''">
             AND t1.gauge_code like concat('%',#{dto.turnoutCode},'%')
         </if>
+        <if test="dto.ekCode != null and dto.ekCode != ''">
+            AND t2.ek_code like concat('%',#{dto.ekCode},'%')
+        </if>
         <if test="dto.startTime != null">
             AND t2.check_time >= #{dto.startTime}
         </if>
         <if test="dto.endTime != null">
             AND t2.check_time <![CDATA[  <=  ]]> #{dto.endTime}
         </if>
+            AND t4.status = 1
         GROUP BY t1.gauge_code
     </select>
     <select id="getDetail"