代码更新--shizhilong

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

@@ -273,10 +273,13 @@
     <select id="getWorkPageList" resultType="org.jeecg.modules.diseaseAnalysis.vo.AnalysisLineBatchWorkVO">
         SELECT
         t1.*,
+        t1.id as analysisBatchId,
+        t1.starting_mileage as unitStartMileage,
+        t1.end_mileage as unitEndMileage,
         t2.check_time,
         t2.check_by,
         t2.ek_id,
-        t2.ek_code,
+        t2.ek_code
         FROM
         t_dsa_analysis_line_batch t1 left join t_dsa_analysis_line_batch_check_data_map t2 on t1.id = t2.analysis_batch_id
         WHERE

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

@@ -27,8 +27,8 @@ public class AnalysisLineBatchWorkVO {
 
     private static final long serialVersionUID = 1L;
 
-    @ApiModelProperty("主键")
-    private String id;
+    @ApiModelProperty("分析批次主键")
+    private String analysisBatchId;
 
     @ApiModelProperty("创建人")
     private String createBy;
@@ -58,10 +58,10 @@ public class AnalysisLineBatchWorkVO {
     private String lineAliasName;
 
     @ApiModelProperty("分析起始里程")
-    private BigDecimal startingMileage;
+    private BigDecimal unitStartMileage;
 
     @ApiModelProperty("分析终点里程")
-    private BigDecimal endMileage;
+    private BigDecimal unitEndMileage;
 
     @ApiModelProperty("分析状态 0-创建 1-分析中  99-分析完成")
     private Integer analysisStatus;

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

@@ -94,8 +94,9 @@ public class WorkBatchController extends JeecgController<WorkBatch, IWorkBatchSe
             map.put("cx", corrugationInfoList);
         }else if(analysisType == 5){
             List<AnalysisLineBatchUnitDeviceTrackBedInfoVO> trackBedInfoList = this.service.getAnalysisLineBatchUnitDeviceTrackBedInfoList(analysisBatchId,analysisBatchUnitDeviceId);
+            Map<String, List<AnalysisLineBatchUnitDeviceTrackBedInfoVO>> trackBedMap = trackBedInfoList.stream().collect(Collectors.groupingBy(AnalysisLineBatchUnitDeviceTrackBedInfoVO::getTrackBedCode));
             //道床检查超限数据
-            map.put("cx", trackBedInfoList);
+            map.put("cx", trackBedMap);
         }else {
             //根据分析单元id查询巡道员备忘录
             String remark = analysisLineBatchUnitDeviceService.getById(analysisBatchUnitDeviceId).getRemark();

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

@@ -29,6 +29,12 @@ public class DispatchDTO {
     @ApiModelProperty("分析批id")
     private String analysisBatchId;
 
+    @ApiModelProperty("检查批次id")
+    private String ekId;
+
+    @ApiModelProperty("检查批次code")
+    private String ekCode;
+
     @ApiModelProperty("单元设备id")
     private String unitId;
 

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

@@ -18,6 +18,12 @@ public class WorkBatchSaveOrUpdateDetailDTO {
     @ApiModelProperty("分析批次code")
     private String analysisBatchCode;
 
+    @ApiModelProperty("检查批次id")
+    private String ekId;
+
+    @ApiModelProperty("检查批次code")
+    private String ekCode;
+
     @ApiModelProperty("单元设备id")
     private String unitId;
 

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

@@ -69,6 +69,14 @@ public class WorkBatchDetail implements Serializable {
     @TableField("analysis_batch_unit_device_id")
     private String analysisBatchUnitDeviceId;
 
+    @TableField("ek_id")
+    @ApiModelProperty("检查批次id")
+    private String ekId;
+
+    @ApiModelProperty("检查批次code")
+    @TableField("ek_code")
+    private String ekCode;
+
     @ApiModelProperty("检查日期")
     @TableField("check_time")
     private Date checkTime;

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

@@ -43,7 +43,9 @@
             t1.reform_remark,
             t1.remark,
             t1.check_by,
-            t1.check_time
+            t1.check_time,
+            t1.ek_id,
+            t1.ek_code
         FROM t_mw_work_batch_detail t1
         WHERE t1.work_batch_id in
         <if test="workBatchIds !=null and workBatchIds.size()>0">

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

@@ -47,6 +47,12 @@ public class WorkBatchDetailVO {
     @ApiModelProperty("工作批次id")
     private String workBatchId;
 
+    @ApiModelProperty("检查批次id")
+    private String ekId;
+
+    @ApiModelProperty("检查批次code")
+    private String ekCode;
+
     @ApiModelProperty("检查日期")
     private Date checkTime;