guzijian / bsth-alcohol-sign · Commits

Commit dd1aa88f5b66378fbe14b8811770a5d9a8c0ca63

Authored by guzijian
1 parent 99702208

feat: 新增字段计划打卡时间

Inline Side-by-side
Showing 5 changed files with 40 additions and 14 deletions
ruoyi-admin/src/main/java/com/ruoyi/eexception/domain/EquipmentException.java
  View file @dd1aa88
... ... @@ -8,6 +8,8 @@ import org.apache.commons.lang3.builder.ToStringStyle;
8 8 import com.ruoyi.common.annotation.Excel;
9 9 import com.ruoyi.common.core.domain.BaseEntity;
10 10  
  11 +import java.util.Date;
  12 +
11 13 /**
12 14 * 设备异常记录对象 equipment_exception
13 15 *
... ... @@ -56,4 +58,5 @@ public class EquipmentException extends BaseEntity
56 58  
57 59 private String nbbm;
58 60  
  61 + private Date planTime;
59 62 }
... ...
ruoyi-admin/src/main/java/com/ruoyi/pojo/response/ReportErrorResponseVo.java
  View file @dd1aa88
... ... @@ -44,6 +44,18 @@ public class ReportErrorResponseVo {
44 44 @ExcelProperty(value = "车辆自编号")
45 45 @ColumnWidth(20)
46 46 private String nbbm;
  47 + @ApiModelProperty("计划时间")
  48 + @ExcelProperty(value = "计划时间")
  49 + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
  50 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
  51 + @ColumnWidth(20)
  52 + private Date planTime;
  53 + @ApiModelProperty("发生时间")
  54 + @ExcelProperty(value = "发生时间")
  55 + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
  56 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
  57 + @ColumnWidth(20)
  58 + private Date createTime;
47 59 @ApiModelProperty("标题")
48 60 @ExcelProperty(value = "标题")
49 61 private String title;
... ... @@ -51,10 +63,5 @@ public class ReportErrorResponseVo {
51 63 @ExcelProperty(value = "详情")
52 64 @ColumnWidth(30)
53 65 private String remark;
54   - @ApiModelProperty("发生时间")
55   - @ExcelProperty(value = "发生时间")
56   - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
57   - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
58   - @ColumnWidth(20)
59   - private Date createTime;
  66 +
60 67 }
... ...
ruoyi-admin/src/main/java/com/ruoyi/service/ReportService.java
  View file @dd1aa88
... ... @@ -71,6 +71,7 @@ public class ReportService {
71 71 vo.setNbbm(item.getNbbm());
72 72 vo.setFleetName(item.getFleetName());
73 73 vo.setLineName(item.getLineName());
  74 + vo.setPlanTime(item.getPlanTime());
74 75 return vo;
75 76 }).collect(Collectors.toList());
76 77 }
... ...
ruoyi-admin/src/main/java/com/ruoyi/service/ThreadJobService.java
  View file @dd1aa88
... ... @@ -162,8 +162,10 @@ public class ThreadJobService {
162 162 exception.setCreateTime(signIn.getCreateTime());
163 163 exception.setFleetName(driver.getFleetName());
164 164 if (CollectionUtil.isNotEmpty(dto)) {
165   - exception.setNbbm(dto.get(globalIndex.getIndex()).getNbbm());
166   - exception.setLineName(dto.get(globalIndex.getIndex()).getLineName());
  165 + DriverScheduling scheduling = dto.get(globalIndex.getIndex());
  166 + exception.setNbbm(scheduling.getNbbm());
  167 + exception.setLineName(scheduling.getLineName());
  168 + exception.setPlanTime(scheduling.getBcType().equals(BC_TYPE_IN) ? new Date(scheduling.getZdsjT()) : new Date(scheduling.getFcsjT()));
167 169 }
168 170 exceptionMapper.insertEquipmentException(exception);
169 171 }
... ...
ruoyi-admin/src/main/resources/mapper/eexception/EquipmentExceptionMapper.xml
  View file @dd1aa88
... ... @@ -19,6 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
19 19 <result property="fleetName" column="fleet_name" />
20 20 <result property="nbbm" column="nbbm" />
21 21 <result property="lineName" column="line_name" />
  22 + <result property="planTime" column="plan_time" />
22 23 </resultMap>
23 24 <resultMap type="EquipmentException" id="EquipmentExceptionResult">
24 25 <result property="id" column="id" />
... ... @@ -30,16 +31,24 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
30 31 <result property="createTime" column="create_time" />
31 32 <result property="remark" column="remark" />
32 33 <result property="exType" column="ex_type" />
  34 + <result property="planTime" column="plan_time" />
33 35 </resultMap>
34 36  
35 37 <sql id="selectEquipmentExceptionVo">
36   - select id, title, device_id, job_code, image, status, create_time, remark,ex_type from equipment_exception
  38 + select id, title, device_id, job_code, image, status, create_time, remark,ex_type,plan_time from equipment_exception
37 39 </sql>
38 40  
39 41 <select id="selectEquipmentExceptionList" parameterType="com.ruoyi.pojo.response.EquipmentExceptionResponseVo" resultMap="EquipmentExceptionResponseResult">
40   - select equipment_exception.id, title, equipment.site_name , equipment_exception.device_id,driver.personnel_name,driver.job_code, equipment_exception.image, equipment_exception.status, equipment_exception.create_time, equipment_exception.ex_type,equipment_exception.remark
  42 + select equipment_exception.id, title, equipment.site_name ,
  43 + equipment_exception.device_id,driver.personnel_name,
  44 + driver.job_code, equipment_exception.image,
  45 + equipment_exception.status, equipment_exception.create_time,
  46 + equipment_exception.ex_type,equipment_exception.remark,
  47 + equipment_exception.plan_time
41 48 from
42   - equipment_exception join driver on driver.job_code = equipment_exception.job_code join equipment on equipment.device_id = equipment_exception.device_id
  49 + equipment_exception
  50 + join driver on driver.job_code = equipment_exception.job_code
  51 + join equipment on equipment.device_id = equipment_exception.device_id
43 52 <where>
44 53 ex_type = 4
45 54 <if test="title != null and title != ''"> and title = #{title}</if>
... ... @@ -67,7 +76,6 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
67 76 </select>
68 77 <select id="selectEquipmentExceptionListByVo"
69 78 resultType="com.ruoyi.pojo.response.EquipmentExceptionResponseVo" resultMap="EquipmentExceptionResponseResult">
70   -
71 79 select equipment_exception.id, title,
72 80 equipment.site_name ,
73 81 equipment_exception.device_id,
... ... @@ -80,9 +88,12 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
80 88 equipment_exception.remark,
81 89 equipment_exception.fleet_name,
82 90 equipment_exception.nbbm,
83   - equipment_exception.line_name
  91 + equipment_exception.line_name,
  92 + equipment_exception.plan_time
84 93 from
85   - equipment_exception join driver on driver.job_code = equipment_exception.job_code join equipment on equipment.device_id = equipment_exception.device_id
  94 + equipment_exception
  95 + join driver on driver.job_code = equipment_exception.job_code
  96 + join equipment on equipment.device_id = equipment_exception.device_id
86 97 <where>
87 98 equipment_exception.`status` != 1
88 99 <if test="siteName != null and siteName != ''"> and equipment.site_name = #{siteName}</if>
... ... @@ -116,6 +127,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
116 127 <if test="fleetName != null and fleetName != ''">fleet_name,</if>
117 128 <if test="nbbm != null and nbbm != ''">nbbm,</if>
118 129 <if test="lineName != null and lineName != ''">line_name,</if>
  130 + <if test="planTime != null">plan_time,</if>
119 131 </trim>
120 132 <trim prefix="values (" suffix=")" suffixOverrides=",">
121 133 <if test="title != null">#{title},</if>
... ... @@ -129,6 +141,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
129 141 <if test="fleetName != null and fleetName != ''">#{fleetName},</if>
130 142 <if test="nbbm != null and nbbm != ''">#{nbbm},</if>
131 143 <if test="lineName != null and lineName != ''">#{lineName},</if>
  144 + <if test="planTime != null ">#{planTime},</if>
132 145 </trim>
133 146 </insert>
134 147  
... ...