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

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

@@ -29,7 +29,9 @@ public class CodeGenerate {
 
         // 表名
         String[] tables = {
-                "t_ek_track_bed_management_check",
+                "t_xd_record_patrol_master",
+                "t_xd_record_patrol__master_assist",
+                "t_xd_record_patrol_master_info",
         };
 
 
@@ -57,7 +59,7 @@ public class CodeGenerate {
                 // 设置过滤前缀
                 .strategyConfig(builder -> {
                     builder.addInclude(tables) // 设置需要生成的表名
-                            .addTablePrefix("t_sn", "t_da","t_ek"); // 设置过滤表前缀
+                            .addTablePrefix("t_sn", "t_da","t_ek","t_xd"); // 设置过滤表前缀
 
                     // entity实体策略
                     builder.entityBuilder()

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

+package org.jeecg.modules.checkData.equipmentCheckData.controller;
+
+
+import org.jeecg.modules.checkData.equipmentCheckData.entity.RecordPatrolMasterAssist;
+import org.jeecg.modules.checkData.equipmentCheckData.service.IRecordPatrolMasterAssistService;
+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-08
+ */
+@RestController
+@RequestMapping("/patrol/masterAssist")
+public class RecordPatrolMasterAssistController extends JeecgController<RecordPatrolMasterAssist, IRecordPatrolMasterAssistService> {
+
+}

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

+package org.jeecg.modules.checkData.equipmentCheckData.controller;
+
+
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.modules.checkData.equipmentCheckData.dto.RecordPatrolMasterDTO;
+import org.jeecg.modules.checkData.equipmentCheckData.entity.*;
+import org.jeecg.modules.checkData.equipmentCheckData.service.IRecordPatrolMasterAssistService;
+import org.jeecg.modules.checkData.equipmentCheckData.service.IRecordPatrolMasterInfoService;
+import org.jeecg.modules.checkData.equipmentCheckData.service.IRecordPatrolMasterService;
+import org.jeecg.modules.checkData.equipmentCheckData.vo.*;
+import org.jeecg.modules.utils.BeanCopyUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+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.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ * 线路巡查记录主表-巡道员使用 前端控制器
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-07-08
+ */
+@RestController
+@RequestMapping("/patrol/master")
+public class RecordPatrolMasterController extends JeecgController<RecordPatrolMaster, IRecordPatrolMasterService> {
+    @Autowired
+    private IRecordPatrolMasterInfoService recordPatrolMasterInfoService;
+
+    @Autowired
+    private IRecordPatrolMasterAssistService recordPatrolMasterAssistService;
+    /**
+     * 线路巡查记录-分页列表查询
+     *
+     * @param pageNo
+     * @param pageSize
+     * @param dto
+     * @return
+     */
+    @AutoLog(value = "线路巡查记录-分页列表查询")
+    @ApiOperation(value = "线路巡查记录-分页列表查询", notes = "线路巡查记录-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<IPage<RecordPatrolMasterVO>> queryPageList(@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                             @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                             RecordPatrolMasterDTO dto) {
+        Page<RecordPatrolMasterVO> pageData = new Page<>(pageNo, pageSize);
+        pageData = this.service.queryPageList(pageData, dto);
+        return Result.OK(pageData);
+    }
+
+    /**
+     * 根据线路巡查记录id查询详情
+     *
+     * @param id 线路巡查记录id
+     * @return
+     */
+    @AutoLog(value = "根据线路巡查记录id查询详情")
+    @ApiOperation(value = "根据线路巡查记录id查询详情", notes = "根据线路巡查记录id查询详情")
+    @GetMapping(value = "/getInfoById")
+    public Result<List<RecordPatrolMasterInfoOneVO>> getInfoById(@ApiParam(name = "线路巡查记录id") String id) {
+        List<RecordPatrolMasterInfo> listResult = recordPatrolMasterInfoService.lambdaQuery()
+                .eq(ObjectUtil.isNotEmpty(id), RecordPatrolMasterInfo::getRecordMasterId, id)
+                .eq(RecordPatrolMasterInfo::getDelFlag, "0")
+                .orderByAsc(RecordPatrolMasterInfo::getCreateTime)
+                .list();
+        //初始化最终返回的集合
+        List<RecordPatrolMasterInfoOneVO> resultList = new ArrayList<>();
+        if (listResult != null && listResult.size() > 0) {
+            //获取去重后的项目名称的集合
+            Set<String> progectNameList = listResult.stream().map(RecordPatrolMasterInfo::getEkProjectName).collect(Collectors.toSet());
+            for(String name: progectNameList){
+                //初始化最终返回的对象
+                RecordPatrolMasterInfoOneVO resultModel = new RecordPatrolMasterInfoOneVO();
+                //初始化检查项目对应的详情记录的集合
+                List<RecordPatrolMasterInfoVO> infoList = new ArrayList<>();
+                //循环符合条件的数据项集合
+                for (RecordPatrolMasterInfo entity : listResult) {
+                    //判断项目名称一样
+                    if(name.equals(entity.getEkProjectName())){
+                        //初始化检查项目对应的详情记录的对象
+                        RecordPatrolMasterInfoVO infoVo = new RecordPatrolMasterInfoVO();
+                        BeanCopyUtil.copyProperties(entity,infoVo);
+                        infoList.add(infoVo);
+                    }
+                }
+                resultModel.setInfoList(infoList);
+                resultModel.setEkProjectName(name);
+                resultList.add(resultModel);
+            }
+        }
+        return Result.OK(resultList);
+    }
+    /**
+     *  根据线路巡查记录id查询协助详情
+     * @param id 线路巡查记录id
+     * @return
+     */
+    @AutoLog(value = "根据线路巡查记录id查询协助详情")
+    @ApiOperation(value = "根据线路巡查记录id查询协助详情", notes = "根据线路巡查记录id查询协助详情")
+    @GetMapping(value = "/getAssistInfo")
+    public Result<List<RecordPatrolMasterAssistVO>> getAssistInfo(@ApiParam(name = "线路巡查记录id") String id) {
+        List<RecordPatrolMasterAssist> listResult = recordPatrolMasterAssistService.lambdaQuery()
+                .eq(ObjectUtil.isNotEmpty(id), RecordPatrolMasterAssist::getRecordMasterId, id)
+                .eq(RecordPatrolMasterAssist::getDelFlag, "0")
+                .orderByAsc(RecordPatrolMasterAssist::getCreateTime)
+                .list();
+        List<RecordPatrolMasterAssistVO> resultList = new ArrayList<>();
+        if(listResult!=null){
+             resultList = BeanCopyUtil.copyListProperties(listResult, RecordPatrolMasterAssistVO::new);
+        }
+        return Result.OK(resultList);
+    }
+
+    /**
+     * 线路巡查记录导出excel
+     * @param request
+     * @param recordPatrolMaster 线路巡查记录
+     * @return
+     */
+    @AutoLog(value = "线路巡查记录导出excel")
+    @ApiOperation(value = "线路巡查记录导出excel", notes = "线路巡查记录导出excel")
+    @GetMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, RecordPatrolMaster recordPatrolMaster) {
+        return super.exportXls(request, recordPatrolMaster, RecordPatrolMaster.class, "线路巡查记录情况");
+    }
+}

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

+package org.jeecg.modules.checkData.equipmentCheckData.controller;
+
+
+import org.jeecg.modules.checkData.equipmentCheckData.entity.RecordPatrolMasterInfo;
+import org.jeecg.modules.checkData.equipmentCheckData.service.IRecordPatrolMasterInfoService;
+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-08
+ */
+@RestController
+@RequestMapping("/patrol/masterInfo")
+public class RecordPatrolMasterInfoController extends JeecgController<RecordPatrolMasterInfo, IRecordPatrolMasterInfoService> {
+
+}

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

@@ -115,7 +115,7 @@ public class RecordsMasterCheckController extends JeecgController<RecordsMasterC
      */
     @AutoLog(value = "设备检查记录导出excel")
     @ApiOperation(value = "设备检查记录导出excel", notes = "设备检查记录导出excel")
-    @RequestMapping(value = "/exportXls")
+    @GetMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request,RecordsMasterCheck recordsMasterCheck) {
         return super.exportXls(request, recordsMasterCheck, RecordsMasterCheck.class, "道床使用情况检查");
     }

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

+package org.jeecg.modules.checkData.equipmentCheckData.dto;
+
+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-08
+ */
+@Data
+public class RecordPatrolMasterAssistDTO {
+
+
+    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("线路巡查记录主表id-外键")
+    private String recordMasterId;
+
+    @ApiModelProperty("巡查区间id")
+    private String subwaySectionId;
+
+    @ApiModelProperty("巡查区间名称")
+    private String subwaySectionName;
+
+    @ApiModelProperty("线别id")
+    private String lineAliasId;
+
+    @ApiModelProperty("线别名称")
+    private String lineAliasName;
+
+    @ApiModelProperty("起始里程")
+    private BigDecimal startingMileage;
+
+    @ApiModelProperty("终点里程")
+    private BigDecimal endMileage;
+
+    @ApiModelProperty("问题记录")
+    private String problemRecord;
+
+    @ApiModelProperty("处理情况")
+    private String handingLog;
+
+    @ApiModelProperty("是否删除（0：未删除；1：已删除）")
+    private String delFlag;
+
+
+}

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

+package org.jeecg.modules.checkData.equipmentCheckData.dto;
+
+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-08
+ */
+@Data
+public class RecordPatrolMasterDTO {
+
+
+    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 ekCode;
+
+    @ApiModelProperty("工单编号")
+    private String workCode;
+
+    @ApiModelProperty("检查日期")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date inspectTime;
+
+    @ApiModelProperty("天气")
+    private String weather;
+
+    @ApiModelProperty("巡查线路id")
+    private String lightRailId;
+
+    @ApiModelProperty("巡查线路名称")
+    private String lightRailName;
+
+    @ApiModelProperty("计划巡道里程（km）")
+    private BigDecimal plannedPatrolMileage;
+
+    @ApiModelProperty("巡道线别id")
+    private String lineAliasId;
+
+    @ApiModelProperty("巡道线别名称")
+    private String lineAliasName;
+
+    @ApiModelProperty("起始里程")
+    private BigDecimal startingMileage;
+
+    @ApiModelProperty("终点里程")
+    private BigDecimal endMileage;
+
+    @ApiModelProperty("完成里程")
+    private BigDecimal completedMileage;
+
+    @ApiModelProperty("巡道类型翻译(1:步行巡道 2:乘车巡道)")
+    private String patrolType;
+
+    @ApiModelProperty("巡道工时")
+    private BigDecimal patrolHourse;
+
+    @ApiModelProperty("检查人姓名")
+    private String checkBy;
+
+    @ApiModelProperty("清点时间")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd hh:mm")
+    @DateTimeFormat(pattern = "yyyy-MM-dd hh:mm")
+    private Date checkTime;
+
+    @ApiModelProperty("销点时间")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd hh:mm")
+    @DateTimeFormat(pattern = "yyyy-MM-dd hh:mm")
+    private Date pinpointTime;
+
+    @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/dto/RecordPatrolMasterInfoDTO.java

+package org.jeecg.modules.checkData.equipmentCheckData.dto;
+
+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.util.Date;
+
+/**
+ * <p>
+ * 线路巡查记录详情表-巡道员使用
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-07-08
+ */
+@Data
+public class RecordPatrolMasterInfoDTO {
+
+
+    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("线路巡查记录主表id-外键")
+    private String recordMasterId;
+
+    @ApiModelProperty("检查项目名称")
+    private String ekProjectName;
+
+    @ApiModelProperty("重点检查项目内容")
+    private String ekProjectContent;
+
+    @ApiModelProperty("问题记录")
+    private String problemRecord;
+
+    @ApiModelProperty("处理情况")
+    private String handingLog;
+
+    @ApiModelProperty("是否满足（1：是；2：否）")
+    private String status;
+
+    @ApiModelProperty("是否删除（0：未删除；1：已删除）")
+    private String delFlag;
+
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/entity/RecordPatrolMaster.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.jeecg.modules.utils.DicMap;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * <p>
+ * 线路巡查记录主表-巡道员使用
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-07-08
+ */
+@Getter
+@Setter
+@TableName("t_xd_record_patrol_master")
+@ApiModel(value = "RecordPatrolMaster对象", description = "线路巡查记录主表-巡道员使用")
+public class RecordPatrolMaster 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("ek_code")
+    @Excel(name = "检查批次编号", width = 15, orderNum = "1")
+    private String ekCode;
+
+    @ApiModelProperty("工单编号")
+    @TableField("work_code")
+    @Excel(name = "工单编号", width = 15, orderNum = "2")
+    private String workCode;
+
+    @ApiModelProperty("检查日期")
+    @TableField("inspect_time")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "检查日期", width = 15,format = "yyyy-MM-dd",orderNum = "3")
+    private Date inspectTime;
+
+    @ApiModelProperty("天气")
+    @TableField("weather")
+    @Excel(name = "天气", width = 15, orderNum = "4")
+    private String weather;
+
+    @ApiModelProperty("巡查线路id")
+    @TableField("light_rail_id")
+    private String lightRailId;
+
+    @ApiModelProperty("巡查线路名称")
+    @TableField("light_rail_name")
+    @Excel(name = "巡查线路", width = 15, orderNum = "5")
+    private String lightRailName;
+
+    @ApiModelProperty("计划巡道里程（km）")
+    @TableField("planned_patrol_mileage")
+    @Excel(name = "计划巡道里程", width = 15, orderNum = "6")
+    private BigDecimal plannedPatrolMileage;
+
+    @ApiModelProperty("巡道线别id")
+    @TableField("line_alias_id")
+    private String lineAliasId;
+
+    @ApiModelProperty("巡道线别名称")
+    @TableField("line_alias_name")
+    @Excel(name = "巡道线别", width = 15, orderNum = "7")
+    private String lineAliasName;
+
+    @ApiModelProperty("起始里程")
+    @TableField("starting_mileage")
+    @Excel(name = "起始里程", width = 15, orderNum = "8")
+    private BigDecimal startingMileage;
+
+    @ApiModelProperty("终点里程")
+    @TableField("end_mileage")
+    @Excel(name = "终点里程", width = 15, orderNum = "9")
+    private BigDecimal endMileage;
+
+    @ApiModelProperty("完成里程")
+    @TableField("completed_mileage")
+    @Excel(name = "完成里程", width = 15, orderNum = "10")
+    private BigDecimal completedMileage;
+
+    @ApiModelProperty("巡道类型(1:步行巡道 2:乘车巡道)")
+    @TableField("patrol_type")
+    private String patrolType;
+
+    @ApiModelProperty("巡道类型翻译(1:步行巡道 2:乘车巡道)")
+    @Excel(name = "巡道类型", width = 15, orderNum = "11")
+    @TableField(exist = false)
+    private String patrolTypeStr;
+    public String getPatrolTypeStr() {
+        return  DicMap.PATROL_TYPE_MAP.get(patrolType);
+    }
+
+
+    @ApiModelProperty("巡道工时")
+    @TableField("patrol_hourse")
+    @Excel(name = "巡道工时", width = 15, orderNum = "12")
+    private BigDecimal patrolHourse;
+
+    @ApiModelProperty("检查人姓名")
+    @TableField("check_by")
+    @Excel(name = "检查人姓名", width = 15, orderNum = "13")
+    private String checkBy;
+
+    @ApiModelProperty("清点时间")
+    @TableField("check_time")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd hh:mm")
+    @DateTimeFormat(pattern = "yyyy-MM-dd hh:mm")
+    @Excel(name = "清点时间", width = 15, format = "yyyy-MM-dd hh:mm", orderNum = "14")
+    private Date checkTime;
+
+    @ApiModelProperty("销点时间")
+    @TableField("pinpoint_time")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd hh:mm")
+    @DateTimeFormat(pattern = "yyyy-MM-dd hh:mm")
+    @Excel(name = "销点时间", width = 15, format = "yyyy-MM-dd hh:mm", orderNum = "15")
+    private Date pinpointTime;
+
+    @ApiModelProperty("审核人姓名")
+    @TableField("verify_by")
+    @Excel(name = "审核人姓名", width = 15, orderNum = "16")
+    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 = "17")
+    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/RecordPatrolMasterAssist.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-08
+ */
+@Getter
+@Setter
+@TableName("t_xd_record_patrol__master_assist")
+@ApiModel(value = "RecordPatrolMasterAssist对象", description = "线路巡查记录-协助情况表-巡道员使用")
+public class RecordPatrolMasterAssist 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("线路巡查记录主表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/entity/RecordPatrolMasterInfo.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.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-08
+ */
+@Getter
+@Setter
+@TableName("t_xd_record_patrol_master_info")
+@ApiModel(value = "RecordPatrolMasterInfo对象", description = "线路巡查记录详情表-巡道员使用")
+public class RecordPatrolMasterInfo 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("线路巡查记录主表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/entity/TrackBedManagementCheck.java

@@ -77,10 +77,6 @@ public class TrackBedManagementCheck implements Serializable {
     @TableField("ek_project_status")
     private String ekProjectStatus;
 
-    @ApiModelProperty("现场检查项目状态名称（1：合格；2：良好；3：不合格）")
-    @TableField(exist = false)
-    private String ekProjectStatusName;
-
     @ApiModelProperty("是否删除（0：未删除，1：已删除）")
     @TableField("del_flag")
     private String delFlag;

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

+package org.jeecg.modules.checkData.equipmentCheckData.mapper;
+
+import org.jeecg.modules.checkData.equipmentCheckData.entity.RecordPatrolMasterAssist;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 线路巡查记录-协助情况表-巡道员使用 Mapper 接口
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-07-08
+ */
+public interface RecordPatrolMasterAssistMapper extends BaseMapper<RecordPatrolMasterAssist> {
+
+}

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

+package org.jeecg.modules.checkData.equipmentCheckData.mapper;
+
+import org.jeecg.modules.checkData.equipmentCheckData.entity.RecordPatrolMasterInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 线路巡查记录详情表-巡道员使用 Mapper 接口
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-07-08
+ */
+public interface RecordPatrolMasterInfoMapper extends BaseMapper<RecordPatrolMasterInfo> {
+
+}

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

+package org.jeecg.modules.checkData.equipmentCheckData.mapper;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.jeecg.modules.checkData.equipmentCheckData.dto.RecordPatrolMasterDTO;
+import org.jeecg.modules.checkData.equipmentCheckData.entity.RecordPatrolMaster;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.checkData.equipmentCheckData.vo.RecordPatrolMasterVO;
+
+/**
+ * <p>
+ * 线路巡查记录主表-巡道员使用 Mapper 接口
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-07-08
+ */
+public interface RecordPatrolMasterMapper extends BaseMapper<RecordPatrolMaster> {
+    /**
+     * 线路巡查记录-分页列表查询
+     * @param pageData
+     * @param dto
+     * @return
+     */
+    Page<RecordPatrolMasterVO> queryPageList(Page<RecordPatrolMasterVO> pageData, RecordPatrolMasterDTO dto);
+
+}

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

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

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/mapper/xml/RecordPatrolMasterMapper.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.RecordPatrolMasterMapper">
+    <select id="queryPageList" resultType="org.jeecg.modules.checkData.equipmentCheckData.vo.RecordPatrolMasterVO">
+        SELECT
+        t1.*
+        FROM
+        t_xd_record_patrol_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.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.del_flag = '0'
+            order by t1.create_time desc
+        </where>
+    </select>
+</mapper>

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

@@ -20,6 +20,7 @@
             <if test="dto.lineAliasName != null and dto.lineAliasName != ''">
                 AND t1.line_alias_name like concat('%',#{dto.lineAliasName},'%')
             </if>
+                AND t1.del_flag = '0'
             order by t1.create_time desc
         </where>
     </select>

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

+package org.jeecg.modules.checkData.equipmentCheckData.service;
+
+import org.jeecg.modules.checkData.equipmentCheckData.entity.RecordPatrolMasterAssist;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 线路巡查记录-协助情况表-巡道员使用 服务类
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-07-08
+ */
+public interface IRecordPatrolMasterAssistService extends IService<RecordPatrolMasterAssist> {
+
+}

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

+package org.jeecg.modules.checkData.equipmentCheckData.service;
+
+import org.jeecg.modules.checkData.equipmentCheckData.entity.RecordPatrolMasterInfo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 线路巡查记录详情表-巡道员使用 服务类
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-07-08
+ */
+public interface IRecordPatrolMasterInfoService extends IService<RecordPatrolMasterInfo> {
+
+}

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

+package org.jeecg.modules.checkData.equipmentCheckData.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.jeecg.modules.checkData.equipmentCheckData.dto.RecordPatrolMasterDTO;
+import org.jeecg.modules.checkData.equipmentCheckData.entity.RecordPatrolMaster;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.checkData.equipmentCheckData.vo.RecordPatrolMasterVO;
+
+/**
+ * <p>
+ * 线路巡查记录主表-巡道员使用 服务类
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-07-08
+ */
+public interface IRecordPatrolMasterService extends IService<RecordPatrolMaster> {
+
+    /**
+     * 线路巡查记录-分页列表查询
+     * @param pageData
+     * @param dto
+     * @return
+     */
+    Page<RecordPatrolMasterVO> queryPageList(Page<RecordPatrolMasterVO> pageData, RecordPatrolMasterDTO dto);
+
+}

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

+package org.jeecg.modules.checkData.equipmentCheckData.service.impl;
+
+import org.jeecg.modules.checkData.equipmentCheckData.entity.RecordPatrolMasterAssist;
+import org.jeecg.modules.checkData.equipmentCheckData.mapper.RecordPatrolMasterAssistMapper;
+import org.jeecg.modules.checkData.equipmentCheckData.service.IRecordPatrolMasterAssistService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 线路巡查记录-协助情况表-巡道员使用 服务实现类
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-07-08
+ */
+@Service
+public class RecordPatrolMasterAssistServiceImpl extends ServiceImpl<RecordPatrolMasterAssistMapper, RecordPatrolMasterAssist> implements IRecordPatrolMasterAssistService {
+
+}

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

+package org.jeecg.modules.checkData.equipmentCheckData.service.impl;
+
+import org.jeecg.modules.checkData.equipmentCheckData.entity.RecordPatrolMasterInfo;
+import org.jeecg.modules.checkData.equipmentCheckData.mapper.RecordPatrolMasterInfoMapper;
+import org.jeecg.modules.checkData.equipmentCheckData.service.IRecordPatrolMasterInfoService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 线路巡查记录详情表-巡道员使用 服务实现类
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-07-08
+ */
+@Service
+public class RecordPatrolMasterInfoServiceImpl extends ServiceImpl<RecordPatrolMasterInfoMapper, RecordPatrolMasterInfo> implements IRecordPatrolMasterInfoService {
+
+}

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

+package org.jeecg.modules.checkData.equipmentCheckData.service.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.jeecg.modules.checkData.equipmentCheckData.dto.RecordPatrolMasterDTO;
+import org.jeecg.modules.checkData.equipmentCheckData.entity.RecordPatrolMaster;
+import org.jeecg.modules.checkData.equipmentCheckData.mapper.RecordPatrolMasterMapper;
+import org.jeecg.modules.checkData.equipmentCheckData.service.IRecordPatrolMasterService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.modules.checkData.equipmentCheckData.vo.RecordPatrolMasterVO;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 线路巡查记录主表-巡道员使用 服务实现类
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-07-08
+ */
+@Service
+public class RecordPatrolMasterServiceImpl extends ServiceImpl<RecordPatrolMasterMapper, RecordPatrolMaster> implements IRecordPatrolMasterService {
+    /**
+     * 线路巡查记录-分页列表查询
+     * @param pageData
+     * @param dto
+     * @return
+     */
+    @Override
+    public Page<RecordPatrolMasterVO> queryPageList(Page<RecordPatrolMasterVO> pageData, RecordPatrolMasterDTO dto) {
+        return this.baseMapper.queryPageList(pageData,dto);
+    }
+}

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/vo/RecordPatrolMasterAssistVO.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-08
+ */
+@Data
+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/RecordPatrolMasterInfoOneVO.java

+package org.jeecg.modules.checkData.equipmentCheckData.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+
+/**
+ * 线路巡查记录详情主返回类
+ *
+ * @author 史志龙
+ * @version V1.0
+ * @Package org.jeecg.modules.checkData.equipmentCheckData.vo
+ * @date 2023/7/8 16:30
+ * @Copyright © 2021-2023 北京腾信软创科技有限公司
+ */
+@Data
+public class RecordPatrolMasterInfoOneVO {
+
+    @ApiModelProperty("检查项目名称")
+    private String ekProjectName;
+
+    @ApiModelProperty("检查项目对应的详情记录的集合")
+    private List<RecordPatrolMasterInfoVO> infoList;
+}

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/vo/RecordPatrolMasterInfoVO.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.util.Date;
+
+/**
+ * <p>
+ * 线路巡查记录详情表-巡道员使用
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-07-08
+ */
+@Data
+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

+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.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-08
+ */
+@Data
+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:乘车巡道)")
+    private String patrolTypeStr;
+    public String getPatrolTypeStr() {
+        return  DicMap.PATROL_TYPE_MAP.get(patrolType);
+    }
+
+    @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/TrackBedManagementCheckVO.java

@@ -74,7 +74,7 @@ public class TrackBedManagementCheckVO {
 
     @ApiModelProperty("现场检查项目状态翻译（1：合格；2：良好；3：不合格）")
     private String ekProjectStatusStr;
-    public String getApprovalStatusStr() {
+    public String getEkProjectStatusStr() {
         return  DicMap.EK_APPROVAL_STATUS_MAP.get(ekProjectStatus);
     }
 

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

@@ -16,6 +16,14 @@ public class DicMap {
      */
     public final static String EK_APPROVAL_STATUS = "EK_APPROVAL_STATUS";
 
+    /**
+     * 巡道类型(1:步行巡道 2:乘车巡道)
+     */
+    public final static String PATROL_TYPE = "PATROL_TYPE";
+
+
+
+
     /**
      * 现场检查项目状态对应的map
      */
@@ -24,6 +32,17 @@ public class DicMap {
         put("2","良好");
         put("3","不合格");
     }};
+    /**
+     * 巡道类型对应的map
+     */
+    public final static HashMap<String,String> PATROL_TYPE_MAP = new HashMap<String,String>(){{
+        put("1","步行巡道");
+        put("2","乘车巡道");
+    }};
+
+
+
+
 
     /**
      * 路由地址 此路由地址放在最后,最后加载
@@ -31,6 +50,7 @@ public class DicMap {
      */
     public final static Map<String,HashMap<String,String>> ROUTE_MAP = new HashMap<String,HashMap<String,String>>(){{
         put("EK_APPROVAL_STATUS", EK_APPROVAL_STATUS_MAP);
+        put("PATROL_TYPE", PATROL_TYPE_MAP);
     }};
 
 }