Merge branch 'dev' into 'dev-szl'

Dev

See merge request !31

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

@@ -41,8 +41,8 @@ public class MovementAdditiveInfo implements Serializable {
 
     @ApiModelProperty("创建日期")
     @TableField("create_time")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
     @ApiModelProperty("更新人")
@@ -51,8 +51,8 @@ public class MovementAdditiveInfo implements Serializable {
 
     @ApiModelProperty("更新时间")
     @TableField("update_time")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
 
     @ApiModelProperty("动静态几何尺寸数据主表主键-》外键")

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

+package org.jeecg.modules.school.controller;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.modules.school.dto.SchoolPlanBatchMasterDTO;
+import org.jeecg.modules.school.entity.SchoolPlanBatchMaster;
+import org.jeecg.modules.school.service.ISchoolPlanBatchMasterService;
+import org.jeecg.modules.school.vo.SchoolPlanBatchMasterVO;
+import org.springframework.web.bind.annotation.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;
+
+/**
+ * <p>
+ * 作业计划批次管理表 前端控制器
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-07-24
+ */
+@RestController
+@RequestMapping("/school/master")
+@Api(tags = "作业计划批次管理")
+public class SchoolPlanBatchMasterController extends JeecgController<SchoolPlanBatchMaster, ISchoolPlanBatchMasterService> {
+    /**
+     * 作业计划批次管理列表分页查询
+     *
+     * @param pageNo
+     * @param pageSize
+     * @param dto
+     * @return
+     */
+    @AutoLog(value = "作业计划批次管理列表分页查询")
+    @ApiOperation(value = "作业计划批次管理列表分页查询", notes = "作业计划批次管理列表分页查询")
+    @GetMapping(value = "/list")
+    public Result<IPage<SchoolPlanBatchMasterVO>> queryPageList(@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                                @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                                SchoolPlanBatchMasterDTO dto) {
+        Page<SchoolPlanBatchMasterVO> pageData = new Page<>(pageNo, pageSize);
+        pageData = this.service.queryPageList(pageData, dto);
+        return Result.OK(pageData);
+    }
+
+}

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

+package org.jeecg.modules.school.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-24
+ */
+@Data
+public class SchoolPlanBatchMasterDTO {
+
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    private String id;
+
+    @ApiModelProperty("创建人")
+    private String createBy;
+
+    @ApiModelProperty("创建日期")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    @ApiModelProperty("更新人")
+    private String updateBy;
+
+    @ApiModelProperty("更新时间")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+    @ApiModelProperty("作业计划批次号")
+    private String batchCode;
+
+    @ApiModelProperty("所属线路id")
+    private String lightRailId;
+
+    @ApiModelProperty("所属线路名称")
+    private String lightRailName;
+
+    @ApiModelProperty("所属线别id")
+    private String lineAliasId;
+
+    @ApiModelProperty("所属线别名称")
+    private String lineAliasName;
+
+    @ApiModelProperty("作业起始里程")
+    private BigDecimal schoolStartingMileage;
+
+    @ApiModelProperty("作业终点里程")
+    private BigDecimal schoolEndMileage;
+
+    @ApiModelProperty("新建日期")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date newlyTime;
+
+    @ApiModelProperty("作业起始时间")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date schoolStartTime;
+
+    @ApiModelProperty("作业终止时间")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date schoolEndTime;
+
+    @ApiModelProperty("作业班组")
+    private String team;
+
+    @ApiModelProperty("派工状态（0：未派工 1：已派工）")
+    private Integer workerStatus;
+
+    @ApiModelProperty("作业状态（0：未作业 1：已作业）")
+    private Integer schoolStatus;
+
+    @ApiModelProperty("是否删除（0：未删除；1：已删除）")
+    private String delFlag;
+
+}

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

+package org.jeecg.modules.school.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-24
+ */
+@Getter
+@Setter
+@TableName("t_jh_school_plan_batch_master")
+@ApiModel(value = "SchoolPlanBatchMaster对象", description = "作业计划批次管理表")
+public class SchoolPlanBatchMaster 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 HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    @ApiModelProperty("更新人")
+    @TableField("update_by")
+    private String updateBy;
+
+    @ApiModelProperty("更新时间")
+    @TableField("update_time")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+    @ApiModelProperty("作业计划批次号")
+    @TableField("batch_code")
+    private String batchCode;
+
+    @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("school_starting_mileage")
+    private BigDecimal schoolStartingMileage;
+
+    @ApiModelProperty("作业终点里程")
+    @TableField("school_end_mileage")
+    private BigDecimal schoolEndMileage;
+
+    @ApiModelProperty("新建日期")
+    @TableField("newly_time")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date newlyTime;
+
+    @ApiModelProperty("作业起始时间")
+    @TableField("school_start_time")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date schoolStartTime;
+
+    @ApiModelProperty("作业终止时间")
+    @TableField("school_end_time")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date schoolEndTime;
+
+    @ApiModelProperty("作业班组")
+    @TableField("team")
+    private String team;
+
+    @ApiModelProperty("派工状态（0：未派工 1：已派工）")
+    @TableField("worker_status")
+    private Integer workerStatus;
+
+    @ApiModelProperty("作业状态（0：未作业 1：已作业）")
+    @TableField("school_status")
+    private Integer schoolStatus;
+
+    @ApiModelProperty("是否删除（0：未删除；1：已删除）")
+    @TableField("del_flag")
+    private String delFlag;
+
+
+}

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

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

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

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.school.mapper.SchoolPlanBatchMasterMapper">
+    <select id="queryPageList" resultType="org.jeecg.modules.school.vo.SchoolPlanBatchMasterVO">
+        SELECT
+        t1.*
+        FROM
+        t_jh_school_plan_batch_master t1 left join t_sn_light_rail t2 on t1.light_rail_id = t2.id
+        <where>
+            1=1
+            <if test="dto.batchCode != null and dto.batchCode != ''">
+                AND t1.batch_code like concat('%',#{dto.batchCode},'%')
+            </if>
+            <if test="dto.workerStatus != null and dto.workerStatus != ''">
+                AND t1.worker_status = #{dto.workerStatus}
+            </if>
+            <if test="dto.schoolStatus != null and dto.schoolStatus != ''">
+                AND t1.school_status = #{dto.schoolStatus}
+            </if>
+            <if test="dto.lightRailId != null and dto.lightRailId != ''">
+                AND t1.light_rail_id = #{dto.lightRailId}
+            </if>
+            <if test="dto.lineAliasId != null and dto.lineAliasId != ''">
+                AND t1.line_alias_id = #{dto.lineAliasId}
+            </if>
+            <if test="dto.team != null and dto.team != ''">
+                AND t1.team like concat('%',#{dto.team},'%')
+            </if>
+            AND t1.del_flag = '0'
+            AND t2.status = 1
+            order by t1.create_time desc
+        </where>
+    </select>
+</mapper>

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

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

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

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

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

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

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

@@ -20,9 +20,32 @@ public class DicMap {
      * 巡道类型(1:步行巡道 2:乘车巡道)
      */
     public final static String PATROL_TYPE = "PATROL_TYPE";
+    /**
+     * 派工状态（0：未派工 1：已派工）
+     */
+    public final static String WORKER_STATUS = "WORKER_STATUS";
 
+    /**
+     * 作业状态（0：未作业 1：已作业）
+     */
+    public final static String SCHOOL_STATUS = "SCHOOL_STATUS";
 
+    //*************************************映射MAP******************************************************************************
+    /**
+     * 作业状态（0：未作业 1：已作业）的map
+     */
+    public final static HashMap<Integer,String> SCHOOL_STATUS_MAP = new HashMap<Integer,String>(){{
+        put(0,"未作业");
+        put(1,"已作业");
+    }};
 
+    /**
+     * 派工状态（0：未派工 1：已派工）的map
+     */
+    public final static HashMap<Integer,String> WORKER_STATUS_MAP = new HashMap<Integer,String>(){{
+        put(0,"未派工");
+        put(1,"已派工");
+    }};
 
     /**
      * 现场检查项目状态对应的map
@@ -52,5 +75,13 @@ public class DicMap {
         put("EK_APPROVAL_STATUS", EK_APPROVAL_STATUS_MAP);
         put("PATROL_TYPE", PATROL_TYPE_MAP);
     }};
+    /**
+     * 路由地址 此路由地址放在最后,最后加载数值类型
+     *
+     */
+    public final static Map<String,HashMap<Integer,String>> ROUTE_INTEGER_MAP = new HashMap<String,HashMap<Integer,String>>(){{
+        put("WORKER_STATUS", WORKER_STATUS_MAP);
+        put("SCHOOL_STATUS", SCHOOL_STATUS_MAP);
 
+    }};
 }