Merge branch 'dev-szl' into 'dev'

Dev szl

See merge request !17

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/controller/RecordsMasterCheckController.java

@@ -142,8 +142,9 @@ public class RecordsMasterCheckController extends JeecgController<RecordsMasterC
         ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
         List<RecordsMasterCheck> resultList = this.service.list(new LambdaQueryWrapper<RecordsMasterCheck>()
                 .like(ObjectUtil.isNotEmpty(recordsMasterCheck.getEkCode()), RecordsMasterCheck::getEkCode, recordsMasterCheck.getEkCode())
-                .like(ObjectUtil.isNotEmpty(recordsMasterCheck.getSubwaySectionName()), RecordsMasterCheck::getSubwaySectionName, recordsMasterCheck.getSubwaySectionName())
-                .like(ObjectUtil.isNotEmpty(recordsMasterCheck.getLightRailName()), RecordsMasterCheck::getLightRailName, recordsMasterCheck.getLightRailName())
+                .eq(ObjectUtil.isNotEmpty(recordsMasterCheck.getSubwaySectionId()), RecordsMasterCheck::getSubwaySectionId, recordsMasterCheck.getSubwaySectionId())
+                .eq(ObjectUtil.isNotEmpty(recordsMasterCheck.getLightRailId()), RecordsMasterCheck::getLightRailId, recordsMasterCheck.getLightRailId())
+                .eq(ObjectUtil.isNotEmpty(recordsMasterCheck.getLineAliasId()), RecordsMasterCheck::getLineAliasId, recordsMasterCheck.getLineAliasId())
                 .orderByAsc(RecordsMasterCheck::getCreateTime));
         //导出文件名称
         mv.addObject(NormalExcelConstants.FILE_NAME, "道床使用情况检查");
@@ -164,8 +165,9 @@ public class RecordsMasterCheckController extends JeecgController<RecordsMasterC
     public void export(RecordsMasterCheck recordsMasterCheck, HttpServletResponse response) {
         List<RecordsMasterCheck> resultList = this.service.list(new LambdaQueryWrapper<RecordsMasterCheck>()
                 .like(ObjectUtil.isNotEmpty(recordsMasterCheck.getEkCode()), RecordsMasterCheck::getEkCode, recordsMasterCheck.getEkCode())
-                .like(ObjectUtil.isNotEmpty(recordsMasterCheck.getSubwaySectionName()), RecordsMasterCheck::getSubwaySectionName, recordsMasterCheck.getSubwaySectionName())
-                .like(ObjectUtil.isNotEmpty(recordsMasterCheck.getLightRailName()), RecordsMasterCheck::getLightRailName, recordsMasterCheck.getLightRailName())
+                .eq(ObjectUtil.isNotEmpty(recordsMasterCheck.getSubwaySectionId()), RecordsMasterCheck::getSubwaySectionId, recordsMasterCheck.getSubwaySectionId())
+                .eq(ObjectUtil.isNotEmpty(recordsMasterCheck.getLightRailId()), RecordsMasterCheck::getLightRailId, recordsMasterCheck.getLightRailId())
+                .eq(ObjectUtil.isNotEmpty(recordsMasterCheck.getLineAliasId()), RecordsMasterCheck::getLineAliasId, recordsMasterCheck.getLineAliasId())
                 .orderByAsc(RecordsMasterCheck::getCreateTime));
         int num = 0;
         for (RecordsMasterCheck s : resultList) {

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

@@ -39,7 +39,7 @@ public class MovementCourseInfoDTO {
     private String movementMasterId;
 
     @ApiModelProperty("动静态几何尺寸对应得里程信息主键-》外键")
-    private BigDecimal movementCourseId;
+    private String movementCourseId;
 
     @ApiModelProperty("轨号")
     private String trackCode;

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

@@ -60,7 +60,7 @@ public class MovementCourseInfo implements Serializable {
 
     @ApiModelProperty("动静态几何尺寸对应得里程信息主键-》外键")
     @TableField("movement_course_id")
-    private BigDecimal movementCourseId;
+    private String movementCourseId;
 
     @ApiModelProperty("轨号")
     @TableField("track_code")

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

@@ -11,14 +11,14 @@
             <if test="dto.ekCode != null and dto.ekCode != ''">
                 AND t1.ek_code like concat('%',#{dto.ekCode},'%')
             </if>
-            <if test="dto.subwaySectionName != null and dto.subwaySectionName != ''">
-                AND t1.subway_section_name like concat('%',#{dto.subwaySectionName},'%')
+            <if test="dto.subwaySectionId != null and dto.subwaySectionId != ''">
+                AND t1.subway_section_id = #{dto.subwaySectionId}
             </if>
-            <if test="dto.lightRailName != null and dto.lightRailName != ''">
-                AND t1.light_rail_name like concat('%',#{dto.lightRailName},'%')
+            <if test="dto.lightRailId != null and dto.lightRailId != ''">
+                AND t1.light_rail_id = #{dto.lightRailId}
             </if>
-            <if test="dto.lineAliasName != null and dto.lineAliasName != ''">
-                AND t1.line_alias_name like concat('%',#{dto.lineAliasName},'%')
+            <if test="dto.lineAliasId != null and dto.lineAliasId != ''">
+                AND t1.line_alias_id = #{dto.lineAliasId}
             </if>
             AND t1.type = #{dto.type}
             AND t1.del_flag = '0'

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

@@ -11,11 +11,11 @@
             <if test="dto.ekCode != null and dto.ekCode != ''">
                 AND t1.ek_code like concat('%',#{dto.ekCode},'%')
             </if>
-            <if test="dto.lightRailName != null and dto.lightRailName != ''">
-                AND t1.light_rail_name like concat('%',#{dto.lightRailName},'%')
+            <if test="dto.lightRailId != null and dto.lightRailId != ''">
+                AND t1.light_rail_id = #{dto.lightRailId}
             </if>
-            <if test="dto.lineAliasName != null and dto.lineAliasName != ''">
-                AND t1.line_alias_name like concat('%',#{dto.lineAliasName},'%')
+            <if test="dto.lineAliasId != null and dto.lineAliasId != ''">
+                AND t1.line_alias_id = #{dto.lineAliasId}
             </if>
                 AND t1.del_flag = '0'
             order by t1.create_time desc

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

@@ -11,14 +11,14 @@
             <if test="dto.ekCode != null and dto.ekCode != ''">
                 AND t1.ek_code like concat('%',#{dto.ekCode},'%')
             </if>
-            <if test="dto.subwaySectionName != null and dto.subwaySectionName != ''">
-                AND t1.subway_section_name like concat('%',#{dto.subwaySectionName},'%')
+            <if test="dto.subwaySectionId != null and dto.subwaySectionId != ''">
+                AND t1.subway_section_id = #{dto.subwaySectionId}
             </if>
-            <if test="dto.lightRailName != null and dto.lightRailName != ''">
-                AND t1.light_rail_name like concat('%',#{dto.lightRailName},'%')
+            <if test="dto.lightRailId != null and dto.lightRailId != ''">
+                AND t1.light_rail_id = #{dto.lightRailId}
             </if>
-            <if test="dto.lineAliasName != null and dto.lineAliasName != ''">
-                AND t1.line_alias_name like concat('%',#{dto.lineAliasName},'%')
+            <if test="dto.lineAliasId != null and dto.lineAliasId != ''">
+                AND t1.line_alias_id = #{dto.lineAliasId}
             </if>
                 AND t1.del_flag = '0'
             order by t1.create_time desc

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

@@ -45,7 +45,7 @@ public class MovementCourseInfoVO {
     private String movementMasterId;
 
     @ApiModelProperty("动静态几何尺寸对应得里程信息主键-》外键")
-    private BigDecimal movementCourseId;
+    private String movementCourseId;
 
     @ApiModelProperty("轨号")
     private String trackCode;