feat:1.算法

.gitignore

@@ -10,3 +10,4 @@ rebel.xml
 ## front
 **/*.lock
 /jeecg-module-system/src/main/java/org/jeecg/modules/test/
+/jeecg-module-system/src/main/resources/application-hkl.yml

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

@@ -25,12 +25,12 @@ public class CodeGenerate {
         String outputDir = projectPath + "\\jeecg-module-system\\src\\main\\java\\";
 
         // 模块名
-        String moduleName = "dynamicStaticAnalysis";
+        String moduleName = "maintenanceWork";
 
         // 表名
         String[] tables = {
-                "t_dsa_config_allow_value",
-                "t_dsa_config_dispatching",
+                "t_mw_work_batch",
+                "t_mw_work_batch_detail",
         };
 
 
@@ -58,7 +58,7 @@ public class CodeGenerate {
                 // 设置过滤前缀
                 .strategyConfig(builder -> {
                     builder.addInclude(tables) // 设置需要生成的表名
-                            .addTablePrefix("t_sn", "t_da", "t_ek", "t_xd", "t_dsg", "t_djt", "t_jh", "t_dsa"); // 设置过滤表前缀
+                            .addTablePrefix("t_sn", "t_da", "t_ek", "t_xd", "t_dsg", "t_djt", "t_jh", "t_dsa","t_mw"); // 设置过滤表前缀
 
                     // entity实体策略
                     builder.entityBuilder()

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

@@ -25,7 +25,16 @@ public class SingleConsumer {
                 analysisAlgorithm.analysis(analysisBatchId);
 
             } catch (Exception e) {
-                log.info("SingleConsumer[消费者]|线程id:【" + Thread.currentThread().getId() + "】异常信息:" + e.getCause());
+                StackTraceElement[] stackTrace = e.getStackTrace();
+                String exceptionMessage = "错误类名:" +
+                        stackTrace[0].getClassName() +
+                        ".错误方法名:" +
+                        stackTrace[0].getMethodName() +
+                        ".错误行号:" +
+                        stackTrace[0].getLineNumber() +
+                        ".异常:" +
+                        e.toString();
+                log.error("SingleConsumer[消费者]|线程id:【" + Thread.currentThread().getId() + "】异常信息:" + exceptionMessage);
                 e.printStackTrace();
             }
 

jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/controller/AnalysisBatchUnitDeviceController.java

@@ -10,12 +10,14 @@ import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.modules.dynamicStaticAnalysis.dto.AnalysisBatchUnitDeviceDTO;
 import org.jeecg.modules.dynamicStaticAnalysis.entity.AnalysisBatchUnitDevice;
+import org.jeecg.modules.dynamicStaticAnalysis.entity.AnalysisBatchUnitDeviceTransfinite;
 import org.jeecg.modules.dynamicStaticAnalysis.service.IAnalysisBatchUnitDeviceService;
+import org.jeecg.modules.dynamicStaticAnalysis.service.IAnalysisBatchUnitDeviceTransfiniteService;
 import org.jeecg.modules.dynamicStaticAnalysis.vo.AnalysisBatchUnitDeviceVO;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
 
 /**
  * <p>
@@ -33,12 +35,14 @@ public class AnalysisBatchUnitDeviceController extends JeecgController<AnalysisB
 
     @AutoLog(value = "动静态分析-分析批次-单元设备-获取列表数据")
     @ApiOperation(value = "动静态分析-分析批次-单元设备-获取列表数据", notes = "动静态分析-分析批次-单元设备-获取列表数据")
-    @GetMapping(value = "/listRecord")
-    public Result<IPage<AnalysisBatchUnitDeviceVO>> listRecord(@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                               @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                                               AnalysisBatchUnitDeviceDTO dto) {
-        Page<AnalysisBatchUnitDeviceVO> pageData = new Page<>(pageNo, pageSize);
+    @PostMapping(value = "/listRecord")
+    public Result<IPage<AnalysisBatchUnitDeviceVO>> listRecord(@RequestBody AnalysisBatchUnitDeviceDTO dto) {
+        Page<AnalysisBatchUnitDeviceVO> pageData = new Page<>(dto.getPageNo(), dto.getPageSize());
         pageData = this.service.listRecord(pageData, dto);
+
+
         return Result.OK(pageData);
     }
+
+
 }

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

@@ -41,6 +41,18 @@ public class AnalysisBatchSaveOrUpdateDTO {
     @ApiModelProperty("分析类型 1-均值分析 2-峰值分析")
     private Integer analysisType;
 
+    @ApiModelProperty("评价速度等级字典值")
+    private String dictValue;
+
+    @ApiModelProperty("评价速度等级字典名称")
+    private String dictLabel;
+
+//    @ApiModelProperty("速度下限")
+//    private Integer speedMin;
+//
+//    @ApiModelProperty("速度上限")
+//    private Integer speedMax;
+
     @ApiModelProperty("容许值差")
     private String allowValue;
 

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

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.util.List;
 
 /**
  * <p>
@@ -19,22 +20,36 @@ import java.math.BigDecimal;
 public class AnalysisBatchUnitDeviceDTO {
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "当前页码")
+    private Integer pageNo = 1;
+
+    @ApiModelProperty(value = "每页记录数")
+    private Integer pageSize = 10;
+
     @ApiModelProperty("分析批id")
     private String analysisBatchId;
 
-    @ApiModelProperty("设备单元类型1-钢轨 2-曲线 3-竖曲线 4-道岔")
-    private Integer unitType;
-
     @ApiModelProperty("设备单元起始里程")
     private BigDecimal unitStartingMileage;
 
     @ApiModelProperty("设备单元结束里程")
     private BigDecimal unitEndMileage;
 
-    @ApiModelProperty("是否存在人工检查数据 0-不存在 1-存在")
-    private Integer labourCheck;
+    @ApiModelProperty("是否超限")
+    private int isTransfinite;
+
+    @ApiModelProperty("单元编号")
+    private String unitCode;
+
+    @ApiModelProperty("设备编号")
+    private String unitDeviceCode;
 
     @ApiModelProperty("得分平级")
-    private String gradeJudge;
+    private List<String> gradeJudgeList;
 
+    @ApiModelProperty("派工状态 0-未派工 1-已派工")
+    private List<Integer> isWordList;
+
+    @ApiModelProperty("设备单元类型1-钢轨 2-曲线 3-竖曲线 4-道岔")
+    private List<Integer> unitTypeList;
 }

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

@@ -79,6 +79,22 @@ public class AnalysisBatch implements Serializable {
     @TableField("analysis_type")
     private Integer analysisType;
 
+    @ApiModelProperty("评价速度等级字典值")
+    @TableField("dict_value")
+    private String dictValue;
+
+    @ApiModelProperty("评价速度等级字典名称")
+    @TableField("dict_label")
+    private String dictLabel;
+
+    @ApiModelProperty("速度下限")
+    @TableField("speed_min")
+    private Integer speedMin;
+
+    @ApiModelProperty("速度上限")
+    @TableField("speed_max")
+    private Integer speedMax;
+
     @ApiModelProperty("容许值差")
     @TableField("allow_value")
     private String allowValue;

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

@@ -73,6 +73,10 @@ public class AnalysisBatchUnitDevice implements Serializable {
     @TableField("unit_type_name")
     private String unitTypeName;
 
+    @ApiModelProperty("设备编号")
+    @TableField("unit_device_code")
+    private String unitDeviceCode;
+
     @ApiModelProperty("设备单元起始里程")
     @TableField("unit_starting_mileage")
     private BigDecimal unitStartingMileage;
@@ -85,37 +89,46 @@ public class AnalysisBatchUnitDevice implements Serializable {
     @TableField("unit_end_mileage")
     private BigDecimal unitEndMileage;
 
+    @ApiModelProperty("单元得分等级 1-优良 2-合格 3-失格")
+    @TableField("unit_score_level")
+    private Integer unitScoreLevel;
+
+    @ApiModelProperty("单元得分")
+    @TableField("unit_score")
+    private BigDecimal unitScore;
+
     @ApiModelProperty("是否存在人工检查数据 0-不存在 1-存在")
     @TableField("labour_check")
     private Integer labourCheck;
 
     @ApiModelProperty("人工检查数据得分")
-    @TableField("labour_check_grade")
-    private BigDecimal labourCheckGrade;
+    @TableField("labour_check_score")
+    private BigDecimal labourCheckScore;
 
     @ApiModelProperty("是否存在轨检仪检查数据 0-不存在 1-存在")
     @TableField("rail_device_check")
     private Integer railDeviceCheck;
 
     @ApiModelProperty("轨检仪检查数据得分")
-    @TableField("rail_device_check_grade")
-    private BigDecimal railDeviceCheckGrade;
+    @TableField("rail_device_check_score")
+    private BigDecimal railDeviceCheckScore;
 
     @ApiModelProperty("是否存在轨检车查数据 0-不存在 1-存在")
     @TableField("rail_vehicle_check")
     private Integer railVehicleCheck;
 
     @ApiModelProperty("轨检车查数据得分")
-    @TableField("rail_vehicle_check_grade")
-    private BigDecimal railVehicleCheckGrade;
+    @TableField("rail_vehicle_check_score")
+    private BigDecimal railVehicleCheckScore;
 
     @ApiModelProperty("是否存在添乘仪查数据 0-不存在 1-存在")
     @TableField("add_device_check")
     private Integer addDeviceCheck;
 
     @ApiModelProperty("添乘仪查数据得分")
-    @TableField("add_device_check_grade")
-    private BigDecimal addDeviceCheckGrade;
+    @TableField("add_device_check_score")
+    private BigDecimal addDeviceCheckScore;
+
 
     @ApiModelProperty("备注")
     @TableField("remark")

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

+package org.jeecg.modules.dynamicStaticAnalysis.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;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 动静态分析-分析批次-单元设备测点得分
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-08-08
+ */
+@Getter
+@Setter
+@TableName("t_dsa_analysis_batch_unit_device_point_score")
+@ApiModel(value = "AnalysisBatchUnitDevicePointScore对象", description = "动静态分析-分析批次-单元设备测点得分")
+public class AnalysisBatchUnitDevicePointScore implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    @TableId("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("速度下限")
+    @TableField("speed_min")
+    private Integer speedMin;
+
+    @ApiModelProperty("速度上限")
+    @TableField("speed_max")
+    private Integer speedMax;
+
+    @ApiModelProperty("分析类型 1-均值分析 2-峰值分析")
+    @TableField("analysis_type")
+    private Integer analysisType;
+
+    @ApiModelProperty("分析批次单元设备id")
+    @TableField("analysis_batch_unit_device_id")
+    private String analysisBatchUnitDeviceId;
+
+    @ApiModelProperty("分析批次号")
+    @TableField("analysis_batch_code")
+    private String analysisBatchCode;
+
+    @ApiModelProperty("分析批id")
+    @TableField("analysis_batch_id")
+    private String analysisBatchId;
+
+    @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("point_type_name")
+    private String pointTypeName;
+
+    @ApiModelProperty("测点值")
+    @TableField("point_value")
+    private Integer pointValue;
+
+    @ApiModelProperty("测点得分")
+    @TableField("point_score")
+    private BigDecimal pointScore;
+
+    @ApiModelProperty("权值")
+    @TableField("weight_values")
+    private BigDecimal weightValues;
+
+    @ApiModelProperty("备注")
+    @TableField("remark")
+    private String remark;
+
+
+}

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

+package org.jeecg.modules.dynamicStaticAnalysis.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.util.Date;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 动静态分析-分析批次-单元设备超限
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-08-04
+ */
+@Getter
+@Setter
+@TableName("t_dsa_analysis_batch_unit_device_transfinite")
+@ApiModel(value = "AnalysisBatchUnitDeviceTransfinite对象", description = "动静态分析-分析批次-单元设备超限")
+public class AnalysisBatchUnitDeviceTransfinite implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    @TableId("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_unit_device_id")
+    private String analysisBatchUnitDeviceId;
+
+    @ApiModelProperty("分析批次号")
+    @TableField("analysis_batch_code")
+    private String analysisBatchCode;
+
+    @ApiModelProperty("分析批id")
+    @TableField("analysis_batch_id")
+    private String analysisBatchId;
+
+    @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("transfinite_grade")
+    private Integer transfiniteGrade;
+
+    @ApiModelProperty("超限等级名称")
+    @TableField("transfinite_grade_name")
+    private String transfiniteGradeName;
+
+    @ApiModelProperty("超限类型")
+    @TableField("transfinite_type")
+    private String transfiniteType;
+
+    @ApiModelProperty("容许值")
+    @TableField("allow_value")
+    private String allowValue;
+
+    @ApiModelProperty("测点值")
+    @TableField("measure_point_value")
+    private String measurePointValue;
+
+    @ApiModelProperty("是否派工 0-否 1-是")
+    @TableField("is_work")
+    private Integer isWork;
+
+    @ApiModelProperty("备注")
+    @TableField("remark")
+    private String remark;
+
+
+}

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

+package org.jeecg.modules.dynamicStaticAnalysis.mapper;
+
+import org.jeecg.modules.dynamicStaticAnalysis.entity.AnalysisBatchUnitDevicePointScore;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 动静态分析-分析批次-单元设备测点得分 Mapper 接口
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-08-08
+ */
+public interface AnalysisBatchUnitDevicePointScoreMapper extends BaseMapper<AnalysisBatchUnitDevicePointScore> {
+
+}

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

+package org.jeecg.modules.dynamicStaticAnalysis.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.dynamicStaticAnalysis.entity.AnalysisBatchUnitDeviceTransfinite;
+import org.jeecg.modules.dynamicStaticAnalysis.vo.AnalysisBatchUnitDeviceTransfiniteVO;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 动静态分析-分析批次-单元设备超限 Mapper 接口
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-08-04
+ */
+public interface AnalysisBatchUnitDeviceTransfiniteMapper extends BaseMapper<AnalysisBatchUnitDeviceTransfinite> {
+
+    List<AnalysisBatchUnitDeviceTransfiniteVO> getTransfiniteList(String analysisBatchUnitDeviceId);
+}

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

@@ -5,12 +5,14 @@
     <select id="getUnitDevice" resultType="java.util.Map">
         SELECT id,
                unitCode,
+               deviceCode,
                startMileage,
                endMileage,
                type,
                typeName
         FROM (SELECT t1.id,
                      t1.unit_code        unitCode,
+                     t1.rail_code        deviceCode,
                      t1.starting_mileage startMileage,
                      t1.end_mileage      endMileage,
                      1                   type,
@@ -23,6 +25,7 @@
 
               SELECT t1.id,
                      t1.unit_code        unitCode,
+                     t1.curve_code       deviceCode,
                      t1.curve_mileage_zh startMileage,
                      t1.curve_mileage_hz endMileage,
                      2                   type,
@@ -35,11 +38,12 @@
               UNION ALL
 
               SELECT t1.id,
-                     t1.unit_code        unitCode,
-                     t1.starting_mileage startMileage,
-                     t1.end_mileage      endMileage,
-                     3                   type,
-                     '竖曲线'            typeName
+                     t1.unit_code           unitCode,
+                     t1.vertical_curve_code deviceCode,
+                     t1.starting_mileage    startMileage,
+                     t1.end_mileage         endMileage,
+                     3                      type,
+                     '竖曲线'               typeName
               FROM t_da_vertical_curve_management t1
                        LEFT JOIN t_sn_train_station t2 ON t1.section_id = t1.id
               WHERE t1.line_alias_id = #{lineAliasId}
@@ -47,6 +51,7 @@
               UNION ALL
               SELECT t1.id,
                      t1.unit_code          unitCode,
+                     t1.switch_code        deviceCode,
                      t1.byroad_pre_mileage startMileage,
                      t1.byroad_end_mileage endMileage,
                      4                     type,

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

@@ -52,6 +52,8 @@
             t1.starting_mileage,
             t1.end_mileage,
             t1.analysis_type,
+            t1.dict_value,
+            t1.dict_label,
             t1.allow_value,
             t1.dispatching,
             t1.analysis_status,

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

@@ -3,32 +3,47 @@
 <mapper namespace="org.jeecg.modules.dynamicStaticAnalysis.mapper.AnalysisBatchUnitDeviceMapper">
 
     <select id="listRecord" resultType="org.jeecg.modules.dynamicStaticAnalysis.vo.AnalysisBatchUnitDeviceVO">
-        SELECT
-            t1.id,
-            t1.create_by,
-            t1.create_time,
-            t1.update_by,
-            t1.update_time,
-            t1.analysis_batch_code,
-            t1.analysis_batch_id,
-            t1.unit_id,
-            t1.unit_code,
-            t1.unit_type,
-            t1.unit_type_name,
-            t1.unit_starting_mileage,
-            t1.unit_center_mileage,
-            t1.unit_end_mileage,
-            t1.labour_check,
-            t1.labour_check_grade,
-            t1.rail_device_check,
-            t1.rail_device_check_grade,
-            t1.rail_vehicle_check,
-            t1.rail_vehicle_check_grade,
-            t1.add_device_check,
-            t1.add_device_check_grade,
-            t1.remark
-        FROM
+        SELECT * FROM
+        (
+            SELECT
+                t1.id,
+                t1.create_by,
+                t1.create_time,
+                t1.update_by,
+                t1.update_time,
+                t1.analysis_batch_code,
+                t1.analysis_batch_id,
+                t1.unit_id,
+                t1.unit_code,
+                t1.unit_device_code,
+                t1.unit_type,
+                t1.unit_type_name,
+                t1.unit_starting_mileage,
+                t1.unit_center_mileage,
+                t1.unit_end_mileage,
+                t1.unit_score finalGrade,
+                t1.unit_score_level gradeJudge,
+                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
+            FROM
             t_dsa_analysis_batch_unit_device t1
-        WHERE t1.analysis_batch_id = #{dto.analysisBatchId}
+        WHERE
+        t1.analysis_batch_id = #{dto.analysisBatchId}
+        ) analysis
+        WHERE
+        1 =1
+        <if test="dto.isWordList!=null and dto.isWordList.size()>0">
+            AND analysis.is_work in
+            <foreach collection="dto.isWordList" index="index" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+        <if test="dto.unitTypeList!=null and dto.unitTypeList.size()>0">
+            AND analysis.unit_type in
+            <foreach collection="dto.unitTypeList" index="index" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
     </select>
 </mapper>

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

jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/mapper/xml/AnalysisBatchUnitDeviceTransfiniteMapper.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.dynamicStaticAnalysis.mapper.AnalysisBatchUnitDeviceTransfiniteMapper">
+
+    <select id="getTransfiniteList"
+            resultType="org.jeecg.modules.dynamicStaticAnalysis.vo.AnalysisBatchUnitDeviceTransfiniteVO">
+        SELECT
+            t1.id,
+            t1.create_by,
+            t1.create_time,
+            t1.update_by,
+            t1.update_time,
+            t1.analysis_batch_unit_device_id,
+            t1.analysis_batch_code,
+            t1.analysis_batch_id,
+            t1.unit_id,
+            t1.unit_code,
+            t1.unit_type,
+            t1.unit_type_name,
+            t1.transfinite_grade,
+            t1.transfinite_grade_name,
+            t1.transfinite_type,
+            t1.allow_value,
+            t1.measure_point_value,
+            t1.is_work,
+            t1.remark
+        FROM
+            t_dsa_analysis_batch_unit_device_transfinite t1
+        WHERE t1.analysis_batch_unit_device_id = #{analysisBatchUnitDeviceId}
+    </select>
+</mapper>

jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/service/IAnalysisBatchUnitDevicePointScoreService.java

+package org.jeecg.modules.dynamicStaticAnalysis.service;
+
+import org.jeecg.modules.dynamicStaticAnalysis.entity.AnalysisBatchUnitDevicePointScore;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 动静态分析-分析批次-单元设备测点得分 服务类
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-08-08
+ */
+public interface IAnalysisBatchUnitDevicePointScoreService extends IService<AnalysisBatchUnitDevicePointScore> {
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/service/IAnalysisBatchUnitDeviceTransfiniteService.java

+package org.jeecg.modules.dynamicStaticAnalysis.service;
+
+import org.jeecg.modules.dynamicStaticAnalysis.entity.AnalysisBatchUnitDeviceTransfinite;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 动静态分析-分析批次-单元设备超限 服务类
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-08-04
+ */
+public interface IAnalysisBatchUnitDeviceTransfiniteService extends IService<AnalysisBatchUnitDeviceTransfinite> {
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/service/impl/AnalysisBatchServiceImpl.java

@@ -15,6 +15,7 @@ import org.jeecg.modules.dynamicStaticAnalysis.mapper.AnalysisBatchCheckDataMapM
 import org.jeecg.modules.dynamicStaticAnalysis.mapper.AnalysisBatchMapper;
 import org.jeecg.modules.dynamicStaticAnalysis.service.IAnalysisBatchService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.modules.dynamicStaticAnalysis.util.StrUtil;
 import org.jeecg.modules.dynamicStaticAnalysis.vo.AnalysisBatchQueryVO;
 import org.jeecg.modules.dynamicStaticAnalysis.vo.CheckBatchVO;
 import org.jeecg.modules.utils.BeanCopyUtil;
@@ -49,6 +50,10 @@ public class AnalysisBatchServiceImpl extends ServiceImpl<AnalysisBatchMapper, A
         AnalysisBatch analysisBatch = BeanUtil.copyProperties(dto, AnalysisBatch.class);
         analysisBatch.setId(UUIDGenerator.generate());
         analysisBatch.setAnalysisStatus(1); // 1-分析中
+        Integer[] speedLevels = StrUtil.getSpeedLevel(dto.getDictLabel());
+        analysisBatch.setSpeedMin(speedLevels[0]);
+        analysisBatch.setSpeedMax(speedLevels[1]);
+
 
         // 明细
         List<AnalysisBatchCheckDataMap> analysisBatchCheckDataMaps = new ArrayList<>();
@@ -84,6 +89,9 @@ public class AnalysisBatchServiceImpl extends ServiceImpl<AnalysisBatchMapper, A
         // 主表
         AnalysisBatch analysisBatch = BeanUtil.copyProperties(dto, AnalysisBatch.class);
         analysisBatch.setAnalysisType(1); // 1-分析中
+        Integer[] speedLevels = StrUtil.getSpeedLevel(dto.getDictLabel());
+        analysisBatch.setSpeedMin(speedLevels[0]);
+        analysisBatch.setSpeedMax(speedLevels[1]);
 
         // 明细
         // 1.先删除

jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/service/impl/AnalysisBatchUnitDevicePointScoreServiceImpl.java

+package org.jeecg.modules.dynamicStaticAnalysis.service.impl;
+
+import org.jeecg.modules.dynamicStaticAnalysis.entity.AnalysisBatchUnitDevicePointScore;
+import org.jeecg.modules.dynamicStaticAnalysis.mapper.AnalysisBatchUnitDevicePointScoreMapper;
+import org.jeecg.modules.dynamicStaticAnalysis.service.IAnalysisBatchUnitDevicePointScoreService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 动静态分析-分析批次-单元设备测点得分 服务实现类
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-08-08
+ */
+@Service
+public class AnalysisBatchUnitDevicePointScoreServiceImpl extends ServiceImpl<AnalysisBatchUnitDevicePointScoreMapper, AnalysisBatchUnitDevicePointScore> implements IAnalysisBatchUnitDevicePointScoreService {
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/service/impl/AnalysisBatchUnitDeviceServiceImpl.java

@@ -4,11 +4,16 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.jeecg.modules.dynamicStaticAnalysis.dto.AnalysisBatchUnitDeviceDTO;
 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.service.IAnalysisBatchUnitDeviceService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.modules.dynamicStaticAnalysis.vo.AnalysisBatchUnitDeviceTransfiniteVO;
 import org.jeecg.modules.dynamicStaticAnalysis.vo.AnalysisBatchUnitDeviceVO;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+import java.util.List;
+
 /**
  * <p>
  * 动静态分析-分析批次-单元设备 服务实现类
@@ -19,9 +24,19 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class AnalysisBatchUnitDeviceServiceImpl extends ServiceImpl<AnalysisBatchUnitDeviceMapper, AnalysisBatchUnitDevice> implements IAnalysisBatchUnitDeviceService {
+    @Resource
+    private AnalysisBatchUnitDeviceTransfiniteMapper transfiniteMapper;
+
 
     @Override
     public Page<AnalysisBatchUnitDeviceVO> listRecord(Page<AnalysisBatchUnitDeviceVO> pageData, AnalysisBatchUnitDeviceDTO dto) {
-        return this.baseMapper.listRecord(pageData,dto);
+
+        Page<AnalysisBatchUnitDeviceVO> page = this.baseMapper.listRecord(pageData, dto);
+        for (AnalysisBatchUnitDeviceVO record : page.getRecords()) {
+            List<AnalysisBatchUnitDeviceTransfiniteVO> transfiniteList = transfiniteMapper.getTransfiniteList(record.getId());
+            record.setTransfiniteList(transfiniteList);
+        }
+
+        return page;
     }
 }

jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/service/impl/AnalysisBatchUnitDeviceTransfiniteServiceImpl.java

+package org.jeecg.modules.dynamicStaticAnalysis.service.impl;
+
+import org.jeecg.modules.dynamicStaticAnalysis.entity.AnalysisBatchUnitDeviceTransfinite;
+import org.jeecg.modules.dynamicStaticAnalysis.mapper.AnalysisBatchUnitDeviceTransfiniteMapper;
+import org.jeecg.modules.dynamicStaticAnalysis.service.IAnalysisBatchUnitDeviceTransfiniteService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 动静态分析-分析批次-单元设备超限 服务实现类
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-08-04
+ */
+@Service
+public class AnalysisBatchUnitDeviceTransfiniteServiceImpl extends ServiceImpl<AnalysisBatchUnitDeviceTransfiniteMapper, AnalysisBatchUnitDeviceTransfinite> implements IAnalysisBatchUnitDeviceTransfiniteService {
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/util/StrUtil.java

+package org.jeecg.modules.dynamicStaticAnalysis.util;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * 字符串工具类
+ */
+public class StrUtil {
+
+    /**
+     * @param expressions
+     * @return 返回一个速度等级数组:Integer[] speedLevel = new Integer[2]<br/>
+     * 其中 speedLevel[0]速度下限制,speedLevel[1] 速度上限
+     */
+    public static Integer[] getSpeedLevel(String expressions) {
+        if (null == expressions) {
+            return null;
+        }
+        Integer[] speedLevel = new Integer[2];
+
+        String regex = "\\d+";
+        Pattern pattern = Pattern.compile(regex);
+        Matcher matcher = pattern.matcher(expressions);
+        int i = 0;
+        while (matcher.find()) {
+            speedLevel[i] = Integer.valueOf(matcher.group());
+            i++;
+        }
+
+        return speedLevel;
+    }
+}

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

@@ -55,6 +55,12 @@ public class AnalysisBatchQueryVO {
     @ApiModelProperty("分析类型 1-均值分析 2-峰值分析")
     private Integer analysisType;
 
+    @ApiModelProperty("评价速度等级字典值")
+    private String dictValue;
+
+    @ApiModelProperty("评价速度等级字典名称")
+    private String dictLabel;
+
     @ApiModelProperty("容许值差")
     private String allowValue;
 

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

+package org.jeecg.modules.dynamicStaticAnalysis.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.util.Date;
+
+/**
+ * <p>
+ * 动静态分析-分析批次表
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-07-26
+ */
+@Data
+@ApiModel(value = "AnalysisBatchUnitDeviceTransfiniteVO对象", description = "动静态分析-分析批次-单元设备-超限列表")
+public class AnalysisBatchUnitDeviceTransfiniteVO {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    private String id;
+
+    @ApiModelProperty("分析批次单元设备id")
+    private String analysisBatchUnitDeviceId;
+
+    @ApiModelProperty("超限等级")
+    private Integer transfiniteGrade;
+
+    @ApiModelProperty("超限等级名称")
+    private String transfiniteGradeName;
+
+    @ApiModelProperty("超限类型")
+    private String transfiniteType;
+
+    @ApiModelProperty("容许值")
+    private String allowValue;
+
+    @ApiModelProperty("测点值")
+    private String measurePointValue;
+
+    @ApiModelProperty("是否派工 0-否 1-是")
+    private Integer isWork;
+
+    @ApiModelProperty("备注")
+    private String remark;
+}

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

 package org.jeecg.modules.dynamicStaticAnalysis.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.List;
 
 /**
  * <p>
@@ -40,6 +42,9 @@ public class AnalysisBatchUnitDeviceVO {
     @ApiModelProperty("设备单元类型名称")
     private String unitTypeName;
 
+    @ApiModelProperty("设备编号")
+    private String unitDeviceCode;
+
     @ApiModelProperty("设备单元起始里程")
     private BigDecimal unitStartingMileage;
 
@@ -49,30 +54,6 @@ public class AnalysisBatchUnitDeviceVO {
     @ApiModelProperty("设备单元结束里程")
     private BigDecimal unitEndMileage;
 
-    @ApiModelProperty("是否存在人工检查数据 0-不存在 1-存在")
-    private Integer labourCheck;
-
-    @ApiModelProperty("人工检查数据得分")
-    private BigDecimal labourCheckGrade;
-
-    @ApiModelProperty("是否存在轨检仪检查数据 0-不存在 1-存在")
-    private Integer railDeviceCheck;
-
-    @ApiModelProperty("轨检仪检查数据得分")
-    private BigDecimal railDeviceCheckGrade;
-
-    @ApiModelProperty("是否存在轨检车查数据 0-不存在 1-存在")
-    private Integer railVehicleCheck;
-
-    @ApiModelProperty("轨检车查数据得分")
-    private BigDecimal railVehicleCheckGrade;
-
-    @ApiModelProperty("是否存在添乘仪查数据 0-不存在 1-存在")
-    private Integer addDeviceCheck;
-
-    @ApiModelProperty("添乘仪查数据得分")
-    private BigDecimal addDeviceCheckGrade;
-
     @ApiModelProperty("最后得分")
     private BigDecimal finalGrade;
 
@@ -82,5 +63,17 @@ public class AnalysisBatchUnitDeviceVO {
     @ApiModelProperty("备注")
     private String remark;
 
+    @ApiModelProperty("超限list")
+    private List<AnalysisBatchUnitDeviceTransfiniteVO> transfiniteList;
+
+    @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

+package org.jeecg.modules.maintenanceWork.controller;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+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.entity.WorkBatch;
+import org.jeecg.modules.maintenanceWork.service.IWorkBatchService;
+import org.jeecg.modules.maintenanceWork.vo.WorkBatchVO;
+import org.springframework.web.bind.annotation.*;
+
+import org.jeecg.common.system.base.controller.JeecgController;
+
+/**
+ * <p>
+ * 维修作业管理-作业计划批次管理表 前端控制器
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-08-09
+ */
+@RestController
+@RequestMapping("/maintenanceWork/workBatch")
+@Api(tags = "维修作业管理-作业计划批次管理")
+public class WorkBatchController extends JeecgController<WorkBatch, IWorkBatchService> {
+
+    @AutoLog(value = "维修作业管理-作业计划批次管理-分页列表查询")
+    @ApiOperation(value = "维修作业管理-作业计划批次管理-分页列表查询", notes = "维修作业管理-作业计划批次管理-分页列表查询")
+    @GetMapping(value = "/listRecord")
+    public Result<IPage<WorkBatchVO>> listRecord(@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                 @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                 WorkBatchDTO dto) {
+        Page<WorkBatchVO> pageData = new Page<>(pageNo, pageSize);
+        pageData = this.service.listRecord(pageData, dto);
+        return Result.OK(pageData);
+    }
+
+    @AutoLog(value = "维修作业管理-作业计划批次管理-维修作业管理页面新增")
+    @ApiOperation(value = "维修作业管理-作业计划批次管理-维修作业管理页面新增", notes = "维修作业管理-作业计划批次管理-维修作业管理页面新增")
+    @PostMapping(value = "/saveRecord")
+    public Result<String> saveRecord(@RequestBody WorkBatchSaveOrUpdateDTO dto) {
+
+        this.service.saveRecord(dto);
+
+        return Result.OK("操作成功");
+    }
+
+
+    @AutoLog(value = "维修作业管理-作业计划批次管理-维修作业管理页面更新")
+    @ApiOperation(value = "维修作业管理-作业计划批次管理-维修作业管理页面更新", notes = "维修作业管理-作业计划批次管理-维修作业管理页面更新")
+    @PostMapping(value = "/updateRecord")
+    public Result<String> updateRecord(@RequestBody WorkBatchSaveOrUpdateDTO dto) {
+
+        this.service.updateRecord(dto);
+
+        return Result.OK("操作成功");
+    }
+
+    @AutoLog(value = "维修作业管理-作业计划批次管理-通过id删除")
+    @ApiOperation(value = "维修作业管理-作业计划批次管理-通过id删除", notes = "维修作业管理-作业计划批次管理-通过id删除")
+    @GetMapping(value = "/deleteRecord")
+    public Result<String> deleteRecord(@RequestParam(name = "id", required = true) String id) {
+        this.service.deleteRecord(id);
+        return Result.OK("删除成功!");
+    }
+
+}

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

-package org.jeecg.modules.school.dto;
+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 com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.math.BigDecimal;
-import java.util.Date;
 
 /**
  * <p>
- * 作业计划批次管理表
+ * 维修作业管理-作业计划批次管理表
  * </p>
  *
  * @author hkl
- * @since 2023-07-24
+ * @since 2023-08-09
  */
 @Data
-public class SchoolPlanBatchMasterDTO {
-
+@ApiModel(value = "WorkBatchDTO对象", description = "维修作业管理-作业计划批次管理表")
+public class WorkBatchDTO {
 
     private static final long serialVersionUID = 1L;
 
-    @ApiModelProperty("主键")
-    private String id;
-
-    @ApiModelProperty("创建人")
-    private String createBy;
-
-    @ApiModelProperty("创建日期")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-
-    @ApiModelProperty("更新人")
-    private String updateBy;
-
-    @ApiModelProperty("更新时间")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date updateTime;
 
     @ApiModelProperty("作业计划批次号")
-    private String batchCode;
+    private String workBatchCode;
 
     @ApiModelProperty("所属线路id")
     private String lightRailId;
@@ -59,37 +44,19 @@ public class SchoolPlanBatchMasterDTO {
     @ApiModelProperty("所属线别名称")
     private String lineAliasName;
 
-    @ApiModelProperty("作业起始里程")
-    private BigDecimal schoolStartingMileage;
-
-    @ApiModelProperty("作业终点里程")
-    private BigDecimal schoolEndMileage;
-
-    @ApiModelProperty("新建日期")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    private Date newlyTime;
-
-    @ApiModelProperty("作业起始时间")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date schoolStartTime;
-
     @ApiModelProperty("作业终止时间")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date schoolEndTime;
+    private Date workEndTime;
 
     @ApiModelProperty("作业班组")
     private String team;
 
-    @ApiModelProperty("派工状态（0：未派工 1：已派工）")
-    private Integer workerStatus;
+    @ApiModelProperty("来源 1-页面添加 2-超限派工添加")
+    private Integer source;
 
-    @ApiModelProperty("作业状态（0：未作业 1：已作业）")
-    private Integer schoolStatus;
+    @ApiModelProperty("作业状态 0-未作业 1-已作业")
+    private Integer workStatus;
 
-    @ApiModelProperty("是否删除（0：未删除；1：已删除）")
+    @ApiModelProperty("是否删除 0-未删除 1-已删除")
     private String delFlag;
 
 }

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;
+
+/**
+ * <p>
+ * 维修作业管理-作业计划批次管理明细表
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-08-09
+ */
+@Data
+@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")
+    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;
+
+
+}

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

+package org.jeecg.modules.maintenanceWork.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * <p>
+ * 维修作业管理-作业计划批次管理表
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-08-09
+ */
+@Data
+@ApiModel(value = "WorkBatchSaveOrUpdateDTO对象", description = "维修作业管理-作业计划批次管理表")
+public class WorkBatchSaveOrUpdateDTO {
+
+    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 workEndTime;
+
+    @ApiModelProperty("作业班组")
+    private String team;
+
+    @ApiModelProperty("来源 1-页面添加 2-超限派工添加")
+    private Integer source;
+
+    @ApiModelProperty("作业状态 0-未作业 1-已作业")
+    private Integer workStatus;
+
+    @ApiModelProperty("是否删除 0-未删除 1-已删除")
+    private String delFlag;
+
+}

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

-package org.jeecg.modules.school.entity;
+package org.jeecg.modules.maintenanceWork.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -6,27 +6,24 @@ 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 io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
-import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * <p>
- * 作业计划批次管理表
+ * 维修作业管理-作业计划批次管理表
  * </p>
  *
  * @author hkl
- * @since 2023-07-24
+ * @since 2023-08-09
  */
 @Getter
 @Setter
-@TableName("t_jh_school_plan_batch_master")
-@ApiModel(value = "SchoolPlanBatchMaster对象", description = "作业计划批次管理表")
-public class SchoolPlanBatchMaster implements Serializable {
+@TableName("t_mw_work_batch")
+@ApiModel(value = "WorkBatch对象", description = "维修作业管理-作业计划批次管理表")
+public class WorkBatch implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -40,8 +37,6 @@ public class SchoolPlanBatchMaster implements Serializable {
 
     @ApiModelProperty("创建日期")
     @TableField("create_time")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
     @ApiModelProperty("更新人")
@@ -50,13 +45,11 @@ public class SchoolPlanBatchMaster implements Serializable {
 
     @ApiModelProperty("更新时间")
     @TableField("update_time")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
 
     @ApiModelProperty("作业计划批次号")
-    @TableField("batch_code")
-    private String batchCode;
+    @TableField("work_batch_code")
+    private String workBatchCode;
 
     @ApiModelProperty("所属线路id")
     @TableField("light_rail_id")
@@ -75,44 +68,34 @@ public class SchoolPlanBatchMaster implements Serializable {
     private String lineAliasName;
 
     @ApiModelProperty("作业起始里程")
-    @TableField("school_starting_mileage")
-    private BigDecimal schoolStartingMileage;
+    @TableField("work_starting_mileage")
+    private BigDecimal workStartingMileage;
 
     @ApiModelProperty("作业终点里程")
-    @TableField("school_end_mileage")
-    private BigDecimal schoolEndMileage;
-
-    @ApiModelProperty("新建日期")
-    @TableField("newly_time")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    private Date newlyTime;
+    @TableField("work_end_mileage")
+    private BigDecimal workEndMileage;
 
     @ApiModelProperty("作业起始时间")
-    @TableField("school_start_time")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date schoolStartTime;
+    @TableField("work_start_time")
+    private Date workStartTime;
 
     @ApiModelProperty("作业终止时间")
-    @TableField("school_end_time")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date schoolEndTime;
+    @TableField("work_end_time")
+    private Date workEndTime;
 
     @ApiModelProperty("作业班组")
     @TableField("team")
     private String team;
 
-    @ApiModelProperty("派工状态（0：未派工 1：已派工）")
-    @TableField("worker_status")
-    private Integer workerStatus;
+    @ApiModelProperty("来源 1-页面添加 2-超限派工添加")
+    @TableField("source")
+    private Integer source;
 
-    @ApiModelProperty("作业状态（0：未作业 1：已作业）")
-    @TableField("school_status")
-    private Integer schoolStatus;
+    @ApiModelProperty("作业状态 0-未作业 9-已作业")
+    @TableField("work_status")
+    private Integer workStatus;
 
-    @ApiModelProperty("是否删除（0：未删除；1：已删除）")
+    @ApiModelProperty("是否删除 0-未删除 1-已删除")
     @TableField("del_flag")
     private String delFlag;
 

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

+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;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 维修作业管理-作业计划批次管理明细表
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-08-09
+ */
+@Getter
+@Setter
+@TableName("t_mw_work_batch_detail")
+@ApiModel(value = "WorkBatchDetail对象", description = "维修作业管理-作业计划批次管理明细表")
+public class WorkBatchDetail implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    @TableId("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("工作批次code")
+    @TableField("work_batch_code")
+    private String workBatchCode;
+
+    @ApiModelProperty("工作批次id")
+    @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("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_starting_mileage")
+    private BigDecimal unitStartingMileage;
+
+    @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")
+    private BigDecimal unitScore;
+
+    @ApiModelProperty("备注")
+    @TableField("remark")
+    private String remark;
+
+
+}

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

+package org.jeecg.modules.maintenanceWork.mapper;
+
+import org.jeecg.modules.maintenanceWork.entity.WorkBatchDetail;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 维修作业管理-作业计划批次管理明细表 Mapper 接口
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-08-09
+ */
+public interface WorkBatchDetailMapper extends BaseMapper<WorkBatchDetail> {
+
+}

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

+package org.jeecg.modules.maintenanceWork.mapper;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.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;
+
+/**
+ * <p>
+ * 维修作业管理-作业计划批次管理表 Mapper 接口
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-08-09
+ */
+public interface WorkBatchMapper extends BaseMapper<WorkBatch> {
+
+    Page<WorkBatchVO> listRecord(Page<WorkBatchVO> pageData, WorkBatchDTO dto);
+}

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

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

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

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.maintenanceWork.mapper.WorkBatchMapper">
+
+    <select id="listRecord" resultType="org.jeecg.modules.maintenanceWork.vo.WorkBatchVO">
+        SELECT
+            t1.id,
+            t1.create_by,
+            t1.create_time,
+            t1.update_by,
+            t1.update_time,
+            t1.work_batch_code,
+            t1.light_rail_id,
+            t1.light_rail_name,
+            t1.line_alias_id,
+            t1.line_alias_name,
+            t1.work_starting_mileage,
+            t1.work_end_mileage,
+            t1.work_start_time,
+            t1.work_end_time,
+            t1.team,
+            t1.source,
+            t1.work_status,
+            t1.del_flag
+        FROM
+            t_mw_work_batch t1
+        WHERE
+            t1.del_flag = '0'
+        <if test="dto.workBatchCode != null and dto.workBatchCode != ''">
+            AND t2.work_batch_code like concat('%',#{dto.workBatchCode},'%')
+        </if>
+    </select>
+</mapper>

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

+package org.jeecg.modules.maintenanceWork.service;
+
+import org.jeecg.modules.maintenanceWork.entity.WorkBatchDetail;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 维修作业管理-作业计划批次管理明细表 服务类
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-08-09
+ */
+public interface IWorkBatchDetailService extends IService<WorkBatchDetail> {
+
+}

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.entity.WorkBatch;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.maintenanceWork.vo.WorkBatchVO;
+
+/**
+ * <p>
+ * 维修作业管理-作业计划批次管理表 服务类
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-08-09
+ */
+public interface IWorkBatchService extends IService<WorkBatch> {
+
+    Page<WorkBatchVO> listRecord(Page<WorkBatchVO> pageData, WorkBatchDTO dto);
+
+    void saveRecord(WorkBatchSaveOrUpdateDTO dto);
+
+    void updateRecord(WorkBatchSaveOrUpdateDTO dto);
+
+    void deleteRecord(String id);
+}

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

+package org.jeecg.modules.maintenanceWork.service.impl;
+
+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.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 维修作业管理-作业计划批次管理明细表 服务实现类
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-08-09
+ */
+@Service
+public class WorkBatchDetailServiceImpl extends ServiceImpl<WorkBatchDetailMapper, WorkBatchDetail> implements IWorkBatchDetailService {
+
+}

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 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.maintenanceWork.entity.WorkBatch;
+import org.jeecg.modules.maintenanceWork.entity.WorkBatchDetail;
+import org.jeecg.modules.maintenanceWork.mapper.WorkBatchDetailMapper;
+import org.jeecg.modules.maintenanceWork.mapper.WorkBatchMapper;
+import org.jeecg.modules.maintenanceWork.service.IWorkBatchService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.modules.maintenanceWork.vo.WorkBatchVO;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+/**
+ * <p>
+ * 维修作业管理-作业计划批次管理表 服务实现类
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-08-09
+ */
+@Service
+public class WorkBatchServiceImpl extends ServiceImpl<WorkBatchMapper, WorkBatch> implements IWorkBatchService {
+    @Resource
+    private WorkBatchDetailMapper workBatchDetailMapper;
+
+    @Override
+    public Page<WorkBatchVO> listRecord(Page<WorkBatchVO> pageData, WorkBatchDTO dto) {
+        return this.baseMapper.listRecord(pageData, dto);
+    }
+
+    @Override
+    public void saveRecord(WorkBatchSaveOrUpdateDTO dto) {
+        WorkBatch workBatch = BeanUtil.copyProperties(dto, WorkBatch.class);
+        workBatch.setId(UUIDGenerator.generate());
+        this.save(workBatch);
+    }
+
+    @Override
+    public void updateRecord(WorkBatchSaveOrUpdateDTO dto) {
+        WorkBatch workBatch = BeanUtil.copyProperties(dto, WorkBatch.class);
+        this.updateById(workBatch);
+    }
+
+    @Override
+    public void deleteRecord(String id) {
+        this.removeById(id);
+    }
+
+}

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

+package org.jeecg.modules.maintenanceWork.vo;
+
+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;
+
+/**
+ * <p>
+ * 维修作业管理-作业计划批次管理明细表
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-08-09
+ */
+@Data
+@ApiModel(value = "WorkBatchDetail对象", description = "维修作业管理-作业计划批次管理明细表")
+
+public class WorkBatchDetailVO {
+
+    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")
+    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;
+}

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

+package org.jeecg.modules.maintenanceWork.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 维修作业管理-作业计划批次管理表
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-08-09
+ */
+@Data
+@ApiModel(value = "WorkBatch对象", description = "维修作业管理-作业计划批次管理表")
+public class WorkBatchVO {
+
+    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 workEndTime;
+
+    @ApiModelProperty("作业班组")
+    private String team;
+
+    @ApiModelProperty("来源 1-页面添加 2-超限派工添加")
+    private Integer source;
+
+    @ApiModelProperty("作业状态 0-未作业 1-已作业")
+    private Integer workStatus;
+
+    @ApiModelProperty("是否删除 0-未删除 1-已删除")
+    private String delFlag;
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/school/controller/SchoolPlanBatchMasterController.java

-package org.jeecg.modules.school.controller;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import org.apache.shiro.SecurityUtils;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
-import org.jeecg.common.system.vo.LoginUser;
-import org.jeecg.modules.school.dto.SchoolPlanBatchMasterDTO;
-import org.jeecg.modules.school.entity.SchoolPlanBatchMaster;
-import org.jeecg.modules.school.service.ISchoolPlanBatchMasterService;
-import org.jeecg.modules.school.vo.SchoolPlanBatchMasterVO;
-import org.springframework.web.bind.annotation.*;
-
-import org.jeecg.common.system.base.controller.JeecgController;
-
-import java.util.Date;
-
-/**
- * <p>
- * 作业计划批次管理表 前端控制器
- * </p>
- *
- * @author hkl
- * @since 2023-07-24
- */
-@RestController
-@RequestMapping("/school/master")
-@Api(tags = "作业计划批次管理")
-public class SchoolPlanBatchMasterController extends JeecgController<SchoolPlanBatchMaster, ISchoolPlanBatchMasterService> {
-    /**
-     * 作业计划批次管理列表分页查询
-     *
-     * @param pageNo
-     * @param pageSize
-     * @param dto
-     * @return
-     */
-    @AutoLog(value = "作业计划批次管理列表分页查询")
-    @ApiOperation(value = "作业计划批次管理列表分页查询", notes = "作业计划批次管理列表分页查询")
-    @GetMapping(value = "/list")
-    public Result<IPage<SchoolPlanBatchMasterVO>> queryPageList(@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                                @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                                                SchoolPlanBatchMasterDTO dto) {
-        Page<SchoolPlanBatchMasterVO> pageData = new Page<>(pageNo, pageSize);
-        pageData = this.service.queryPageList(pageData, dto);
-        return Result.OK(pageData);
-    }
-
-    @AutoLog(value = "作业计划批次管理新增或者编辑")
-    @ApiOperation(value = "作业计划批次管理新增或者编辑", notes = "作业计划批次管理新增或者编辑")
-    @PostMapping(value = "/saveOrUpdate")
-    @ResponseBody
-    public Result<String> saveOrUpdate(@RequestBody SchoolPlanBatchMaster schoolPlanBatchMaster) {
-        //获取当前登录人信息
-        LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        String realname = user.getRealname();
-        schoolPlanBatchMaster.setUpdateTime(new Date());
-        schoolPlanBatchMaster.setDelFlag("0");
-        schoolPlanBatchMaster.setUpdateBy(realname);
-        if (ObjectUtil.isEmpty(schoolPlanBatchMaster.getId())) {
-            this.service.save(schoolPlanBatchMaster);
-        } else {
-            this.service.updateById(schoolPlanBatchMaster);
-        }
-        return Result.OK("操作成功!");
-    }
-
-    /**
-     * 删除作业计划批次管理数据
-     * @param id
-     * @return
-     */
-    @AutoLog(value = "删除作业计划批次管理数据")
-    @ApiOperation(value = "删除作业计划批次管理数据", notes = "删除作业计划批次管理数据")
-    @GetMapping(value = "/delete")
-    public Result<String> delete(@ApiParam(name = "作业计划批次管理id", required = true) String id) {
-        //删除动静态几何尺寸数据
-        LambdaUpdateWrapper<SchoolPlanBatchMaster> update = Wrappers.lambdaUpdate();
-        update.set(SchoolPlanBatchMaster::getDelFlag, "1");
-        update.eq(SchoolPlanBatchMaster::getId, id);
-        this.service.update(update);
-        return Result.OK("删除成功!");
-    }
-}

jeecg-module-system/src/main/java/org/jeecg/modules/school/mapper/SchoolPlanBatchMasterMapper.java

-package org.jeecg.modules.school.mapper;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.jeecg.modules.school.dto.SchoolPlanBatchMasterDTO;
-import org.jeecg.modules.school.entity.SchoolPlanBatchMaster;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.jeecg.modules.school.vo.SchoolPlanBatchMasterVO;
-
-/**
- * <p>
- * 作业计划批次管理表 Mapper 接口
- * </p>
- *
- * @author hkl
- * @since 2023-07-24
- */
-public interface SchoolPlanBatchMasterMapper extends BaseMapper<SchoolPlanBatchMaster> {
-    /**
-     * 作业计划批次管理列表分页查询
-     *
-     * @param pageData
-     * @param dto
-     * @return
-     */
-    Page<SchoolPlanBatchMasterVO> queryPageList(Page<SchoolPlanBatchMasterVO> pageData, SchoolPlanBatchMasterDTO dto);
-
-}

jeecg-module-system/src/main/java/org/jeecg/modules/school/mapper/xml/SchoolPlanBatchMasterMapper.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.school.mapper.SchoolPlanBatchMasterMapper">
-    <select id="queryPageList" resultType="org.jeecg.modules.school.vo.SchoolPlanBatchMasterVO">
-        SELECT
-        t1.*
-        FROM
-        t_jh_school_plan_batch_master t1 left join t_sn_light_rail t2 on t1.light_rail_id = t2.id
-        <where>
-            1=1
-            <if test="dto.batchCode != null and dto.batchCode != ''">
-                AND t1.batch_code like concat('%',#{dto.batchCode},'%')
-            </if>
-            <if test="dto.workerStatus != null and dto.workerStatus != ''">
-                AND t1.worker_status = #{dto.workerStatus}
-            </if>
-            <if test="dto.schoolStatus != null and dto.schoolStatus != ''">
-                AND t1.school_status = #{dto.schoolStatus}
-            </if>
-            <if test="dto.lightRailId != null and dto.lightRailId != ''">
-                AND t1.light_rail_id = #{dto.lightRailId}
-            </if>
-            <if test="dto.lineAliasId != null and dto.lineAliasId != ''">
-                AND t1.line_alias_id = #{dto.lineAliasId}
-            </if>
-            <if test="dto.team != null and dto.team != ''">
-                AND t1.team like concat('%',#{dto.team},'%')
-            </if>
-            AND t1.del_flag = '0'
-            AND t2.status = 1
-            order by t1.create_time desc
-        </where>
-    </select>
-</mapper>

jeecg-module-system/src/main/java/org/jeecg/modules/school/service/ISchoolPlanBatchMasterService.java

-package org.jeecg.modules.school.service;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.jeecg.modules.checkData.equipmentCheckData.dto.MovementRecordsMasterDTO;
-import org.jeecg.modules.checkData.equipmentCheckData.vo.MovementRecordsMasterVO;
-import org.jeecg.modules.school.dto.SchoolPlanBatchMasterDTO;
-import org.jeecg.modules.school.entity.SchoolPlanBatchMaster;
-import com.baomidou.mybatisplus.extension.service.IService;
-import org.jeecg.modules.school.vo.SchoolPlanBatchMasterVO;
-
-/**
- * <p>
- * 作业计划批次管理表 服务类
- * </p>
- *
- * @author hkl
- * @since 2023-07-24
- */
-public interface ISchoolPlanBatchMasterService extends IService<SchoolPlanBatchMaster> {
-    /**
-     * 作业计划批次管理列表分页查询
-     *
-     * @param pageData
-     * @param dto
-     * @return
-     */
-    Page<SchoolPlanBatchMasterVO> queryPageList(Page<SchoolPlanBatchMasterVO> pageData, SchoolPlanBatchMasterDTO dto);
-
-}

jeecg-module-system/src/main/java/org/jeecg/modules/school/service/impl/SchoolPlanBatchMasterServiceImpl.java

-package org.jeecg.modules.school.service.impl;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.jeecg.modules.school.dto.SchoolPlanBatchMasterDTO;
-import org.jeecg.modules.school.entity.SchoolPlanBatchMaster;
-import org.jeecg.modules.school.mapper.SchoolPlanBatchMasterMapper;
-import org.jeecg.modules.school.service.ISchoolPlanBatchMasterService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.jeecg.modules.school.vo.SchoolPlanBatchMasterVO;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 作业计划批次管理表 服务实现类
- * </p>
- *
- * @author hkl
- * @since 2023-07-24
- */
-@Service
-public class SchoolPlanBatchMasterServiceImpl extends ServiceImpl<SchoolPlanBatchMasterMapper, SchoolPlanBatchMaster> implements ISchoolPlanBatchMasterService {
-    /**
-     * 作业计划批次管理列表分页查询
-     *
-     * @param pageData
-     * @param dto
-     * @return
-     */
-    @Override
-    public Page<SchoolPlanBatchMasterVO> queryPageList(Page<SchoolPlanBatchMasterVO> pageData, SchoolPlanBatchMasterDTO dto) {
-        return this.baseMapper.queryPageList(pageData,dto);
-    }
-}

jeecg-module-system/src/main/java/org/jeecg/modules/school/vo/SchoolPlanBatchMasterVO.java

-package org.jeecg.modules.school.vo;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.jeecg.modules.utils.DicMap;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * <p>
- * 作业计划批次管理表
- * </p>
- *
- * @author hkl
- * @since 2023-07-24
- */
-@Data
-public class SchoolPlanBatchMasterVO {
-
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty("主键")
-    private String id;
-
-    @ApiModelProperty("创建人")
-    private String createBy;
-
-    @ApiModelProperty("创建日期")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-
-    @ApiModelProperty("更新人")
-    private String updateBy;
-
-    @ApiModelProperty("更新时间")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date updateTime;
-
-    @ApiModelProperty("作业计划批次号")
-    private String batchCode;
-
-    @ApiModelProperty("所属线路id")
-    private String lightRailId;
-
-    @ApiModelProperty("所属线路名称")
-    private String lightRailName;
-
-    @ApiModelProperty("所属线别id")
-    private String lineAliasId;
-
-    @ApiModelProperty("所属线别名称")
-    private String lineAliasName;
-
-    @ApiModelProperty("作业起始里程")
-    private BigDecimal schoolStartingMileage;
-
-    @ApiModelProperty("作业终点里程")
-    private BigDecimal schoolEndMileage;
-
-    @ApiModelProperty("新建日期")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    private Date newlyTime;
-
-    @ApiModelProperty("作业起始时间")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date schoolStartTime;
-
-    @ApiModelProperty("作业终止时间")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date schoolEndTime;
-
-    @ApiModelProperty("作业班组")
-    private String team;
-
-    @ApiModelProperty("派工状态（0：未派工 1：已派工）")
-    private Integer workerStatus;
-
-    @ApiModelProperty("派工状态翻译（0：未派工 1：已派工）")
-    private String workerStatusStr;
-    public String getWorkerStatusStr() {
-        return DicMap.WORKER_STATUS_MAP.get(workerStatus);
-    }
-    @ApiModelProperty("作业状态（0：未作业 1：已作业）")
-    private Integer schoolStatus;
-
-    @ApiModelProperty("作业状态翻译（0：未作业 1：已作业）")
-    private String schoolStatusStr;
-    public String getSchoolStatusStr() {
-        return DicMap.SCHOOL_STATUS_MAP.get(schoolStatus);
-    }
-
-    @ApiModelProperty("是否删除（0：未删除；1：已删除）")
-    private String delFlag;
-
-
-}