作业逻辑提交--shizhilong

jeecg-module-system/src/main/java/org/jeecg/codegenerate/CodeGenerate.java

@@ -29,9 +29,13 @@ public class CodeGenerate {
 
         // 表名
         String[] tables = {
-                "t_dsa_analysis_line_batch_unit_device_track_bed_info",
-                "t_dsa_analysis_line_batch_unit_device_patrol_info",
-                "t_dsa_analysis_line_batch_unit_device_patrol_assist_info"
+                "t_mw_work_batch_detail_corrugation_info",
+                "t_mw_work_batch_detail_curve_wear_info",
+                "t_mw_work_batch_detail_patrol_assist_info",
+                "t_mw_work_batch_detail_patrol_info",
+                "t_mw_work_batch_detail_rail_wear_info",
+                "t_mw_work_batch_detail_track_bed_info",
+                "t_mw_work_batch_detail_turnout_info"
         };
 
 

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

@@ -23,6 +23,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -47,30 +48,24 @@ public class CurveWearRecordController extends JeecgController<CurveWearRecord,
         return Result.OK(pageData);
     }
 
-//    @AutoLog(value = "检查数据设备-设备检查记录数据-曲线磨耗情况检查-获取曲线编号List")
-//    @ApiOperation(value = "检查数据设备-设备检查记录数据-曲线磨耗情况检查-获取道岔编号List", notes = "检查数据设备-设备检查记录数据-曲线磨耗情况检查-获取道岔编号List")
-//    @GetMapping(value = "/getCurveCodeList")
-//    public Result<List<Map<String, Object>>> getCurveCodeList(@ApiParam("设备检查记录主表id") String recordsMasterCheckId) {
-//        List<CurveWearRecord> records = this.service.lambdaQuery()
-//                .eq(CurveWearRecord::getRecordsMasterCheckId, recordsMasterCheckId)
-//                .list();
-//
-//        List<Map<String, Object>> list = new ArrayList<>();
-//        for (CurveWearRecord curveWearRecord : records) {
-//            Map<String, Object> map = new HashMap<>();
-//            map.put("label", curveWearRecord.getCurveCode());
-//            map.put("value", curveWearRecord.getId());
-//            list.add(map);
-//        }
-//        return Result.OK(list);
-//    }
-
+    @AutoLog(value = "检查数据设备-设备检查记录数据-曲线磨耗情况检查-获取曲线编号List")
+    @ApiOperation(value = "检查数据设备-设备检查记录数据-曲线磨耗情况检查-获取道岔编号List", notes = "检查数据设备-设备检查记录数据-曲线磨耗情况检查-获取道岔编号List")
+    @GetMapping(value = "/getCurveCodeList")
+    public Result<Map<String, List<CurveWearRecord>>> getCurveCodeList(@ApiParam("设备检查记录主表id") String recordsMasterCheckId) {
+        List<CurveWearRecord> records = this.service.lambdaQuery()
+                .eq(CurveWearRecord::getRecordsMasterCheckId, recordsMasterCheckId)
+                .list();
+        Map<String, List<CurveWearRecord>> map = records.stream().collect(Collectors.groupingBy(CurveWearRecord::getCurveCode));
 
-    @AutoLog(value = "检查数据设备-设备检查记录数据-曲线磨耗情况检查-曲线检查详情页")
-    @ApiOperation(value = "检查数据设备-设备检查记录数据-曲线磨耗情况检查-曲线检查详情页", notes = "检查数据设备-设备检查记录数据-曲线磨耗情况检查-道岔检查详情页")
-    @GetMapping(value = "/getDetail")
-    public Result<List<CurveWearRecordDetailVO>> getDetail(@ApiParam("检查主表id") String masterRecordId) {
-        List<CurveWearRecordDetailVO> dataList = this.service.getDetail(masterRecordId);
-        return Result.OK(dataList);
+        return Result.OK(map);
     }
+
+
+//    @AutoLog(value = "检查数据设备-设备检查记录数据-曲线磨耗情况检查-曲线检查详情页")
+//    @ApiOperation(value = "检查数据设备-设备检查记录数据-曲线磨耗情况检查-曲线检查详情页", notes = "检查数据设备-设备检查记录数据-曲线磨耗情况检查-道岔检查详情页")
+//    @GetMapping(value = "/getDetail")
+//    public Result<List<CurveWearRecordDetailVO>> getDetail(@ApiParam("检查主表id") String masterRecordId) {
+//        List<CurveWearRecordDetailVO> dataList = this.service.getDetail(masterRecordId);
+//        return Result.OK(dataList);
+//    }
 }

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

@@ -5,29 +5,11 @@
     <select id="queryPageList"
             resultType="org.jeecg.modules.checkData.vo.CurveWearRecordVO">
         SELECT
-            t2.id recordsMasterCheckId,
-            t2.ek_code,
-            t2.work_code,
-            t2.check_time,
-            t2.check_by,
-            t2.verify_by,
-            t2.verify_time,
-            t2.subway_section_id,
-            t2.subway_section_name,
-            t2.light_rail_id,
-            t2.light_rail_name,
-            t2.line_alias_id,
-            t2.line_alias_name,
-            t2.starting_mileage,
-            t2.end_mileage,
-            t1.curve_code,
-            COUNT(1) curve_num,
-            t2.remark
+            t2.*
         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'
+            t_ek_records_master_check t2
+        WHERE t2.del_flag = '0'
+        AND t2.type = '3'
         <if test="dto.ekCode != null and dto.ekCode != ''">
             AND t2.ek_code like concat('%',#{dto.ekCode},'%')
         </if>
@@ -37,8 +19,8 @@
         <if test="dto.endTime != null">
             AND t2.check_time <![CDATA[  <=  ]]> DATE_ADD(#{dto.endTime},INTERVAL 1 DAY)
         </if>
-            AND t3.status = 1
-        GROUP BY t1.curve_code
+
+        order by t2.create_time desc
     </select>
     <select id="getDetail"
             resultType="org.jeecg.modules.checkData.vo.CurveWearRecordDetailVO">

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

@@ -21,7 +21,7 @@ public class CurveWearRecordVO {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty("设备检查记录主表id")
-    private String recordsMasterCheckId;
+    private String id;
 
     @ApiModelProperty("检查批次号")
     private String ekCode;

jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/controller/WorkBatchController.java

@@ -20,12 +20,9 @@ import org.jeecg.modules.maintenanceWork.dto.*;
 import org.jeecg.modules.maintenanceWork.entity.WorkBatch;
 import org.jeecg.modules.maintenanceWork.entity.WorkBatchDetail;
 import org.jeecg.modules.maintenanceWork.service.IWorkBatchService;
-import org.jeecg.modules.maintenanceWork.vo.WorkBatchDetailModifyVO;
-import org.jeecg.modules.maintenanceWork.vo.WorkBatchUserVO;
-import org.jeecg.modules.maintenanceWork.vo.WorkBatchVO;
+import org.jeecg.modules.maintenanceWork.vo.*;
 import org.jeecg.modules.maintenanceWork.service.IWorkBatchDetailService;
 import org.jeecg.modules.maintenanceWork.service.IWorkBatchDetailModifyService;
-import org.jeecg.modules.maintenanceWork.vo.WorkUnitDeviceModifyVO;
 import org.springframework.web.bind.annotation.*;
 
 import org.jeecg.common.system.base.controller.JeecgController;
@@ -112,6 +109,41 @@ public class WorkBatchController extends JeecgController<WorkBatch, IWorkBatchSe
         }
         return Result.OK(map);
     }
+    @AutoLog(value = "维修作业管理-作业计划批次管理-获取整改详情数据")
+    @ApiOperation(value = "维修作业管理-作业计划批次管理-获取整改详情数据", notes = "维修作业管理-作业计划批次管理-获取整改详情数据")
+    @GetMapping(value = "/getRectificationList")
+    public Result<Map<String, Object>> getRectificationList(@RequestParam("workId") String workId, @RequestParam("workInfoId") String workInfoId, @RequestParam("analysisType") Integer analysisType) {
+        Map<String, Object> map = new HashMap<>();
+        if(analysisType == 1){
+            List<WorkBatchDetailTurnoutInfoVO> turnoutInfoVOList = this.service.getWorkBatchDetailTurnoutInfoList(workId,workInfoId);
+            //整改道岔超限数据
+            map.put("zg", turnoutInfoVOList);
+        }else if(analysisType == 2){
+            List<WorkBatchDetailRailWearInfoVO> railWearInfoList = this.service.getWorkBatchDetailRailWearInfoList(workId,workInfoId);
+            //整改钢轨伤损超限数据
+            map.put("zg", railWearInfoList);
+        }else if(analysisType == 3){
+            List<WorkBatchDetailCurveWearInfoVO> curveWearInfoList = this.service.getWorkBatchDetailCurveWearInfoList(workId,workInfoId);
+            //整改曲线磨耗检查超限数据
+            map.put("zg", curveWearInfoList);
+        }else if(analysisType == 4){
+            List<WorkBatchDetailCorrugationInfoVO> corrugationInfoList = this.service.getWorkBatchDetailCorrugationInfoList(workId,workInfoId);
+            //整改钢轨波磨检查超限数据
+            map.put("zg", corrugationInfoList);
+        }else if(analysisType == 5){
+            List<WorkBatchDetailTrackBedInfoVO> trackBedInfoList = this.service.getWorkBatchDetailTrackBedInfoList(workId,workInfoId);
+            //整改道床检查超限数据
+            map.put("zg", trackBedInfoList);
+        }else {
+            List<WorkBatchDetailPatrolInfoVO> patrolInfoList = this.service.getWorkBatchDetailPatrolInfoList(workId,workInfoId);
+            List<WorkBatchDetailPatrolAssistInfoVO> patrolAssistInfoList = this.service.getWorkBatchDetailPatrolAssistInfoList(workId,workInfoId);
+            //整改线路巡查超限数据
+            map.put("zg", patrolInfoList);
+            //整改协助线路巡查超限数据
+            map.put("xzzg", patrolAssistInfoList);
+        }
+        return Result.OK(map);
+    }
 
     @AutoLog(value = "维修作业管理-作业计划批次管理-获取派工用户")
     @ApiOperation(value = "维修作业管理-作业计划批次管理-获取派工用户", notes = "维修作业管理-作业计划批次管理-获取派工用户")
@@ -183,11 +215,8 @@ public class WorkBatchController extends JeecgController<WorkBatch, IWorkBatchSe
     @ApiOperation(value = "维修作业管理-作业计划批次管理-通过id删除", notes = "维修作业管理-作业计划批次管理-通过id删除")
     @GetMapping(value = "/deleteRecord")
     public Result<String> deleteRecord(@RequestParam(name = "id", required = true) String id) {
-
-
         this.service.deleteRecord(id);
 
-
         return Result.OK("删除成功!");
     }
 

jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/dto/WorkBatchDetailCorrugationInfoDTO.java

+package org.jeecg.modules.maintenanceWork.dto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 维修作业---钢轨波磨检查
+ * </p>
+ *
+ * @author hkl
+ * @since 2024-08-05
+ */
+@Getter
+@Setter
+@ApiModel(value = "WorkBatchDetailCorrugationInfo对象", description = "维修作业---钢轨波磨检查")
+
+public class WorkBatchDetailCorrugationInfoDTO {
+
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    private String id;
+
+    @ApiModelProperty("创建人")
+    private String createBy;
+
+    @ApiModelProperty("创建日期")
+    private Date createTime;
+
+    @ApiModelProperty("更新人")
+    private String updateBy;
+
+    @ApiModelProperty("更新时间")
+    private Date updateTime;
+
+    @ApiModelProperty("分析批id")
+    private String analysisBatchId;
+
+    @ApiModelProperty("分析批次号")
+    private String analysisBatchCode;
+
+    @ApiModelProperty("设备检查记录主表id（t_ek_records_master_check）")
+    private String ekId;
+
+    @ApiModelProperty("检查批次号（t_ek_records_master_check）")
+    private String ekCode;
+
+    @ApiModelProperty("单元表id（t_dsa_analysis_line_batch_unit_device）")
+    private String deviceId;
+
+    @ApiModelProperty("维修作业主表id")
+    private String workId;
+
+    @ApiModelProperty("维修作业单元表id")
+    private String workDetailId;
+
+    @ApiModelProperty("检查设备id(设备资产四种表的主键)")
+    private String deviceProjectId;
+
+    @ApiModelProperty("检查设备单元编码(设备资产四种表的unit_code)")
+    private String deviceProjectCode;
+
+    @ApiModelProperty("检查设备类型（1-钢轨,2-曲线,3-竖曲线,4-道岔）")
+    private Integer deviceProjectType;
+
+    @ApiModelProperty("曲线半径")
+    private BigDecimal curveRadius;
+
+    @ApiModelProperty("曲线超高")
+    private BigDecimal superHigh;
+
+    @ApiModelProperty("曲线长度")
+    private BigDecimal curveLen;
+
+    @ApiModelProperty("检查项目-波段-谷深(10-30)")
+    private BigDecimal checkBandOne;
+
+    @ApiModelProperty("检查项目-波段-谷深(30-100)")
+    private BigDecimal checkBandTwo;
+
+    @ApiModelProperty("检查项目-波段-谷深(100-300)")
+    private BigDecimal checkBandThree;
+
+    @ApiModelProperty("检查项目-波段-谷深(300-1000)")
+    private BigDecimal checkBandFour;
+
+    @ApiModelProperty("超限记录")
+    private String overrunInfo;
+
+    @ApiModelProperty("整改说明")
+    private String reformRemark;
+
+    @ApiModelProperty("是否删除（0：未删除，1：已删除）")
+    private String delFlag;
+
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/dto/WorkBatchDetailCurveWearInfoDTO.java

+package org.jeecg.modules.maintenanceWork.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 维修作业---曲线波磨检查
+ * </p>
+ *
+ * @author hkl
+ * @since 2024-08-05
+ */
+@Getter
+@Setter
+@ApiModel(value = "WorkBatchDetailCurveWearInfo对象", description = "维修作业---曲线波磨检查")
+
+public class WorkBatchDetailCurveWearInfoDTO {
+
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    private String id;
+
+    @ApiModelProperty("创建人")
+    private String createBy;
+
+    @ApiModelProperty("创建日期")
+    private Date createTime;
+
+    @ApiModelProperty("更新人")
+    private String updateBy;
+
+    @ApiModelProperty("更新时间")
+    private Date updateTime;
+
+    @ApiModelProperty("分析批id")
+    private String analysisBatchId;
+
+    @ApiModelProperty("分析批次号")
+    private String analysisBatchCode;
+
+    @ApiModelProperty("设备检查记录主表id（t_ek_records_master_check）")
+    private String ekId;
+
+    @ApiModelProperty("检查批次号（t_ek_records_master_check）")
+    private String ekCode;
+
+    @ApiModelProperty("单元表id（t_dsa_analysis_line_batch_unit_device）")
+    private String deviceId;
+
+    @ApiModelProperty("维修作业主表id")
+    private String workId;
+
+    @ApiModelProperty("维修作业单元表id")
+    private String workDetailId;
+
+    @ApiModelProperty("检查设备id(设备资产四种表的主键)")
+    private String deviceProjectId;
+
+    @ApiModelProperty("检查设备编码(设备资产四种表的unit_code)")
+    private String deviceProjectCode;
+
+    @ApiModelProperty("检查设备类型（1-钢轨,2-曲线,3-竖曲线,4-道岔）")
+    private Integer deviceProjectType;
+
+    @ApiModelProperty("曲线半径")
+    private BigDecimal curveRadius;
+
+    @ApiModelProperty("曲线超高")
+    private BigDecimal curveSuperHigh;
+
+    @ApiModelProperty("缓和曲线长度")
+    private BigDecimal transitionCurveHigh;
+
+    @ApiModelProperty("圆曲线长")
+    private BigDecimal curveTangentLen;
+
+    @ApiModelProperty("圆曲转向（1：左 2：右）")
+    private String curveTurn;
+
+    @ApiModelProperty("检查类型（1：垂直磨耗 2：侧面磨耗）")
+    private Integer curveType;
+
+    @ApiModelProperty("2H")
+    private BigDecimal twoNum;
+
+    @ApiModelProperty("HY")
+    private BigDecimal hyNum;
+
+    @ApiModelProperty("HZ")
+    private BigDecimal hzNum;
+
+    @ApiModelProperty("QZ")
+    private BigDecimal qzNum;
+
+    @ApiModelProperty("YH")
+    private BigDecimal yhNum;
+
+    @ApiModelProperty("超限记录类型(1:无，2：轻伤，3：重伤)")
+    private Integer overType;
+
+    @ApiModelProperty("整改说明")
+    private String reformRemark;
+
+    @ApiModelProperty("是否删除（0：未删除，1：已删除）")
+    private String delFlag;
+
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/dto/WorkBatchDetailPatrolAssistInfoDTO.java

+package org.jeecg.modules.maintenanceWork.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 维修作业---线路巡查协助巡道员详情
+ * </p>
+ *
+ * @author hkl
+ * @since 2024-08-05
+ */
+@Getter
+@Setter
+@ApiModel(value = "WorkBatchDetailPatrolAssistInfo对象", description = "维修作业---线路巡查协助巡道员详情")
+
+public class WorkBatchDetailPatrolAssistInfoDTO {
+
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    private String id;
+
+    @ApiModelProperty("创建人")
+    private String createBy;
+
+    @ApiModelProperty("创建日期")
+    private Date createTime;
+
+    @ApiModelProperty("更新人")
+    private String updateBy;
+
+    @ApiModelProperty("更新时间")
+    private Date updateTime;
+
+    @ApiModelProperty("分析批id")
+    private String analysisBatchId;
+
+    @ApiModelProperty("分析批次号")
+    private String analysisBatchCode;
+
+    @ApiModelProperty("设备检查记录主表id（t_ek_records_master_check、t_xd_record_patrol_master）")
+    private String ekId;
+
+    @ApiModelProperty("检查批次号（t_ek_records_master_check）")
+    private String ekCode;
+
+    @ApiModelProperty("单元表id（t_dsa_analysis_line_batch_unit_device）")
+    private String deviceId;
+
+    @ApiModelProperty("维修作业主表id")
+    private String workId;
+
+    @ApiModelProperty("维修作业单元表id")
+    private String workDetailId;
+
+    @ApiModelProperty("巡查区间id")
+    private String subwaySectionId;
+
+    @ApiModelProperty("巡查区间名称")
+    private String subwaySectionName;
+
+    @ApiModelProperty("线别id")
+    private String lineAliasId;
+
+    @ApiModelProperty("线别名称")
+    private String lineAliasName;
+
+    @ApiModelProperty("起始里程")
+    private BigDecimal startingMileage;
+
+    @ApiModelProperty("终点里程")
+    private BigDecimal endMileage;
+
+    @ApiModelProperty("问题记录")
+    private String problemRecord;
+
+    @ApiModelProperty("处理情况")
+    private String handingLog;
+
+    @ApiModelProperty("整改说明")
+    private String reformRemark;
+
+    @ApiModelProperty("是否删除（0：未删除，1：已删除）")
+    private String delFlag;
+
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/dto/WorkBatchDetailPatrolInfoDTO.java

+package org.jeecg.modules.maintenanceWork.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+
+/**
+ * <p>
+ * 维修作业---线路巡查巡道员详情
+ * </p>
+ *
+ * @author hkl
+ * @since 2024-08-05
+ */
+@Getter
+@Setter
+@ApiModel(value = "WorkBatchDetailPatrolInfo对象", description = "维修作业---线路巡查巡道员详情")
+
+public class WorkBatchDetailPatrolInfoDTO {
+
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    private String id;
+
+    @ApiModelProperty("创建人")
+    private String createBy;
+
+    @ApiModelProperty("创建日期")
+    private Date createTime;
+
+    @ApiModelProperty("更新人")
+    private String updateBy;
+
+    @ApiModelProperty("更新时间")
+    private Date updateTime;
+
+    @ApiModelProperty("分析批id")
+    private String analysisBatchId;
+
+    @ApiModelProperty("分析批次号")
+    private String analysisBatchCode;
+
+    @ApiModelProperty("设备检查记录主表id（t_ek_records_master_check、t_xd_record_patrol_master）")
+    private String ekId;
+
+    @ApiModelProperty("检查批次号（t_ek_records_master_check）")
+    private String ekCode;
+
+    @ApiModelProperty("单元表id（t_dsa_analysis_line_batch_unit_device）")
+    private String deviceId;
+
+    @ApiModelProperty("维修作业主表id")
+    private String workId;
+
+    @ApiModelProperty("维修作业单元表id")
+    private String workDetailId;
+
+    @ApiModelProperty("检查项目名称")
+    private String ekProjectName;
+
+    @ApiModelProperty("重点检查项目内容")
+    private String ekProjectContent;
+
+    @ApiModelProperty("问题记录")
+    private String problemRecord;
+
+    @ApiModelProperty("处理情况")
+    private String handingLog;
+
+    @ApiModelProperty("是否满足（1：是；2：否）")
+    private String status;
+
+    @ApiModelProperty("排序")
+    private Integer seq;
+
+    @ApiModelProperty("备忘录")
+    private String remark;
+
+    @ApiModelProperty("整改说明")
+    private String reformRemark;
+
+    @ApiModelProperty("是否删除（0：未删除，1：已删除）")
+    private String delFlag;
+
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/dto/WorkBatchDetailRailWearInfoDTO.java

+package org.jeecg.modules.maintenanceWork.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 维修作业---钢轨探伤检查
+ * </p>
+ *
+ * @author hkl
+ * @since 2024-08-05
+ */
+@Getter
+@Setter
+@ApiModel(value = "WorkBatchDetailRailWearInfo对象", description = "维修作业---钢轨探伤检查")
+
+public class WorkBatchDetailRailWearInfoDTO {
+
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    private String id;
+
+    @ApiModelProperty("创建人")
+    private String createBy;
+
+    @ApiModelProperty("创建日期")
+    private Date createTime;
+
+    @ApiModelProperty("更新人")
+    private String updateBy;
+
+    @ApiModelProperty("更新时间")
+    private Date updateTime;
+
+    @ApiModelProperty("分析批id")
+    private String analysisBatchId;
+
+    @ApiModelProperty("分析批次号")
+    private String analysisBatchCode;
+
+    @ApiModelProperty("设备检查记录主表id（t_ek_records_master_check）")
+    private String ekId;
+
+    @ApiModelProperty("检查批次号（t_ek_records_master_check）")
+    private String ekCode;
+
+    @ApiModelProperty("单元表id（t_dsa_analysis_line_batch_unit_device）")
+    private String deviceId;
+
+    @ApiModelProperty("维修作业主表id")
+    private String workId;
+
+    @ApiModelProperty("维修作业单元表id")
+    private String workDetailId;
+
+    @ApiModelProperty("检查设备id(设备资产四种表的主键)")
+    private String deviceProjectId;
+
+    @ApiModelProperty("检查设备编码(设备资产四种表的unit_code)")
+    private String deviceProjectCode;
+
+    @ApiModelProperty("检查设备类型（1-钢轨,2-曲线,3-竖曲线,4-道岔）")
+    private Integer deviceProjectType;
+
+    @ApiModelProperty("股别(1-左股，2-右股)")
+    private Integer damageLevel;
+
+    @ApiModelProperty("伤损钢轨数量")
+    private Integer damageNum;
+
+    @ApiModelProperty("伤损种类（1-鱼鳞纹,2-剥落掉块,3-表面疲劳裂纹,4-轨底掉块,5-灼伤,6-核伤,7-焊缝,8-其他）")
+    private Integer damageType;
+
+    @ApiModelProperty("伤损里程")
+    private BigDecimal damageMileage;
+
+    @ApiModelProperty("伤损程度(1-轻伤,2-轻伤有发展,3-重伤)")
+    private Integer damageDegree;
+
+    @ApiModelProperty("换轨计划")
+    private String damagePlan;
+
+    @ApiModelProperty("整改说明")
+    private String reformRemark;
+
+    @ApiModelProperty("是否删除（0：未删除，1：已删除）")
+    private String delFlag;
+
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/dto/WorkBatchDetailTrackBedInfoDTO.java

+package org.jeecg.modules.maintenanceWork.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 维修作业---道床检查
+ * </p>
+ *
+ * @author hkl
+ * @since 2024-08-05
+ */
+@Getter
+@Setter
+@ApiModel(value = "WorkBatchDetailTrackBedInfo对象", description = "维修作业---道床检查")
+
+public class WorkBatchDetailTrackBedInfoDTO {
+
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    private String id;
+
+    @ApiModelProperty("创建人")
+    private String createBy;
+
+    @ApiModelProperty("创建日期")
+    private Date createTime;
+
+    @ApiModelProperty("更新人")
+    private String updateBy;
+
+    @ApiModelProperty("更新时间")
+    private Date updateTime;
+
+    @ApiModelProperty("分析批id")
+    private String analysisBatchId;
+
+    @ApiModelProperty("分析批次号")
+    private String analysisBatchCode;
+
+    @ApiModelProperty("设备检查记录主表id（t_ek_records_master_check）")
+    private String ekId;
+
+    @ApiModelProperty("检查批次号（t_ek_records_master_check）")
+    private String ekCode;
+
+    @ApiModelProperty("单元表id（t_dsa_analysis_line_batch_unit_device）")
+    private String deviceId;
+
+    @ApiModelProperty("维修作业主表id")
+    private String workId;
+
+    @ApiModelProperty("维修作业单元表id")
+    private String workDetailId;
+
+    @ApiModelProperty("道床id")
+    private String trackBedId;
+
+    @ApiModelProperty("道床编号")
+    private String trackBedCode;
+
+    @ApiModelProperty("道床类型")
+    private String trackBedType;
+
+    @ApiModelProperty("道床起点里程")
+    private BigDecimal startingMileage;
+
+    @ApiModelProperty("道床终点里程")
+    private BigDecimal endMileage;
+
+    @ApiModelProperty("道床长度")
+    private BigDecimal trackBedLen;
+
+    @ApiModelProperty("检查项目名称")
+    private String ekProjectName;
+
+    @ApiModelProperty("检查项目内容")
+    private String ekProjectContent;
+
+    @ApiModelProperty("检查合格评判标准")
+    private String ekProjectTemplate;
+
+    @ApiModelProperty("现场检查项目状态（1：合格；2：良好；3：不合格）")
+    private String ekProjectStatus;
+
+    @ApiModelProperty("整改说明")
+    private String reformRemark;
+
+    @ApiModelProperty("是否删除（0：未删除，1：已删除）")
+    private String delFlag;
+
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/dto/WorkBatchDetailTurnoutInfoDTO.java

+package org.jeecg.modules.maintenanceWork.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+
+/**
+ * <p>
+ * 维修作业---道岔检查记录
+ * </p>
+ *
+ * @author hkl
+ * @since 2024-08-05
+ */
+@Getter
+@Setter
+@ApiModel(value = "WorkBatchDetailTurnoutInfo对象", description = "维修作业---道岔检查记录	")
+
+public class WorkBatchDetailTurnoutInfoDTO {
+
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    private String id;
+
+    @ApiModelProperty("创建人")
+    private String createBy;
+
+    @ApiModelProperty("创建日期")
+    private Date createTime;
+
+    @ApiModelProperty("更新人")
+    private String updateBy;
+
+    @ApiModelProperty("更新时间")
+    private Date updateTime;
+
+    @ApiModelProperty("分析批id")
+    private String analysisBatchId;
+
+    @ApiModelProperty("分析批次号")
+    private String analysisBatchCode;
+
+    @ApiModelProperty("设备检查记录主表id（t_ek_records_master_check）")
+    private String ekId;
+
+    @ApiModelProperty("检查批次号（t_ek_records_master_check）")
+    private String ekCode;
+
+    @ApiModelProperty("单元表id（t_dsa_analysis_line_batch_unit_device）")
+    private String deviceId;
+
+    @ApiModelProperty("维修作业主表id")
+    private String workId;
+
+    @ApiModelProperty("维修作业单元表id")
+    private String workDetailId;
+
+    @ApiModelProperty("设备编号(道岔表设备编号W3301)")
+    private String switchCode;
+
+    @ApiModelProperty("设备号数(t_ek_records_master_turnout_info)")
+    private String switchCodeNum;
+
+    @ApiModelProperty("轨距水平尺编号")
+    private String gaugeCode;
+
+    @ApiModelProperty("检查项目类型（1：轨距；2：水平；3：支距；4：轮缘槽；5：滑床板；6：顶铁；7：接头螺栓；8：护轨螺栓；9:道岔）")
+    private String type;
+
+    @ApiModelProperty("值1")
+    private String numOne;
+
+    @ApiModelProperty("值2")
+    private String numTwo;
+
+    @ApiModelProperty("值3")
+    private String numThree;
+
+    @ApiModelProperty("值4")
+    private String numFour;
+
+    @ApiModelProperty("值5")
+    private String numFive;
+
+    @ApiModelProperty("值6")
+    private String numSix;
+
+    @ApiModelProperty("值7")
+    private String numSeven;
+
+    @ApiModelProperty("值8")
+    private String numEight;
+
+    @ApiModelProperty("值9")
+    private String numNine;
+
+    @ApiModelProperty("值10")
+    private String numTen;
+
+    @ApiModelProperty("值11")
+    private String numTenOne;
+
+    @ApiModelProperty("值12")
+    private String numTenTwo;
+
+    @ApiModelProperty("值13")
+    private String numTenThree;
+
+    @ApiModelProperty("值14")
+    private String numTenFour;
+
+    @ApiModelProperty("值15")
+    private String numTenFive;
+
+    @ApiModelProperty("值16")
+    private String numTenSix;
+
+    @ApiModelProperty("值17")
+    private String numTenSeven;
+
+    @ApiModelProperty("值18")
+    private String numTenEight;
+
+    @ApiModelProperty("值19")
+    private String numTenNine;
+
+    @ApiModelProperty("值20")
+    private String numTwenty;
+
+    @ApiModelProperty("值21")
+    private String numTwentyOne;
+
+    @ApiModelProperty("值22")
+    private String numTwentyTwo;
+
+    @ApiModelProperty("是否合格（1：合格；2：不合格）")
+    private String qualified;
+
+    @ApiModelProperty("不合格说明")
+    private String noQualifiedRemark;
+
+    @ApiModelProperty("备注")
+    private String remark;
+
+    @ApiModelProperty("整改说明")
+    private String reformRemark;
+
+    @ApiModelProperty("是否删除（0：未删除，1：已删除）")
+    private String delFlag;
+
+    @ApiModelProperty("导入道岔顺序")
+    private Integer sort;
+
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/entity/WorkBatchDetailCorrugationInfo.java

+package org.jeecg.modules.maintenanceWork.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 维修作业---钢轨波磨检查
+ * </p>
+ *
+ * @author hkl
+ * @since 2024-08-05
+ */
+@Getter
+@Setter
+@TableName("t_mw_work_batch_detail_corrugation_info")
+@ApiModel(value = "WorkBatchDetailCorrugationInfo对象", description = "维修作业---钢轨波磨检查")
+public class WorkBatchDetailCorrugationInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    @TableField("id")
+    private String id;
+
+    @ApiModelProperty("创建人")
+    @TableField("create_by")
+    private String createBy;
+
+    @ApiModelProperty("创建日期")
+    @TableField("create_time")
+    private Date createTime;
+
+    @ApiModelProperty("更新人")
+    @TableField("update_by")
+    private String updateBy;
+
+    @ApiModelProperty("更新时间")
+    @TableField("update_time")
+    private Date updateTime;
+
+    @ApiModelProperty("分析批id")
+    @TableField("analysis_batch_id")
+    private String analysisBatchId;
+
+    @ApiModelProperty("分析批次号")
+    @TableField("analysis_batch_code")
+    private String analysisBatchCode;
+
+    @ApiModelProperty("设备检查记录主表id（t_ek_records_master_check）")
+    @TableField("ek_id")
+    private String ekId;
+
+    @ApiModelProperty("检查批次号（t_ek_records_master_check）")
+    @TableField("ek_code")
+    private String ekCode;
+
+    @ApiModelProperty("单元表id（t_dsa_analysis_line_batch_unit_device）")
+    @TableField("device_id")
+    private String deviceId;
+
+    @ApiModelProperty("维修作业主表id")
+    @TableField("work_id")
+    private String workId;
+
+    @ApiModelProperty("维修作业单元表id")
+    @TableField("work_detail_id")
+    private String workDetailId;
+
+    @ApiModelProperty("检查设备id(设备资产四种表的主键)")
+    @TableField("device_project_id")
+    private String deviceProjectId;
+
+    @ApiModelProperty("检查设备单元编码(设备资产四种表的unit_code)")
+    @TableField("device_project_code")
+    private String deviceProjectCode;
+
+    @ApiModelProperty("检查设备类型（1-钢轨,2-曲线,3-竖曲线,4-道岔）")
+    @TableField("device_project_type")
+    private Integer deviceProjectType;
+
+    @ApiModelProperty("曲线半径")
+    @TableField("curve_radius")
+    private BigDecimal curveRadius;
+
+    @ApiModelProperty("曲线超高")
+    @TableField("super_high")
+    private BigDecimal superHigh;
+
+    @ApiModelProperty("曲线长度")
+    @TableField("curve_len")
+    private BigDecimal curveLen;
+
+    @ApiModelProperty("检查项目-波段-谷深(10-30)")
+    @TableField("check_band_one")
+    private BigDecimal checkBandOne;
+
+    @ApiModelProperty("检查项目-波段-谷深(30-100)")
+    @TableField("check_band_two")
+    private BigDecimal checkBandTwo;
+
+    @ApiModelProperty("检查项目-波段-谷深(100-300)")
+    @TableField("check_band_three")
+    private BigDecimal checkBandThree;
+
+    @ApiModelProperty("检查项目-波段-谷深(300-1000)")
+    @TableField("check_band_four")
+    private BigDecimal checkBandFour;
+
+    @ApiModelProperty("超限记录")
+    @TableField("overrun_info")
+    private String overrunInfo;
+
+    @ApiModelProperty("整改备注")
+    @TableField("reform_remark")
+    private String reformRemark;
+
+    @ApiModelProperty("是否删除（0：未删除，1：已删除）")
+    @TableField("del_flag")
+    private String delFlag;
+
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/entity/WorkBatchDetailCurveWearInfo.java

+package org.jeecg.modules.maintenanceWork.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 维修作业---曲线波磨检查
+ * </p>
+ *
+ * @author hkl
+ * @since 2024-08-05
+ */
+@Getter
+@Setter
+@TableName("t_mw_work_batch_detail_curve_wear_info")
+@ApiModel(value = "WorkBatchDetailCurveWearInfo对象", description = "维修作业---曲线波磨检查")
+public class WorkBatchDetailCurveWearInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    @TableField("id")
+    private String id;
+
+    @ApiModelProperty("创建人")
+    @TableField("create_by")
+    private String createBy;
+
+    @ApiModelProperty("创建日期")
+    @TableField("create_time")
+    private Date createTime;
+
+    @ApiModelProperty("更新人")
+    @TableField("update_by")
+    private String updateBy;
+
+    @ApiModelProperty("更新时间")
+    @TableField("update_time")
+    private Date updateTime;
+
+    @ApiModelProperty("分析批id")
+    @TableField("analysis_batch_id")
+    private String analysisBatchId;
+
+    @ApiModelProperty("分析批次号")
+    @TableField("analysis_batch_code")
+    private String analysisBatchCode;
+
+    @ApiModelProperty("设备检查记录主表id（t_ek_records_master_check）")
+    @TableField("ek_id")
+    private String ekId;
+
+    @ApiModelProperty("检查批次号（t_ek_records_master_check）")
+    @TableField("ek_code")
+    private String ekCode;
+
+    @ApiModelProperty("单元表id（t_dsa_analysis_line_batch_unit_device）")
+    @TableField("device_id")
+    private String deviceId;
+
+    @ApiModelProperty("维修作业主表id")
+    @TableField("work_id")
+    private String workId;
+
+    @ApiModelProperty("维修作业单元表id")
+    @TableField("work_detail_id")
+    private String workDetailId;
+
+    @ApiModelProperty("检查设备id(设备资产四种表的主键)")
+    @TableField("device_project_id")
+    private String deviceProjectId;
+
+    @ApiModelProperty("检查设备编码(设备资产四种表的unit_code)")
+    @TableField("device_project_code")
+    private String deviceProjectCode;
+
+    @ApiModelProperty("检查设备类型（1-钢轨,2-曲线,3-竖曲线,4-道岔）")
+    @TableField("device_project_type")
+    private Integer deviceProjectType;
+
+    @ApiModelProperty("曲线半径")
+    @TableField("curve_radius")
+    private BigDecimal curveRadius;
+
+    @ApiModelProperty("曲线超高")
+    @TableField("curve_super_high")
+    private BigDecimal curveSuperHigh;
+
+    @ApiModelProperty("缓和曲线长度")
+    @TableField("transition_curve_high")
+    private BigDecimal transitionCurveHigh;
+
+    @ApiModelProperty("圆曲线长")
+    @TableField("curve_tangent_len")
+    private BigDecimal curveTangentLen;
+
+    @ApiModelProperty("圆曲转向（1：左 2：右）")
+    @TableField("curve_turn")
+    private String curveTurn;
+
+    @ApiModelProperty("检查类型（1：垂直磨耗 2：侧面磨耗）")
+    @TableField("curve_type")
+    private Integer curveType;
+
+    @ApiModelProperty("2H")
+    @TableField("two_num")
+    private BigDecimal twoNum;
+
+    @ApiModelProperty("HY")
+    @TableField("hy_num")
+    private BigDecimal hyNum;
+
+    @ApiModelProperty("HZ")
+    @TableField("hz_num")
+    private BigDecimal hzNum;
+
+    @ApiModelProperty("QZ")
+    @TableField("qz_num")
+    private BigDecimal qzNum;
+
+    @ApiModelProperty("YH")
+    @TableField("yh_num")
+    private BigDecimal yhNum;
+
+    @ApiModelProperty("超限记录类型(1:无，2：轻伤，3：重伤)")
+    @TableField("over_type")
+    private Integer overType;
+
+    @ApiModelProperty("整改备注")
+    @TableField("reform_remark")
+    private String reformRemark;
+
+    @ApiModelProperty("是否删除（0：未删除，1：已删除）")
+    @TableField("del_flag")
+    private String delFlag;
+
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/entity/WorkBatchDetailPatrolAssistInfo.java

+package org.jeecg.modules.maintenanceWork.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 维修作业---线路巡查协助巡道员详情
+ * </p>
+ *
+ * @author hkl
+ * @since 2024-08-05
+ */
+@Getter
+@Setter
+@TableName("t_mw_work_batch_detail_patrol_assist_info")
+@ApiModel(value = "WorkBatchDetailPatrolAssistInfo对象", description = "维修作业---线路巡查协助巡道员详情")
+public class WorkBatchDetailPatrolAssistInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    @TableField("id")
+    private String id;
+
+    @ApiModelProperty("创建人")
+    @TableField("create_by")
+    private String createBy;
+
+    @ApiModelProperty("创建日期")
+    @TableField("create_time")
+    private Date createTime;
+
+    @ApiModelProperty("更新人")
+    @TableField("update_by")
+    private String updateBy;
+
+    @ApiModelProperty("更新时间")
+    @TableField("update_time")
+    private Date updateTime;
+
+    @ApiModelProperty("分析批id")
+    @TableField("analysis_batch_id")
+    private String analysisBatchId;
+
+    @ApiModelProperty("分析批次号")
+    @TableField("analysis_batch_code")
+    private String analysisBatchCode;
+
+    @ApiModelProperty("设备检查记录主表id（t_ek_records_master_check、t_xd_record_patrol_master）")
+    @TableField("ek_id")
+    private String ekId;
+
+    @ApiModelProperty("检查批次号（t_ek_records_master_check）")
+    @TableField("ek_code")
+    private String ekCode;
+
+    @ApiModelProperty("单元表id（t_dsa_analysis_line_batch_unit_device）")
+    @TableField("device_id")
+    private String deviceId;
+
+    @ApiModelProperty("维修作业主表id")
+    @TableField("work_id")
+    private String workId;
+
+    @ApiModelProperty("维修作业单元表id")
+    @TableField("work_detail_id")
+    private String workDetailId;
+
+    @ApiModelProperty("巡查区间id")
+    @TableField("subway_section_id")
+    private String subwaySectionId;
+
+    @ApiModelProperty("巡查区间名称")
+    @TableField("subway_section_name")
+    private String subwaySectionName;
+
+    @ApiModelProperty("线别id")
+    @TableField("line_alias_id")
+    private String lineAliasId;
+
+    @ApiModelProperty("线别名称")
+    @TableField("line_alias_name")
+    private String lineAliasName;
+
+    @ApiModelProperty("起始里程")
+    @TableField("starting_mileage")
+    private BigDecimal startingMileage;
+
+    @ApiModelProperty("终点里程")
+    @TableField("end_mileage")
+    private BigDecimal endMileage;
+
+    @ApiModelProperty("问题记录")
+    @TableField("problem_record")
+    private String problemRecord;
+
+    @ApiModelProperty("处理情况")
+    @TableField("handing_log")
+    private String handingLog;
+
+    @ApiModelProperty("整改备注")
+    @TableField("reform_remark")
+    private String reformRemark;
+
+    @ApiModelProperty("是否删除（0：未删除，1：已删除）")
+    @TableField("del_flag")
+    private String delFlag;
+
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/entity/WorkBatchDetailPatrolInfo.java

+package org.jeecg.modules.maintenanceWork.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 维修作业---线路巡查巡道员详情
+ * </p>
+ *
+ * @author hkl
+ * @since 2024-08-05
+ */
+@Getter
+@Setter
+@TableName("t_mw_work_batch_detail_patrol_info")
+@ApiModel(value = "WorkBatchDetailPatrolInfo对象", description = "维修作业---线路巡查巡道员详情")
+public class WorkBatchDetailPatrolInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    @TableField("id")
+    private String id;
+
+    @ApiModelProperty("创建人")
+    @TableField("create_by")
+    private String createBy;
+
+    @ApiModelProperty("创建日期")
+    @TableField("create_time")
+    private Date createTime;
+
+    @ApiModelProperty("更新人")
+    @TableField("update_by")
+    private String updateBy;
+
+    @ApiModelProperty("更新时间")
+    @TableField("update_time")
+    private Date updateTime;
+
+    @ApiModelProperty("分析批id")
+    @TableField("analysis_batch_id")
+    private String analysisBatchId;
+
+    @ApiModelProperty("分析批次号")
+    @TableField("analysis_batch_code")
+    private String analysisBatchCode;
+
+    @ApiModelProperty("设备检查记录主表id（t_ek_records_master_check、t_xd_record_patrol_master）")
+    @TableField("ek_id")
+    private String ekId;
+
+    @ApiModelProperty("检查批次号（t_ek_records_master_check）")
+    @TableField("ek_code")
+    private String ekCode;
+
+    @ApiModelProperty("单元表id（t_dsa_analysis_line_batch_unit_device）")
+    @TableField("device_id")
+    private String deviceId;
+
+    @ApiModelProperty("维修作业主表id")
+    @TableField("work_id")
+    private String workId;
+
+    @ApiModelProperty("维修作业单元表id")
+    @TableField("work_detail_id")
+    private String workDetailId;
+
+    @ApiModelProperty("检查项目名称")
+    @TableField("ek_project_name")
+    private String ekProjectName;
+
+    @ApiModelProperty("重点检查项目内容")
+    @TableField("ek_project_content")
+    private String ekProjectContent;
+
+    @ApiModelProperty("问题记录")
+    @TableField("problem_record")
+    private String problemRecord;
+
+    @ApiModelProperty("处理情况")
+    @TableField("handing_log")
+    private String handingLog;
+
+    @ApiModelProperty("是否满足（1：是；2：否）")
+    @TableField("status")
+    private String status;
+
+    @ApiModelProperty("排序")
+    @TableField("seq")
+    private Integer seq;
+
+    @ApiModelProperty("备忘录")
+    @TableField("remark")
+    private String remark;
+
+    @ApiModelProperty("整改备注")
+    @TableField("reform_remark")
+    private String reformRemark;
+
+    @ApiModelProperty("是否删除（0：未删除，1：已删除）")
+    @TableField("del_flag")
+    private String delFlag;
+
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/entity/WorkBatchDetailRailWearInfo.java

+package org.jeecg.modules.maintenanceWork.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 维修作业---钢轨探伤检查
+ * </p>
+ *
+ * @author hkl
+ * @since 2024-08-05
+ */
+@Getter
+@Setter
+@TableName("t_mw_work_batch_detail_rail_wear_info")
+@ApiModel(value = "WorkBatchDetailRailWearInfo对象", description = "维修作业---钢轨探伤检查")
+public class WorkBatchDetailRailWearInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    @TableField("id")
+    private String id;
+
+    @ApiModelProperty("创建人")
+    @TableField("create_by")
+    private String createBy;
+
+    @ApiModelProperty("创建日期")
+    @TableField("create_time")
+    private Date createTime;
+
+    @ApiModelProperty("更新人")
+    @TableField("update_by")
+    private String updateBy;
+
+    @ApiModelProperty("更新时间")
+    @TableField("update_time")
+    private Date updateTime;
+
+    @ApiModelProperty("分析批id")
+    @TableField("analysis_batch_id")
+    private String analysisBatchId;
+
+    @ApiModelProperty("分析批次号")
+    @TableField("analysis_batch_code")
+    private String analysisBatchCode;
+
+    @ApiModelProperty("设备检查记录主表id（t_ek_records_master_check）")
+    @TableField("ek_id")
+    private String ekId;
+
+    @ApiModelProperty("检查批次号（t_ek_records_master_check）")
+    @TableField("ek_code")
+    private String ekCode;
+
+    @ApiModelProperty("单元表id（t_dsa_analysis_line_batch_unit_device）")
+    @TableField("device_id")
+    private String deviceId;
+
+    @ApiModelProperty("维修作业主表id")
+    @TableField("work_id")
+    private String workId;
+
+    @ApiModelProperty("维修作业单元表id")
+    @TableField("work_detail_id")
+    private String workDetailId;
+
+    @ApiModelProperty("检查设备id(设备资产四种表的主键)")
+    @TableField("device_project_id")
+    private String deviceProjectId;
+
+    @ApiModelProperty("检查设备编码(设备资产四种表的unit_code)")
+    @TableField("device_project_code")
+    private String deviceProjectCode;
+
+    @ApiModelProperty("检查设备类型（1-钢轨,2-曲线,3-竖曲线,4-道岔）")
+    @TableField("device_project_type")
+    private Integer deviceProjectType;
+
+    @ApiModelProperty("股别(1-左股，2-右股)")
+    @TableField("damage_level")
+    private Integer damageLevel;
+
+    @ApiModelProperty("伤损钢轨数量")
+    @TableField("damage_num")
+    private Integer damageNum;
+
+    @ApiModelProperty("伤损种类（1-鱼鳞纹,2-剥落掉块,3-表面疲劳裂纹,4-轨底掉块,5-灼伤,6-核伤,7-焊缝,8-其他）")
+    @TableField("damage_type")
+    private Integer damageType;
+
+    @ApiModelProperty("伤损里程")
+    @TableField("damage_mileage")
+    private BigDecimal damageMileage;
+
+    @ApiModelProperty("伤损程度(1-轻伤,2-轻伤有发展,3-重伤)")
+    @TableField("damage_degree")
+    private Integer damageDegree;
+
+    @ApiModelProperty("换轨计划")
+    @TableField("damage_plan")
+    private String damagePlan;
+
+    @ApiModelProperty("整改备注")
+    @TableField("reform_remark")
+    private String reformRemark;
+
+    @ApiModelProperty("是否删除（0：未删除，1：已删除）")
+    @TableField("del_flag")
+    private String delFlag;
+
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/entity/WorkBatchDetailTrackBedInfo.java

+package org.jeecg.modules.maintenanceWork.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 维修作业---道床检查
+ * </p>
+ *
+ * @author hkl
+ * @since 2024-08-05
+ */
+@Getter
+@Setter
+@TableName("t_mw_work_batch_detail_track_bed_info")
+@ApiModel(value = "WorkBatchDetailTrackBedInfo对象", description = "维修作业---道床检查")
+public class WorkBatchDetailTrackBedInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    @TableField("id")
+    private String id;
+
+    @ApiModelProperty("创建人")
+    @TableField("create_by")
+    private String createBy;
+
+    @ApiModelProperty("创建日期")
+    @TableField("create_time")
+    private Date createTime;
+
+    @ApiModelProperty("更新人")
+    @TableField("update_by")
+    private String updateBy;
+
+    @ApiModelProperty("更新时间")
+    @TableField("update_time")
+    private Date updateTime;
+
+    @ApiModelProperty("分析批id")
+    @TableField("analysis_batch_id")
+    private String analysisBatchId;
+
+    @ApiModelProperty("分析批次号")
+    @TableField("analysis_batch_code")
+    private String analysisBatchCode;
+
+    @ApiModelProperty("设备检查记录主表id（t_ek_records_master_check）")
+    @TableField("ek_id")
+    private String ekId;
+
+    @ApiModelProperty("检查批次号（t_ek_records_master_check）")
+    @TableField("ek_code")
+    private String ekCode;
+
+    @ApiModelProperty("单元表id（t_dsa_analysis_line_batch_unit_device）")
+    @TableField("device_id")
+    private String deviceId;
+
+    @ApiModelProperty("维修作业主表id")
+    @TableField("work_id")
+    private String workId;
+
+    @ApiModelProperty("维修作业单元表id")
+    @TableField("work_detail_id")
+    private String workDetailId;
+
+    @ApiModelProperty("道床id")
+    @TableField("track_bed_id")
+    private String trackBedId;
+
+    @ApiModelProperty("道床编号")
+    @TableField("track_bed_code")
+    private String trackBedCode;
+
+    @ApiModelProperty("道床类型")
+    @TableField("track_bed_type")
+    private String trackBedType;
+
+    @ApiModelProperty("道床起点里程")
+    @TableField("starting_mileage")
+    private BigDecimal startingMileage;
+
+    @ApiModelProperty("道床终点里程")
+    @TableField("end_mileage")
+    private BigDecimal endMileage;
+
+    @ApiModelProperty("道床长度")
+    @TableField("track_bed_len")
+    private BigDecimal trackBedLen;
+
+    @ApiModelProperty("检查项目名称")
+    @TableField("ek_project_name")
+    private String ekProjectName;
+
+    @ApiModelProperty("检查项目内容")
+    @TableField("ek_project_content")
+    private String ekProjectContent;
+
+    @ApiModelProperty("检查合格评判标准")
+    @TableField("ek_project_template")
+    private String ekProjectTemplate;
+
+    @ApiModelProperty("现场检查项目状态（1：合格；2：良好；3：不合格）")
+    @TableField("ek_project_status")
+    private String ekProjectStatus;
+
+    @ApiModelProperty("整改备注")
+    @TableField("reform_remark")
+    private String reformRemark;
+
+    @ApiModelProperty("是否删除（0：未删除，1：已删除）")
+    @TableField("del_flag")
+    private String delFlag;
+
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/entity/WorkBatchDetailTurnoutInfo.java

+package org.jeecg.modules.maintenanceWork.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 维修作业---道岔检查记录	
+ * </p>
+ *
+ * @author hkl
+ * @since 2024-08-05
+ */
+@Getter
+@Setter
+@TableName("t_mw_work_batch_detail_turnout_info")
+@ApiModel(value = "WorkBatchDetailTurnoutInfo对象", description = "维修作业---道岔检查记录	")
+public class WorkBatchDetailTurnoutInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    @TableField("id")
+    private String id;
+
+    @ApiModelProperty("创建人")
+    @TableField("create_by")
+    private String createBy;
+
+    @ApiModelProperty("创建日期")
+    @TableField("create_time")
+    private Date createTime;
+
+    @ApiModelProperty("更新人")
+    @TableField("update_by")
+    private String updateBy;
+
+    @ApiModelProperty("更新时间")
+    @TableField("update_time")
+    private Date updateTime;
+
+    @ApiModelProperty("分析批id")
+    @TableField("analysis_batch_id")
+    private String analysisBatchId;
+
+    @ApiModelProperty("分析批次号")
+    @TableField("analysis_batch_code")
+    private String analysisBatchCode;
+
+    @ApiModelProperty("设备检查记录主表id（t_ek_records_master_check）")
+    @TableField("ek_id")
+    private String ekId;
+
+    @ApiModelProperty("检查批次号（t_ek_records_master_check）")
+    @TableField("ek_code")
+    private String ekCode;
+
+    @ApiModelProperty("单元表id（t_dsa_analysis_line_batch_unit_device）")
+    @TableField("device_id")
+    private String deviceId;
+
+    @ApiModelProperty("维修作业主表id")
+    @TableField("work_id")
+    private String workId;
+
+    @ApiModelProperty("维修作业单元表id")
+    @TableField("work_detail_id")
+    private String workDetailId;
+
+    @ApiModelProperty("设备编号(道岔表设备编号W3301)")
+    @TableField("switch_code")
+    private String switchCode;
+
+    @ApiModelProperty("设备号数(t_ek_records_master_turnout_info)")
+    @TableField("switch_code_num")
+    private String switchCodeNum;
+
+    @ApiModelProperty("轨距水平尺编号")
+    @TableField("gauge_code")
+    private String gaugeCode;
+
+    @ApiModelProperty("检查项目类型（1：轨距；2：水平；3：支距；4：轮缘槽；5：滑床板；6：顶铁；7：接头螺栓；8：护轨螺栓；9:道岔）")
+    @TableField("type")
+    private String type;
+
+    @ApiModelProperty("值1")
+    @TableField("num_one")
+    private String numOne;
+
+    @ApiModelProperty("值2")
+    @TableField("num_two")
+    private String numTwo;
+
+    @ApiModelProperty("值3")
+    @TableField("num_three")
+    private String numThree;
+
+    @ApiModelProperty("值4")
+    @TableField("num_four")
+    private String numFour;
+
+    @ApiModelProperty("值5")
+    @TableField("num_five")
+    private String numFive;
+
+    @ApiModelProperty("值6")
+    @TableField("num_six")
+    private String numSix;
+
+    @ApiModelProperty("值7")
+    @TableField("num_seven")
+    private String numSeven;
+
+    @ApiModelProperty("值8")
+    @TableField("num_eight")
+    private String numEight;
+
+    @ApiModelProperty("值9")
+    @TableField("num_nine")
+    private String numNine;
+
+    @ApiModelProperty("值10")
+    @TableField("num_ten")
+    private String numTen;
+
+    @ApiModelProperty("值11")
+    @TableField("num_ten_one")
+    private String numTenOne;
+
+    @ApiModelProperty("值12")
+    @TableField("num_ten_two")
+    private String numTenTwo;
+
+    @ApiModelProperty("值13")
+    @TableField("num_ten_three")
+    private String numTenThree;
+
+    @ApiModelProperty("值14")
+    @TableField("num_ten_four")
+    private String numTenFour;
+
+    @ApiModelProperty("值15")
+    @TableField("num_ten_five")
+    private String numTenFive;
+
+    @ApiModelProperty("值16")
+    @TableField("num_ten_six")
+    private String numTenSix;
+
+    @ApiModelProperty("值17")
+    @TableField("num_ten_seven")
+    private String numTenSeven;
+
+    @ApiModelProperty("值18")
+    @TableField("num_ten_eight")
+    private String numTenEight;
+
+    @ApiModelProperty("值19")
+    @TableField("num_ten_nine")
+    private String numTenNine;
+
+    @ApiModelProperty("值20")
+    @TableField("num_twenty")
+    private String numTwenty;
+
+    @ApiModelProperty("值21")
+    @TableField("num_twenty_one")
+    private String numTwentyOne;
+
+    @ApiModelProperty("值22")
+    @TableField("num_twenty_two")
+    private String numTwentyTwo;
+
+    @ApiModelProperty("是否合格（1：合格；2：不合格）")
+    @TableField("qualified")
+    private String qualified;
+
+    @ApiModelProperty("不合格说明")
+    @TableField("no_qualified_remark")
+    private String noQualifiedRemark;
+
+    @ApiModelProperty("备注")
+    @TableField("remark")
+    private String remark;
+
+    @ApiModelProperty("整改说明")
+    @TableField("reform_remark")
+    private String reformRemark;
+
+    @ApiModelProperty("是否删除（0：未删除，1：已删除）")
+    @TableField("del_flag")
+    private String delFlag;
+
+    @ApiModelProperty("导入道岔顺序")
+    @TableField("sort")
+    private Integer sort;
+
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/mapper/WorkBatchDetailCorrugationInfoMapper.java

+package org.jeecg.modules.maintenanceWork.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.maintenanceWork.entity.WorkBatchDetailCorrugationInfo;
+
+/**
+ * <p>
+ * 维修作业---钢轨波磨检查 Mapper 接口
+ * </p>
+ *
+ * @author hkl
+ * @since 2024-08-05
+ */
+public interface WorkBatchDetailCorrugationInfoMapper extends BaseMapper<WorkBatchDetailCorrugationInfo> {
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/mapper/WorkBatchDetailCurveWearInfoMapper.java

+package org.jeecg.modules.maintenanceWork.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.maintenanceWork.entity.WorkBatchDetailCurveWearInfo;
+
+/**
+ * <p>
+ * 维修作业---曲线波磨检查 Mapper 接口
+ * </p>
+ *
+ * @author hkl
+ * @since 2024-08-05
+ */
+public interface WorkBatchDetailCurveWearInfoMapper extends BaseMapper<WorkBatchDetailCurveWearInfo> {
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/mapper/WorkBatchDetailPatrolAssistInfoMapper.java

+package org.jeecg.modules.maintenanceWork.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.maintenanceWork.entity.WorkBatchDetailPatrolAssistInfo;
+
+/**
+ * <p>
+ * 维修作业---线路巡查协助巡道员详情 Mapper 接口
+ * </p>
+ *
+ * @author hkl
+ * @since 2024-08-05
+ */
+public interface WorkBatchDetailPatrolAssistInfoMapper extends BaseMapper<WorkBatchDetailPatrolAssistInfo> {
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/mapper/WorkBatchDetailPatrolInfoMapper.java

+package org.jeecg.modules.maintenanceWork.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.maintenanceWork.entity.WorkBatchDetailPatrolInfo;
+
+/**
+ * <p>
+ * 维修作业---线路巡查巡道员详情 Mapper 接口
+ * </p>
+ *
+ * @author hkl
+ * @since 2024-08-05
+ */
+public interface WorkBatchDetailPatrolInfoMapper extends BaseMapper<WorkBatchDetailPatrolInfo> {
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/mapper/WorkBatchDetailRailWearInfoMapper.java

+package org.jeecg.modules.maintenanceWork.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.maintenanceWork.entity.WorkBatchDetailRailWearInfo;
+
+/**
+ * <p>
+ * 维修作业---钢轨探伤检查 Mapper 接口
+ * </p>
+ *
+ * @author hkl
+ * @since 2024-08-05
+ */
+public interface WorkBatchDetailRailWearInfoMapper extends BaseMapper<WorkBatchDetailRailWearInfo> {
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/mapper/WorkBatchDetailTrackBedInfoMapper.java

+package org.jeecg.modules.maintenanceWork.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.maintenanceWork.entity.WorkBatchDetailTrackBedInfo;
+
+/**
+ * <p>
+ * 维修作业---道床检查 Mapper 接口
+ * </p>
+ *
+ * @author hkl
+ * @since 2024-08-05
+ */
+public interface WorkBatchDetailTrackBedInfoMapper extends BaseMapper<WorkBatchDetailTrackBedInfo> {
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/mapper/WorkBatchDetailTurnoutInfoMapper.java

+package org.jeecg.modules.maintenanceWork.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.maintenanceWork.entity.WorkBatchDetailTurnoutInfo;
+
+/**
+ * <p>
+ * 维修作业---道岔检查记录	 Mapper 接口
+ * </p>
+ *
+ * @author hkl
+ * @since 2024-08-05
+ */
+public interface WorkBatchDetailTurnoutInfoMapper extends BaseMapper<WorkBatchDetailTurnoutInfo> {
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/mapper/WorkBatchMapper.java

 package org.jeecg.modules.maintenanceWork.mapper;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
 import org.jeecg.modules.homePage.vo.ToDoDetailVO;
 import org.jeecg.modules.maintenanceWork.dto.UnitDeviceDTO;
 import org.jeecg.modules.maintenanceWork.dto.WorkBatchDTO;
 import org.jeecg.modules.maintenanceWork.entity.WorkBatch;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.jeecg.modules.maintenanceWork.vo.WorkBatchUserVO;
-import org.jeecg.modules.maintenanceWork.vo.WorkBatchVO;
+import org.jeecg.modules.maintenanceWork.vo.*;
 import org.jeecg.modules.unitDevice.dto.CaseReportCheckDataDTO;
 import org.jeecg.modules.unitDevice.dto.CaseReportWorkBatchDTO;
 import org.jeecg.modules.unitDevice.vo.CaseReportCheckDataVO;
@@ -35,4 +35,57 @@ public interface WorkBatchMapper extends BaseMapper<WorkBatch> {
     List<ToDoDetailVO> getTodoList(String currentUserId);
 
     List<WorkBatchUserVO> listUser(String query);
+    /**
+     * 整改道岔
+     * @param workId 维修主表id
+     * @param workInfoId 维修单元表id
+     * @return
+     */
+    List<WorkBatchDetailTurnoutInfoVO> getWorkBatchDetailTurnoutInfoList(@Param("workId") String workId, @Param("workInfoId")String workInfoId);
+
+    /**
+     * 整改钢轨伤损
+     * @param workId 维修主表id
+     * @param workInfoId 维修单元表id
+     * @return
+     */
+    List<WorkBatchDetailRailWearInfoVO> getWorkBatchDetailRailWearInfoList(@Param("workId") String workId, @Param("workInfoId")String workInfoId);
+    /**
+     * 整改曲线磨耗
+     * @param workId 维修主表id
+     * @param workInfoId 维修单元表id
+     * @return
+     */
+    List<WorkBatchDetailCurveWearInfoVO> getWorkBatchDetailCurveWearInfoList(@Param("workId") String workId, @Param("workInfoId")String workInfoId);
+    /**
+     * 整改钢轨波磨
+     * @param workId 维修主表id
+     * @param workInfoId 维修单元表id
+     * @return
+     */
+    List<WorkBatchDetailCorrugationInfoVO> getWorkBatchDetailCorrugationInfoList(@Param("workId") String workId, @Param("workInfoId")String workInfoId);
+    /**
+     * 整改道床
+     * @param workId 维修主表id
+     * @param workInfoId 维修单元表id
+     * @return
+     */
+    List<WorkBatchDetailTrackBedInfoVO> getWorkBatchDetailTrackBedInfoList(@Param("workId") String workId, @Param("workInfoId")String workInfoId);
+
+    /**
+     * 整改线路巡查
+     * @param workId 维修主表id
+     * @param workInfoId 维修单元表id
+     * @return
+     */
+    List<WorkBatchDetailPatrolInfoVO> getWorkBatchDetailPatrolInfoList(@Param("workId") String workId, @Param("workInfoId")String workInfoId);
+
+    /**
+     * 整改协助线路巡查
+     * @param workId 维修主表id
+     * @param workInfoId 维修单元表id
+     * @return
+     */
+    List<WorkBatchDetailPatrolAssistInfoVO> getWorkBatchDetailPatrolAssistInfoList(@Param("workId") String workId, @Param("workInfoId")String workInfoId);
+
 }

jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/mapper/xml/WorkBatchDetailCorrugationInfoMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.maintenanceWork.mapper.WorkBatchDetailCorrugationInfoMapper">
+
+</mapper>

jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/mapper/xml/WorkBatchDetailCurveWearInfoMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.maintenanceWork.mapper.WorkBatchDetailCurveWearInfoMapper">
+
+</mapper>

jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/mapper/xml/WorkBatchDetailPatrolAssistInfoMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.maintenanceWork.mapper.WorkBatchDetailPatrolAssistInfoMapper">
+
+</mapper>

jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/mapper/xml/WorkBatchDetailPatrolInfoMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.maintenanceWork.mapper.WorkBatchDetailPatrolInfoMapper">
+
+</mapper>

jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/mapper/xml/WorkBatchDetailRailWearInfoMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.maintenanceWork.mapper.WorkBatchDetailRailWearInfoMapper">
+
+</mapper>

jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/mapper/xml/WorkBatchDetailTrackBedInfoMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.maintenanceWork.mapper.WorkBatchDetailTrackBedInfoMapper">
+
+</mapper>

jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/mapper/xml/WorkBatchDetailTurnoutInfoMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.maintenanceWork.mapper.WorkBatchDetailTurnoutInfoMapper">
+
+</mapper>

jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/mapper/xml/WorkBatchMapper.xml

@@ -23,7 +23,7 @@
             t1.work_status,
             t1.del_flag,
             t1.analysis_type,
-            t1.work_type
+            t1.work_type,
             (SELECT count(1) FROM t_mw_work_batch_detail WHERE work_batch_id = t1.id) work_unit_device_num
         FROM
             t_mw_work_batch t1
@@ -189,4 +189,109 @@
         GROUP BY
             t1.id, t1.username, t1.realname, t1.user_identity;
     </select>
+    <select id="getWorkBatchDetailTurnoutInfoList" resultType="org.jeecg.modules.maintenanceWork.vo.WorkBatchDetailTurnoutInfoVO">
+        SELECT
+        t1.*
+        FROM
+        t_mw_work_batch_detail_turnout_info t1
+        WHERE
+        t1.del_flag = 0
+        <if test="workId != null and workId != ''">
+            AND t1.work_id = #{workId}
+        </if>
+        <if test="workInfoId != null and workInfoId != ''">
+            AND t1.work_detail_id = #{workInfoId}
+        </if>
+        order by t1.create_time
+    </select>
+    <select id="getWorkBatchDetailRailWearInfoList" resultType="org.jeecg.modules.maintenanceWork.vo.WorkBatchDetailRailWearInfoVO">
+        SELECT
+        t1.*
+        FROM
+        t_mw_work_batch_detail_rail_wear_info t1
+        WHERE
+        t1.del_flag = 0
+        <if test="workId != null and workId != ''">
+            AND t1.work_id = #{workId}
+        </if>
+        <if test="workInfoId != null and workInfoId != ''">
+            AND t1.work_detail_id = #{workInfoId}
+        </if>
+        order by t1.create_time
+    </select>
+    <select id="getWorkBatchDetailCurveWearInfoList" resultType="org.jeecg.modules.maintenanceWork.vo.WorkBatchDetailCurveWearInfoVO">
+        SELECT
+        t1.*
+        FROM
+        t_mw_work_batch_detail_curve_wear_info t1
+        WHERE
+        t1.del_flag = 0
+        <if test="workId != null and workId != ''">
+            AND t1.work_id = #{workId}
+        </if>
+        <if test="workInfoId != null and workInfoId != ''">
+            AND t1.work_detail_id = #{workInfoId}
+        </if>
+        order by t1.create_time
+    </select>
+    <select id="getWorkBatchDetailCorrugationInfoList" resultType="org.jeecg.modules.maintenanceWork.vo.WorkBatchDetailCorrugationInfoVO">
+        SELECT
+        t1.*
+        FROM
+        t_mw_work_batch_detail_corrugation_info t1
+        WHERE
+        t1.del_flag = 0
+        <if test="workId != null and workId != ''">
+            AND t1.work_id = #{workId}
+        </if>
+        <if test="workInfoId != null and workInfoId != ''">
+            AND t1.work_detail_id = #{workInfoId}
+        </if>
+        order by t1.create_time
+    </select>
+    <select id="getWorkBatchDetailTrackBedInfoList" resultType="org.jeecg.modules.maintenanceWork.vo.WorkBatchDetailTrackBedInfoVO">
+        SELECT
+        t1.*
+        FROM
+        t_mw_work_batch_detail_track_bed_info t1
+        WHERE
+        t1.del_flag = 0
+        <if test="workId != null and workId != ''">
+            AND t1.work_id = #{workId}
+        </if>
+        <if test="workInfoId != null and workInfoId != ''">
+            AND t1.work_detail_id = #{workInfoId}
+        </if>
+        order by t1.create_time
+    </select>
+    <select id="getWorkBatchDetailPatrolInfoList" resultType="org.jeecg.modules.maintenanceWork.vo.WorkBatchDetailPatrolInfoVO">
+        SELECT
+        t1.*
+        FROM
+        t_mw_work_batch_detail_patrol_info t1
+        WHERE
+        t1.del_flag = 0
+        <if test="workId != null and workId != ''">
+            AND t1.work_id = #{workId}
+        </if>
+        <if test="workInfoId != null and workInfoId != ''">
+            AND t1.work_detail_id = #{workInfoId}
+        </if>
+        order by t1.create_time
+    </select>
+    <select id="getWorkBatchDetailPatrolAssistInfoList" resultType="org.jeecg.modules.maintenanceWork.vo.WorkBatchDetailPatrolAssistInfoVO">
+        SELECT
+        t1.*
+        FROM
+        t_mw_work_batch_detail_patrol_assist_info t1
+        WHERE
+        t1.del_flag = 0
+        <if test="workId != null and workId != ''">
+            AND t1.work_id = #{workId}
+        </if>
+        <if test="workInfoId != null and workInfoId != ''">
+            AND t1.work_detail_id = #{workInfoId}
+        </if>
+        order by t1.create_time
+    </select>
 </mapper>

jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/service/IWorkBatchDetailCorrugationInfoService.java

+package org.jeecg.modules.maintenanceWork.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.maintenanceWork.entity.WorkBatchDetailCorrugationInfo;
+
+/**
+ * <p>
+ * 维修作业---钢轨波磨检查 服务类
+ * </p>
+ *
+ * @author hkl
+ * @since 2024-08-05
+ */
+public interface IWorkBatchDetailCorrugationInfoService extends IService<WorkBatchDetailCorrugationInfo> {
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/service/IWorkBatchDetailCurveWearInfoService.java

+package org.jeecg.modules.maintenanceWork.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.maintenanceWork.entity.WorkBatchDetailCurveWearInfo;
+
+/**
+ * <p>
+ * 维修作业---曲线波磨检查 服务类
+ * </p>
+ *
+ * @author hkl
+ * @since 2024-08-05
+ */
+public interface IWorkBatchDetailCurveWearInfoService extends IService<WorkBatchDetailCurveWearInfo> {
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/service/IWorkBatchDetailPatrolAssistInfoService.java

+package org.jeecg.modules.maintenanceWork.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.maintenanceWork.entity.WorkBatchDetailPatrolAssistInfo;
+
+/**
+ * <p>
+ * 维修作业---线路巡查协助巡道员详情 服务类
+ * </p>
+ *
+ * @author hkl
+ * @since 2024-08-05
+ */
+public interface IWorkBatchDetailPatrolAssistInfoService extends IService<WorkBatchDetailPatrolAssistInfo> {
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/service/IWorkBatchDetailPatrolInfoService.java

+package org.jeecg.modules.maintenanceWork.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.maintenanceWork.entity.WorkBatchDetailPatrolInfo;
+
+/**
+ * <p>
+ * 维修作业---线路巡查巡道员详情 服务类
+ * </p>
+ *
+ * @author hkl
+ * @since 2024-08-05
+ */
+public interface IWorkBatchDetailPatrolInfoService extends IService<WorkBatchDetailPatrolInfo> {
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/service/IWorkBatchDetailRailWearInfoService.java

+package org.jeecg.modules.maintenanceWork.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.maintenanceWork.entity.WorkBatchDetailRailWearInfo;
+
+/**
+ * <p>
+ * 维修作业---钢轨探伤检查 服务类
+ * </p>
+ *
+ * @author hkl
+ * @since 2024-08-05
+ */
+public interface IWorkBatchDetailRailWearInfoService extends IService<WorkBatchDetailRailWearInfo> {
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/service/IWorkBatchDetailTrackBedInfoService.java

+package org.jeecg.modules.maintenanceWork.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.maintenanceWork.entity.WorkBatchDetailTrackBedInfo;
+
+/**
+ * <p>
+ * 维修作业---道床检查 服务类
+ * </p>
+ *
+ * @author hkl
+ * @since 2024-08-05
+ */
+public interface IWorkBatchDetailTrackBedInfoService extends IService<WorkBatchDetailTrackBedInfo> {
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/service/IWorkBatchDetailTurnoutInfoService.java

+package org.jeecg.modules.maintenanceWork.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.maintenanceWork.entity.WorkBatchDetailTurnoutInfo;
+
+/**
+ * <p>
+ * 维修作业---道岔检查记录	 服务类
+ * </p>
+ *
+ * @author hkl
+ * @since 2024-08-05
+ */
+public interface IWorkBatchDetailTurnoutInfoService extends IService<WorkBatchDetailTurnoutInfo> {
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/service/IWorkBatchService.java

@@ -8,8 +8,7 @@ import org.jeecg.modules.homePage.vo.ToDoDetailVO;
 import org.jeecg.modules.maintenanceWork.dto.*;
 import org.jeecg.modules.maintenanceWork.entity.WorkBatch;
 import com.baomidou.mybatisplus.extension.service.IService;
-import org.jeecg.modules.maintenanceWork.vo.WorkBatchUserVO;
-import org.jeecg.modules.maintenanceWork.vo.WorkBatchVO;
+import org.jeecg.modules.maintenanceWork.vo.*;
 import org.jeecg.modules.unitDevice.dto.CaseReportCheckDataDTO;
 import org.jeecg.modules.unitDevice.dto.CaseReportWorkBatchDTO;
 import org.jeecg.modules.unitDevice.vo.CaseReportCheckDataVO;
@@ -108,4 +107,58 @@ public interface IWorkBatchService extends IService<WorkBatch> {
     List<ToDoDetailVO> getTodoList(String currentUserId);
 
     List<WorkBatchUserVO> listUser(String query);
+
+    /**
+     * 整改道岔
+     * @param workId 维修主表id
+     * @param workInfoId 维修单元表id
+     * @return
+     */
+    List<WorkBatchDetailTurnoutInfoVO> getWorkBatchDetailTurnoutInfoList(String workId, String workInfoId);
+
+    /**
+     * 整改钢轨伤损
+     * @param workId 维修主表id
+     * @param workInfoId 维修单元表id
+     * @return
+     */
+    List<WorkBatchDetailRailWearInfoVO> getWorkBatchDetailRailWearInfoList(String workId, String workInfoId);
+    /**
+     * 整改曲线磨耗
+     * @param workId 维修主表id
+     * @param workInfoId 维修单元表id
+     * @return
+     */
+    List<WorkBatchDetailCurveWearInfoVO> getWorkBatchDetailCurveWearInfoList(String workId, String workInfoId);
+    /**
+     * 整改钢轨波磨
+     * @param workId 维修主表id
+     * @param workInfoId 维修单元表id
+     * @return
+     */
+    List<WorkBatchDetailCorrugationInfoVO> getWorkBatchDetailCorrugationInfoList(String workId, String workInfoId);
+    /**
+     * 整改道床
+     * @param workId 维修主表id
+     * @param workInfoId 维修单元表id
+     * @return
+     */
+    List<WorkBatchDetailTrackBedInfoVO> getWorkBatchDetailTrackBedInfoList(String workId, String workInfoId);
+
+    /**
+     * 整改线路巡查
+     * @param workId 维修主表id
+     * @param workInfoId 维修单元表id
+     * @return
+     */
+    List<WorkBatchDetailPatrolInfoVO> getWorkBatchDetailPatrolInfoList(String workId, String workInfoId);
+
+    /**
+     * 整改协助线路巡查
+     * @param workId 维修主表id
+     * @param workInfoId 维修单元表id
+     * @return
+     */
+    List<WorkBatchDetailPatrolAssistInfoVO> getWorkBatchDetailPatrolAssistInfoList(String workId, String workInfoId);
+
 }

jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/service/impl/WorkBatchDetailCorrugationInfoServiceImpl.java

+package org.jeecg.modules.maintenanceWork.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.modules.maintenanceWork.entity.WorkBatchDetailCorrugationInfo;
+import org.jeecg.modules.maintenanceWork.mapper.WorkBatchDetailCorrugationInfoMapper;
+import org.jeecg.modules.maintenanceWork.service.IWorkBatchDetailCorrugationInfoService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 维修作业---钢轨波磨检查 服务实现类
+ * </p>
+ *
+ * @author hkl
+ * @since 2024-08-05
+ */
+@Service
+public class WorkBatchDetailCorrugationInfoServiceImpl extends ServiceImpl<WorkBatchDetailCorrugationInfoMapper, WorkBatchDetailCorrugationInfo> implements IWorkBatchDetailCorrugationInfoService {
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/service/impl/WorkBatchDetailCurveWearInfoServiceImpl.java

+package org.jeecg.modules.maintenanceWork.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.modules.maintenanceWork.entity.WorkBatchDetailCurveWearInfo;
+import org.jeecg.modules.maintenanceWork.mapper.WorkBatchDetailCurveWearInfoMapper;
+import org.jeecg.modules.maintenanceWork.service.IWorkBatchDetailCurveWearInfoService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 维修作业---曲线波磨检查 服务实现类
+ * </p>
+ *
+ * @author hkl
+ * @since 2024-08-05
+ */
+@Service
+public class WorkBatchDetailCurveWearInfoServiceImpl extends ServiceImpl<WorkBatchDetailCurveWearInfoMapper, WorkBatchDetailCurveWearInfo> implements IWorkBatchDetailCurveWearInfoService {
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/service/impl/WorkBatchDetailPatrolAssistInfoServiceImpl.java

+package org.jeecg.modules.maintenanceWork.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.modules.maintenanceWork.entity.WorkBatchDetailPatrolAssistInfo;
+import org.jeecg.modules.maintenanceWork.mapper.WorkBatchDetailPatrolAssistInfoMapper;
+import org.jeecg.modules.maintenanceWork.service.IWorkBatchDetailPatrolAssistInfoService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 维修作业---线路巡查协助巡道员详情 服务实现类
+ * </p>
+ *
+ * @author hkl
+ * @since 2024-08-05
+ */
+@Service
+public class WorkBatchDetailPatrolAssistInfoServiceImpl extends ServiceImpl<WorkBatchDetailPatrolAssistInfoMapper, WorkBatchDetailPatrolAssistInfo> implements IWorkBatchDetailPatrolAssistInfoService {
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/service/impl/WorkBatchDetailPatrolInfoServiceImpl.java

+package org.jeecg.modules.maintenanceWork.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.modules.maintenanceWork.entity.WorkBatchDetailPatrolInfo;
+import org.jeecg.modules.maintenanceWork.mapper.WorkBatchDetailPatrolInfoMapper;
+import org.jeecg.modules.maintenanceWork.service.IWorkBatchDetailPatrolInfoService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 维修作业---线路巡查巡道员详情 服务实现类
+ * </p>
+ *
+ * @author hkl
+ * @since 2024-08-05
+ */
+@Service
+public class WorkBatchDetailPatrolInfoServiceImpl extends ServiceImpl<WorkBatchDetailPatrolInfoMapper, WorkBatchDetailPatrolInfo> implements IWorkBatchDetailPatrolInfoService {
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/service/impl/WorkBatchDetailRailWearInfoServiceImpl.java

+package org.jeecg.modules.maintenanceWork.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.modules.maintenanceWork.entity.WorkBatchDetailRailWearInfo;
+import org.jeecg.modules.maintenanceWork.mapper.WorkBatchDetailRailWearInfoMapper;
+import org.jeecg.modules.maintenanceWork.service.IWorkBatchDetailRailWearInfoService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 维修作业---钢轨探伤检查 服务实现类
+ * </p>
+ *
+ * @author hkl
+ * @since 2024-08-05
+ */
+@Service
+public class WorkBatchDetailRailWearInfoServiceImpl extends ServiceImpl<WorkBatchDetailRailWearInfoMapper, WorkBatchDetailRailWearInfo> implements IWorkBatchDetailRailWearInfoService {
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/service/impl/WorkBatchDetailTrackBedInfoServiceImpl.java

+package org.jeecg.modules.maintenanceWork.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.modules.maintenanceWork.entity.WorkBatchDetailTrackBedInfo;
+import org.jeecg.modules.maintenanceWork.mapper.WorkBatchDetailTrackBedInfoMapper;
+import org.jeecg.modules.maintenanceWork.service.IWorkBatchDetailTrackBedInfoService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 维修作业---道床检查 服务实现类
+ * </p>
+ *
+ * @author hkl
+ * @since 2024-08-05
+ */
+@Service
+public class WorkBatchDetailTrackBedInfoServiceImpl extends ServiceImpl<WorkBatchDetailTrackBedInfoMapper, WorkBatchDetailTrackBedInfo> implements IWorkBatchDetailTrackBedInfoService {
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/service/impl/WorkBatchDetailTurnoutInfoServiceImpl.java

+package org.jeecg.modules.maintenanceWork.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.modules.maintenanceWork.entity.WorkBatchDetailTurnoutInfo;
+import org.jeecg.modules.maintenanceWork.mapper.WorkBatchDetailTurnoutInfoMapper;
+import org.jeecg.modules.maintenanceWork.service.IWorkBatchDetailTurnoutInfoService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 维修作业---道岔检查记录	 服务实现类
+ * </p>
+ *
+ * @author hkl
+ * @since 2024-08-05
+ */
+@Service
+public class WorkBatchDetailTurnoutInfoServiceImpl extends ServiceImpl<WorkBatchDetailTurnoutInfoMapper, WorkBatchDetailTurnoutInfo> implements IWorkBatchDetailTurnoutInfoService {
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/vo/WorkBatchDetailCorrugationInfoVO.java

+package org.jeecg.modules.maintenanceWork.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 维修作业---钢轨波磨检查
+ * </p>
+ *
+ * @author hkl
+ * @since 2024-08-05
+ */
+@Getter
+@Setter
+@ApiModel(value = "WorkBatchDetailCorrugationInfo对象", description = "维修作业---钢轨波磨检查")
+
+public class WorkBatchDetailCorrugationInfoVO {
+
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    private String id;
+
+    @ApiModelProperty("创建人")
+    private String createBy;
+
+    @ApiModelProperty("创建日期")
+    private Date createTime;
+
+    @ApiModelProperty("更新人")
+    private String updateBy;
+
+    @ApiModelProperty("更新时间")
+    private Date updateTime;
+
+    @ApiModelProperty("分析批id")
+    private String analysisBatchId;
+
+    @ApiModelProperty("分析批次号")
+    private String analysisBatchCode;
+
+    @ApiModelProperty("设备检查记录主表id（t_ek_records_master_check）")
+    private String ekId;
+
+    @ApiModelProperty("检查批次号（t_ek_records_master_check）")
+    private String ekCode;
+
+    @ApiModelProperty("单元表id（t_dsa_analysis_line_batch_unit_device）")
+    private String deviceId;
+
+    @ApiModelProperty("维修作业主表id")
+    private String workId;
+
+    @ApiModelProperty("维修作业单元表id")
+    private String workDetailId;
+
+    @ApiModelProperty("检查设备id(设备资产四种表的主键)")
+    private String deviceProjectId;
+
+    @ApiModelProperty("检查设备单元编码(设备资产四种表的unit_code)")
+    private String deviceProjectCode;
+
+    @ApiModelProperty("检查设备类型（1-钢轨,2-曲线,3-竖曲线,4-道岔）")
+    private Integer deviceProjectType;
+
+    @ApiModelProperty("曲线半径")
+    private BigDecimal curveRadius;
+
+    @ApiModelProperty("曲线超高")
+    private BigDecimal superHigh;
+
+    @ApiModelProperty("曲线长度")
+    private BigDecimal curveLen;
+
+    @ApiModelProperty("检查项目-波段-谷深(10-30)")
+    private BigDecimal checkBandOne;
+
+    @ApiModelProperty("检查项目-波段-谷深(30-100)")
+    private BigDecimal checkBandTwo;
+
+    @ApiModelProperty("检查项目-波段-谷深(100-300)")
+    private BigDecimal checkBandThree;
+
+    @ApiModelProperty("检查项目-波段-谷深(300-1000)")
+    private BigDecimal checkBandFour;
+
+    @ApiModelProperty("超限记录")
+    private String overrunInfo;
+
+    @ApiModelProperty("整改说明")
+    private String reformRemark;
+
+    @ApiModelProperty("是否删除（0：未删除，1：已删除）")
+    private String delFlag;
+
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/vo/WorkBatchDetailCurveWearInfoVO.java

+package org.jeecg.modules.maintenanceWork.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 维修作业---曲线波磨检查
+ * </p>
+ *
+ * @author hkl
+ * @since 2024-08-05
+ */
+@Getter
+@Setter
+@ApiModel(value = "WorkBatchDetailCurveWearInfo对象", description = "维修作业---曲线波磨检查")
+
+public class WorkBatchDetailCurveWearInfoVO {
+
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    private String id;
+
+    @ApiModelProperty("创建人")
+    private String createBy;
+
+    @ApiModelProperty("创建日期")
+    private Date createTime;
+
+    @ApiModelProperty("更新人")
+    private String updateBy;
+
+    @ApiModelProperty("更新时间")
+    private Date updateTime;
+
+    @ApiModelProperty("分析批id")
+    private String analysisBatchId;
+
+    @ApiModelProperty("分析批次号")
+    private String analysisBatchCode;
+
+    @ApiModelProperty("设备检查记录主表id（t_ek_records_master_check）")
+    private String ekId;
+
+    @ApiModelProperty("检查批次号（t_ek_records_master_check）")
+    private String ekCode;
+
+    @ApiModelProperty("单元表id（t_dsa_analysis_line_batch_unit_device）")
+    private String deviceId;
+
+    @ApiModelProperty("维修作业主表id")
+    private String workId;
+
+    @ApiModelProperty("维修作业单元表id")
+    private String workDetailId;
+
+    @ApiModelProperty("检查设备id(设备资产四种表的主键)")
+    private String deviceProjectId;
+
+    @ApiModelProperty("检查设备编码(设备资产四种表的unit_code)")
+    private String deviceProjectCode;
+
+    @ApiModelProperty("检查设备类型（1-钢轨,2-曲线,3-竖曲线,4-道岔）")
+    private Integer deviceProjectType;
+
+    @ApiModelProperty("曲线半径")
+    private BigDecimal curveRadius;
+
+    @ApiModelProperty("曲线超高")
+    private BigDecimal curveSuperHigh;
+
+    @ApiModelProperty("缓和曲线长度")
+    private BigDecimal transitionCurveHigh;
+
+    @ApiModelProperty("圆曲线长")
+    private BigDecimal curveTangentLen;
+
+    @ApiModelProperty("圆曲转向（1：左 2：右）")
+    private String curveTurn;
+
+    @ApiModelProperty("检查类型（1：垂直磨耗 2：侧面磨耗）")
+    private Integer curveType;
+
+    @ApiModelProperty("2H")
+    private BigDecimal twoNum;
+
+    @ApiModelProperty("HY")
+    private BigDecimal hyNum;
+
+    @ApiModelProperty("HZ")
+    private BigDecimal hzNum;
+
+    @ApiModelProperty("QZ")
+    private BigDecimal qzNum;
+
+    @ApiModelProperty("YH")
+    private BigDecimal yhNum;
+
+    @ApiModelProperty("超限记录类型(1:无，2：轻伤，3：重伤)")
+    private Integer overType;
+
+    @ApiModelProperty("整改说明")
+    private String reformRemark;
+
+    @ApiModelProperty("是否删除（0：未删除，1：已删除）")
+    private String delFlag;
+
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/vo/WorkBatchDetailPatrolAssistInfoVO.java

+package org.jeecg.modules.maintenanceWork.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 维修作业---线路巡查协助巡道员详情
+ * </p>
+ *
+ * @author hkl
+ * @since 2024-08-05
+ */
+@Getter
+@Setter
+@ApiModel(value = "WorkBatchDetailPatrolAssistInfo对象", description = "维修作业---线路巡查协助巡道员详情")
+
+public class WorkBatchDetailPatrolAssistInfoVO {
+
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    private String id;
+
+    @ApiModelProperty("创建人")
+    private String createBy;
+
+    @ApiModelProperty("创建日期")
+    private Date createTime;
+
+    @ApiModelProperty("更新人")
+    private String updateBy;
+
+    @ApiModelProperty("更新时间")
+    private Date updateTime;
+
+    @ApiModelProperty("分析批id")
+    private String analysisBatchId;
+
+    @ApiModelProperty("分析批次号")
+    private String analysisBatchCode;
+
+    @ApiModelProperty("设备检查记录主表id（t_ek_records_master_check、t_xd_record_patrol_master）")
+    private String ekId;
+
+    @ApiModelProperty("检查批次号（t_ek_records_master_check）")
+    private String ekCode;
+
+    @ApiModelProperty("单元表id（t_dsa_analysis_line_batch_unit_device）")
+    private String deviceId;
+
+    @ApiModelProperty("维修作业主表id")
+    private String workId;
+
+    @ApiModelProperty("维修作业单元表id")
+    private String workDetailId;
+
+    @ApiModelProperty("巡查区间id")
+    private String subwaySectionId;
+
+    @ApiModelProperty("巡查区间名称")
+    private String subwaySectionName;
+
+    @ApiModelProperty("线别id")
+    private String lineAliasId;
+
+    @ApiModelProperty("线别名称")
+    private String lineAliasName;
+
+    @ApiModelProperty("起始里程")
+    private BigDecimal startingMileage;
+
+    @ApiModelProperty("终点里程")
+    private BigDecimal endMileage;
+
+    @ApiModelProperty("问题记录")
+    private String problemRecord;
+
+    @ApiModelProperty("处理情况")
+    private String handingLog;
+
+    @ApiModelProperty("整改说明")
+    private String reformRemark;
+
+    @ApiModelProperty("是否删除（0：未删除，1：已删除）")
+    private String delFlag;
+
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/vo/WorkBatchDetailPatrolInfoVO.java

+package org.jeecg.modules.maintenanceWork.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+
+/**
+ * <p>
+ * 维修作业---线路巡查巡道员详情
+ * </p>
+ *
+ * @author hkl
+ * @since 2024-08-05
+ */
+@Getter
+@Setter
+@ApiModel(value = "WorkBatchDetailPatrolInfo对象", description = "维修作业---线路巡查巡道员详情")
+
+public class WorkBatchDetailPatrolInfoVO {
+
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    private String id;
+
+    @ApiModelProperty("创建人")
+    private String createBy;
+
+    @ApiModelProperty("创建日期")
+    private Date createTime;
+
+    @ApiModelProperty("更新人")
+    private String updateBy;
+
+    @ApiModelProperty("更新时间")
+    private Date updateTime;
+
+    @ApiModelProperty("分析批id")
+    private String analysisBatchId;
+
+    @ApiModelProperty("分析批次号")
+    private String analysisBatchCode;
+
+    @ApiModelProperty("设备检查记录主表id（t_ek_records_master_check、t_xd_record_patrol_master）")
+    private String ekId;
+
+    @ApiModelProperty("检查批次号（t_ek_records_master_check）")
+    private String ekCode;
+
+    @ApiModelProperty("单元表id（t_dsa_analysis_line_batch_unit_device）")
+    private String deviceId;
+
+    @ApiModelProperty("维修作业主表id")
+    private String workId;
+
+    @ApiModelProperty("维修作业单元表id")
+    private String workDetailId;
+
+    @ApiModelProperty("检查项目名称")
+    private String ekProjectName;
+
+    @ApiModelProperty("重点检查项目内容")
+    private String ekProjectContent;
+
+    @ApiModelProperty("问题记录")
+    private String problemRecord;
+
+    @ApiModelProperty("处理情况")
+    private String handingLog;
+
+    @ApiModelProperty("是否满足（1：是；2：否）")
+    private String status;
+
+    @ApiModelProperty("排序")
+    private Integer seq;
+
+    @ApiModelProperty("备忘录")
+    private String remark;
+
+    @ApiModelProperty("整改说明")
+    private String reformRemark;
+
+    @ApiModelProperty("是否删除（0：未删除，1：已删除）")
+    private String delFlag;
+
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/vo/WorkBatchDetailRailWearInfoVO.java

+package org.jeecg.modules.maintenanceWork.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 维修作业---钢轨探伤检查
+ * </p>
+ *
+ * @author hkl
+ * @since 2024-08-05
+ */
+@Getter
+@Setter
+@ApiModel(value = "WorkBatchDetailRailWearInfo对象", description = "维修作业---钢轨探伤检查")
+
+public class WorkBatchDetailRailWearInfoVO {
+
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    private String id;
+
+    @ApiModelProperty("创建人")
+    private String createBy;
+
+    @ApiModelProperty("创建日期")
+    private Date createTime;
+
+    @ApiModelProperty("更新人")
+    private String updateBy;
+
+    @ApiModelProperty("更新时间")
+    private Date updateTime;
+
+    @ApiModelProperty("分析批id")
+    private String analysisBatchId;
+
+    @ApiModelProperty("分析批次号")
+    private String analysisBatchCode;
+
+    @ApiModelProperty("设备检查记录主表id（t_ek_records_master_check）")
+    private String ekId;
+
+    @ApiModelProperty("检查批次号（t_ek_records_master_check）")
+    private String ekCode;
+
+    @ApiModelProperty("单元表id（t_dsa_analysis_line_batch_unit_device）")
+    private String deviceId;
+
+    @ApiModelProperty("维修作业主表id")
+    private String workId;
+
+    @ApiModelProperty("维修作业单元表id")
+    private String workDetailId;
+
+    @ApiModelProperty("检查设备id(设备资产四种表的主键)")
+    private String deviceProjectId;
+
+    @ApiModelProperty("检查设备编码(设备资产四种表的unit_code)")
+    private String deviceProjectCode;
+
+    @ApiModelProperty("检查设备类型（1-钢轨,2-曲线,3-竖曲线,4-道岔）")
+    private Integer deviceProjectType;
+
+    @ApiModelProperty("股别(1-左股，2-右股)")
+    private Integer damageLevel;
+
+    @ApiModelProperty("伤损钢轨数量")
+    private Integer damageNum;
+
+    @ApiModelProperty("伤损种类（1-鱼鳞纹,2-剥落掉块,3-表面疲劳裂纹,4-轨底掉块,5-灼伤,6-核伤,7-焊缝,8-其他）")
+    private Integer damageType;
+
+    @ApiModelProperty("伤损里程")
+    private BigDecimal damageMileage;
+
+    @ApiModelProperty("伤损程度(1-轻伤,2-轻伤有发展,3-重伤)")
+    private Integer damageDegree;
+
+    @ApiModelProperty("换轨计划")
+    private String damagePlan;
+
+    @ApiModelProperty("整改说明")
+    private String reformRemark;
+
+    @ApiModelProperty("是否删除（0：未删除，1：已删除）")
+    private String delFlag;
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/vo/WorkBatchDetailTrackBedInfoVO.java

+package org.jeecg.modules.maintenanceWork.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 维修作业---道床检查
+ * </p>
+ *
+ * @author hkl
+ * @since 2024-08-05
+ */
+@Getter
+@Setter
+@ApiModel(value = "WorkBatchDetailTrackBedInfo对象", description = "维修作业---道床检查")
+
+public class WorkBatchDetailTrackBedInfoVO {
+
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    private String id;
+
+    @ApiModelProperty("创建人")
+    private String createBy;
+
+    @ApiModelProperty("创建日期")
+    private Date createTime;
+
+    @ApiModelProperty("更新人")
+    private String updateBy;
+
+    @ApiModelProperty("更新时间")
+    private Date updateTime;
+
+    @ApiModelProperty("分析批id")
+    private String analysisBatchId;
+
+    @ApiModelProperty("分析批次号")
+    private String analysisBatchCode;
+
+    @ApiModelProperty("设备检查记录主表id（t_ek_records_master_check）")
+    private String ekId;
+
+    @ApiModelProperty("检查批次号（t_ek_records_master_check）")
+    private String ekCode;
+
+    @ApiModelProperty("单元表id（t_dsa_analysis_line_batch_unit_device）")
+    private String deviceId;
+
+    @ApiModelProperty("维修作业主表id")
+    private String workId;
+
+    @ApiModelProperty("维修作业单元表id")
+    private String workDetailId;
+
+    @ApiModelProperty("道床id")
+    private String trackBedId;
+
+    @ApiModelProperty("道床编号")
+    private String trackBedCode;
+
+    @ApiModelProperty("道床类型")
+    private String trackBedType;
+
+    @ApiModelProperty("道床起点里程")
+    private BigDecimal startingMileage;
+
+    @ApiModelProperty("道床终点里程")
+    private BigDecimal endMileage;
+
+    @ApiModelProperty("道床长度")
+    private BigDecimal trackBedLen;
+
+    @ApiModelProperty("检查项目名称")
+    private String ekProjectName;
+
+    @ApiModelProperty("检查项目内容")
+    private String ekProjectContent;
+
+    @ApiModelProperty("检查合格评判标准")
+    private String ekProjectTemplate;
+
+    @ApiModelProperty("现场检查项目状态（1：合格；2：良好；3：不合格）")
+    private String ekProjectStatus;
+
+    @ApiModelProperty("整改说明")
+    private String reformRemark;
+
+    @ApiModelProperty("是否删除（0：未删除，1：已删除）")
+    private String delFlag;
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/vo/WorkBatchDetailTurnoutInfoVO.java

+package org.jeecg.modules.maintenanceWork.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+
+/**
+ * <p>
+ * 维修作业---道岔检查记录
+ * </p>
+ *
+ * @author hkl
+ * @since 2024-08-05
+ */
+@Getter
+@Setter
+@ApiModel(value = "WorkBatchDetailTurnoutInfo对象", description = "维修作业---道岔检查记录	")
+
+public class WorkBatchDetailTurnoutInfoVO {
+
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    private String id;
+
+    @ApiModelProperty("创建人")
+    private String createBy;
+
+    @ApiModelProperty("创建日期")
+    private Date createTime;
+
+    @ApiModelProperty("更新人")
+    private String updateBy;
+
+    @ApiModelProperty("更新时间")
+    private Date updateTime;
+
+    @ApiModelProperty("分析批id")
+    private String analysisBatchId;
+
+    @ApiModelProperty("分析批次号")
+    private String analysisBatchCode;
+
+    @ApiModelProperty("设备检查记录主表id（t_ek_records_master_check）")
+    private String ekId;
+
+    @ApiModelProperty("检查批次号（t_ek_records_master_check）")
+    private String ekCode;
+
+    @ApiModelProperty("单元表id（t_dsa_analysis_line_batch_unit_device）")
+    private String deviceId;
+
+    @ApiModelProperty("维修作业主表id")
+    private String workId;
+
+    @ApiModelProperty("维修作业单元表id")
+    private String workDetailId;
+
+    @ApiModelProperty("设备编号(道岔表设备编号W3301)")
+    private String switchCode;
+
+    @ApiModelProperty("设备号数(t_ek_records_master_turnout_info)")
+    private String switchCodeNum;
+
+    @ApiModelProperty("轨距水平尺编号")
+    private String gaugeCode;
+
+    @ApiModelProperty("检查项目类型（1：轨距；2：水平；3：支距；4：轮缘槽；5：滑床板；6：顶铁；7：接头螺栓；8：护轨螺栓；9:道岔）")
+    private String type;
+
+    @ApiModelProperty("值1")
+    private String numOne;
+
+    @ApiModelProperty("值2")
+    private String numTwo;
+
+    @ApiModelProperty("值3")
+    private String numThree;
+
+    @ApiModelProperty("值4")
+    private String numFour;
+
+    @ApiModelProperty("值5")
+    private String numFive;
+
+    @ApiModelProperty("值6")
+    private String numSix;
+
+    @ApiModelProperty("值7")
+    private String numSeven;
+
+    @ApiModelProperty("值8")
+    private String numEight;
+
+    @ApiModelProperty("值9")
+    private String numNine;
+
+    @ApiModelProperty("值10")
+    private String numTen;
+
+    @ApiModelProperty("值11")
+    private String numTenOne;
+
+    @ApiModelProperty("值12")
+    private String numTenTwo;
+
+    @ApiModelProperty("值13")
+    private String numTenThree;
+
+    @ApiModelProperty("值14")
+    private String numTenFour;
+
+    @ApiModelProperty("值15")
+    private String numTenFive;
+
+    @ApiModelProperty("值16")
+    private String numTenSix;
+
+    @ApiModelProperty("值17")
+    private String numTenSeven;
+
+    @ApiModelProperty("值18")
+    private String numTenEight;
+
+    @ApiModelProperty("值19")
+    private String numTenNine;
+
+    @ApiModelProperty("值20")
+    private String numTwenty;
+
+    @ApiModelProperty("值21")
+    private String numTwentyOne;
+
+    @ApiModelProperty("值22")
+    private String numTwentyTwo;
+
+    @ApiModelProperty("是否合格（1：合格；2：不合格）")
+    private String qualified;
+
+    @ApiModelProperty("不合格说明")
+    private String noQualifiedRemark;
+
+    @ApiModelProperty("备注")
+    private String remark;
+
+    @ApiModelProperty("整改说明")
+    private String reformRemark;
+
+    @ApiModelProperty("是否删除（0：未删除，1：已删除）")
+    private String delFlag;
+
+    @ApiModelProperty("导入道岔顺序")
+    private Integer sort;
+
+
+}