feat: 1.设备病例本

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

@@ -91,6 +91,7 @@ public class MovementOverReportUnitDeviceMap implements Serializable {
     @TableField("over_report_mileage")
     private BigDecimal overReportMileage;
 
+
     @ApiModelProperty("超限类型")
     @TableField("over_type")
     private String overType;
@@ -99,6 +100,10 @@ public class MovementOverReportUnitDeviceMap implements Serializable {
     @TableField("over_level")
     private Integer overLevel;
 
+    @ApiModelProperty("长度(m)")
+    @TableField("longitude")
+    private String longitude;
+
     @ApiModelProperty("峰值（mm或g）")
     @TableField("peak_value")
     private String peakValue;

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

@@ -19,6 +19,7 @@
                t1.over_type,
                t1.over_level,
                t1.peak_value,
+               t1.longitude,
                t1.data_difference,
                t1.xianxing,
                t1.standard,

jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/algorithm/AnalysisAlgorithm.java

@@ -890,6 +890,7 @@ public class AnalysisAlgorithm {
                     overReportUnitDeviceMap.setOverReportMileage(movementOverReport.getMileage());
                     overReportUnitDeviceMap.setOverLevel(Convert.toInt(movementOverReport.getOverrunLevel()));
                     overReportUnitDeviceMap.setOverType(movementOverReport.getOverrunType());
+                    overReportUnitDeviceMap.setLongitude(movementOverReport.getLongitude());
                     overReportUnitDeviceMap.setPeakValue(movementOverReport.getPeakValue());
                     overReportUnitDeviceMap.setDataDifference(movementOverReport.getDataDifference());
                     overReportUnitDeviceMap.setXianxing(movementOverReport.getXianxing());

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

@@ -3,6 +3,8 @@ package org.jeecg.modules.maintenanceWork.mapper;
 import org.jeecg.modules.maintenanceWork.entity.WorkBatchDetail;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.jeecg.modules.maintenanceWork.vo.WorkBatchDetailVO;
+import org.jeecg.modules.unitDevice.dto.CaseReportWorkBatchDetailDTO;
+import org.jeecg.modules.unitDevice.vo.CaseReportWorkBatchDetailVO;
 
 import java.util.List;
 
@@ -17,4 +19,6 @@ import java.util.List;
 public interface WorkBatchDetailMapper extends BaseMapper<WorkBatchDetail> {
 
     List<WorkBatchDetailVO> queryListByWorkBatchId(String workBatchId);
+
+    List<CaseReportWorkBatchDetailVO> caseReportWorkBatchDetail(CaseReportWorkBatchDetailDTO dto);
 }

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

@@ -6,6 +6,10 @@ 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.WorkBatchVO;
+import org.jeecg.modules.unitDevice.dto.CaseReportCheckDataDTO;
+import org.jeecg.modules.unitDevice.dto.CaseReportWorkBatchDTO;
+import org.jeecg.modules.unitDevice.vo.CaseReportCheckDataVO;
+import org.jeecg.modules.unitDevice.vo.CaseReportWorkBatchVO;
 
 import java.util.Map;
 
@@ -22,4 +26,6 @@ public interface WorkBatchMapper extends BaseMapper<WorkBatch> {
     Page<WorkBatchVO> listRecord(Page<WorkBatchVO> pageData, WorkBatchDTO dto);
 
     Page<Map<String, Object>> getUnitDevicePage(Page<Map<String, Object>> pageData, UnitDeviceDTO dto);
+
+    Page<CaseReportWorkBatchVO> caseReportWorkBatch(Page<CaseReportWorkBatchVO> pageData, CaseReportWorkBatchDTO dto);
 }

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

@@ -22,4 +22,27 @@
         FROM t_mw_work_batch_detail t1
         WHERE t1.work_batch_id = #{workBatchId}
     </select>
+    <select id="caseReportWorkBatchDetail"
+            resultType="org.jeecg.modules.unitDevice.vo.CaseReportWorkBatchDetailVO">
+        SELECT t1.id,
+               t1.work_batch_id,
+               t1.work_batch_code,
+               t1.analysis_batch_unit_device_id,
+               t1.unit_id,
+               t1.unit_code,
+               t1.unit_type,
+               t1.unit_type_name,
+               t1.unit_device_code,
+               t1.unit_start_mileage,
+               t1.unit_center_mileage,
+               t1.unit_end_mileage,
+               t1.unit_score_level,
+               t1.unit_score_level_str,
+               t1.unit_score,
+               t1.remark
+        FROM t_mw_work_batch_detail t1
+        WHERE t1.work_batch_id = #{workBatchId}
+          AND t1.unit_id = #{unitId}
+
+    </select>
 </mapper>

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

@@ -110,4 +110,30 @@
 
         ORDER BY t.startMileage
     </select>
+    <select id="caseReportWorkBatch" resultType="org.jeecg.modules.unitDevice.vo.CaseReportWorkBatchVO">
+        SELECT
+            t1.unit_id,
+            t2.id workBatchId,
+            t2.create_by,
+            t2.create_time,
+            t2.update_by,
+            t2.update_time,
+            t2.work_batch_code,
+            t2.light_rail_id,
+            t2.light_rail_name,
+            t2.line_alias_id,
+            t2.line_alias_name,
+            t2.work_start_mileage,
+            t2.work_end_mileage,
+            t2.work_start_time,
+            t2.work_end_time,
+            t2.team,
+            t2.source,
+            t2.work_status,
+            t2.del_flag
+        FROM
+            ( SELECT work_batch_id, unit_id, unit_type FROM t_mw_work_batch_detail WHERE unit_id = #{dto.unitId} AND unit_type = #{dto.unitType} ) t1
+                LEFT JOIN t_mw_work_batch t2 ON t1.work_batch_id = t2.id AND t2.del_flag = '0'
+        ORDER BY t2.create_time
+    </select>
 </mapper>

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

@@ -2,6 +2,10 @@ package org.jeecg.modules.maintenanceWork.service;
 
 import org.jeecg.modules.maintenanceWork.entity.WorkBatchDetail;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.unitDevice.dto.CaseReportWorkBatchDetailDTO;
+import org.jeecg.modules.unitDevice.vo.CaseReportWorkBatchDetailVO;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +17,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IWorkBatchDetailService extends IService<WorkBatchDetail> {
 
+    List<CaseReportWorkBatchDetailVO> caseReportWorkBatchDetail(CaseReportWorkBatchDetailDTO dto);
 }

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

@@ -5,6 +5,10 @@ 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.WorkBatchVO;
+import org.jeecg.modules.unitDevice.dto.CaseReportCheckDataDTO;
+import org.jeecg.modules.unitDevice.dto.CaseReportWorkBatchDTO;
+import org.jeecg.modules.unitDevice.vo.CaseReportCheckDataVO;
+import org.jeecg.modules.unitDevice.vo.CaseReportWorkBatchVO;
 
 import java.util.Map;
 
@@ -31,4 +35,6 @@ public interface IWorkBatchService extends IService<WorkBatch> {
     Page<Map<String, Object>> getUnitDevicePage(Page<Map<String, Object>> pageData, UnitDeviceDTO dto);
 
     void batchSaveRecord(AnalysisBatchSaveDTO dto);
+
+    Page<CaseReportWorkBatchVO> caseReportWorkBatch(Page<CaseReportWorkBatchVO> pageData, CaseReportWorkBatchDTO dto);
 }

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

@@ -4,8 +4,12 @@ import org.jeecg.modules.maintenanceWork.entity.WorkBatchDetail;
 import org.jeecg.modules.maintenanceWork.mapper.WorkBatchDetailMapper;
 import org.jeecg.modules.maintenanceWork.service.IWorkBatchDetailService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.modules.unitDevice.dto.CaseReportWorkBatchDetailDTO;
+import org.jeecg.modules.unitDevice.vo.CaseReportWorkBatchDetailVO;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 维修作业管理-作业计划批次管理明细表 服务实现类
@@ -17,4 +21,8 @@ import org.springframework.stereotype.Service;
 @Service
 public class WorkBatchDetailServiceImpl extends ServiceImpl<WorkBatchDetailMapper, WorkBatchDetail> implements IWorkBatchDetailService {
 
+    @Override
+    public List<CaseReportWorkBatchDetailVO> caseReportWorkBatchDetail(CaseReportWorkBatchDetailDTO dto) {
+        return this.baseMapper.caseReportWorkBatchDetail(dto);
+    }
 }

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

@@ -10,7 +10,6 @@ import org.jeecg.common.util.UUIDGenerator;
 import org.jeecg.modules.dynamicStaticAnalysis.entity.AnalysisBatchUnitDevice;
 import org.jeecg.modules.dynamicStaticAnalysis.mapper.AnalysisBatchUnitDeviceMapper;
 import org.jeecg.modules.dynamicStaticAnalysis.mapper.AnalysisBatchUnitDeviceTransfiniteMapper;
-import org.jeecg.modules.dynamicStaticAnalysis.vo.AnalysisBatchUnitDeviceTransfiniteVO;
 import org.jeecg.modules.maintenanceWork.dto.*;
 import org.jeecg.modules.maintenanceWork.entity.WorkBatch;
 import org.jeecg.modules.maintenanceWork.entity.WorkBatchDetail;
@@ -19,6 +18,8 @@ import org.jeecg.modules.maintenanceWork.mapper.WorkBatchMapper;
 import org.jeecg.modules.maintenanceWork.service.IWorkBatchService;
 import org.jeecg.modules.maintenanceWork.vo.WorkBatchDetailVO;
 import org.jeecg.modules.maintenanceWork.vo.WorkBatchVO;
+import org.jeecg.modules.unitDevice.dto.CaseReportWorkBatchDTO;
+import org.jeecg.modules.unitDevice.vo.CaseReportWorkBatchVO;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -183,4 +184,10 @@ public class WorkBatchServiceImpl extends ServiceImpl<WorkBatchMapper, WorkBatch
         }
     }
 
+    @Override
+    public Page<CaseReportWorkBatchVO> caseReportWorkBatch(Page<CaseReportWorkBatchVO> pageData, CaseReportWorkBatchDTO dto) {
+        return this.baseMapper.caseReportWorkBatch(pageData,dto);
+    }
+
+
 }

jeecg-module-system/src/main/java/org/jeecg/modules/unitDevice/controller/UnitDeviceController.java

@@ -10,11 +10,11 @@ import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.modules.unitDevice.dto.CaseReportCheckDataDTO;
+import org.jeecg.modules.unitDevice.dto.CaseReportUnitScoreDTO;
+import org.jeecg.modules.unitDevice.dto.CaseReportWorkBatchDTO;
+import org.jeecg.modules.unitDevice.dto.CaseReportWorkBatchDetailDTO;
 import org.jeecg.modules.unitDevice.face.IUnitDeviceFace;
-import org.jeecg.modules.unitDevice.vo.CaseReportCheckDataDetailVO;
-import org.jeecg.modules.unitDevice.vo.CaseReportCheckDataVO;
-import org.jeecg.modules.unitDevice.vo.CaseReportUnitScoreVO;
-import org.jeecg.modules.unitDevice.vo.CaseReportWorkBatchVO;
+import org.jeecg.modules.unitDevice.vo.*;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -64,13 +64,9 @@ public class UnitDeviceController {
     @AutoLog(value = "单元设备-设备病历本-单元得分列表")
     @ApiOperation(value = "单元设备-设备病历本-单元得分列表", notes = "单元设备-设备病历本-单元得分列表")
     @GetMapping(value = "/caseReportUnitScore")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "unitId", value = "设备ID", required = true),
-            @ApiImplicitParam(name = "unitType", value = "设备类型 1-钢轨 2-曲线 3-竖曲线 4-道岔 ", required = true)
-    })
-    public Result<List<CaseReportUnitScoreVO>> caseReportUnitScore(String unitId, int unitType) {
+    public Result<List<CaseReportUnitScoreVO>> caseReportUnitScore(CaseReportUnitScoreDTO dto) {
 
-        List<CaseReportUnitScoreVO> vo = unitDeviceFace.caseReportUnitScore(unitId, unitType);
+        List<CaseReportUnitScoreVO> vo = unitDeviceFace.caseReportUnitScore(dto);
 
         return Result.OK(vo);
     }
@@ -79,15 +75,20 @@ public class UnitDeviceController {
     @AutoLog(value = "单元设备-设备病历本-作业批次列表")
     @ApiOperation(value = "单元设备-设备病历本-作业批次列表", notes = "单元设备-设备病历本-作业批次列表")
     @GetMapping(value = "/caseReportWorkBatch")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "unitId", value = "设备ID", required = true),
-            @ApiImplicitParam(name = "unitType", value = "设备类型 1-钢轨 2-曲线 3-竖曲线 4-道岔 ", required = true)
-    })
-    public Result<List<CaseReportWorkBatchVO>> caseReportWorkBatch(String unitId, int unitType) {
+    public Result<IPage<CaseReportWorkBatchVO>> caseReportWorkBatch(@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                                    @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                                    CaseReportWorkBatchDTO dto) {
+        Page<CaseReportWorkBatchVO> pageData = new Page<>(pageNo, pageSize);
+        pageData = unitDeviceFace.caseReportWorkBatch(pageData, dto);
+        return Result.OK(pageData);
+    }
 
-        List<CaseReportWorkBatchVO> vo = unitDeviceFace.caseReportWorkBatch(unitId, unitType);
 
-        return Result.OK(vo);
+    @AutoLog(value = "单元设备-设备病历本-作业批次列表")
+    @ApiOperation(value = "单元设备-设备病历本-作业批次列表", notes = "单元设备-设备病历本-作业批次列表")
+    @GetMapping(value = "/caseReportWorkBatchDetail")
+    public Result<List<CaseReportWorkBatchDetailVO>> caseReportWorkBatchDetail(CaseReportWorkBatchDetailDTO dto) {
+        return Result.OK(unitDeviceFace.caseReportWorkBatchDetail(dto));
     }
 
 

jeecg-module-system/src/main/java/org/jeecg/modules/unitDevice/dto/CaseReportUnitScoreDTO.java

+package org.jeecg.modules.unitDevice.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+@Data
+@ApiModel(value = "CaseReportUnitScoreDTO对象", description = "单元设备-病例报告检查数列据表")
+public class CaseReportUnitScoreDTO {
+
+    @ApiModelProperty(value = "设备ID")
+    private String unitId;
+
+    @ApiModelProperty(value = "设备类型 1-钢轨 2-曲线 3-竖曲线 4-道岔")
+    private int unitType;
+
+    @ApiModelProperty(value = "开始时间")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date startTime;
+
+    @ApiModelProperty(value = "结束时间")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date endTime;
+}

jeecg-module-system/src/main/java/org/jeecg/modules/unitDevice/dto/CaseReportWorkBatchDTO.java

+package org.jeecg.modules.unitDevice.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "CaseReportWorkBatchDTO对象", description = "单元设备-病例报告检查数列据表")
+public class CaseReportWorkBatchDTO {
+    @ApiModelProperty("单元id")
+    private String unitId;
+
+    @ApiModelProperty("单元类型")
+    private String unitType;
+}

jeecg-module-system/src/main/java/org/jeecg/modules/unitDevice/dto/CaseReportWorkBatchDetailDTO.java

+package org.jeecg.modules.unitDevice.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "CaseReportWorkBatchDetailDTO对象", description = "单元设备-病例报告检查数列据表")
+public class CaseReportWorkBatchDetailDTO {
+    @ApiModelProperty("单元id")
+    private String unitId;
+
+    @ApiModelProperty("单元类型")
+    private String unitType;
+
+    @ApiModelProperty("作业批次id")
+    private String workBatchId;
+}

jeecg-module-system/src/main/java/org/jeecg/modules/unitDevice/face/IUnitDeviceFace.java

@@ -2,10 +2,10 @@ package org.jeecg.modules.unitDevice.face;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.jeecg.modules.unitDevice.dto.CaseReportCheckDataDTO;
-import org.jeecg.modules.unitDevice.vo.CaseReportCheckDataDetailVO;
-import org.jeecg.modules.unitDevice.vo.CaseReportCheckDataVO;
-import org.jeecg.modules.unitDevice.vo.CaseReportUnitScoreVO;
-import org.jeecg.modules.unitDevice.vo.CaseReportWorkBatchVO;
+import org.jeecg.modules.unitDevice.dto.CaseReportUnitScoreDTO;
+import org.jeecg.modules.unitDevice.dto.CaseReportWorkBatchDTO;
+import org.jeecg.modules.unitDevice.dto.CaseReportWorkBatchDetailDTO;
+import org.jeecg.modules.unitDevice.vo.*;
 
 import java.util.List;
 
@@ -16,11 +16,14 @@ public interface IUnitDeviceFace {
      * @param unitId
      * @param unitType
      */
-    CaseReportCheckDataDetailVO caseReportCheckData(String unitId, int unitType,String checkId);
+    CaseReportCheckDataDetailVO caseReportCheckData(String unitId, int unitType, String checkId);
 
     Page<CaseReportCheckDataVO> queryPageList(Page<CaseReportCheckDataVO> pageData, CaseReportCheckDataDTO dto);
 
-    List<CaseReportUnitScoreVO> caseReportUnitScore(String unitId, int unitType);
+    List<CaseReportUnitScoreVO> caseReportUnitScore(CaseReportUnitScoreDTO dto);
+
+    Page<CaseReportWorkBatchVO> caseReportWorkBatch(Page<CaseReportWorkBatchVO> pageData, CaseReportWorkBatchDTO dto);
+
+    List<CaseReportWorkBatchDetailVO> caseReportWorkBatchDetail(CaseReportWorkBatchDetailDTO dto);
 
-    List<CaseReportWorkBatchVO> caseReportWorkBatch(String unitId, int unitType);
 }

jeecg-module-system/src/main/java/org/jeecg/modules/unitDevice/face/impl/UnitDeviceFaceImpl.java

@@ -11,6 +11,9 @@ import org.jeecg.modules.dynamicStaticAnalysis.service.IAnalysisBatchUnitDeviceS
 import org.jeecg.modules.maintenanceWork.service.IWorkBatchDetailService;
 import org.jeecg.modules.maintenanceWork.service.IWorkBatchService;
 import org.jeecg.modules.unitDevice.dto.CaseReportCheckDataDTO;
+import org.jeecg.modules.unitDevice.dto.CaseReportUnitScoreDTO;
+import org.jeecg.modules.unitDevice.dto.CaseReportWorkBatchDTO;
+import org.jeecg.modules.unitDevice.dto.CaseReportWorkBatchDetailDTO;
 import org.jeecg.modules.unitDevice.face.IUnitDeviceFace;
 import org.jeecg.modules.unitDevice.vo.*;
 import org.springframework.stereotype.Service;
@@ -82,11 +85,13 @@ public class UnitDeviceFaceImpl implements IUnitDeviceFace {
     }
 
     @Override
-    public List<CaseReportUnitScoreVO> caseReportUnitScore(String unitId, int unitType) {
+    public List<CaseReportUnitScoreVO> caseReportUnitScore(CaseReportUnitScoreDTO dto) {
 
         List<AnalysisBatchUnitDevice> records = analysisBatchUnitDeviceService.lambdaQuery()
-                .eq(AnalysisBatchUnitDevice::getUnitId, unitId)
-                .eq(AnalysisBatchUnitDevice::getUnitType, unitType)
+                .eq(AnalysisBatchUnitDevice::getUnitId, dto.getUnitId())
+                .eq(AnalysisBatchUnitDevice::getUnitType, dto.getUnitType())
+                .ge(AnalysisBatchUnitDevice::getCreateTime, dto.getStartTime())
+                .le(AnalysisBatchUnitDevice::getCreateTime, dto.getEndTime())
                 .ne(AnalysisBatchUnitDevice::getUnitScore, -1)
                 .orderByAsc(AnalysisBatchUnitDevice::getCreateTime).list();
 
@@ -98,6 +103,7 @@ public class UnitDeviceFaceImpl implements IUnitDeviceFace {
                 result.setUnitScore(record.getUnitScore());
                 result.setUnitScoreLevelStr(result.getUnitScoreLevelStr());
                 result.setAnalysisTime(record.getCreateTime());
+                results.add(result);
             }
 
         }
@@ -106,8 +112,15 @@ public class UnitDeviceFaceImpl implements IUnitDeviceFace {
     }
 
     @Override
-    public List<CaseReportWorkBatchVO> caseReportWorkBatch(String unitId, int unitType) {
-        return null;
+    public Page<CaseReportWorkBatchVO> caseReportWorkBatch(Page<CaseReportWorkBatchVO> pageData, CaseReportWorkBatchDTO dto) {
+
+
+        return workBatchService.caseReportWorkBatch(pageData, dto);
+    }
+
+    @Override
+    public List<CaseReportWorkBatchDetailVO> caseReportWorkBatchDetail(CaseReportWorkBatchDetailDTO dto) {
+        return workBatchDetailService.caseReportWorkBatchDetail(dto);
     }
 
 }

jeecg-module-system/src/main/java/org/jeecg/modules/unitDevice/vo/CaseReportWorkBatchDetailVO.java

+package org.jeecg.modules.unitDevice.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+@ApiModel(value = "CaseReportWorkBatchDetailVO对象", description = "单元设备-病例报告作业批次对象")
+public class CaseReportWorkBatchDetailVO {
+
+    @ApiModelProperty("主键")
+    @TableId("id")
+    private String id;
+
+    @ApiModelProperty("工作批次code")
+    @TableField("work_batch_code")
+    private String workBatchCode;
+
+    @ApiModelProperty("工作批次id")
+    @TableField("work_batch_id")
+    private String workBatchId;
+
+    @ApiModelProperty("分析批次单元设备id")
+    @TableField("analysis_batch_unit_device_id")
+    private String analysisBatchUnitDeviceId;
+
+    @ApiModelProperty("单元设备id")
+    @TableField("unit_id")
+    private String unitId;
+
+    @ApiModelProperty("单元设备code")
+    @TableField("unit_code")
+    private String unitCode;
+
+    @ApiModelProperty("设备单元类型1-钢轨,2-曲线,3-竖曲线,4-道岔")
+    @TableField("unit_type")
+    private Integer unitType;
+
+    @ApiModelProperty("设备单元类型名称")
+    @TableField("unit_type_name")
+    private String unitTypeName;
+
+    @ApiModelProperty("设备编号")
+    @TableField("unit_device_code")
+    private String unitDeviceCode;
+
+    @ApiModelProperty("设备单元起始里程")
+    @TableField("unit_start_mileage")
+    private BigDecimal unitStartMileage;
+
+    @ApiModelProperty("设备单元中心里程")
+    @TableField("unit_center_mileage")
+    private BigDecimal unitCenterMileage;
+
+    @ApiModelProperty("设备单元结束里程")
+    @TableField("unit_end_mileage")
+    private BigDecimal unitEndMileage;
+
+    @ApiModelProperty("单元得分等级 1-优良 2-合格 3-失格")
+    @TableField("unit_score_level")
+    private Integer unitScoreLevel;
+
+    @ApiModelProperty("单元得分等级说明")
+    @TableField("unit_score_level_str")
+    private String unitScoreLevelStr;
+
+    @ApiModelProperty("单元得分")
+    @TableField("unit_score")
+    private BigDecimal unitScore;
+
+    @ApiModelProperty("备注")
+    private String remark;
+
+    @ApiModelProperty("维修日期")
+    private Date maintenanceDate;
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/unitDevice/vo/CaseReportWorkBatchVO.java

 package org.jeecg.modules.unitDevice.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
+import java.util.Date;
+
 @Data
 @ApiModel(value = "CaseReportWorkBatchVO对象", description = "单元设备-病例报告作业批次对象")
 public class CaseReportWorkBatchVO {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("单元ID")
+    private String unitId;
+
+    @ApiModelProperty("作业计划批ID")
+    private String workBatchId;
+
+    @ApiModelProperty("作业计划批次号")
+    private String workBatchCode;
+
+    @ApiModelProperty("所属线路id")
+    private String lightRailId;
+
+    @ApiModelProperty("所属线路名称")
+    private String lightRailName;
+
+    @ApiModelProperty("所属线别id")
+    private String lineAliasId;
+
+    @ApiModelProperty("所属线别名称")
+    private String lineAliasName;
+
+    @ApiModelProperty("作业开始时间")
+    private Date workStartTime;
+
+    @ApiModelProperty("作业终止时间")
+    private Date workEndTime;
+
+    @ApiModelProperty("作业终止时间")
+    private BigDecimal workStartMileage;
+
+    @ApiModelProperty("作业终止时间")
+    private BigDecimal workEndMileage;
+
+    @ApiModelProperty("作业班组")
+    private String team;
+
+    @ApiModelProperty("来源 1-页面添加 2-超限派工添加")
+    private Integer source;
+
+    @ApiModelProperty("作业状态 0-未作业 9-已作业")
+    private Integer workStatus;
+
+    @ApiModelProperty("作业单元数量")
+    private Integer workUnitDeviceNum;
+
+    @ApiModelProperty("备注")
+    @TableField("remark")
+    private String remark;
+
 }

jeecg-module-system/src/main/java/org/jeecg/modules/unitDevice/vo/RailVehicleCheckVO.java

 package org.jeecg.modules.unitDevice.vo;
 
-import com.baomidou.mybatisplus.annotation.TableId;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -71,6 +70,9 @@ public class RailVehicleCheckVO {
     @ApiModelProperty("超限等级")
     private Integer overLevel;
 
+    @ApiModelProperty("长度(m)")
+    private String longitude;
+
     @ApiModelProperty("峰值（mm或g）")
     private String peakValue;