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

guzijian
1 parent 99702208
Showing 5 changed files with 40 additions and 14 deletions
ruoyi-admin/src/main/java/com/ruoyi/eexception/domain/EquipmentException.java
ruoyi-admin/src/main/java/com/ruoyi/pojo/response/ReportErrorResponseVo.java
ruoyi-admin/src/main/java/com/ruoyi/service/ReportService.java
ruoyi-admin/src/main/java/com/ruoyi/service/ThreadJobService.java
ruoyi-admin/src/main/resources/mapper/eexception/EquipmentExceptionMapper.xml
@@ -8,6 +8,8 @@ import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
+import java.util.Date;
+
 /**
  * 设备异常记录对象 equipment_exception
  * 
@@ -56,4 +58,5 @@ public class EquipmentException extends BaseEntity
     private String nbbm;
+    private Date planTime;
 }
@@ -44,6 +44,18 @@ public class ReportErrorResponseVo {
     @ExcelProperty(value = "车辆自编号")
     @ColumnWidth(20)
     private String nbbm;
+    @ApiModelProperty("计划时间")
+    @ExcelProperty(value = "计划时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
+    @ColumnWidth(20)
+    private Date planTime;
+    @ApiModelProperty("发生时间")
+    @ExcelProperty(value = "发生时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
+    @ColumnWidth(20)
+    private Date createTime;
     @ApiModelProperty("标题")
     @ExcelProperty(value = "标题")
     private String title;
@@ -51,10 +63,5 @@ public class ReportErrorResponseVo {
     @ExcelProperty(value = "详情")
     @ColumnWidth(30)
     private String remark;
-    @ApiModelProperty("发生时间")
-    @ExcelProperty(value = "发生时间")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
-    @ColumnWidth(20)
-    private Date createTime;
+
 }
@@ -71,6 +71,7 @@ public class ReportService {
             vo.setNbbm(item.getNbbm());
             vo.setFleetName(item.getFleetName());
             vo.setLineName(item.getLineName());
+            vo.setPlanTime(item.getPlanTime());
             return vo;
         }).collect(Collectors.toList());
     }
@@ -162,8 +162,10 @@ public class ThreadJobService {
             exception.setCreateTime(signIn.getCreateTime());
             exception.setFleetName(driver.getFleetName());
             if (CollectionUtil.isNotEmpty(dto)) {
-                exception.setNbbm(dto.get(globalIndex.getIndex()).getNbbm());
-                exception.setLineName(dto.get(globalIndex.getIndex()).getLineName());
+                DriverScheduling scheduling = dto.get(globalIndex.getIndex());
+                exception.setNbbm(scheduling.getNbbm());
+                exception.setLineName(scheduling.getLineName());
+                exception.setPlanTime(scheduling.getBcType().equals(BC_TYPE_IN) ? new Date(scheduling.getZdsjT()) : new Date(scheduling.getFcsjT()));
             }
             exceptionMapper.insertEquipmentException(exception);
         }
@@ -19,6 +19,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
         <result property="fleetName"    column="fleet_name"    />
         <result property="nbbm"    column="nbbm"    />
         <result property="lineName"    column="line_name"    />
+        <result property="planTime"    column="plan_time"    />
     </resultMap>
     <resultMap type="EquipmentException" id="EquipmentExceptionResult">
         <result property="id"    column="id"    />
@@ -30,16 +31,24 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
         <result property="createTime"    column="create_time"    />
         <result property="remark"    column="remark"    />
         <result property="exType"    column="ex_type"    />
+        <result property="planTime"    column="plan_time"    />
     </resultMap>
     <sql id="selectEquipmentExceptionVo">
-        select id, title, device_id, job_code, image, status, create_time, remark,ex_type from equipment_exception
+        select id, title, device_id, job_code, image, status, create_time, remark,ex_type,plan_time from equipment_exception
     </sql>
     <select id="selectEquipmentExceptionList" parameterType="com.ruoyi.pojo.response.EquipmentExceptionResponseVo" resultMap="EquipmentExceptionResponseResult">
-        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
+        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,
+               equipment_exception.plan_time
         from
-            equipment_exception join driver on driver.job_code = equipment_exception.job_code join equipment on equipment.device_id = equipment_exception.device_id
+            equipment_exception
+                join driver on driver.job_code = equipment_exception.job_code
+                join equipment on equipment.device_id = equipment_exception.device_id
         <where>
             ex_type = 4
             <if test="title != null  and title != ''"> and title = #{title}</if>
@@ -67,7 +76,6 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
     </select>
     <select id="selectEquipmentExceptionListByVo"
             resultType="com.ruoyi.pojo.response.EquipmentExceptionResponseVo" resultMap="EquipmentExceptionResponseResult">
-
         select equipment_exception.id, title,
                equipment.site_name ,
                equipment_exception.device_id,
@@ -80,9 +88,12 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
                equipment_exception.remark,
                 equipment_exception.fleet_name,
                 equipment_exception.nbbm,
-                equipment_exception.line_name
+                equipment_exception.line_name,
+                equipment_exception.plan_time
         from
-        equipment_exception join driver on driver.job_code = equipment_exception.job_code join equipment on equipment.device_id = equipment_exception.device_id
+            equipment_exception
+            join driver on driver.job_code = equipment_exception.job_code
+            join equipment on equipment.device_id = equipment_exception.device_id
         <where>
             equipment_exception.`status` != 1
             <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;
             <if test="fleetName != null and fleetName != ''">fleet_name,</if>
             <if test="nbbm != null and nbbm != ''">nbbm,</if>
             <if test="lineName != null and lineName != ''">line_name,</if>
+            <if test="planTime != null">plan_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="title != null">#{title},</if>
@@ -129,6 +141,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="fleetName != null and fleetName != ''">#{fleetName},</if>
             <if test="nbbm != null and nbbm != ''">#{nbbm},</if>
             <if test="lineName != null and lineName != ''">#{lineName},</if>
+            <if test="planTime != null ">#{planTime},</if>
          </trim>
     </insert>