Merge remote-tracking branch 'origin/dev' into dev-hkl

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

+package org.jeecg.modules.checkData.equipmentCheckData.controller;
+
+
+import org.jeecg.modules.checkData.equipmentCheckData.entity.MovementCourse;
+import org.jeecg.modules.checkData.equipmentCheckData.service.IMovementCourseService;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+import org.jeecg.common.system.base.controller.JeecgController;
+
+/**
+ * <p>
+ * 动静态几何尺寸对应得里程相关信息表	 前端控制器
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-07-11
+ */
+@RestController
+@RequestMapping("/movement/course")
+public class MovementCourseController extends JeecgController<MovementCourse, IMovementCourseService> {
+
+}

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

+package org.jeecg.modules.checkData.equipmentCheckData.controller;
+
+
+import org.jeecg.modules.checkData.equipmentCheckData.entity.MovementCourseInfo;
+import org.jeecg.modules.checkData.equipmentCheckData.service.IMovementCourseInfoService;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+import org.jeecg.common.system.base.controller.JeecgController;
+
+/**
+ * <p>
+ * 动静态几何尺寸对应得里程相关信息详情表 前端控制器
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-07-11
+ */
+@RestController
+@RequestMapping("/movement/courseInfo")
+public class MovementCourseInfoController extends JeecgController<MovementCourseInfo, IMovementCourseInfoService> {
+
+}

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

@@ -2,13 +2,16 @@ package org.jeecg.modules.checkData.equipmentCheckData.controller;
 
 
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 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 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.checkData.equipmentCheckData.dto.RecordsMasterCheckDTO;
 import org.jeecg.modules.checkData.equipmentCheckData.entity.RecordsMasterCheck;
 import org.jeecg.modules.checkData.equipmentCheckData.entity.TrackBedManagementCheck;
@@ -19,6 +22,10 @@ import org.jeecg.modules.checkData.equipmentCheckData.vo.TrackBedManagementCheck
 import org.jeecg.modules.deviceAsset.entity.TrackBedManagement;
 import org.jeecg.modules.deviceAsset.service.ITrackBedManagementService;
 import org.jeecg.modules.utils.BeanCopyUtil;
+import org.jeecg.modules.utils.ExcelUtils;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -29,6 +36,7 @@ import org.jeecg.common.system.base.controller.JeecgController;
 import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -120,4 +128,50 @@ public class RecordsMasterCheckController extends JeecgController<RecordsMasterC
         return super.exportXls(request, recordsMasterCheck, RecordsMasterCheck.class, "道床使用情况检查");
     }
 
+    /**
+     * 导出excel
+     *
+     * @param request
+     */
+    @AutoLog(value = "设备检查记录-导出")
+    @ApiOperation(value = "设备检查记录-导出", notes = "设备检查记录-导出")
+    @GetMapping(value = "/exportXl")
+    public ModelAndView exportXl(RecordsMasterCheck recordsMasterCheck, HttpServletRequest request) {
+        // Step.1 组装查询条件
+        //Step.2 AutoPoi 导出Excel
+        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+        List<RecordsMasterCheck> resultList = this.service.list(new LambdaQueryWrapper<RecordsMasterCheck>()
+                .like(ObjectUtil.isNotEmpty(recordsMasterCheck.getEkCode()), RecordsMasterCheck::getEkCode, recordsMasterCheck.getEkCode())
+                .like(ObjectUtil.isNotEmpty(recordsMasterCheck.getSubwaySectionName()), RecordsMasterCheck::getSubwaySectionName, recordsMasterCheck.getSubwaySectionName())
+                .like(ObjectUtil.isNotEmpty(recordsMasterCheck.getLightRailName()), RecordsMasterCheck::getLightRailName, recordsMasterCheck.getLightRailName())
+                .orderByAsc(RecordsMasterCheck::getCreateTime));
+        //导出文件名称
+        mv.addObject(NormalExcelConstants.FILE_NAME, "道床使用情况检查");
+        mv.addObject(NormalExcelConstants.CLASS, RecordsMasterCheck.class);
+        LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("道床使用情况检查列表数据", "导出人:", "导出信息"));
+        mv.addObject(NormalExcelConstants.DATA_LIST, resultList);
+        return mv;
+    }
+    /**
+     * 设备检查记录-导出
+     *
+     * @param response
+     */
+    @AutoLog(value = "设备检查记录-导出")
+    @ApiOperation(value = "设备检查记录-导出", notes = "设备检查记录-导出")
+    @GetMapping("/exportXls2")
+    public void export(RecordsMasterCheck recordsMasterCheck, HttpServletResponse response) {
+        List<RecordsMasterCheck> resultList = this.service.list(new LambdaQueryWrapper<RecordsMasterCheck>()
+                .like(ObjectUtil.isNotEmpty(recordsMasterCheck.getEkCode()), RecordsMasterCheck::getEkCode, recordsMasterCheck.getEkCode())
+                .like(ObjectUtil.isNotEmpty(recordsMasterCheck.getSubwaySectionName()), RecordsMasterCheck::getSubwaySectionName, recordsMasterCheck.getSubwaySectionName())
+                .like(ObjectUtil.isNotEmpty(recordsMasterCheck.getLightRailName()), RecordsMasterCheck::getLightRailName, recordsMasterCheck.getLightRailName())
+                .orderByAsc(RecordsMasterCheck::getCreateTime));
+        int num = 0;
+        for (RecordsMasterCheck s : resultList) {
+            num = num + 1;
+            s.setRowNum(num);
+        }
+        ExcelUtils.export(response, "设备检查记录", resultList, RecordsMasterCheck.class);
+    }
 }

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/dto/MovementCourseDTO.java

+package org.jeecg.modules.checkData.equipmentCheckData.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 动静态几何尺寸对应得里程相关信息表
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-07-11
+ */
+@Data
+public class MovementCourseDTO {
+
+
+    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("动静态几何尺寸数据主表主键-》外键")
+    private String movementMasterId;
+
+    @ApiModelProperty("检查起始里程（m）")
+    private BigDecimal courseStartingMileage;
+
+    @ApiModelProperty("检查终点里程(m)")
+    private BigDecimal courseEndMileage;
+
+    @ApiModelProperty("曲线半径（m）")
+    private BigDecimal curveRadius;
+
+    @ApiModelProperty("超高（mm）")
+    private BigDecimal superHigh;
+
+    @ApiModelProperty("加宽（mm）")
+    private BigDecimal widen;
+
+    @ApiModelProperty("顺坡率（‰）")
+    private BigDecimal slopeRatio;
+
+    @ApiModelProperty("长度（m）")
+    private BigDecimal longExtent;
+
+    @ApiModelProperty("备注")
+    private String remark;
+
+    @ApiModelProperty("是否删除（0：未删除；1：已删除）")
+    private String delFlag;
+
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/dto/MovementCourseInfoDTO.java

+package org.jeecg.modules.checkData.equipmentCheckData.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 动静态几何尺寸对应得里程相关信息详情表
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-07-11
+ */
+@Data
+public class MovementCourseInfoDTO {
+
+
+    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("动静态几何尺寸数据主表主键-》外键")
+    private String movementMasterId;
+
+    @ApiModelProperty("动静态几何尺寸对应得里程信息主键-》外键")
+    private BigDecimal movementCourseId;
+
+    @ApiModelProperty("轨号")
+    private String trackCode;
+
+    @ApiModelProperty("测点")
+    private Integer measurePoint;
+
+    @ApiModelProperty("轨距")
+    private String trackGauge;
+
+    @ApiModelProperty("水平")
+    private String level;
+
+    @ApiModelProperty("三角坑")
+    private String triangularPit;
+
+    @ApiModelProperty("方向")
+    private String direction;
+
+    @ApiModelProperty("高低")
+    private String height;
+
+    @ApiModelProperty("结构")
+    private String structure;
+
+    @ApiModelProperty("整改")
+    private String rectification;
+
+    @ApiModelProperty("是否删除（0：未删除；1：已删除）")
+    private String delFlag;
+
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/dto/MovementRecordsMasterDTO.java

+package org.jeecg.modules.checkData.equipmentCheckData.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 动静态几何尺寸数据主表
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-07-11
+ */
+@Data
+public class MovementRecordsMasterDTO {
+
+
+    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("动态几何尺寸类型（1：人工静态检查；2：轨检仪静态检查）")
+    private String type;
+
+    @ApiModelProperty("检查批次编号")
+    private String ekCode;
+
+    @ApiModelProperty("工单编号")
+    private String workCode;
+
+    @ApiModelProperty("检查区间id")
+    private String subwaySectionId;
+
+    @ApiModelProperty("检查区间名称")
+    private String subwaySectionName;
+
+    @ApiModelProperty("所属线路id")
+    private String lightRailId;
+
+    @ApiModelProperty("所属线路名称")
+    private String lightRailName;
+
+    @ApiModelProperty("所属线别id")
+    private String lineAliasId;
+
+    @ApiModelProperty("所属线别名称")
+    private String lineAliasName;
+
+    @ApiModelProperty("起始里程")
+    private BigDecimal startingMileage;
+
+    @ApiModelProperty("终点里程")
+    private BigDecimal endMileage;
+
+    @ApiModelProperty("钢轨单元数量")
+    private Integer railNum;
+
+    @ApiModelProperty("曲线数量")
+    private Integer curveNum;
+
+    @ApiModelProperty("竖曲线数量")
+    private Integer verticalCurveNum;
+
+    @ApiModelProperty("道岔数量")
+    private Integer switchNum;
+
+    @ApiModelProperty("检查人姓名")
+    private String checkBy;
+
+    @ApiModelProperty("检查日期")
+    private Date checkTime;
+
+    @ApiModelProperty("审核人姓名")
+    private String verifyBy;
+
+    @ApiModelProperty("审核时间")
+    private Date verifyTime;
+
+    @ApiModelProperty("备注")
+    private String remark;
+
+    @ApiModelProperty("是否删除（0：未删除；1：已删除）")
+    private String delFlag;
+
+
+}

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

+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 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-11
+ */
+@Getter
+@Setter
+@TableName("t_djt_movement_course")
+@ApiModel(value = "MovementCourse对象", description = "动静态几何尺寸对应得里程相关信息表	")
+public class MovementCourse 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")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date createTime;
+
+    @ApiModelProperty("更新人")
+    @TableField("update_by")
+    private String updateBy;
+
+    @ApiModelProperty("更新时间")
+    @TableField("update_time")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date updateTime;
+
+    @ApiModelProperty("动静态几何尺寸数据主表主键-》外键")
+    @TableField("movement_master_id")
+    private String movementMasterId;
+
+    @ApiModelProperty("检查起始里程（m）")
+    @TableField("course_starting_mileage")
+    private BigDecimal courseStartingMileage;
+
+    @ApiModelProperty("检查终点里程(m)")
+    @TableField("course_end_mileage")
+    private BigDecimal courseEndMileage;
+
+    @ApiModelProperty("曲线半径（m）")
+    @TableField("curve_radius")
+    private BigDecimal curveRadius;
+
+    @ApiModelProperty("超高（mm）")
+    @TableField("super_high")
+    private BigDecimal superHigh;
+
+    @ApiModelProperty("加宽（mm）")
+    @TableField("widen")
+    private BigDecimal widen;
+
+    @ApiModelProperty("顺坡率（‰）")
+    @TableField("slope_ratio")
+    private BigDecimal slopeRatio;
+
+    @ApiModelProperty("长度（m）")
+    @TableField("long_extent")
+    private BigDecimal longExtent;
+
+    @ApiModelProperty("备注")
+    @TableField("remark")
+    private String remark;
+
+    @ApiModelProperty("是否删除（0：未删除；1：已删除）")
+    @TableField("del_flag")
+    private String delFlag;
+
+
+}

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

+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 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-11
+ */
+@Getter
+@Setter
+@TableName("t_djt_movement_course_info")
+@ApiModel(value = "MovementCourseInfo对象", description = "动静态几何尺寸对应得里程相关信息详情表")
+public class MovementCourseInfo 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")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date createTime;
+
+    @ApiModelProperty("更新人")
+    @TableField("update_by")
+    private String updateBy;
+
+    @ApiModelProperty("更新时间")
+    @TableField("update_time")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date updateTime;
+
+    @ApiModelProperty("动静态几何尺寸数据主表主键-》外键")
+    @TableField("movement_master_id")
+    private String movementMasterId;
+
+    @ApiModelProperty("动静态几何尺寸对应得里程信息主键-》外键")
+    @TableField("movement_course_id")
+    private BigDecimal movementCourseId;
+
+    @ApiModelProperty("轨号")
+    @TableField("track_code")
+    private String trackCode;
+
+    @ApiModelProperty("测点")
+    @TableField("measure_point")
+    private Integer measurePoint;
+
+    @ApiModelProperty("轨距")
+    @TableField("track_gauge")
+    private String trackGauge;
+
+    @ApiModelProperty("水平")
+    @TableField("level")
+    private String level;
+
+    @ApiModelProperty("三角坑")
+    @TableField("triangular_pit")
+    private String triangularPit;
+
+    @ApiModelProperty("方向")
+    @TableField("direction")
+    private String direction;
+
+    @ApiModelProperty("高低")
+    @TableField("height")
+    private String height;
+
+    @ApiModelProperty("结构")
+    @TableField("structure")
+    private String structure;
+
+    @ApiModelProperty("整改")
+    @TableField("rectification")
+    private String rectification;
+
+    @ApiModelProperty("是否删除（0：未删除；1：已删除）")
+    @TableField("del_flag")
+    private String delFlag;
+
+
+}

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

+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 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-11
+ */
+@Getter
+@Setter
+@TableName("t_djt_movement_records_master")
+@ApiModel(value = "MovementRecordsMaster对象", description = "动静态几何尺寸数据主表	")
+public class MovementRecordsMaster 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")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date createTime;
+
+    @ApiModelProperty("更新人")
+    @TableField("update_by")
+    private String updateBy;
+
+    @ApiModelProperty("更新时间")
+    @TableField("update_time")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date updateTime;
+
+    @ApiModelProperty("动态几何尺寸类型（1：人工静态检查；2：轨检仪静态检查）")
+    @TableField("type")
+    private String type;
+
+    @ApiModelProperty("检查批次编号")
+    @TableField("ek_code")
+    private String ekCode;
+
+    @ApiModelProperty("工单编号")
+    @TableField("work_code")
+    private String workCode;
+
+    @ApiModelProperty("检查区间id")
+    @TableField("subway_section_id")
+    private String subwaySectionId;
+
+    @ApiModelProperty("检查区间名称")
+    @TableField("subway_section_name")
+    private String subwaySectionName;
+
+    @ApiModelProperty("所属线路id")
+    @TableField("light_rail_id")
+    private String lightRailId;
+
+    @ApiModelProperty("所属线路名称")
+    @TableField("light_rail_name")
+    private String lightRailName;
+
+    @ApiModelProperty("所属线别id")
+    @TableField("line_alias_id")
+    private String lineAliasId;
+
+    @ApiModelProperty("所属线别名称")
+    @TableField("line_alias_name")
+    private String lineAliasName;
+
+    @ApiModelProperty("起始里程")
+    @TableField("starting_mileage")
+    private BigDecimal startingMileage;
+
+    @ApiModelProperty("终点里程")
+    @TableField("end_mileage")
+    private BigDecimal endMileage;
+
+    @ApiModelProperty("钢轨单元数量")
+    @TableField("rail_num")
+    private Integer railNum;
+
+    @ApiModelProperty("曲线数量")
+    @TableField("curve_num")
+    private Integer curveNum;
+
+    @ApiModelProperty("竖曲线数量")
+    @TableField("vertical_curve_num")
+    private Integer verticalCurveNum;
+
+    @ApiModelProperty("道岔数量")
+    @TableField("switch_num")
+    private Integer switchNum;
+
+    @ApiModelProperty("检查人姓名")
+    @TableField("check_by")
+    private String checkBy;
+
+    @ApiModelProperty("检查日期")
+    @TableField("check_time")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date checkTime;
+
+    @ApiModelProperty("审核人姓名")
+    @TableField("verify_by")
+    private String verifyBy;
+
+    @ApiModelProperty("审核时间")
+    @TableField("verify_time")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date verifyTime;
+
+    @ApiModelProperty("备注")
+    @TableField("remark")
+    private String remark;
+
+    @ApiModelProperty("是否删除（0：未删除；1：已删除）")
+    @TableField("del_flag")
+    private String delFlag;
+
+
+}

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

@@ -12,9 +12,9 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
-import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.modules.utils.ExcelExport;
 import org.springframework.format.annotation.DateTimeFormat;
-
+import org.jeecgframework.poi.excel.annotation.Excel;
 /**
  * <p>
  * 设备检查记录主表
@@ -31,6 +31,10 @@ public class RecordsMasterCheck implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @ExcelExport(value = "序号", sort = 1)
+    @TableField(exist = false)
+    private int rowNum;
+
     @ApiModelProperty("主键")
     @TableId("id")
     private String id;
@@ -55,14 +59,16 @@ public class RecordsMasterCheck implements Serializable {
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date updateTime;
 
-    @Excel(name = "检查批次编号", width = 15, orderNum = "1")
+    @ExcelExport(value = "检查批次编号", sort = 2)
+    //@Excel(name = "检查批次编号", width = 15, orderNum = "1")
     @ApiModelProperty("检查批次编号")
     @TableField("ek_code")
     private String ekCode;
 
+    @ExcelExport(value = "工单编号", sort = 3)
     @ApiModelProperty("工单编号")
     @TableField("work_code")
-    @Excel(name = "工单编号", width = 15, orderNum = "2")
+    //@Excel(name = "工单编号", width = 15, orderNum = "2")
     private String workCode;
 
     @ApiModelProperty("检查区间id")
@@ -71,7 +77,8 @@ public class RecordsMasterCheck implements Serializable {
 
     @ApiModelProperty("检查区间名称")
     @TableField("subway_section_name")
-    @Excel(name = "检查区间", width = 15, orderNum = "3")
+    @ExcelExport(value = "检查区间名称", sort = 4)
+   // @Excel(name = "检查区间", width = 15, orderNum = "3")
     private String subwaySectionName;
 
     @ApiModelProperty("所属线路id")
@@ -80,7 +87,8 @@ public class RecordsMasterCheck implements Serializable {
 
     @ApiModelProperty("所属线路名称")
     @TableField("light_rail_name")
-    @Excel(name = "所属线路", width = 15, orderNum = "4")
+    @ExcelExport(value = "所属线路", sort = 5)
+    //@Excel(name = "所属线路", width = 15, orderNum = "4")
     private String lightRailName;
 
     @ApiModelProperty("所属线别id")
@@ -89,44 +97,52 @@ public class RecordsMasterCheck implements Serializable {
 
     @ApiModelProperty("所属线别名称")
     @TableField("line_alias_name")
-    @Excel(name = "所属线路", width = 15, orderNum = "5")
+    @ExcelExport(value = "所属线别", sort = 6)
+    //@Excel(name = "所属线别", width = 15, orderNum = "5")
     private String lineAliasName;
 
     @ApiModelProperty("起始里程")
     @TableField("starting_mileage")
-    @Excel(name = "起始里程", width = 15, orderNum = "6")
+    //@Excel(name = "起始里程", width = 15, orderNum = "6")
+    @ExcelExport(value = "起始里程", sort = 7)
     private BigDecimal startingMileage;
 
     @ApiModelProperty("终点里程")
     @TableField("end_mileage")
-    @Excel(name = "终点里程", width = 15, orderNum = "7")
+    //@Excel(name = "终点里程", width = 15, orderNum = "7")
+    @ExcelExport(value = "终点里程", sort = 8)
     private BigDecimal endMileage;
 
     @ApiModelProperty("备注")
     @TableField("remark")
-    @Excel(name = "备注", width = 15, orderNum = "12")
+    //@Excel(name = "备注", width = 15, orderNum = "12")
+    @ExcelExport(value = "备注", sort = 13)
     private String remark;
 
     @ApiModelProperty("检查人姓名")
     @TableField("check_by")
-    @Excel(name = "检查人姓名", width = 15, orderNum = "8")
+    //@Excel(name = "检查人姓名", width = 15, orderNum = "8")
+    @ExcelExport(value = "检查人姓名", sort = 9)
     private String checkBy;
 
     @ApiModelProperty("检查日期")
     @TableField("check_time")
-    @Excel(name = "检查日期", width = 15, format = "yyyy-MM-dd", orderNum = "9")
+   // @Excel(name = "检查日期", width = 15, format = "yyyy-MM-dd", orderNum = "9")
+    @ExcelExport(value = "检查日期", format = "yyyy-MM-dd",sort = 10)
     private Date checkTime;
 
     @ApiModelProperty("审核人姓名")
     @TableField("verify_by")
-    @Excel(name = "审核人姓名", width = 15, orderNum = "10")
+   // @Excel(name = "审核人姓名", width = 15, orderNum = "10")
+    @ExcelExport(value = "审核人姓名",sort = 11)
     private String verifyBy;
 
     @ApiModelProperty("审核时间")
     @TableField("verify_time")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "审核日期", width = 15, format = "yyyy-MM-dd", orderNum = "11")
+   // @Excel(name = "审核日期", width = 15, format = "yyyy-MM-dd", orderNum = "11")
+    @ExcelExport(value = "审核日期",format = "yyyy-MM-dd",sort = 12)
     private Date verifyTime;
 
     @ApiModelProperty("是否删除（0：未删除；1：已删除）")

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

+package org.jeecg.modules.checkData.equipmentCheckData.mapper;
+
+import org.jeecg.modules.checkData.equipmentCheckData.entity.MovementCourseInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 动静态几何尺寸对应得里程相关信息详情表 Mapper 接口
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-07-11
+ */
+public interface MovementCourseInfoMapper extends BaseMapper<MovementCourseInfo> {
+
+}

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

+package org.jeecg.modules.checkData.equipmentCheckData.mapper;
+
+import org.jeecg.modules.checkData.equipmentCheckData.entity.MovementCourse;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 动静态几何尺寸对应得里程相关信息表	 Mapper 接口
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-07-11
+ */
+public interface MovementCourseMapper extends BaseMapper<MovementCourse> {
+
+}

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

+package org.jeecg.modules.checkData.equipmentCheckData.mapper;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.jeecg.modules.checkData.equipmentCheckData.dto.MovementRecordsMasterDTO;
+import org.jeecg.modules.checkData.equipmentCheckData.dto.RecordPatrolMasterDTO;
+import org.jeecg.modules.checkData.equipmentCheckData.entity.MovementRecordsMaster;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.checkData.equipmentCheckData.vo.MovementRecordsMasterVO;
+import org.jeecg.modules.checkData.equipmentCheckData.vo.RecordPatrolMasterVO;
+
+/**
+ * <p>
+ * 动静态几何尺寸数据主表	 Mapper 接口
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-07-11
+ */
+public interface MovementRecordsMasterMapper extends BaseMapper<MovementRecordsMaster> {
+    /**
+     * 动静态几何尺寸列表-分页列表查询
+     * @param pageData
+     * @param dto
+     * @return
+     */
+    Page<MovementRecordsMasterVO> queryPageList(Page<MovementRecordsMasterVO> pageData, MovementRecordsMasterDTO dto);
+}

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

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

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/mapper/xml/MovementRecordsMasterMapper.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.checkData.equipmentCheckData.mapper.MovementRecordsMasterMapper">
+    <select id="queryPageList" resultType="org.jeecg.modules.checkData.equipmentCheckData.vo.MovementRecordsMasterVO">
+        SELECT
+        t1.*
+        FROM
+        t_djt_movement_records_master t1
+        <where>
+            1=1
+            <if test="dto.ekCode != null and dto.ekCode != ''">
+                AND t1.ek_code like concat('%',#{dto.ekCode},'%')
+            </if>
+            <if test="dto.subwaySectionName != null and dto.subwaySectionName != ''">
+                AND t1.subway_section_name like concat('%',#{dto.subwaySectionName},'%')
+            </if>
+            <if test="dto.lightRailName != null and dto.lightRailName != ''">
+                AND t1.light_rail_name like concat('%',#{dto.lightRailName},'%')
+            </if>
+            <if test="dto.lineAliasName != null and dto.lineAliasName != ''">
+                AND t1.line_alias_name like concat('%',#{dto.lineAliasName},'%')
+            </if>
+            AND t1.type = #{dto.type}
+            AND t1.del_flag = '0'
+            order by t1.create_time desc
+        </where>
+    </select>
+</mapper>

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

+package org.jeecg.modules.checkData.equipmentCheckData.service;
+
+import org.jeecg.modules.checkData.equipmentCheckData.entity.MovementCourseInfo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 动静态几何尺寸对应得里程相关信息详情表 服务类
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-07-11
+ */
+public interface IMovementCourseInfoService extends IService<MovementCourseInfo> {
+
+}

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

+package org.jeecg.modules.checkData.equipmentCheckData.service;
+
+import org.jeecg.modules.checkData.equipmentCheckData.entity.MovementCourse;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 动静态几何尺寸对应得里程相关信息表	 服务类
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-07-11
+ */
+public interface IMovementCourseService extends IService<MovementCourse> {
+
+}

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

+package org.jeecg.modules.checkData.equipmentCheckData.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.jeecg.modules.checkData.equipmentCheckData.dto.MovementRecordsMasterDTO;
+import org.jeecg.modules.checkData.equipmentCheckData.entity.MovementRecordsMaster;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.checkData.equipmentCheckData.vo.MovementRecordsMasterVO;
+
+/**
+ * <p>
+ * 动静态几何尺寸数据主表	 服务类
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-07-11
+ */
+public interface IMovementRecordsMasterService extends IService<MovementRecordsMaster> {
+    /**
+     * 动静态几何尺寸列表-分页列表查询
+     * @param pageData
+     * @param dto
+     * @return
+     */
+    Page<MovementRecordsMasterVO> queryPageList(Page<MovementRecordsMasterVO> pageData, MovementRecordsMasterDTO dto);
+}

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

+package org.jeecg.modules.checkData.equipmentCheckData.service.impl;
+
+import org.jeecg.modules.checkData.equipmentCheckData.entity.MovementCourseInfo;
+import org.jeecg.modules.checkData.equipmentCheckData.mapper.MovementCourseInfoMapper;
+import org.jeecg.modules.checkData.equipmentCheckData.service.IMovementCourseInfoService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 动静态几何尺寸对应得里程相关信息详情表 服务实现类
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-07-11
+ */
+@Service
+public class MovementCourseInfoServiceImpl extends ServiceImpl<MovementCourseInfoMapper, MovementCourseInfo> implements IMovementCourseInfoService {
+
+}

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

+package org.jeecg.modules.checkData.equipmentCheckData.service.impl;
+
+import org.jeecg.modules.checkData.equipmentCheckData.entity.MovementCourse;
+import org.jeecg.modules.checkData.equipmentCheckData.mapper.MovementCourseMapper;
+import org.jeecg.modules.checkData.equipmentCheckData.service.IMovementCourseService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 动静态几何尺寸对应得里程相关信息表	 服务实现类
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-07-11
+ */
+@Service
+public class MovementCourseServiceImpl extends ServiceImpl<MovementCourseMapper, MovementCourse> implements IMovementCourseService {
+
+}

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

+package org.jeecg.modules.checkData.equipmentCheckData.service.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.jeecg.modules.checkData.equipmentCheckData.dto.MovementRecordsMasterDTO;
+import org.jeecg.modules.checkData.equipmentCheckData.entity.MovementRecordsMaster;
+import org.jeecg.modules.checkData.equipmentCheckData.mapper.MovementRecordsMasterMapper;
+import org.jeecg.modules.checkData.equipmentCheckData.service.IMovementRecordsMasterService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.modules.checkData.equipmentCheckData.vo.MovementRecordsMasterVO;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 动静态几何尺寸数据主表	 服务实现类
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-07-11
+ */
+@Service
+public class MovementRecordsMasterServiceImpl extends ServiceImpl<MovementRecordsMasterMapper, MovementRecordsMaster> implements IMovementRecordsMasterService {
+    /**
+     * 动静态几何尺寸列表-分页列表查询
+     * @param pageData
+     * @param dto
+     * @return
+     */
+    @Override
+    public Page<MovementRecordsMasterVO> queryPageList(Page<MovementRecordsMasterVO> pageData, MovementRecordsMasterDTO dto) {
+        return this.baseMapper.queryPageList(pageData,dto);
+    }
+}

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

+package org.jeecg.modules.checkData.equipmentCheckData.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ * 动静态几何尺寸对应得里程相关信息详情表
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-07-11
+ */
+@Data
+public class MovementCourseInfoOneVO {
+
+    @ApiModelProperty("轨号")
+    private String trackCode;
+
+    @ApiModelProperty("轨号对应的详情集合")
+    private List<MovementCourseInfoVO> infoList;
+
+
+}

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

+package org.jeecg.modules.checkData.equipmentCheckData.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 动静态几何尺寸对应得里程相关信息详情表
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-07-11
+ */
+@Data
+public class MovementCourseInfoVO {
+
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    private String id;
+
+    @ApiModelProperty("创建人")
+    private String createBy;
+
+    @ApiModelProperty("创建日期")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date createTime;
+
+    @ApiModelProperty("更新人")
+    private String updateBy;
+
+    @ApiModelProperty("更新时间")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date updateTime;
+
+    @ApiModelProperty("动静态几何尺寸数据主表主键-》外键")
+    private String movementMasterId;
+
+    @ApiModelProperty("动静态几何尺寸对应得里程信息主键-》外键")
+    private BigDecimal movementCourseId;
+
+    @ApiModelProperty("轨号")
+    private String trackCode;
+
+    @ApiModelProperty("测点")
+    private Integer measurePoint;
+
+    @ApiModelProperty("轨距")
+    private String trackGauge;
+
+    @ApiModelProperty("水平")
+    private String level;
+
+    @ApiModelProperty("三角坑")
+    private String triangularPit;
+
+    @ApiModelProperty("方向")
+    private String direction;
+
+    @ApiModelProperty("高低")
+    private String height;
+
+    @ApiModelProperty("结构")
+    private String structure;
+
+    @ApiModelProperty("整改")
+    private String rectification;
+
+    @ApiModelProperty("是否删除（0：未删除；1：已删除）")
+    private String delFlag;
+
+
+}

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

+package org.jeecg.modules.checkData.equipmentCheckData.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 动静态几何尺寸对应得里程相关信息表
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-07-11
+ */
+@Data
+public class MovementCourseVO {
+
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    private String id;
+
+    @ApiModelProperty("创建人")
+    private String createBy;
+
+    @ApiModelProperty("创建日期")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date createTime;
+
+    @ApiModelProperty("更新人")
+    private String updateBy;
+
+    @ApiModelProperty("更新时间")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date updateTime;
+
+    @ApiModelProperty("动静态几何尺寸数据主表主键-》外键")
+    private String movementMasterId;
+
+    @ApiModelProperty("检查起始里程（m）")
+    private BigDecimal courseStartingMileage;
+
+    @ApiModelProperty("检查终点里程(m)")
+    private BigDecimal courseEndMileage;
+
+    @ApiModelProperty("曲线半径（m）")
+    private BigDecimal curveRadius;
+
+    @ApiModelProperty("超高（mm）")
+    private BigDecimal superHigh;
+
+    @ApiModelProperty("加宽（mm）")
+    private BigDecimal widen;
+
+    @ApiModelProperty("顺坡率（‰）")
+    private BigDecimal slopeRatio;
+
+    @ApiModelProperty("长度（m）")
+    private BigDecimal longExtent;
+
+    @ApiModelProperty("备注")
+    private String remark;
+
+    @ApiModelProperty("是否删除（0：未删除；1：已删除）")
+    private String delFlag;
+
+
+}

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

+package org.jeecg.modules.checkData.equipmentCheckData.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+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-11
+ */
+@Data
+public class MovementRecordsMasterVO {
+
+
+    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("动态几何尺寸类型（1：人工静态检查；2：轨检仪静态检查）")
+    private String type;
+
+    @ApiModelProperty("检查批次编号")
+    private String ekCode;
+
+    @ApiModelProperty("工单编号")
+    private String workCode;
+
+    @ApiModelProperty("检查区间id")
+    private String subwaySectionId;
+
+    @ApiModelProperty("检查区间名称")
+    private String subwaySectionName;
+
+    @ApiModelProperty("所属线路id")
+    private String lightRailId;
+
+    @ApiModelProperty("所属线路名称")
+    private String lightRailName;
+
+    @ApiModelProperty("所属线别id")
+    private String lineAliasId;
+
+    @ApiModelProperty("所属线别名称")
+    private String lineAliasName;
+
+    @ApiModelProperty("起始里程")
+    private BigDecimal startingMileage;
+
+    @ApiModelProperty("终点里程")
+    private BigDecimal endMileage;
+
+    @ApiModelProperty("钢轨单元数量")
+    private Integer railNum;
+
+    @ApiModelProperty("曲线数量")
+    private Integer curveNum;
+
+    @ApiModelProperty("竖曲线数量")
+    private Integer verticalCurveNum;
+
+    @ApiModelProperty("道岔数量")
+    private Integer switchNum;
+
+    @ApiModelProperty("检查人姓名")
+    private String checkBy;
+
+    @ApiModelProperty("检查日期")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date checkTime;
+
+    @ApiModelProperty("审核人姓名")
+    private String verifyBy;
+
+    @ApiModelProperty("审核时间")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date verifyTime;
+
+    @ApiModelProperty("备注")
+    private String remark;
+
+    @ApiModelProperty("是否删除（0：未删除；1：已删除）")
+    private String delFlag;
+
+
+}

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

+package org.jeecg.modules.checkData.equipmentCheckData.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+
+/**
+ * 动静态几何保存时初始化回显接口返回类
+ */
+@Data
+public class MovementSavaQueryVO {
+
+    @ApiModelProperty("检查区间id")
+    private String subwaySectionId;
+
+    @ApiModelProperty("检查区间名称")
+    private String subwaySectionName;
+
+    @ApiModelProperty("所属线路id")
+    private String lightRailId;
+
+    @ApiModelProperty("所属线路名称")
+    private String lightRailName;
+
+    @ApiModelProperty("所属线别id")
+    private String lineAliasId;
+
+    @ApiModelProperty("所属线别名称")
+    private String lineAliasName;
+
+    @ApiModelProperty("起始里程")
+    private BigDecimal startingMileage;
+
+    @ApiModelProperty("终点里程")
+    private BigDecimal endMileage;
+
+    @ApiModelProperty("钢轨单元数量")
+    private Integer railNum;
+
+    @ApiModelProperty("曲线数量")
+    private Integer curveNum;
+
+    @ApiModelProperty("竖曲线数量")
+    private Integer verticalCurveNum;
+
+    @ApiModelProperty("道岔数量")
+    private Integer switchNum;
+
+
+
+
+}

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

@@ -28,67 +28,52 @@ public class RecordPatrolMasterAssistVO {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty("主键")
-    @TableId("id")
     private String id;
 
     @ApiModelProperty("创建人")
-    @TableField("create_by")
     private String createBy;
 
     @ApiModelProperty("创建日期")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @TableField("create_time")
     private Date createTime;
 
     @ApiModelProperty("更新人")
-    @TableField("update_by")
     private String updateBy;
 
     @ApiModelProperty("更新时间")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @TableField("update_time")
     private Date updateTime;
 
     @ApiModelProperty("线路巡查记录主表id-外键")
-    @TableField("record_master_id")
     private String recordMasterId;
 
     @ApiModelProperty("巡查区间id")
-    @TableField("subway_section_id")
     private String subwaySectionId;
 
     @ApiModelProperty("巡查区间名称")
-    @TableField("subway_section_name")
     private String subwaySectionName;
 
     @ApiModelProperty("线别id")
-    @TableField("line_alias_id")
     private String lineAliasId;
 
     @ApiModelProperty("线别名称")
-    @TableField("line_alias_name")
     private String lineAliasName;
 
     @ApiModelProperty("起始里程")
-    @TableField("starting_mileage")
     private BigDecimal startingMileage;
 
     @ApiModelProperty("终点里程")
-    @TableField("end_mileage")
     private BigDecimal endMileage;
 
     @ApiModelProperty("问题记录")
-    @TableField("problem_record")
     private String problemRecord;
 
     @ApiModelProperty("处理情况")
-    @TableField("handing_log")
     private String handingLog;
 
     @ApiModelProperty("是否删除（0：未删除；1：已删除）")
-    @TableField("del_flag")
     private String delFlag;
 
 

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

@@ -27,55 +27,43 @@ public class RecordPatrolMasterInfoVO {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty("主键")
-    @TableId("id")
     private String id;
 
     @ApiModelProperty("创建人")
-    @TableField("create_by")
     private String createBy;
 
     @ApiModelProperty("创建日期")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @TableField("create_time")
     private Date createTime;
 
     @ApiModelProperty("更新人")
-    @TableField("update_by")
     private String updateBy;
 
     @ApiModelProperty("更新时间")
-    @TableField("update_time")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date updateTime;
 
     @ApiModelProperty("线路巡查记录主表id-外键")
-    @TableField("record_master_id")
     private String recordMasterId;
 
     @ApiModelProperty("检查项目名称")
-    @TableField("ek_project_name")
     private String ekProjectName;
 
     @ApiModelProperty("重点检查项目内容")
-    @TableField("ek_project_content")
     private String ekProjectContent;
 
     @ApiModelProperty("问题记录")
-    @TableField("problem_record")
     private String problemRecord;
 
     @ApiModelProperty("处理情况")
-    @TableField("handing_log")
     private String handingLog;
 
     @ApiModelProperty("是否满足（1：是；2：否）")
-    @TableField("status")
     private String status;
 
     @ApiModelProperty("是否删除（0：未删除；1：已删除）")
-    @TableField("del_flag")
     private String delFlag;
 
 

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

@@ -29,81 +29,63 @@ public class RecordPatrolMasterVO {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty("主键")
-    @TableId("id")
     private String id;
 
     @ApiModelProperty("创建人")
-    @TableField("create_by")
     private String createBy;
 
     @ApiModelProperty("创建日期")
-    @TableField("create_time")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date createTime;
 
     @ApiModelProperty("更新人")
-    @TableField("update_by")
     private String updateBy;
 
     @ApiModelProperty("更新时间")
-    @TableField("update_time")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date updateTime;
 
     @ApiModelProperty("检查批次编号")
-    @TableField("ek_code")
     private String ekCode;
 
     @ApiModelProperty("工单编号")
-    @TableField("work_code")
     private String workCode;
 
     @ApiModelProperty("检查日期")
-    @TableField("inspect_time")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date inspectTime;
 
     @ApiModelProperty("天气")
-    @TableField("weather")
     private String weather;
 
     @ApiModelProperty("巡查线路id")
-    @TableField("light_rail_id")
     private String lightRailId;
 
     @ApiModelProperty("巡查线路名称")
-    @TableField("light_rail_name")
     private String lightRailName;
 
     @ApiModelProperty("计划巡道里程（km）")
-    @TableField("planned_patrol_mileage")
     private BigDecimal plannedPatrolMileage;
 
     @ApiModelProperty("巡道线别id")
-    @TableField("line_alias_id")
     private String lineAliasId;
 
     @ApiModelProperty("巡道线别名称")
-    @TableField("line_alias_name")
     private String lineAliasName;
 
     @ApiModelProperty("起始里程")
-    @TableField("starting_mileage")
     private BigDecimal startingMileage;
 
     @ApiModelProperty("终点里程")
-    @TableField("end_mileage")
     private BigDecimal endMileage;
 
     @ApiModelProperty("完成里程")
-    @TableField("completed_mileage")
     private BigDecimal completedMileage;
 
     @ApiModelProperty("巡道类型(1:步行巡道 2:乘车巡道)")
-    @TableField("patrol_type")
     private String patrolType;
 
     @ApiModelProperty("巡道类型翻译(1:步行巡道 2:乘车巡道)")
@@ -113,41 +95,33 @@ public class RecordPatrolMasterVO {
     }
 
     @ApiModelProperty("巡道工时")
-    @TableField("patrol_hourse")
     private BigDecimal patrolHourse;
 
     @ApiModelProperty("检查人姓名")
-    @TableField("check_by")
     private String checkBy;
 
     @ApiModelProperty("清点时间")
-    @TableField("check_time")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd hh:mm")
     @DateTimeFormat(pattern = "yyyy-MM-dd hh:mm")
     private Date checkTime;
 
     @ApiModelProperty("销点时间")
-    @TableField("pinpoint_time")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd hh:mm")
     @DateTimeFormat(pattern = "yyyy-MM-dd hh:mm")
     private Date pinpointTime;
 
     @ApiModelProperty("审核人姓名")
-    @TableField("verify_by")
     private String verifyBy;
 
     @ApiModelProperty("审核时间")
-    @TableField("verify_time")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date verifyTime;
 
     @ApiModelProperty("巡道员备忘录")
-    @TableField("remark")
     private String remark;
 
     @ApiModelProperty("是否删除（0：未删除；1：已删除）")
-    @TableField("del_flag")
     private String delFlag;
 
 

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

@@ -28,95 +28,74 @@ public class RecordsMasterCheckVO {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty("主键")
-    @TableId("id")
     private String id;
 
     @ApiModelProperty("创建人")
-    @TableField("create_by")
     private String createBy;
 
     @ApiModelProperty("创建日期")
-    @TableField("create_time")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date createTime;
 
     @ApiModelProperty("更新人")
-    @TableField("update_by")
     private String updateBy;
 
     @ApiModelProperty("更新时间")
-    @TableField("update_time")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date updateTime;
 
     @ApiModelProperty("检查批次编号")
-    @TableField("ek_code")
     private String ekCode;
 
     @ApiModelProperty("工单编号")
-    @TableField("work_code")
     private String workCode;
 
     @ApiModelProperty("检查区间id")
-    @TableField("subway_section_id")
     private String subwaySectionId;
 
     @ApiModelProperty("检查区间名称")
-    @TableField("subway_section_name")
     private String subwaySectionName;
 
     @ApiModelProperty("所属线路id")
-    @TableField("light_rail_id")
     private String lightRailId;
 
     @ApiModelProperty("所属线路名称")
-    @TableField("light_rail_name")
     private String lightRailName;
 
     @ApiModelProperty("所属线别id")
-    @TableField("line_alias_id")
     private String lineAliasId;
 
     @ApiModelProperty("所属线别名称")
-    @TableField("line_alias_name")
     private String lineAliasName;
 
     @ApiModelProperty("起始里程")
-    @TableField("starting_mileage")
     private BigDecimal startingMileage;
 
     @ApiModelProperty("终点里程")
-    @TableField("end_mileage")
     private BigDecimal endMileage;
 
     @ApiModelProperty("备注")
-    @TableField("remark")
     private String remark;
 
     @ApiModelProperty("检查人姓名")
-    @TableField("check_by")
     private String checkBy;
 
     @ApiModelProperty("检查日期")
-    @TableField("check_time")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date checkTime;
 
     @ApiModelProperty("审核人姓名")
-    @TableField("verify_by")
     private String verifyBy;
 
     @ApiModelProperty("审核时间")
-    @TableField("verify_time")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date verifyTime;
 
     @ApiModelProperty("是否删除（0：未删除；1：已删除）")
-    @TableField("del_flag")
     private String delFlag;
 
 

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

@@ -25,51 +25,40 @@ public class TrackBedManagementCheckVO {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty("主键")
-    @TableId("id")
     private String id;
 
     @ApiModelProperty("创建人")
-    @TableField("create_by")
     private String createBy;
 
     @ApiModelProperty("创建日期")
-    @TableField("create_time")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date createTime;
 
     @ApiModelProperty("更新人")
-    @TableField("update_by")
     private String updateBy;
 
     @ApiModelProperty("更新时间")
-    @TableField("update_time")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date updateTime;
 
     @ApiModelProperty("设备检查记录主表id->外键")
-    @TableField("records_master_check_id")
     private String recordsMasterCheckId;
 
     @ApiModelProperty("道床id->外键")
-    @TableField("trak_bed_management_id")
     private String trakBedManagementId;
 
     @ApiModelProperty("检查项目名称")
-    @TableField("ek_project_name")
     private String ekProjectName;
 
     @ApiModelProperty("检查项目内容")
-    @TableField("ek_project_content")
     private String ekProjectContent;
 
     @ApiModelProperty("检查合格评判标准")
-    @TableField("ek_peoject_template")
     private String ekPeojectTemplate;
 
     @ApiModelProperty("现场检查项目状态（1：合格；2：良好；3：不合格）")
-    @TableField("ek_project_status")
     private String ekProjectStatus;
 
     @ApiModelProperty("现场检查项目状态翻译（1：合格；2：良好；3：不合格）")
@@ -79,7 +68,6 @@ public class TrackBedManagementCheckVO {
     }
 
     @ApiModelProperty("是否删除（0：未删除，1：已删除）")
-    @TableField("del_flag")
     private String delFlag;
 
 

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

@@ -22,71 +22,54 @@ public class TurnoutUseCheckVO {
 
     private static final long serialVersionUID = 1L;
 
-    @TableField("id")
     private String id;
 
     @ApiModelProperty("创建人")
-    @TableField("create_by")
     private String createBy;
 
     @ApiModelProperty("创建日期")
-    @TableField("create_time")
     private Date createTime;
 
     @ApiModelProperty("更新人")
-    @TableField("update_by")
     private String updateBy;
 
     @ApiModelProperty("更新时间")
-    @TableField("update_time")
     private Date updateTime;
 
     @ApiModelProperty("检查批次号")
-    @TableField("check_batch_code")
     private String checkBatchCode;
 
     @ApiModelProperty("工单编号")
-    @TableField("work_code")
     private String workCode;
 
     @ApiModelProperty("轨距水平尺编号")
-    @TableField("gauge_level_code")
     private String gaugeLevelCode;
 
     @ApiModelProperty("检查人姓名")
-    @TableField("check_by")
     private String checkBy;
 
     @ApiModelProperty("检查日期")
-    @TableField("check_time")
     private Date checkTime;
 
     @ApiModelProperty("道岔数量")
-    @TableField("turnout_num")
     private Integer turnoutNum;
 
     @ApiModelProperty("车站id")
-    @TableField("train_station_id")
     private String trainStationId;
 
     @ApiModelProperty("线别id")
-    @TableField("line_alias_id")
     private String lineAliasId;
 
     @ApiModelProperty("曲线半径R(m)")
-    @TableField("curve_adius")
     private BigDecimal curveAdius;
 
     @ApiModelProperty("审核人姓名")
-    @TableField("verify_by")
     private String verifyBy;
 
     @ApiModelProperty("审核时间")
-    @TableField("verify_time")
     private Date verifyTime;
 
     @ApiModelProperty("备注")
-    @TableField("remark")
     private String remark;
 
 

jeecg-module-system/src/main/java/org/jeecg/modules/utils/ExcelClassField.java

+package org.jeecg.modules.utils;
+
+import java.util.LinkedHashMap;
+
+/**
+ * @author sunnyzyq
+ * @date 2021/12/17
+ */
+public class ExcelClassField {
+
+    /** 字段名称 */
+    private String fieldName;
+
+    /** 表头名称 */
+    private String name;
+
+    /** 映射关系 */
+    private LinkedHashMap<String, String> kvMap;
+
+    /** 示例值 */
+    private Object example;
+
+    /** 排序 */
+    private int sort;
+
+    /** 是否为注解字段：0-否，1-是 */
+    private int hasAnnotation;
+
+    public String getFieldName() {
+        return fieldName;
+    }
+
+    public void setFieldName(String fieldName) {
+        this.fieldName = fieldName;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public LinkedHashMap<String, String> getKvMap() {
+        return kvMap;
+    }
+
+    public void setKvMap(LinkedHashMap<String, String> kvMap) {
+        this.kvMap = kvMap;
+    }
+
+    public Object getExample() {
+        return example;
+    }
+
+    public void setExample(Object example) {
+        this.example = example;
+    }
+
+    public int getSort() {
+        return sort;
+    }
+
+    public void setSort(int sort) {
+        this.sort = sort;
+    }
+
+    public int getHasAnnotation() {
+        return hasAnnotation;
+    }
+
+    public void setHasAnnotation(int hasAnnotation) {
+        this.hasAnnotation = hasAnnotation;
+    }
+
+}
\ No newline at end of file

jeecg-module-system/src/main/java/org/jeecg/modules/utils/ExcelExport.java

+package org.jeecg.modules.utils;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * @author sunnyzyq
+ * @date 2021/12/17
+ */
+@Target(ElementType.FIELD)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface ExcelExport {
+
+    /** 字段名称 */
+    String value();
+
+    /** 导出排序先后: 数字越小越靠前（默认按Java类字段顺序导出） */
+    int sort() default 0;
+
+    /** 导出映射，格式如：0-未知;1-男;2-女 */
+    String kv() default "";
+
+    /** 导出模板示例值（有值的话，直接取该值，不做映射） */
+    String example() default "";
+    String format() default "";
+}
\ No newline at end of file

jeecg-module-system/src/main/java/org/jeecg/modules/utils/ExcelImport.java

+package org.jeecg.modules.utils;
+
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * @author sunnyzyq
+ * @date 2021/12/17
+ */
+@Target(ElementType.FIELD)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface ExcelImport {
+
+    /** 字段名称 */
+    String value();
+
+    /** 导出映射，格式如：0-未知;1-男;2-女 */
+    String kv() default "";
+
+    /** 是否为必填字段（默认为非必填） */
+    boolean required() default false;
+
+    /** 最大长度（默认255） */
+    int maxLength() default 255;
+
+    /** 导入唯一性验证（多个字段则取联合验证） */
+    boolean unique() default false;
+
+}
\ No newline at end of file