钢轨破模和曲线破模初始化以及曲线破模接口改造提交--shizhilong

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

@@ -47,30 +47,30 @@ 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<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 = "检查数据设备-设备检查记录数据-曲线磨耗情况检查-道岔检查详情页")
-    @ApiOperation(value = "检查数据设备-设备检查记录数据-曲线磨耗情况检查-道岔检查详情页", notes = "检查数据设备-设备检查记录数据-曲线磨耗情况检查-道岔检查详情页")
+    @AutoLog(value = "检查数据设备-设备检查记录数据-曲线磨耗情况检查-曲线检查详情页")
+    @ApiOperation(value = "检查数据设备-设备检查记录数据-曲线磨耗情况检查-曲线检查详情页", notes = "检查数据设备-设备检查记录数据-曲线磨耗情况检查-道岔检查详情页")
     @GetMapping(value = "/getDetail")
-    public Result<CurveWearRecordDetailVO> getDetail(@ApiParam("曲线磨损记录id") String curveWearRecordId) {
-        CurveWearRecordDetailVO data = this.service.getDetail(curveWearRecordId);
-        return Result.OK(data);
+    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/entity/CurveWearRecord.java

@@ -50,14 +50,18 @@ public class CurveWearRecord implements Serializable {
     @TableField("records_master_check_id")
     private String recordsMasterCheckId;
 
-    @ApiModelProperty("检查日期")
-    @TableField("check_time")
-    private Date checkTime;
+    @ApiModelProperty("曲线设备id")
+    @TableField("curve_id")
+    private String curveId;
 
-    @ApiModelProperty("曲线编码")
+    @ApiModelProperty("曲线单元编码")
     @TableField("curve_code")
     private String curveCode;
 
+    @ApiModelProperty("检查设备类型（1-钢轨,2-曲线,3-竖曲线,4-道岔）")
+    @TableField("project_type")
+    private Integer projectType;
+
     @ApiModelProperty("曲线半径")
     @TableField("curve_radius")
     private BigDecimal curveRadius;
@@ -74,17 +78,37 @@ public class CurveWearRecord implements Serializable {
     @TableField("transition_curve_high")
     private BigDecimal transitionCurveHigh;
 
-    @ApiModelProperty("圆曲转向")
+    @ApiModelProperty("圆曲转向（1：左 2：右）")
     @TableField("curve_turn")
     private String curveTurn;
 
-    @ApiModelProperty("检查人")
-    @TableField("check_by")
-    private String checkBy;
+    @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("检查数据")
-    @TableField("check_data")
-    private String checkData;
+    @ApiModelProperty("超限记录类型(1:无，2：轻伤，3：重伤)")
+    @TableField("over_type")
+    private Integer overType;
 
     @ApiModelProperty("是否删除（0：未删除，1：已删除）")
     @TableField("del_flag")

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

@@ -65,7 +65,7 @@ public class RailWearRecord implements Serializable {
     @TableField("device_project_id")
     private String deviceProjectId;
 
-    @ApiModelProperty("检查设备code")
+    @ApiModelProperty("检查设备单元code")
     @TableField("device_project_code")
     private String deviceProjectCode;
 

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

@@ -7,6 +7,8 @@ import org.jeecg.modules.checkData.entity.CurveWearRecord;
 import org.jeecg.modules.checkData.vo.CurveWearRecordDetailVO;
 import org.jeecg.modules.checkData.vo.CurveWearRecordVO;
 
+import java.util.List;
+
 /**
  * <p>
  * 检查数据设备-设备检查记录数据-曲线磨耗情况检查 Mapper 接口
@@ -19,5 +21,5 @@ public interface CurveWearRecordMapper extends BaseMapper<CurveWearRecord> {
 
     Page<CurveWearRecordVO> queryPageList(Page<CurveWearRecordVO> pageData, CurveWearRecordDTO dto);
 
-    CurveWearRecordDetailVO getDetail(String curveWearRecordId);
+    List<CurveWearRecordDetailVO> getDetail(String masterRecordId);
 }

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

@@ -46,6 +46,6 @@
             t1.*
         FROM
             t_ek_curve_wear_record t1
-        where t1.id = #{curveWearRecordId}
+        where t1.records_master_check_id = #{masterRecordId}
     </select>
 </mapper>

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/service/ICurveWearRecordService.java

@@ -7,6 +7,8 @@ import org.jeecg.modules.checkData.entity.CurveWearRecord;
 import org.jeecg.modules.checkData.vo.CurveWearRecordDetailVO;
 import org.jeecg.modules.checkData.vo.CurveWearRecordVO;
 
+import java.util.List;
+
 /**
  * <p>
  * 检查数据设备-设备检查记录数据-曲线磨耗情况检查 服务类
@@ -19,5 +21,5 @@ public interface ICurveWearRecordService extends IService<CurveWearRecord> {
 
     Page<CurveWearRecordVO> queryPageList(Page<CurveWearRecordVO> pageData, CurveWearRecordDTO dto);
 
-    CurveWearRecordDetailVO getDetail(String curveWearRecordId);
+    List<CurveWearRecordDetailVO> getDetail(String masterRecordId);
 }

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/service/impl/CurveWearRecordServiceImpl.java

@@ -10,6 +10,8 @@ import org.jeecg.modules.checkData.vo.CurveWearRecordDetailVO;
 import org.jeecg.modules.checkData.vo.CurveWearRecordVO;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 检查数据设备-设备检查记录数据-曲线磨耗情况检查 服务实现类
@@ -27,7 +29,7 @@ public class CurveWearRecordServiceImpl extends ServiceImpl<CurveWearRecordMappe
     }
 
     @Override
-    public CurveWearRecordDetailVO getDetail(String curveWearRecordId) {
-        return this.baseMapper.getDetail(curveWearRecordId);
+    public List<CurveWearRecordDetailVO> getDetail(String masterRecordId) {
+        return this.baseMapper.getDetail(masterRecordId);
     }
 }

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

@@ -27,17 +27,35 @@ public class CurveWearRecordDetailVO {
     @ApiModelProperty("设备检查记录主表id")
     private String recordsMasterCheckId;
 
-    @ApiModelProperty("检查日期")
-    private Date checkTime;
+    @ApiModelProperty("曲线设备id")
+    private String curveId;
 
-    @ApiModelProperty("曲线编码")
+    @ApiModelProperty("曲线单元编码")
     private String curveCode;
 
-    @ApiModelProperty("检查人")
-    private String checkBy;
+    @ApiModelProperty("检查设备类型（1-钢轨,2-曲线,3-竖曲线,4-道岔）")
+    private Integer projectType;
 
-    @ApiModelProperty("检查数据")
-    private String checkData;
+    @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 BigDecimal curveRadius;
@@ -51,7 +69,7 @@ public class CurveWearRecordDetailVO {
     @ApiModelProperty("缓和曲线长")
     private BigDecimal transitionCurveHigh;
 
-    @ApiModelProperty("圆曲转向")
+    @ApiModelProperty("圆曲转向（1：左 2：右）")
     private String curveTurn;
 
 }

jeecg-module-system/src/main/java/org/jeecg/modules/diseaseAnalysis/algorithm/AnalysisAlgorithmLine.java

 package org.jeecg.modules.diseaseAnalysis.algorithm;
 
-import cn.hutool.core.convert.Convert;
-import cn.hutool.core.util.ObjectUtil;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.BeanUtils;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.util.UUIDGenerator;
 import org.jeecg.modules.checkData.entity.*;
-import org.jeecg.modules.checkData.mapper.RecordsMasterCheckMapper;
 import org.jeecg.modules.checkData.service.*;
-import org.jeecg.modules.diseaseAnalysis.entity.AnalysisLineBatch;
-import org.jeecg.modules.diseaseAnalysis.entity.AnalysisLineBatchCheckDataMap;
-import org.jeecg.modules.diseaseAnalysis.entity.AnalysisLineBatchUnitDevice;
-import org.jeecg.modules.diseaseAnalysis.entity.AnalysisLineBatchUnitDeviceTurnoutInfo;
-import org.jeecg.modules.diseaseAnalysis.service.IAnalysisLineBatchCheckDataMapService;
-import org.jeecg.modules.diseaseAnalysis.service.IAnalysisLineBatchService;
-import org.jeecg.modules.diseaseAnalysis.service.IAnalysisLineBatchUnitDeviceService;
-import org.jeecg.modules.diseaseAnalysis.service.IAnalysisLineBatchUnitDeviceTurnoutInfoService;
-import org.jeecg.modules.dynamicStaticAnalysis.entity.*;
+import org.jeecg.modules.diseaseAnalysis.entity.*;
+import org.jeecg.modules.diseaseAnalysis.service.*;
 import org.jeecg.modules.dynamicStaticAnalysis.mapper.AnalysisAlgorithmMapper;
-import org.jeecg.modules.dynamicStaticAnalysis.service.*;
-import org.jeecg.modules.dynamicStaticAnalysis.util.StrUtil;
 import org.jeecg.modules.utils.BeanCopyUtil;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
-import java.math.RoundingMode;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -50,8 +34,12 @@ public class AnalysisAlgorithmLine {
     @Resource
     private IAnalysisLineBatchUnitDeviceTurnoutInfoService analysisLineBatchUnitDeviceTurnoutInfoService;
     @Resource
+    private IAnalysisLineBatchUnitDeviceRailWearInfoService analysisLineBatchUnitDeviceRailWearInfoService;
+    @Resource
     private IRecordsMasterTurnoutInfoService turnoutInfoService;
     @Resource
+    private IRailWearRecordService railWearRecordService;
+    @Resource
     private IAnalysisLineBatchUnitDeviceService unitDeviceService;
     @Resource
     private IRecordsMasterCheckService masterCheckService;
@@ -92,12 +80,16 @@ public class AnalysisAlgorithmLine {
                 analysisLineBatchUnitDeviceTurnoutInfoService.remove(wrapper3);
                 turnoutCheckDataLineAnalysis(analysisLineBatch, checkDataMap, unitDeviceList);
 
+            } else if ("2" == checkDataMap.getEkType()) {
+                //2-钢轨常规探伤检查
+                //原来道岔检查单元信息详情删除
+                LambdaQueryWrapper<AnalysisLineBatchUnitDeviceRailWearInfo> wrapper3 = Wrappers.lambdaQuery();
+                wrapper3.eq(AnalysisLineBatchUnitDeviceRailWearInfo::getAnalysisBatchId, analysisLineBatch.getId());
+                analysisLineBatchUnitDeviceRailWearInfoService.remove(wrapper3);
+                railWearInfoCheckDataLineAnalysis(analysisLineBatch, checkDataMap, unitDeviceList);
+
             }
-//            else if ("2" == checkDataMap.getEkType()) {
-//                //2-钢轨常规探伤检查
-//                railDeviceCheckDataAnalysis(analysisBatch, checkDataMap, unitDeviceList);
-//
-//            } else if ("3" == checkDataMap.getEkType()) {
+//            else if ("3" == checkDataMap.getEkType()) {
 //                //3-曲线钢轨磨耗检查
 //                railVehicleCheckDataAnalysis(analysisBatch, checkDataMap, unitDeviceList);
 //
@@ -118,6 +110,44 @@ public class AnalysisAlgorithmLine {
         log.info("[分析完成]|线程id:【" + Thread.currentThread().getId() + "】=============分析批次ID:【" + analysisLineBatchId + "】");
     }
 
+    /**
+     * 病害分析->钢轨探伤病害分析批次数据、检查批次、1-钢轨,2-曲线,3-竖曲线,4-道岔
+     */
+    public void railWearInfoCheckDataLineAnalysis(AnalysisLineBatch analysisLineBatch, AnalysisLineBatchCheckDataMap
+            checkDataMap, List<Map<String, Object>> unitDeviceList) {
+        //初始化单元表
+        List<AnalysisLineBatchUnitDevice> unitList = new ArrayList<>();
+        //初始化钢轨探伤病害分析单元表详情
+        List<AnalysisLineBatchUnitDeviceRailWearInfo> unitInfoList = new ArrayList<>();
+        //获取检查记录详情
+        List<RailWearRecord> ekList = railWearRecordService.lambdaQuery().eq(RailWearRecord::getRecordsMasterCheckId, checkDataMap.getEkId()).eq(RailWearRecord::getDelFlag, "0")
+                .list();
+        //按道岔编号分组检查记录详情
+        Map<String, List<RailWearRecord>> deviceProjectList = ekList.stream().collect(Collectors.groupingBy(RailWearRecord::getDeviceProjectCode));
+        if (CollectionUtils.isNotEmpty(ekList)) {
+            for (Map<String, Object> map : unitDeviceList) {
+                //获取分析批次筛选的单元设备编码
+                String unitCode = map.get("unitCode").toString();
+                //判断分析批次的设备与检查时维护的设备是同一个设备
+                List<RailWearRecord> railWearRecordList = deviceProjectList.get(unitCode);
+                if (CollectionUtils.isNotEmpty(railWearRecordList)) {
+                    String deviceCode = map.get("deviceCode").toString();
+                    //保存单元信息
+                    String deviceId = saveUnit(analysisLineBatch, checkDataMap, map, unitList, deviceCode);
+                    railWearRecordList.forEach(model -> {
+                        //保存道岔单元信息详情
+                        saveRailWearRecordUnitInfo(analysisLineBatch,checkDataMap,unitInfoList,model,deviceId);
+                    });
+                }
+            }
+        }
+        if(CollectionUtils.isNotEmpty(unitList)){
+            unitDeviceService.saveBatch(unitList);
+        }
+        if(CollectionUtils.isNotEmpty(unitInfoList)){
+            analysisLineBatchUnitDeviceRailWearInfoService.saveBatch(unitInfoList);
+        }
+    }
     /**
      * 病害分析->道岔病害分析批次数据、检查批次、1-钢轨,2-曲线,3-竖曲线,4-道岔
      */
@@ -211,4 +241,26 @@ public class AnalysisAlgorithmLine {
         unitInfo.setType(info.getType());
         unitInfoList.add(unitInfo);
     }
+    /**
+     * 钢轨探伤病害分析单元详情维护
+     * @param analysisLineBatch 分析主表
+     * @param checkDataMap      分析表对应的检查表关系表
+     * @param unitInfoList      最终封装到的集合
+     * @param info              检查记录详情
+     * @param deviceId          单元表id
+     */
+    public void saveRailWearRecordUnitInfo(AnalysisLineBatch analysisLineBatch, AnalysisLineBatchCheckDataMap
+            checkDataMap, List<AnalysisLineBatchUnitDeviceRailWearInfo> unitInfoList, RailWearRecord info, String deviceId) {
+
+        //维护单元详情表
+        AnalysisLineBatchUnitDeviceRailWearInfo unitInfo = new AnalysisLineBatchUnitDeviceRailWearInfo();
+        BeanCopyUtil.copyProperties(info, AnalysisLineBatchUnitDeviceRailWearInfo.class);
+        unitInfo.setId(UUIDGenerator.generate());
+        unitInfo.setDeviceId(deviceId);
+        unitInfo.setAnalysisBatchId(analysisLineBatch.getId());
+        unitInfo.setAnalysisBatchCode(analysisLineBatch.getAnalysisBatchCode());
+        unitInfo.setEkCode(checkDataMap.getEkCode());
+        unitInfo.setEkId(checkDataMap.getEkId());
+        unitInfoList.add(unitInfo);
+    }
 }

jeecg-module-system/src/main/java/org/jeecg/modules/diseaseAnalysis/controller/AnalysisLineBatchController.java

 package org.jeecg.modules.diseaseAnalysis.controller;
 
 
+import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -100,7 +101,20 @@ public class AnalysisLineBatchController extends JeecgController<AnalysisLineBat
                 Map<String, List<AnalysisLineBatchCheckDataMapVO>> analysisBatchMap = checkBatchList.stream().collect(Collectors.groupingBy(AnalysisLineBatchCheckDataMapVO::getAnalysisBatchId));
                 records.forEach(record -> {
                     List<AnalysisLineBatchCheckDataMapVO> checkBatchVOS = analysisBatchMap.get(record.getId());
-                    record.setVoInfoList(checkBatchVOS);
+                    record.setCheckBatchList(checkBatchVOS);
+                });
+            }
+            // 获取是否可编辑列表
+            List<Map<String, Object>> isEditList = this.service.getIsEditList(analysisLineBatchIds);
+            if (ObjectUtil.isNotEmpty(isEditList)) {
+                Map<String, Boolean> isEditMap = isEditList.stream().collect(
+                        Collectors.toMap(
+                                key -> key.get("id").toString(),
+                                value -> !Convert.toBool(value.get("isEdit"))
+                        )
+                );
+                records.forEach(record -> {
+                    record.setEdit(isEditMap.get(record.getId()));
                 });
             }
         }
@@ -141,6 +155,21 @@ public class AnalysisLineBatchController extends JeecgController<AnalysisLineBat
         List<AnalysisLineBatchUnitDeviceTurnoutInfoVO> list = this.service.getAnalysisLineBatchUnitEkInfoList(analysisBatchId, ekId, deviceId);
         return Result.OK(list);
     }
+    /**
+     * 线路质量分析-其他病害分析-钢轨探伤单元详情检查记录查询
+     *
+     * @param analysisBatchId 分析批次id
+     * @param ekId            检查批次id
+     * @param deviceId        线路质量分析-其他病害分析-单元表id
+     * @return
+     */
+    @AutoLog(value = "线路质量分析-其他病害分析-钢轨探伤单元详情检查记录查询")
+    @ApiOperation(value = "线路质量分析-其他病害分析-钢轨探伤单元详情检查记录查询", notes = "线路质量分析-其他病害分析-钢轨探伤单元详情检查记录查询")
+    @GetMapping(value = "/getAnalysisLineBatchUnitDeviceRailWearInfoList")
+    public Result<List<AnalysisLineBatchUnitDeviceRailWearInfoVO>> getAnalysisLineBatchUnitDeviceRailWearInfoList(@RequestParam String analysisBatchId, @RequestParam String ekId, @RequestParam String deviceId) {
+        List<AnalysisLineBatchUnitDeviceRailWearInfoVO> list = this.service.getAnalysisLineBatchUnitDeviceRailWearInfoList(analysisBatchId, ekId, deviceId);
+        return Result.OK(list);
+    }
 
     //***********************************分析新增编辑接口*************************************************************************************************************
     @AutoLog(value = "其他病害分析-分析批次-新增分析批次")
@@ -195,14 +224,14 @@ public class AnalysisLineBatchController extends JeecgController<AnalysisLineBat
     @AutoLog(value = "其他病害分析-分析批次-删除")
     @ApiOperation(value = "其他病害分析-分析批次-删除", notes = "其他病害分析-分析批次-删除")
     @GetMapping(value = "/deleteBatchRecord")
-    public Result<String> deleteBatchRecord(@RequestParam(name = "ids", required = true) String ids) {
+    public Result<String> deleteBatchRecord(@RequestParam(name = "ids", required = true) String ids,@RequestParam(name = "type", required = true) Integer type) {
         List<String> idList = new ArrayList<>();
         if (ids.contains(",")) {
             idList = Arrays.asList(ids.split(","));
         } else {
             idList.add(ids);
         }
-        this.service.deleteBatchRecord(idList);
+        this.service.deleteBatchRecord(idList,type);
 
         return Result.OK("批量删除成功!");
     }

jeecg-module-system/src/main/java/org/jeecg/modules/diseaseAnalysis/controller/AnalysisLineBatchUnitDeviceController.java

-package org.jeecg.modules.diseaseAnalysis.controller;
-
-
-import org.jeecg.modules.diseaseAnalysis.entity.AnalysisLineBatchUnitDevice;
-import org.jeecg.modules.diseaseAnalysis.service.IAnalysisLineBatchUnitDeviceService;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-import org.jeecg.common.system.base.controller.JeecgController;
-
-/**
- * <p>
- * 线路质量分析-分析批次表-单元设备（1个分析批次有多个检查批次，1个检查批次有多个单位设备） 前端控制器
- * </p>
- *
- * @author hkl
- * @since 2024-07-19
- */
-@RestController
-@RequestMapping("/analysisLineBatchUnitDevice")
-public class AnalysisLineBatchUnitDeviceController extends JeecgController<AnalysisLineBatchUnitDevice, IAnalysisLineBatchUnitDeviceService> {
-
-}

jeecg-module-system/src/main/java/org/jeecg/modules/diseaseAnalysis/controller/AnalysisLineBatchUnitDeviceTurnoutInfoController.java

-package org.jeecg.modules.diseaseAnalysis.controller;
-
-
-import org.jeecg.modules.diseaseAnalysis.entity.AnalysisLineBatchCheckDataMap;
-import org.jeecg.modules.diseaseAnalysis.entity.AnalysisLineBatchUnitDeviceTurnoutInfo;
-import org.jeecg.modules.diseaseAnalysis.service.IAnalysisLineBatchCheckDataMapService;
-import org.jeecg.modules.diseaseAnalysis.service.IAnalysisLineBatchUnitDeviceTurnoutInfoService;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-import org.jeecg.common.system.base.controller.JeecgController;
-
-/**
- * <p>
- * 检查数据设备-设备检查记录数据-道岔使用情况检查数据 前端控制器
- * </p>
- *
- * @author hkl
- * @since 2024-07-19
- */
-@RestController
-@RequestMapping("/analysisLineBatchUnitDeviceTurnoutInfo")
-public class AnalysisLineBatchUnitDeviceTurnoutInfoController extends JeecgController<AnalysisLineBatchUnitDeviceTurnoutInfo, IAnalysisLineBatchUnitDeviceTurnoutInfoService> {
-
-}

jeecg-module-system/src/main/java/org/jeecg/modules/diseaseAnalysis/dto/AnalysisLineBatchUnitDeviceCorrugationInfoDTO.java

+package org.jeecg.modules.diseaseAnalysis.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>
+ * 线路质量分析-分析批次表-单元设备详情（1个分析批次有多个检查批次，1个检查批次有多个单位设备，1个单元设备有多个详情）---钢轨波磨检查
+ * </p>
+ *
+ * @author hkl
+ * @since 2024-07-25
+ */
+@Getter
+@Setter
+@ApiModel(value = "AnalysisLineBatchUnitDeviceCorrugationInfo对象", description = "线路质量分析-分析批次表-单元设备详情（1个分析批次有多个检查批次，1个检查批次有多个单位设备，1个单元设备有多个详情）---钢轨波磨检查")
+
+public class AnalysisLineBatchUnitDeviceCorrugationInfoDTO {
+
+
+    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 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("是否删除（0：未删除，1：已删除）")
+    private String delFlag;
+
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/diseaseAnalysis/dto/AnalysisLineBatchUnitDeviceCurveWearInfoDTO.java

+package org.jeecg.modules.diseaseAnalysis.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>
+ * 线路质量分析-分析批次表-单元设备详情（1个分析批次有多个检查批次，1个检查批次有多个单位设备，1个单元设备有多个详情）---曲线波磨检查
+ * </p>
+ *
+ * @author hkl
+ * @since 2024-07-25
+ */
+@Getter
+@Setter
+@ApiModel(value = "AnalysisLineBatchUnitDeviceCurveWearInfo对象", description = "线路质量分析-分析批次表-单元设备详情（1个分析批次有多个检查批次，1个检查批次有多个单位设备，1个单元设备有多个详情）---曲线波磨检查")
+
+public class AnalysisLineBatchUnitDeviceCurveWearInfoDTO {
+
+
+    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 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("是否删除（0：未删除，1：已删除）")
+    private String delFlag;
+
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/diseaseAnalysis/entity/AnalysisLineBatchUnitDeviceCorrugationInfo.java

+package org.jeecg.modules.diseaseAnalysis.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>
+ * 线路质量分析-分析批次表-单元设备详情（1个分析批次有多个检查批次，1个检查批次有多个单位设备，1个单元设备有多个详情）---钢轨波磨检查
+ * </p>
+ *
+ * @author hkl
+ * @since 2024-07-25
+ */
+@Getter
+@Setter
+@TableName("t_dsa_analysis_line_batch_unit_device_corrugation_info")
+@ApiModel(value = "AnalysisLineBatchUnitDeviceCorrugationInfo对象", description = "线路质量分析-分析批次表-单元设备详情（1个分析批次有多个检查批次，1个检查批次有多个单位设备，1个单元设备有多个详情）---钢轨波磨检查")
+public class AnalysisLineBatchUnitDeviceCorrugationInfo 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("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("是否删除（0：未删除，1：已删除）")
+    @TableField("del_flag")
+    private String delFlag;
+
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/diseaseAnalysis/entity/AnalysisLineBatchUnitDeviceCurveWearInfo.java

+package org.jeecg.modules.diseaseAnalysis.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>
+ * 线路质量分析-分析批次表-单元设备详情（1个分析批次有多个检查批次，1个检查批次有多个单位设备，1个单元设备有多个详情）---曲线波磨检查
+ * </p>
+ *
+ * @author hkl
+ * @since 2024-07-25
+ */
+@Getter
+@Setter
+@TableName("t_dsa_analysis_line_batch_unit_device_curve_wear_info")
+@ApiModel(value = "AnalysisLineBatchUnitDeviceCurveWearInfo对象", description = "线路质量分析-分析批次表-单元设备详情（1个分析批次有多个检查批次，1个检查批次有多个单位设备，1个单元设备有多个详情）---曲线波磨检查")
+public class AnalysisLineBatchUnitDeviceCurveWearInfo 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("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("是否删除（0：未删除，1：已删除）")
+    @TableField("del_flag")
+    private String delFlag;
+
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/diseaseAnalysis/entity/AnalysisLineBatchUnitDeviceRailWearInfo.java

@@ -71,7 +71,7 @@ public class AnalysisLineBatchUnitDeviceRailWearInfo implements Serializable {
     @TableField("device_project_id")
     private String deviceProjectId;
 
-    @ApiModelProperty("检查设备编码(设备资产四种表的switch_code)")
+    @ApiModelProperty("检查设备编码(设备资产四种表的unit_code)")
     @TableField("device_project_code")
     private String deviceProjectCode;
 

jeecg-module-system/src/main/java/org/jeecg/modules/diseaseAnalysis/mapper/AnalysisLineBatchMapper.java

@@ -12,6 +12,7 @@ import org.jeecg.modules.diseaseAnalysis.entity.AnalysisLineBatch;
 import org.jeecg.modules.diseaseAnalysis.vo.*;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -46,6 +47,12 @@ public interface AnalysisLineBatchMapper extends BaseMapper<AnalysisLineBatch> {
      */
     Page<AnalysisLineBatchVO> getPageList(@Param("pageData")Page<AnalysisLineBatchVO> pageData, @Param("dto")AnalysisLineBatchDTO dto);
 
+    /**
+     * 获取是否可编辑列表
+     * @param analysisBatchIds
+     * @return
+     */
+    List<Map<String, Object>> getIsEditList(List<String> analysisBatchIds);
     /**
      * 获取分析批次对应得检查批次信息
      * @param analysisLineBatchIds 分析批次id集合
@@ -70,5 +77,13 @@ public interface AnalysisLineBatchMapper extends BaseMapper<AnalysisLineBatch> {
      * @return
      */
     List<AnalysisLineBatchUnitDeviceTurnoutInfoVO> getAnalysisLineBatchUnitEkInfoList(@Param("analysisBatchId") String analysisBatchId, @Param("ekId")String ekId, @Param("deviceId")String deviceId);
+    /**
+     * 线路质量分析-其他病害分析-钢轨探伤单元详情检查记录查询
+     * @param analysisBatchId
+     * @param ekId
+     * @param deviceId
+     * @return
+     */
+    List<AnalysisLineBatchUnitDeviceRailWearInfoVO> getAnalysisLineBatchUnitDeviceRailWearInfoList(@Param("analysisBatchId") String analysisBatchId, @Param("ekId")String ekId, @Param("deviceId")String deviceId);
 
 }

jeecg-module-system/src/main/java/org/jeecg/modules/diseaseAnalysis/mapper/AnalysisLineBatchUnitDeviceCorrugationInfoMapper.java

+package org.jeecg.modules.diseaseAnalysis.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.diseaseAnalysis.entity.AnalysisLineBatchUnitDeviceCorrugationInfo;
+
+/**
+ * <p>
+ * 线路质量分析-分析批次表-单元设备详情（1个分析批次有多个检查批次，1个检查批次有多个单位设备，1个单元设备有多个详情）---钢轨波磨检查 Mapper 接口
+ * </p>
+ *
+ * @author hkl
+ * @since 2024-07-25
+ */
+public interface AnalysisLineBatchUnitDeviceCorrugationInfoMapper extends BaseMapper<AnalysisLineBatchUnitDeviceCorrugationInfo> {
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/diseaseAnalysis/mapper/AnalysisLineBatchUnitDeviceCurveWearInfoMapper.java

+package org.jeecg.modules.diseaseAnalysis.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.diseaseAnalysis.entity.AnalysisLineBatchUnitDeviceCurveWearInfo;
+
+/**
+ * <p>
+ * 线路质量分析-分析批次表-单元设备详情（1个分析批次有多个检查批次，1个检查批次有多个单位设备，1个单元设备有多个详情）---曲线波磨检查 Mapper 接口
+ * </p>
+ *
+ * @author hkl
+ * @since 2024-07-25
+ */
+public interface AnalysisLineBatchUnitDeviceCurveWearInfoMapper extends BaseMapper<AnalysisLineBatchUnitDeviceCurveWearInfo> {
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/diseaseAnalysis/mapper/xml/AnalysisLineBatchMapper.xml

@@ -72,6 +72,20 @@
         </if>
         ORDER BY t1.update_time DESC
     </select>
+    <select id="getIsEditList" resultType="java.util.Map">
+        SELECT
+        t1.id,
+        COUNT(t3.analysis_batch_unit_device_id) isEdit
+        FROM
+        t_dsa_analysis_line_batch t1
+        LEFT JOIN t_dsa_analysis_line_batch_unit_device t2 ON t1.id = t2.analysis_batch_id
+        LEFT JOIN t_mw_work_batch_detail t3 ON t2.id  = t3.analysis_batch_unit_device_id
+        WHERE t1.id IN
+        <foreach collection="analysisBatchIds" item="item" index="index" separator="," open="(" close=")">
+            #{item}
+        </foreach>
+        GROUP BY t1.id
+    </select>
     <select id="listRecordDetail" resultType="org.jeecg.modules.diseaseAnalysis.vo.AnalysisLineBatchCheckDataMapVO">
         SELECT
             t1.*
@@ -120,4 +134,24 @@
         </if>
         ORDER BY t1.update_time DESC
     </select>
+
+    <select id="getAnalysisLineBatchUnitDeviceRailWearInfoList" resultType="org.jeecg.modules.diseaseAnalysis.vo.AnalysisLineBatchUnitDeviceRailWearInfoVO">
+        SELECT
+        t1.*
+        FROM
+        t_dsa_analysis_line_batch_unit_device_rail_wear_info t1
+        WHERE
+        1=1
+        AND t1.del_flag = '0'
+        <if test="analysisBatchId != null and analysisBatchId != ''">
+            AND t1.analysis_batch_id = #{analysisBatchId}
+        </if>
+        <if test="ekId != null and ekId != ''">
+            AND t1.ek_id = #{ekId}
+        </if>
+        <if test="deviceId != null and deviceId != ''">
+            AND t1.device_id = #{deviceId}
+        </if>
+        ORDER BY t1.update_time DESC
+    </select>
 </mapper>

jeecg-module-system/src/main/java/org/jeecg/modules/diseaseAnalysis/mapper/xml/AnalysisLineBatchUnitDeviceCorrugationInfoMapper.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.diseaseAnalysis.mapper.AnalysisLineBatchUnitDeviceCorrugationInfoMapper">
+
+</mapper>

jeecg-module-system/src/main/java/org/jeecg/modules/diseaseAnalysis/mapper/xml/AnalysisLineBatchUnitDeviceCurveWearInfoMapper.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.diseaseAnalysis.mapper.AnalysisLineBatchUnitDeviceCurveWearInfoMapper">
+
+</mapper>

jeecg-module-system/src/main/java/org/jeecg/modules/diseaseAnalysis/service/IAnalysisLineBatchService.java

@@ -15,6 +15,7 @@ import org.jeecg.modules.dynamicStaticAnalysis.dto.AnalysisBatchSaveOrUpdateDTO;
 import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -48,6 +49,12 @@ public interface IAnalysisLineBatchService extends IService<AnalysisLineBatch> {
      */
     Page<AnalysisLineBatchVO> getPageList(Page<AnalysisLineBatchVO> pageData, AnalysisLineBatchDTO dto);
 
+    /**
+     * 获取是否可编辑列表
+     * @param analysisBatchIds
+     * @return
+     */
+    List<Map<String, Object>> getIsEditList(List<String> analysisBatchIds);
     /**
      * 获取分析批次对应得检查批次信息
      * @param analysisLineBatchIds 分析批次id集合
@@ -72,6 +79,14 @@ public interface IAnalysisLineBatchService extends IService<AnalysisLineBatch> {
      */
     List<AnalysisLineBatchUnitDeviceTurnoutInfoVO> getAnalysisLineBatchUnitEkInfoList(String analysisBatchId, String ekId, String deviceId);
 
+    /**
+     * 线路质量分析-其他病害分析-钢轨探伤单元详情检查记录查询
+     * @param analysisBatchId
+     * @param ekId
+     * @param deviceId
+     * @return
+     */
+    List<AnalysisLineBatchUnitDeviceRailWearInfoVO> getAnalysisLineBatchUnitDeviceRailWearInfoList(String analysisBatchId, String ekId, String deviceId);
     /**
      *其他病害分析-分析批次-新增分析批次
      * @param dto
@@ -88,5 +103,5 @@ public interface IAnalysisLineBatchService extends IService<AnalysisLineBatch> {
      * 其他病害分析-分析批次-删除
      * @param idList
      */
-    void deleteBatchRecord(List<String> idList);
+    void deleteBatchRecord(List<String> idList,Integer type);
 }

jeecg-module-system/src/main/java/org/jeecg/modules/diseaseAnalysis/service/IAnalysisLineBatchUnitDeviceCorrugationInfoService.java

+package org.jeecg.modules.diseaseAnalysis.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.diseaseAnalysis.entity.AnalysisLineBatchUnitDeviceCorrugationInfo;
+
+/**
+ * <p>
+ * 线路质量分析-分析批次表-单元设备详情（1个分析批次有多个检查批次，1个检查批次有多个单位设备，1个单元设备有多个详情）---钢轨波磨检查 服务类
+ * </p>
+ *
+ * @author hkl
+ * @since 2024-07-25
+ */
+public interface IAnalysisLineBatchUnitDeviceCorrugationInfoService extends IService<AnalysisLineBatchUnitDeviceCorrugationInfo> {
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/diseaseAnalysis/service/IAnalysisLineBatchUnitDeviceCurveWearInfoService.java

+package org.jeecg.modules.diseaseAnalysis.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.diseaseAnalysis.entity.AnalysisLineBatchUnitDeviceCurveWearInfo;
+
+/**
+ * <p>
+ * 线路质量分析-分析批次表-单元设备详情（1个分析批次有多个检查批次，1个检查批次有多个单位设备，1个单元设备有多个详情）---曲线波磨检查 服务类
+ * </p>
+ *
+ * @author hkl
+ * @since 2024-07-25
+ */
+public interface IAnalysisLineBatchUnitDeviceCurveWearInfoService extends IService<AnalysisLineBatchUnitDeviceCurveWearInfo> {
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/diseaseAnalysis/service/impl/AnalysisLineBatchServiceImpl.java

@@ -10,14 +10,8 @@ import org.jeecg.modules.diseaseAnalysis.dto.AnalysisLineBatchDTO;
 import org.jeecg.modules.diseaseAnalysis.dto.AnalysisLineBatchInfoDTO;
 import org.jeecg.modules.diseaseAnalysis.dto.AnalysisLineBatchSaveOrUpdateDTO;
 import org.jeecg.modules.diseaseAnalysis.dto.EkRecordsMasterCheckDTO;
-import org.jeecg.modules.diseaseAnalysis.entity.AnalysisLineBatch;
-import org.jeecg.modules.diseaseAnalysis.entity.AnalysisLineBatchCheckDataMap;
-import org.jeecg.modules.diseaseAnalysis.entity.AnalysisLineBatchUnitDevice;
-import org.jeecg.modules.diseaseAnalysis.entity.AnalysisLineBatchUnitDeviceTurnoutInfo;
-import org.jeecg.modules.diseaseAnalysis.mapper.AnalysisLineBatchCheckDataMapMapper;
-import org.jeecg.modules.diseaseAnalysis.mapper.AnalysisLineBatchMapper;
-import org.jeecg.modules.diseaseAnalysis.mapper.AnalysisLineBatchUnitDeviceMapper;
-import org.jeecg.modules.diseaseAnalysis.mapper.AnalysisLineBatchUnitDeviceTurnoutInfoMapper;
+import org.jeecg.modules.diseaseAnalysis.entity.*;
+import org.jeecg.modules.diseaseAnalysis.mapper.*;
 import org.jeecg.modules.diseaseAnalysis.service.IAnalysisLineBatchService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.jeecg.modules.diseaseAnalysis.vo.*;
@@ -27,6 +21,7 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -44,6 +39,8 @@ public class AnalysisLineBatchServiceImpl extends ServiceImpl<AnalysisLineBatchM
     private AnalysisLineBatchUnitDeviceMapper analysisLineBatchUnitDeviceMapper;
     @Resource
     private AnalysisLineBatchUnitDeviceTurnoutInfoMapper analysisLineBatchUnitDeviceTurnoutInfoMapper;
+    @Resource
+    private AnalysisLineBatchUnitDeviceRailWearInfoMapper analysisLineBatchUnitDeviceRailWearInfoMapper;
     /**
      * 线路质量分析-其他病害分析-检查记录-分页列表查询
      *
@@ -79,6 +76,15 @@ public class AnalysisLineBatchServiceImpl extends ServiceImpl<AnalysisLineBatchM
     public Page<AnalysisLineBatchVO> getPageList(Page<AnalysisLineBatchVO> pageData, AnalysisLineBatchDTO dto) {
         return this.baseMapper.getPageList(pageData, dto);
     }
+    /**
+     * 获取是否可编辑列表
+     * @param analysisBatchIds
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> getIsEditList(List<String> analysisBatchIds) {
+        return this.baseMapper.getIsEditList(analysisBatchIds);
+    }
 
     /**
      * 获取分析批次对应得检查批次信息
@@ -116,6 +122,21 @@ public class AnalysisLineBatchServiceImpl extends ServiceImpl<AnalysisLineBatchM
         List<AnalysisLineBatchUnitDeviceTurnoutInfoVO> list = this.baseMapper.getAnalysisLineBatchUnitEkInfoList(analysisBatchId, ekId, deviceId);
         return list;
     }
+
+    /**
+     * 线路质量分析-其他病害分析-钢轨探伤单元详情检查记录查询
+     *
+     * @param analysisBatchId 分析批次id
+     * @param ekId            检查批次id
+     * @param deviceId        线路质量分析-其他病害分析-单元表id
+     * @return
+     */
+    @Override
+    public List<AnalysisLineBatchUnitDeviceRailWearInfoVO> getAnalysisLineBatchUnitDeviceRailWearInfoList(String analysisBatchId, String ekId, String deviceId) {
+        List<AnalysisLineBatchUnitDeviceRailWearInfoVO> list = this.baseMapper.getAnalysisLineBatchUnitDeviceRailWearInfoList(analysisBatchId, ekId, deviceId);
+        return list;
+    }
+
     /**
      *其他病害分析-分析批次-新增分析批次
      * @param dto
@@ -214,7 +235,7 @@ public class AnalysisLineBatchServiceImpl extends ServiceImpl<AnalysisLineBatchM
      */
     @Override
     @Transactional
-    public void deleteBatchRecord(List<String> idList) {
+    public void deleteBatchRecord(List<String> idList,Integer type) {
         // 1.先删除病害分析主表与检查记录主表之间的关系表
         LambdaQueryWrapper<AnalysisLineBatchCheckDataMap> wrapper = Wrappers.lambdaQuery();
         wrapper.in(AnalysisLineBatchCheckDataMap::getAnalysisBatchId, idList);
@@ -223,10 +244,18 @@ public class AnalysisLineBatchServiceImpl extends ServiceImpl<AnalysisLineBatchM
         LambdaQueryWrapper<AnalysisLineBatchUnitDevice> wrapper1 = Wrappers.lambdaQuery();
         wrapper1.in(AnalysisLineBatchUnitDevice::getAnalysisBatchId, idList);
         analysisLineBatchUnitDeviceMapper.delete(wrapper1);
+        //type值检查数据类型 1-道岔检查 2-钢轨常规探伤检查 3-曲线钢轨磨耗检查 4-钢轨波磨检查 5-道床检查 6-线路检查
+        if(type == 1){
             //3.删除道岔单元详情表
             LambdaQueryWrapper<AnalysisLineBatchUnitDeviceTurnoutInfo> wrapper2 = Wrappers.lambdaQuery();
             wrapper2.in(AnalysisLineBatchUnitDeviceTurnoutInfo::getAnalysisBatchId, idList);
             analysisLineBatchUnitDeviceTurnoutInfoMapper.delete(wrapper2);
+        }else if(type ==2){
+            //3.删除道岔单元详情表
+            LambdaQueryWrapper<AnalysisLineBatchUnitDeviceRailWearInfo> wrapper2 = Wrappers.lambdaQuery();
+            wrapper2.in(AnalysisLineBatchUnitDeviceRailWearInfo::getAnalysisBatchId, idList);
+            analysisLineBatchUnitDeviceRailWearInfoMapper.delete(wrapper2);
+        }
         //4.删除分析主表
         this.baseMapper.deleteBatchIds(idList);
     }

jeecg-module-system/src/main/java/org/jeecg/modules/diseaseAnalysis/controller/AnalysisLineBatchUnitDeviceRailWearInfoController.java → jeecg-module-system/src/main/java/org/jeecg/modules/diseaseAnalysis/service/impl/AnalysisLineBatchUnitDeviceCorrugationInfoServiceImpl.java

-package org.jeecg.modules.diseaseAnalysis.controller;
+package org.jeecg.modules.diseaseAnalysis.service.impl;
 
-
-import org.jeecg.common.system.base.controller.JeecgController;
-import org.jeecg.modules.diseaseAnalysis.entity.AnalysisLineBatchUnitDeviceRailWearInfo;
-import org.jeecg.modules.diseaseAnalysis.service.IAnalysisLineBatchUnitDeviceRailWearInfoService;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.modules.diseaseAnalysis.entity.AnalysisLineBatchUnitDeviceCorrugationInfo;
+import org.jeecg.modules.diseaseAnalysis.mapper.AnalysisLineBatchUnitDeviceCorrugationInfoMapper;
+import org.jeecg.modules.diseaseAnalysis.service.IAnalysisLineBatchUnitDeviceCorrugationInfoService;
+import org.springframework.stereotype.Service;
 
 /**
  * <p>
- * 线路质量分析-分析批次表-单元设备详情（1个分析批次有多个检查批次，1个检查批次有多个单位设备，1个单元设备有多个详情）---钢轨探伤检查 前端控制器
+ * 线路质量分析-分析批次表-单元设备详情（1个分析批次有多个检查批次，1个检查批次有多个单位设备，1个单元设备有多个详情）---钢轨波磨检查 服务实现类
  * </p>
  *
  * @author hkl
- * @since 2024-07-24
+ * @since 2024-07-25
  */
-@RestController
-@RequestMapping("/analysisLineBatchUnitDeviceRailWearInfo")
-public class AnalysisLineBatchUnitDeviceRailWearInfoController extends JeecgController<AnalysisLineBatchUnitDeviceRailWearInfo, IAnalysisLineBatchUnitDeviceRailWearInfoService> {
+@Service
+public class AnalysisLineBatchUnitDeviceCorrugationInfoServiceImpl extends ServiceImpl<AnalysisLineBatchUnitDeviceCorrugationInfoMapper, AnalysisLineBatchUnitDeviceCorrugationInfo> implements IAnalysisLineBatchUnitDeviceCorrugationInfoService {
 
 }

jeecg-module-system/src/main/java/org/jeecg/modules/diseaseAnalysis/controller/AnalysisLineBatchCheckDataMapController.java → jeecg-module-system/src/main/java/org/jeecg/modules/diseaseAnalysis/service/impl/AnalysisLineBatchUnitDeviceCurveWearInfoServiceImpl.java

-package org.jeecg.modules.diseaseAnalysis.controller;
+package org.jeecg.modules.diseaseAnalysis.service.impl;
 
-
-import org.jeecg.modules.diseaseAnalysis.entity.AnalysisLineBatchCheckDataMap;
-import org.jeecg.modules.diseaseAnalysis.service.IAnalysisLineBatchCheckDataMapService;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-import org.jeecg.common.system.base.controller.JeecgController;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.modules.diseaseAnalysis.entity.AnalysisLineBatchUnitDeviceCurveWearInfo;
+import org.jeecg.modules.diseaseAnalysis.mapper.AnalysisLineBatchUnitDeviceCurveWearInfoMapper;
+import org.jeecg.modules.diseaseAnalysis.service.IAnalysisLineBatchUnitDeviceCurveWearInfoService;
+import org.springframework.stereotype.Service;
 
 /**
  * <p>
- * 线路质量分析-分析批次表-单元设备详情（1个分析批次有多个检查批次，1个检查批次有多个单位设备，1个单元设备有多个详情） 前端控制器
+ * 线路质量分析-分析批次表-单元设备详情（1个分析批次有多个检查批次，1个检查批次有多个单位设备，1个单元设备有多个详情）---曲线波磨检查 服务实现类
  * </p>
  *
  * @author hkl
- * @since 2024-07-19
+ * @since 2024-07-25
  */
-@RestController
-@RequestMapping("/analysisLineBatchCheckDataMap")
-public class AnalysisLineBatchCheckDataMapController extends JeecgController<AnalysisLineBatchCheckDataMap, IAnalysisLineBatchCheckDataMapService> {
+@Service
+public class AnalysisLineBatchUnitDeviceCurveWearInfoServiceImpl extends ServiceImpl<AnalysisLineBatchUnitDeviceCurveWearInfoMapper, AnalysisLineBatchUnitDeviceCurveWearInfo> implements IAnalysisLineBatchUnitDeviceCurveWearInfoService {
 
 }

jeecg-module-system/src/main/java/org/jeecg/modules/diseaseAnalysis/vo/AnalysisLineBatchUnitDeviceCorrugationInfoVO.java

+package org.jeecg.modules.diseaseAnalysis.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>
+ * 线路质量分析-分析批次表-单元设备详情（1个分析批次有多个检查批次，1个检查批次有多个单位设备，1个单元设备有多个详情）---钢轨波磨检查
+ * </p>
+ *
+ * @author hkl
+ * @since 2024-07-25
+ */
+@Getter
+@Setter
+@ApiModel(value = "AnalysisLineBatchUnitDeviceCorrugationInfo对象", description = "线路质量分析-分析批次表-单元设备详情（1个分析批次有多个检查批次，1个检查批次有多个单位设备，1个单元设备有多个详情）---钢轨波磨检查")
+
+public class AnalysisLineBatchUnitDeviceCorrugationInfoVO {
+
+
+    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 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("是否删除（0：未删除，1：已删除）")
+    private String delFlag;
+
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/diseaseAnalysis/vo/AnalysisLineBatchUnitDeviceCurveWearInfoVO.java

+package org.jeecg.modules.diseaseAnalysis.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>
+ * 线路质量分析-分析批次表-单元设备详情（1个分析批次有多个检查批次，1个检查批次有多个单位设备，1个单元设备有多个详情）---曲线波磨检查
+ * </p>
+ *
+ * @author hkl
+ * @since 2024-07-25
+ */
+@Getter
+@Setter
+@ApiModel(value = "AnalysisLineBatchUnitDeviceCurveWearInfo对象", description = "线路质量分析-分析批次表-单元设备详情（1个分析批次有多个检查批次，1个检查批次有多个单位设备，1个单元设备有多个详情）---曲线波磨检查")
+
+public class AnalysisLineBatchUnitDeviceCurveWearInfoVO {
+
+
+    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 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("是否删除（0：未删除，1：已删除）")
+    private String delFlag;
+
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/diseaseAnalysis/vo/AnalysisLineBatchUnitDeviceRailWearInfoVO.java

@@ -58,7 +58,7 @@ public class AnalysisLineBatchUnitDeviceRailWearInfoVO {
     @ApiModelProperty("检查设备id(设备资产四种表的主键)")
     private String deviceProjectId;
 
-    @ApiModelProperty("检查设备编码(设备资产四种表的switch_code)")
+    @ApiModelProperty("检查设备编码(设备资产四种表的unit_code)")
     private String deviceProjectCode;
 
     @ApiModelProperty("检查设备类型（1-钢轨,2-曲线,3-竖曲线,4-道岔）")

jeecg-module-system/src/main/java/org/jeecg/modules/diseaseAnalysis/vo/AnalysisLineBatchVO.java

@@ -72,6 +72,9 @@ public class AnalysisLineBatchVO {
     @ApiModelProperty("1-道岔检查 2-钢轨常规探伤检查 3-曲线钢轨磨耗检查 4-钢轨波磨检查 5-道床检查 6-线路检查）")
     private String ekType;
 
+    @ApiModelProperty("是否可以编辑 ture-可编辑  false-不可编辑")
+    private boolean isEdit;
+
     @ApiModelProperty("分析批次对应得检查批次列表")
-    private List<AnalysisLineBatchCheckDataMapVO> voInfoList;
+    private List<AnalysisLineBatchCheckDataMapVO> checkBatchList;
 }