feat:1.更新数据库 2.维修作业管理

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

@@ -5,8 +5,10 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
@@ -88,5 +90,15 @@ public class RailInspectionEquipmentItemDetail implements Serializable {
     @TableField("info_sort")
     private Integer infoSort;
 
+    @ApiModelProperty("当前格子的起始里程:计算用")
+    @TableField(exist = false)
+    @JsonIgnore
+    private BigDecimal currentStartMileage;
+
+    @ApiModelProperty("当前格子的起始里程:计算用")
+    @TableField(exist = false)
+    @JsonIgnore
+    private BigDecimal currentEndEndMileage;
+
 
 }

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

@@ -3,10 +3,13 @@ package org.jeecg.modules.checkData.equipmentCheckData.entity;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
@@ -105,4 +108,15 @@ public class MovementCourseInfo implements Serializable {
     @TableField("info_sort")
     private Integer infoSort;
 
+    @ApiModelProperty("当前格子的起始里程:计算用")
+    @TableField(exist = false)
+    @JsonIgnore
+    private BigDecimal currentStartMileage;
+
+    @ApiModelProperty("当前格子的起始里程:计算用")
+    @TableField(exist = false)
+    @JsonIgnore
+    private BigDecimal currentEndEndMileage;
+
+
 }

jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/dto/AnalysisBatchUnitDeviceDTO.java

@@ -36,7 +36,7 @@ public class AnalysisBatchUnitDeviceDTO {
     private BigDecimal unitEndMileage;
 
     @ApiModelProperty("是否超限")
-    private int isTransfinite;
+    private Integer isTransfinite;
 
     @ApiModelProperty("单元编号")
     private String unitCode;

jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/entity/AnalysisBatchUnitDevice.java

@@ -93,6 +93,10 @@ public class AnalysisBatchUnitDevice implements Serializable {
     @TableField("unit_score_level")
     private Integer unitScoreLevel;
 
+    @ApiModelProperty("单元得分等级说明")
+    @TableField("unit_score_level_str")
+    private String unitScoreLevelStr;
+
     @ApiModelProperty("单元得分")
     @TableField("unit_score")
     private BigDecimal unitScore;

jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/entity/AnalysisBatchUnitDevicePointScore.java

@@ -87,6 +87,10 @@ public class AnalysisBatchUnitDevicePointScore implements Serializable {
     @TableField("unit_type_name")
     private String unitTypeName;
 
+    @ApiModelProperty("检查类型 1-人工检查 2-轨检仪类型 3-轨检车类型 4-添乘仪类型")
+    @TableField("check_type")
+    private Integer checkType;
+
     @ApiModelProperty("测点类型")
     @TableField("point_type_name")
     private String pointTypeName;

jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/mapper/xml/AnalysisBatchUnitDeviceMapper.xml

@@ -21,11 +21,13 @@
                 t1.unit_starting_mileage,
                 t1.unit_center_mileage,
                 t1.unit_end_mileage,
-                t1.unit_score finalGrade,
-                t1.unit_score_level gradeJudge,
+                t1.unit_score,
+                t1.unit_score_level,
+                t1.unit_score_level_str,
                 t1.remark,
                 ( SELECT COUNT( 1 ) FROM t_dsa_analysis_batch_unit_device_transfinite WHERE analysis_batch_unit_device_id = t1.id LIMIT 1 ) AS is_work,
-                ( SELECT COUNT( 1 ) FROM t_dsa_analysis_batch_unit_device_transfinite WHERE analysis_batch_unit_device_id = t1.id LIMIT 1 ) AS is_transfinite
+                ( SELECT COUNT( 1 ) FROM t_dsa_analysis_batch_unit_device_transfinite WHERE analysis_batch_unit_device_id = t1.id LIMIT 1 ) AS is_transfinite,
+                ( SELECT COUNT( 1 ) FROM t_mw_work_batch_detail WHERE analysis_batch_unit_device_id = t1.id LIMIT 1 ) AS work_status
             FROM
             t_dsa_analysis_batch_unit_device t1
         WHERE
@@ -45,5 +47,8 @@
                 #{item}
             </foreach>
         </if>
+        <if test="dto.isTransfinite != null">
+            AND analysis.is_transfinite = 1
+        </if>
     </select>
 </mapper>

jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/vo/AnalysisBatchUnitDeviceVO.java

@@ -54,11 +54,14 @@ public class AnalysisBatchUnitDeviceVO {
     @ApiModelProperty("设备单元结束里程")
     private BigDecimal unitEndMileage;
 
-    @ApiModelProperty("最后得分")
-    private BigDecimal finalGrade;
+    @ApiModelProperty("单元得分等级中文")
+    private String unitScoreLevelStr;
 
-    @ApiModelProperty("得分平级")
-    private String gradeJudge;
+    @ApiModelProperty("单元得分等级 1-优良 2-合格 3-失格")
+    private int unitScoreLevel;
+
+    @ApiModelProperty("单元得分")
+    private String unitScore;
 
     @ApiModelProperty("备注")
     private String remark;
@@ -69,11 +72,9 @@ public class AnalysisBatchUnitDeviceVO {
     @ApiModelProperty("是否超限 0-否 1-是")
     private Integer isTransfinite;
 
-
     @ApiModelProperty("是否派工 0-否 1-是")
     private Integer isWork;
 
-
     @ApiModelProperty("派工状态 0-未派工 1-派工")
     private Integer workStatus;
 }

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

@@ -7,9 +7,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
-import org.jeecg.modules.dynamicStaticAnalysis.dto.AnalysisBatchSaveOrUpdateDTO;
-import org.jeecg.modules.maintenanceWork.dto.WorkBatchDTO;
-import org.jeecg.modules.maintenanceWork.dto.WorkBatchSaveOrUpdateDTO;
+import org.jeecg.modules.maintenanceWork.dto.*;
 import org.jeecg.modules.maintenanceWork.entity.WorkBatch;
 import org.jeecg.modules.maintenanceWork.service.IWorkBatchService;
 import org.jeecg.modules.maintenanceWork.vo.WorkBatchVO;
@@ -17,6 +15,9 @@ import org.springframework.web.bind.annotation.*;
 
 import org.jeecg.common.system.base.controller.JeecgController;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 维修作业管理-作业计划批次管理表 前端控制器
@@ -51,6 +52,16 @@ public class WorkBatchController extends JeecgController<WorkBatch, IWorkBatchSe
         return Result.OK("操作成功");
     }
 
+    @AutoLog(value = "维修作业管理-作业计划批次管理-超限页面新增")
+    @ApiOperation(value = "维修作业管理-作业计划批次管理-超限页面新增", notes = "维修作业管理-作业计划批次管理-超限页面新增")
+    @PostMapping(value = "/transfiniteSaveRecord")
+    public Result<String> transfiniteSaveRecord(@RequestBody WorkBatchTransfiniteSaveDTO dto) {
+
+        this.service.transfiniteSaveRecord(dto);
+
+        return Result.OK("操作成功");
+    }
+
 
     @AutoLog(value = "维修作业管理-作业计划批次管理-维修作业管理页面更新")
     @ApiOperation(value = "维修作业管理-作业计划批次管理-维修作业管理页面更新", notes = "维修作业管理-作业计划批次管理-维修作业管理页面更新")
@@ -70,4 +81,27 @@ public class WorkBatchController extends JeecgController<WorkBatch, IWorkBatchSe
         return Result.OK("删除成功!");
     }
 
+    @AutoLog(value = "维修作业管理-作业计划批次管理-获取里程单元设备")
+    @ApiOperation(value = "维修作业管理-作业计划批次管理-获取里程单元设备", notes = "维修作业管理-作业计划批次管理-获取里程单元设备")
+    @GetMapping(value = "/getUnitDeviceList")
+    public Result<List<Map<String, Object>>> getUnitDeviceList(@RequestBody UnitDeviceDTO dto) {
+        List<Map<String, Object>> records = this.service.getUnitDeviceList(dto);
+        return Result.OK(records);
+    }
+
+    @AutoLog(value = "维修作业管理-作业计划批次管理-维修作业管理页面详情新增")
+    @ApiOperation(value = "维修作业管理-作业计划批次管理-维修作业管理页面新增", notes = "维修作业管理-作业计划批次管理-维修作业管理页面新增")
+    @PostMapping(value = "/saveDetailRecord")
+    public Result<String> saveDetailRecord(@RequestBody WorkBatchDetailDTO dto) {
+
+        this.service.saveDetailRecord(dto);
+
+        return Result.OK("操作成功");
+    }
+
+
+    
+
+
+
 }

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

+package org.jeecg.modules.maintenanceWork.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * <p>
+ * 维修作业管理-作业计划批次管理明细表
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-08-09
+ */
+@Data
+@ApiModel(value = "TransfiniteDTO对象", description = "维修作业管理-超限")
+public class DispatchDTO {
+
+    @ApiModelProperty("分析批次单元设备id")
+    private String id;
+
+    @ApiModelProperty("单元设备id")
+    private String unitId;
+
+    @ApiModelProperty("单元设备code")
+    private String unitCode;
+
+    @ApiModelProperty("设备单元类型1-钢轨 2-曲线 3-竖曲线 4-道岔")
+    private Integer unitType;
+
+    @ApiModelProperty("设备单元类型名称")
+    private String unitTypeName;
+
+    @ApiModelProperty("设备编号")
+    private String unitDeviceCode;
+
+    @ApiModelProperty("设备单元起始里程")
+    private BigDecimal unitStartingMileage;
+
+    @ApiModelProperty("设备单元中心里程")
+    private BigDecimal unitCenterMileage;
+
+    @ApiModelProperty("设备单元结束里程")
+    private BigDecimal unitEndMileage;
+
+    @ApiModelProperty("单元得分等级中文")
+    private String unitScoreLevelStr;
+
+    @ApiModelProperty("单元得分等级 1-优良 2-合格 3-失格")
+    private int unitScoreLevel;
+
+    @ApiModelProperty("单元得分")
+    private BigDecimal unitScore;
+}

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

+package org.jeecg.modules.maintenanceWork.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+@ApiModel(value = "UnitDeviceDTO对象", description = "fsf1")
+public class UnitDeviceDTO {
+    @ApiModelProperty("作业计划批次号")
+    private String lightRailId;
+    @ApiModelProperty("作业计划批次号")
+    private String lineAliasId;
+    @ApiModelProperty("作业计划批次号")
+    private BigDecimal startMileage;
+    @ApiModelProperty("作业计划批次号")
+    private BigDecimal endMileage;
+}

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

@@ -28,7 +28,6 @@ public class WorkBatchDTO {
 
     private static final long serialVersionUID = 1L;
 
-
     @ApiModelProperty("作业计划批次号")
     private String workBatchCode;
 

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

 package org.jeecg.modules.maintenanceWork.dto;
 
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.Getter;
-import lombok.Setter;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
 
 /**
  * <p>
@@ -26,79 +20,12 @@ import lombok.Setter;
 @ApiModel(value = "WorkBatchDetailDTO对象", description = "维修作业管理-作业计划批次管理明细表")
 public class WorkBatchDetailDTO {
 
-    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("工作批次code")
-    private String workBatchCode;
-
-    @ApiModelProperty("工作批次id")
+    @ApiModelProperty("作业计划批id")
     private String workBatchId;
 
-    @ApiModelProperty("检查批次号")
-    private String ekCode;
-
-    @ApiModelProperty("检查批id")
-    private String ekId;
-
-    @ApiModelProperty("检查数据类型 1-人工静态检查 2-轨检仪静态检查 3-轨检车检查 4-添乘仪检查")
-    private Integer ekType;
-
-    @ApiModelProperty("检查日期")
-    private Date checkTime;
-
-    @ApiModelProperty("起始里程")
-    private BigDecimal startingMileage;
-
-    @ApiModelProperty("终点里程")
-    private BigDecimal endMileage;
-
-    @ApiModelProperty("单元设备id")
-    private String unitId;
-
-    @ApiModelProperty("单元设备code")
-    private String unitCode;
-
-    @ApiModelProperty("设备单元类型1-钢轨,2-曲线,3-竖曲线,4-道岔")
-    private Integer unitType;
-
-    @ApiModelProperty("设备单元类型名称")
-    private String unitTypeName;
-
-    @ApiModelProperty("设备编号")
-    private String unitDeviceCode;
-
-    @ApiModelProperty("设备单元起始里程")
-    private BigDecimal unitStartingMileage;
-
-    @ApiModelProperty("设备单元中心里程")
-    private BigDecimal unitCenterMileage;
-
-    @ApiModelProperty("设备单元结束里程")
-    private BigDecimal unitEndMileage;
-
-    @ApiModelProperty("单元得分等级 1-优良 2-合格 3-失格")
-    private Integer unitScoreLevel;
-
-    @ApiModelProperty("单元得分")
-    private BigDecimal unitScore;
-
-    @ApiModelProperty("备注")
-    private String remark;
-
+    @ApiModelProperty("作业计划批次号")
+    private String workBatchCode;
 
+    @ApiModelProperty("单元设备列表")
+    private List<DispatchDTO> unitDeviceList;
 }

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

@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -15,7 +16,7 @@ import java.util.Date;
  * @since 2023-08-09
  */
 @Data
-@ApiModel(value = "WorkBatchSaveOrUpdateDTO对象", description = "维修作业管理-作业计划批次管理表")
+@ApiModel(value = "PageSaveOrUpdateDTO对象", description = "维修作业管理-页面来源保存或更新dto")
 public class WorkBatchSaveOrUpdateDTO {
 
     private static final long serialVersionUID = 1L;
@@ -37,6 +38,15 @@ public class WorkBatchSaveOrUpdateDTO {
     @ApiModelProperty("所属线别名称")
     private String lineAliasName;
 
+    @ApiModelProperty("作业起始里程")
+    private BigDecimal workStartingMileage;
+
+    @ApiModelProperty("作业终点里程")
+    private BigDecimal workEndMileage;
+
+    @ApiModelProperty("作业终止时间")
+    private Date workStartTime;
+
     @ApiModelProperty("作业终止时间")
     private Date workEndTime;
 
@@ -48,8 +58,4 @@ public class WorkBatchSaveOrUpdateDTO {
 
     @ApiModelProperty("作业状态 0-未作业 1-已作业")
     private Integer workStatus;
-
-    @ApiModelProperty("是否删除 0-未删除 1-已删除")
-    private String delFlag;
-
 }

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

+package org.jeecg.modules.maintenanceWork.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ * 维修作业管理-作业计划批次管理表
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-08-09
+ */
+@Data
+@ApiModel(value = "WorkBatchSaveOrUpdateDTO对象", description = "维修作业管理-作业计划批次管理表")
+public class WorkBatchTransfiniteSaveDTO {
+
+    private static final long serialVersionUID = 1L;
+
+    private String id;
+
+    @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("派工列表")
+    private List<DispatchDTO> dispatchList;
+}

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

@@ -68,8 +68,8 @@ public class WorkBatch implements Serializable {
     private String lineAliasName;
 
     @ApiModelProperty("作业起始里程")
-    @TableField("work_starting_mileage")
-    private BigDecimal workStartingMileage;
+    @TableField("work_start_mileage")
+    private BigDecimal workStartMileage;
 
     @ApiModelProperty("作业终点里程")
     @TableField("work_end_mileage")

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

@@ -3,9 +3,11 @@ package org.jeecg.modules.maintenanceWork.entity;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
@@ -55,29 +57,9 @@ public class WorkBatchDetail implements Serializable {
     @TableField("work_batch_id")
     private String workBatchId;
 
-    @ApiModelProperty("检查批次号")
-    @TableField("ek_code")
-    private String ekCode;
-
-    @ApiModelProperty("检查批id")
-    @TableField("ek_id")
-    private String ekId;
-
-    @ApiModelProperty("检查数据类型 1-人工静态检查 2-轨检仪静态检查 3-轨检车检查 4-添乘仪检查")
-    @TableField("ek_type")
-    private Integer ekType;
-
-    @ApiModelProperty("检查日期")
-    @TableField("check_time")
-    private Date checkTime;
-
-    @ApiModelProperty("起始里程")
-    @TableField("starting_mileage")
-    private BigDecimal startingMileage;
-
-    @ApiModelProperty("终点里程")
-    @TableField("end_mileage")
-    private BigDecimal endMileage;
+    @ApiModelProperty("分析批次单元设备id")
+    @TableField("analysis_batch_unit_device_id")
+    private String analysisBatchUnitDeviceId;
 
     @ApiModelProperty("单元设备id")
     @TableField("unit_id")
@@ -115,6 +97,10 @@ public class WorkBatchDetail implements Serializable {
     @TableField("unit_score_level")
     private Integer unitScoreLevel;
 
+    @ApiModelProperty("单元得分等级说明")
+    @TableField("unit_score_level_str")
+    private String unitScoreLevelStr;
+
     @ApiModelProperty("单元得分")
     @TableField("unit_score")
     private BigDecimal unitScore;

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

@@ -14,14 +14,15 @@
             t1.light_rail_name,
             t1.line_alias_id,
             t1.line_alias_name,
-            t1.work_starting_mileage,
+            t1.work_start_mileage,
             t1.work_end_mileage,
             t1.work_start_time,
             t1.work_end_time,
             t1.team,
             t1.source,
             t1.work_status,
-            t1.del_flag
+            t1.del_flag,
+            (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
         WHERE

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

 package org.jeecg.modules.maintenanceWork.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.jeecg.modules.maintenanceWork.dto.WorkBatchDTO;
-import org.jeecg.modules.maintenanceWork.dto.WorkBatchSaveOrUpdateDTO;
+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 java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 维修作业管理-作业计划批次管理表 服务类
@@ -24,4 +26,10 @@ public interface IWorkBatchService extends IService<WorkBatch> {
     void updateRecord(WorkBatchSaveOrUpdateDTO dto);
 
     void deleteRecord(String id);
+
+    void transfiniteSaveRecord(WorkBatchTransfiniteSaveDTO dto);
+
+    void saveDetailRecord(WorkBatchDetailDTO dto);
+
+    List<Map<String, Object>> getUnitDeviceList(UnitDeviceDTO dto);
 }

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

 package org.jeecg.modules.maintenanceWork.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.convert.Convert;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.jeecg.common.util.UUIDGenerator;
-import org.jeecg.modules.maintenanceWork.dto.WorkBatchDTO;
-import org.jeecg.modules.maintenanceWork.dto.WorkBatchSaveOrUpdateDTO;
+import org.jeecg.modules.dynamicStaticAnalysis.mapper.AnalysisAlgorithmMapper;
+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.mapper.WorkBatchDetailMapper;
@@ -15,6 +18,11 @@ import org.jeecg.modules.maintenanceWork.vo.WorkBatchVO;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -29,6 +37,9 @@ public class WorkBatchServiceImpl extends ServiceImpl<WorkBatchMapper, WorkBatch
     @Resource
     private WorkBatchDetailMapper workBatchDetailMapper;
 
+    @Resource
+    private AnalysisAlgorithmMapper analysisAlgorithmMapper;
+
     @Override
     public Page<WorkBatchVO> listRecord(Page<WorkBatchVO> pageData, WorkBatchDTO dto) {
         return this.baseMapper.listRecord(pageData, dto);
@@ -48,8 +59,88 @@ public class WorkBatchServiceImpl extends ServiceImpl<WorkBatchMapper, WorkBatch
     }
 
     @Override
-    public void deleteRecord(String id) {
-        this.removeById(id);
+    public void deleteRecord(String workBatchId) {
+        this.removeById(workBatchId);
+
+
+        LambdaQueryWrapper<WorkBatchDetail> delWrapper = Wrappers.lambdaQuery();
+        delWrapper.eq(WorkBatchDetail::getWorkBatchId, workBatchId);
+        workBatchDetailMapper.delete(delWrapper);
+    }
+
+    @Override
+    public void transfiniteSaveRecord(WorkBatchTransfiniteSaveDTO dto) {
+        WorkBatch workBatch = BeanUtil.copyProperties(dto, WorkBatch.class);
+        workBatch.setId(UUIDGenerator.generate());
+        workBatch.setWorkStatus(9); // 9-已作业
+        workBatch.setSource(2); // 超限页面
+        this.save(workBatch);
+
+        List<DispatchDTO> transfiniteList = dto.getDispatchList();
+        for (DispatchDTO transfiniteDTO : transfiniteList) {
+            WorkBatchDetail workBatchDetail = new WorkBatchDetail();
+            workBatchDetail.setId(UUIDGenerator.generate());
+            workBatchDetail.setWorkBatchId(workBatch.getId());
+            workBatchDetail.setWorkBatchCode(workBatch.getWorkBatchCode());
+            workBatchDetail.setAnalysisBatchUnitDeviceId(transfiniteDTO.getId());
+            workBatchDetail.setUnitId(transfiniteDTO.getUnitId());
+            workBatchDetail.setUnitCode(transfiniteDTO.getUnitCode());
+            workBatchDetail.setUnitType(transfiniteDTO.getUnitType());
+            workBatchDetail.setUnitTypeName(transfiniteDTO.getUnitTypeName());
+            workBatchDetail.setUnitDeviceCode(transfiniteDTO.getUnitDeviceCode());
+            workBatchDetail.setUnitEndMileage(transfiniteDTO.getUnitStartingMileage());
+            workBatchDetail.setUnitEndMileage(transfiniteDTO.getUnitEndMileage());
+            workBatchDetail.setUnitCenterMileage(transfiniteDTO.getUnitCenterMileage());
+            workBatchDetail.setUnitScore(transfiniteDTO.getUnitScore());
+            workBatchDetail.setUnitScoreLevel(transfiniteDTO.getUnitScoreLevel());
+            workBatchDetail.setUnitScoreLevelStr(transfiniteDTO.getUnitScoreLevelStr());
+            workBatchDetailMapper.insert(workBatchDetail);
+        }
+    }
+
+
+    @Override
+    public void saveDetailRecord(WorkBatchDetailDTO dto) {
+        // 先删除
+        LambdaQueryWrapper<WorkBatchDetail> delWrapper = Wrappers.lambdaQuery();
+        delWrapper.eq(WorkBatchDetail::getWorkBatchId, dto.getWorkBatchId());
+        workBatchDetailMapper.delete(delWrapper);
+
+        List<DispatchDTO> transfiniteList = dto.getUnitDeviceList();
+        for (DispatchDTO dispatchDTO : transfiniteList) {
+            WorkBatchDetail workBatchDetail = new WorkBatchDetail();
+            workBatchDetail.setId(UUIDGenerator.generate());
+            workBatchDetail.setWorkBatchId(dto.getWorkBatchId());
+            workBatchDetail.setWorkBatchCode(dto.getWorkBatchCode());
+            workBatchDetail.setUnitId(dispatchDTO.getUnitId());
+            workBatchDetail.setUnitCode(dispatchDTO.getUnitCode());
+            workBatchDetail.setUnitType(dispatchDTO.getUnitType());
+            workBatchDetail.setUnitTypeName(dispatchDTO.getUnitTypeName());
+            workBatchDetail.setUnitDeviceCode(dispatchDTO.getUnitDeviceCode());
+            workBatchDetail.setUnitEndMileage(dispatchDTO.getUnitStartingMileage());
+            workBatchDetail.setUnitEndMileage(dispatchDTO.getUnitEndMileage());
+            workBatchDetail.setUnitCenterMileage(dispatchDTO.getUnitCenterMileage());
+            workBatchDetail.setUnitScore(dispatchDTO.getUnitScore());
+            workBatchDetail.setUnitScoreLevel(dispatchDTO.getUnitScoreLevel());
+            workBatchDetail.setUnitScoreLevelStr(dispatchDTO.getUnitScoreLevelStr());
+            workBatchDetailMapper.insert(workBatchDetail);
+        }
+    }
+
+    @Override
+    public List<Map<String, Object>> getUnitDeviceList(UnitDeviceDTO dto) {
+        List<Map<String, Object>> resultList = new ArrayList<>();
+        List<Map<String, Object>> unitDeviceList = analysisAlgorithmMapper.getUnitDevice(dto.getLightRailId(), dto.getLineAliasId());
+
+        for (Map<String, Object> unitDevice : unitDeviceList) {
+            BigDecimal startMileage = Convert.toBigDecimal(unitDevice.get("startMileage"));
+            BigDecimal endMileage = Convert.toBigDecimal(unitDevice.get("endMileage"));
+            BigDecimal centerMileage = startMileage.add(endMileage).divide(new BigDecimal("2"), 3, RoundingMode.HALF_UP);
+            if (dto.getStartMileage().compareTo(centerMileage) <= 0 && dto.getEndMileage().compareTo(centerMileage) > 0) {
+                resultList.add(unitDevice);
+            }
+        }
+        return resultList;
     }
 
 }

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

 package org.jeecg.modules.maintenanceWork.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -23,6 +24,12 @@ public class WorkBatchVO {
 
     private String id;
 
+    @ApiModelProperty("创建人")
+    private String createBy;
+
+    @ApiModelProperty("创建日期")
+    private Date createTime;
+
     @ApiModelProperty("作业计划批次号")
     private String workBatchCode;
 
@@ -38,19 +45,32 @@ public class WorkBatchVO {
     @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-未作业 1-已作业")
+    @ApiModelProperty("作业状态 0-未作业 9-已作业")
     private Integer workStatus;
 
+    @ApiModelProperty("作业单元数量")
+    private Integer workUnitDeviceNum;
+
     @ApiModelProperty("是否删除 0-未删除 1-已删除")
     private String delFlag;
 
+
 }

jeecg-module-system/src/main/java/org/jeecg/modules/subwayNetwork/service/impl/SubwaySectionServiceImpl.java

@@ -60,8 +60,8 @@ public class SubwaySectionServiceImpl extends ServiceImpl<SubwaySectionMapper, S
         SubwaySection subwaySection = BeanUtil.copyProperties(dto, SubwaySection.class);
         LightRail rail = lightRailMapper.selectById(dto.getLightRailId()); // 线路id
         subwaySection.setLightRailName(rail.getRailLineName());// 线路昵称
-        subwaySection.setSectionStartingMileage(startTrainStation.getCenterMileage()); // 区间起始里程
-        subwaySection.setSectionEndMileage(endTrainStation.getCenterMileage());// 区间结束里程
+        subwaySection.setSectionStartingMileage(startTrainStation.getEndMileage()); // 区间起始里程
+        subwaySection.setSectionEndMileage(endTrainStation.getStartingMileage());// 区间结束里程
         //维护区间的更新人和更新时间
         subwaySection.setUpdateTime(new Date());
         LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();

jeecg-module-system/src/main/resources/application-dev.yml

@@ -131,7 +131,7 @@ spring:
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:
         master:
-          url: jdbc:mysql://47.94.207.62:3306/hzsomms?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&zeroDateTimeBehavior=convertToNull
+          url: jdbc:mysql://47.94.207.62:3306/hzgw?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&zeroDateTimeBehavior=convertToNull
           username: root
           password: superAdmin&321
           driver-class-name: com.mysql.jdbc.Driver

jeecg-module-system/src/main/resources/application-test.yml

@@ -131,7 +131,7 @@ spring:
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:
         master:
-          url: jdbc:mysql://127.0.0.1:3306/hzsomms?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&zeroDateTimeBehavior=convertToNull
+          url: jdbc:mysql://127.0.0.1:3306/hzgw?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&zeroDateTimeBehavior=convertToNull
           username: root
           password: superAdmin&321
           driver-class-name: com.mysql.jdbc.Driver