1、司机/车辆档案新增认证状态；

2、车辆运单操作时间存储调整；

sckw-modules-api/sckw-fleet-api/src/main/java/com/sckw/fleet/api/model/vo/RDriverDetailVo.java

@@ -1,6 +1,8 @@
 package com.sckw.fleet.api.model.vo;
 
 import lombok.Data;
+
+import java.io.Serial;
 import java.io.Serializable;
 import java.math.BigDecimal;
 
@@ -12,6 +14,9 @@ import java.math.BigDecimal;
 @Data
 public class RDriverDetailVo implements Serializable {
 
+    @Serial
+    private static final long serialVersionUID = -2995208083176944113L;
+
     /**
      * 司机档案主键id
      */

sckw-modules-api/sckw-fleet-api/src/main/java/com/sckw/fleet/api/model/vo/RDriverVo.java

@@ -1,6 +1,8 @@
 package com.sckw.fleet.api.model.vo;
 
 import lombok.Data;
+
+import java.io.Serial;
 import java.io.Serializable;
 import java.math.BigDecimal;
 
@@ -12,6 +14,9 @@ import java.math.BigDecimal;
 @Data
 public class RDriverVo implements Serializable {
 
+    @Serial
+    private static final long serialVersionUID = -2995208083876944213L;
+
     /**
      * 司机档案主键id
      */

sckw-modules-api/sckw-fleet-api/src/main/java/com/sckw/fleet/api/model/vo/RTruckVo.java

@@ -1,6 +1,8 @@
 package com.sckw.fleet.api.model.vo;
 
 import lombok.Data;
+
+import java.io.Serial;
 import java.io.Serializable;
 import java.math.BigDecimal;
 
@@ -12,6 +14,9 @@ import java.math.BigDecimal;
 @Data
 public class RTruckVo implements Serializable {
 
+    @Serial
+    private static final long serialVersionUID = -2991208083876944113L;
+
     /**
      * 车辆档案主键id
      */

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/model/KwfDriver.java

@@ -66,4 +66,9 @@ public class KwfDriver extends BaseModel {
      */
     private Integer businessStatus;
 
+    /**
+     * 认证状态（1认证、2临时、3异常）
+     */
+    private Integer authStatus;
+
 }

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/model/KwfTruck.java

@@ -96,4 +96,9 @@ public class KwfTruck extends BaseModel {
      */
     private Integer businessStatus;
 
+    /**
+     * 认证状态（1认证、2临时、3异常）
+     */
+    private Integer authStatus;
+
 }

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/model/vo/KwfDriverVo.java

@@ -36,10 +36,10 @@ public class KwfDriverVo {
     private String phone;
 
     /**
-     * 状态
+     * 认证状态
      */
     @ExcelProperty(value = "状态", index = 2)
-    private String statusName;
+    private String authStatusName;
 
     /**
      * 身份证号
@@ -152,12 +152,18 @@ public class KwfDriverVo {
     private String remark;
 
     /**
-     * 状态（1正常、2零时、3异常）
+     * 状态(0正常、1锁定)
      */
     @ExcelIgnore
     private int status;
 
-    public String getStatusName() {
-        return status == 1 ? "正常" : status == 2 ? "临时" : "异常";
+    /**
+     * 认证状态（1认证、2临时、3异常）
+     */
+    @ExcelIgnore
+    private Integer authStatus;
+
+    public String getAuthStatusName() {
+        return authStatus == 1 ? "正常" : authStatus == 2 ? "临时" : "异常";
     }
 }

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/model/vo/KwfTruckReportVo.java

@@ -34,15 +34,22 @@ public class KwfTruckReportVo {
     private String truckNo;
 
     /**
-     * 状态（1正常、2零时、3异常）
+     * 状态(0正常、1锁定)
      */
     @ExcelIgnore
     private int status;
+
+    /**
+     * 认证状态（1认证、2临时、3异常）
+     */
+    @ExcelIgnore
+    private Integer authStatus;
+
     /**
-     * 状态名称
+     * 认证状态
      */
     @ExcelProperty(value = "状态")
-    private int statusName;
+    private String authStatusName;
 
     /**
      * 司机主键id
@@ -170,8 +177,8 @@ public class KwfTruckReportVo {
     @ExcelProperty(value = "备注")
     private String remark;
 
-    public String getStatusName() {
-        return status == 1 ? "正常" : status == 2 ? "临时" : "异常";
+    public String getAuthStatusName() {
+        return authStatus == 1 ? "正常" : authStatus == 2 ? "临时" : "异常";
     }
 
 }

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/model/vo/KwfTruckVo.java

@@ -24,15 +24,22 @@ public class KwfTruckVo {
     private String id;
 
     /**
-     * 状态（1正常、2零时、3异常）
+     * 状态(0正常、1锁定)
      */
     @ExcelIgnore
     private int status;
+
+    /**
+     * 认证状态（1认证、2临时、3异常）
+     */
+    @ExcelIgnore
+    private Integer authStatus;
+
     /**
-     * 状态名称
+     * 认证状态
      */
     @ExcelProperty(value = "状态")
-    private int statusName;
+    private String authStatusName;
 
     /**
      * 车牌号
@@ -210,7 +217,8 @@ public class KwfTruckVo {
     @ExcelProperty(value = "备注")
     private String remark;
 
-    public String getStatusName() {
-        return status == 1 ? "正常" : status == 2 ? "临时" : "异常";
+
+    public String getAuthStatusName() {
+        return authStatus == 1 ? "正常" : authStatus == 2 ? "临时" : "异常";
     }
 }

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/service/KwfDriverService.java

@@ -20,7 +20,6 @@ import com.sckw.system.api.RemoteSystemService;
 import com.sckw.system.api.model.dto.res.EntCacheResDto;
 import com.sckw.system.api.model.dto.res.UserCacheResDto;
 import org.apache.dubbo.config.annotation.DubboReference;
-import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -88,8 +87,8 @@ public class KwfDriverService {
         countList.add(allCount);
 
         /**数据处理**/
-        Map<String, Integer> statusMap = new HashMap(){{put("正常", 1); put("临时", 2); put("异常", 3);}};
-        for(Map.Entry<String, Integer> entry:statusMap.entrySet()){
+        Map<String, Integer> authStatusMap = new HashMap(){{put("正常", 1); put("临时", 2); put("异常", 3);}};
+        for(Map.Entry<String, Integer> entry:authStatusMap.entrySet()){
             System.out.println(entry.getKey()+"--->"+entry.getValue());
             KwfTableTopCount count = new KwfTableTopCount();
             for (KwfTableTopCount topCount:counts) {
@@ -109,12 +108,6 @@ public class KwfDriverService {
         return tableCount;
     }
 
-    class KwfTableTopStatus {
-        Map<String, Object> statusMap = new HashMap(){{put("1","正常"); put("2","临时"); put("3","异常");}};
-
-
-    }
-
     /**
      * @param params 分页参数
      * @desc 分页查询
@@ -185,9 +178,9 @@ public class KwfDriverService {
         //证件都有数据则为已认证(前端校验认证数据必填)
         boolean bool = checkLicense(params);
         if (bool) {
-            driver.setStatus(Global.NUMERICAL_ONE);
+            driver.setAuthStatus(Global.NUMERICAL_ONE);
         } else {
-            driver.setStatus(Global.NUMERICAL_TWO);
+            driver.setAuthStatus(Global.NUMERICAL_TWO);
         }
         HttpResult result = driverEdit(driver);
         if (result.getCode() != HttpStatus.SUCCESS_CODE) {
@@ -245,7 +238,7 @@ public class KwfDriverService {
         //证件都有数据则为已认证(前端校验认证数据必填)
         boolean bool = checkLicense(params);
         if (bool) {
-            driver.setStatus(Global.NUMERICAL_ONE);
+            driver.setAuthStatus(Global.NUMERICAL_ONE);
         }
         HttpResult result = driverEdit(driver);
         if (result.getCode() != HttpStatus.SUCCESS_CODE) {
@@ -332,6 +325,7 @@ public class KwfDriverService {
             params.setEntId(LoginUserHolder.getEntId());
             params.setEntId(params.getEntId() == null ? 1 : params.getEntId());// 暂时处理---------------zk
             params.setBusinessStatus(Global.NO);
+            params.setStatus(Global.NO);
             int count = driverDao.insert(params);
             return count > 0 ? HttpResult.ok() : HttpResult.error("司机信息新增失败！");
         } else {
@@ -657,7 +651,7 @@ public class KwfDriverService {
         //更新数据
         KwfDriver driver = new KwfDriver();
         driver.setId(driverId);
-        driver.setStatus(Global.NUMERICAL_ONE);
+        driver.setAuthStatus(Global.NUMERICAL_ONE);
         driverDao.updateById(driver);
     }
 

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/service/KwfTruckReportService.java

@@ -29,10 +29,7 @@ import com.sckw.system.api.model.dto.res.UserCacheResDto;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.multipart.MultipartFile;
-
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -94,8 +91,8 @@ public class KwfTruckReportService {
         countList.add(allCount);
 
         /**数据处理**/
-        Map<String, Integer> statusMap = new HashMap(){{put("正常", 1); put("临时", 2); put("异常", 3);}};
-        for(Map.Entry<String, Integer> entry:statusMap.entrySet()){
+        Map<String, Integer> authStatusMap = new HashMap(){{put("正常", 1); put("临时", 2); put("异常", 3);}};
+        for(Map.Entry<String, Integer> entry:authStatusMap.entrySet()){
             System.out.println(entry.getKey()+"--->"+entry.getValue());
             KwfTableTopCount count = new KwfTableTopCount();
             for (KwfTableTopCount topCount:counts) {

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/service/KwfTruckService.java

@@ -19,7 +19,6 @@ import com.sckw.system.api.model.dto.res.EntCacheResDto;
 import com.sckw.system.api.model.dto.res.SysDictResDto;
 import com.sckw.system.api.model.dto.res.UserCacheResDto;
 import org.apache.dubbo.config.annotation.DubboReference;
-import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
@@ -83,8 +82,8 @@ public class KwfTruckService {
         countList.add(allCount);
 
         /**数据处理**/
-        Map<String, Integer> statusMap = new HashMap(){{put("正常", 1); put("临时", 2); put("异常", 3);}};
-        for(Map.Entry<String, Integer> entry:statusMap.entrySet()){
+        Map<String, Integer> authStatusMap = new HashMap(){{put("正常", 1); put("临时", 2); put("异常", 3);}};
+        for(Map.Entry<String, Integer> entry:authStatusMap.entrySet()){
             System.out.println(entry.getKey()+"--->"+entry.getValue());
             KwfTableTopCount count = new KwfTableTopCount();
             for (KwfTableTopCount topCount:counts) {
@@ -192,9 +191,9 @@ public class KwfTruckService {
         //证件都有数据则为已认证(前端校验认证数据必填)
         boolean bool = checkLicense(params);
         if (bool) {
-            truck.setStatus(Global.NUMERICAL_ONE);
+            truck.setAuthStatus(Global.NUMERICAL_ONE);
         } else {
-            truck.setStatus(Global.NUMERICAL_TWO);
+            truck.setAuthStatus(Global.NUMERICAL_TWO);
         }
         HttpResult result = truckEdit(truck);
         if (result.getCode() != HttpStatus.SUCCESS_CODE) {
@@ -245,7 +244,7 @@ public class KwfTruckService {
         //证件都有数据则为已认证(前端校验认证数据必填)
         boolean bool = checkLicense(params);
         if (bool) {
-            truck.setStatus(Global.NUMERICAL_ONE);
+            truck.setAuthStatus(Global.NUMERICAL_ONE);
         }
         HttpResult result = truckEdit(truck);
         if (result.getCode() != HttpStatus.SUCCESS_CODE) {
@@ -320,6 +319,7 @@ public class KwfTruckService {
             params.setEntId(LoginUserHolder.getEntId());
             params.setEntId(params.getEntId() == null ? 1 : params.getEntId());// 暂时处理---------------zk
             params.setBusinessStatus(Global.NO);
+            params.setStatus(Global.NO);
             int count = truckDao.insert(params);
             return count > 0 ? HttpResult.ok() : HttpResult.error("车辆信息新增失败！");
         } else {
@@ -505,7 +505,7 @@ public class KwfTruckService {
         //更新数据
         KwfTruck truck = new KwfTruck();
         truck.setId(truckId);
-        truck.setStatus(Global.NUMERICAL_ONE);
+        truck.setAuthStatus(Global.NUMERICAL_ONE);
         truckDao.updateById(truck);
     }
 

sckw-modules/sckw-fleet/src/main/resources/mapper/KwfDriverMapper.xml

@@ -4,7 +4,7 @@
 
     <select id="statistics" resultType="com.sckw.fleet.model.vo.KwfTableTopCount" parameterType="java.util.Map" >
         SELECT
-        dr.`status` value, count(0) total
+        dr.`auth_status` value, count(0) total
         from kwf_driver dr
         left join kwf_driver_ent dre on dre.driver_id = dr.id
         left join kwf_driver_card drc on drc.driver_id = dr.id and drc.del_flag = 0
@@ -48,15 +48,16 @@
             or dr.phone like concat('%',#{keywords},'%')
             )
         </if>
-        GROUP BY dr.`status`
+        GROUP BY dr.`auth_status`
     </select>
 
     <select id="findPage" resultType="com.sckw.fleet.model.vo.KwfDriverVo" parameterType="java.util.Map" >
         SELECT
-        dr.id, dr.name, dr.phone, dr.idcard, dr.status, drc.expire_time idcardExpireTime, drc.address, drl.driver_no driverNo,
-        drl.type licenseType, drl.expire_time licenseExpireTime, drl.grant_unit licenseGrantUnit,
-        drq.quali_no qualiNo, dr.ent_id entId, dr.create_by createBy, dr.create_time createTime,
-        dr.update_time updateTime, dr.remark, tr.truck_no truckNo, fl.id fleetId, fl.name fleetName
+        dr.id, dr.name, dr.phone, dr.idcard, dr.status, dr.auth_status authStatus, drc.expire_time idcardExpireTime,
+        drc.address, drl.driver_no driverNo, drl.type licenseType, drl.expire_time licenseExpireTime,
+        drl.grant_unit licenseGrantUnit,drq.quali_no qualiNo, dr.ent_id entId, dr.create_by createBy,
+        dr.create_time createTime,dr.update_time updateTime, dr.remark, tr.truck_no truckNo, fl.id fleetId,
+        fl.name fleetName
         from kwf_driver dr
         left join kwf_driver_ent dre on dre.driver_id = dr.id
         left join kwf_driver_card drc on drc.driver_id = dr.id and drc.del_flag = 0
@@ -91,6 +92,9 @@
         <if test="status != null and status != ''">
             and dr.status = #{status, jdbcType=VARCHAR}
         </if>
+        <if test="authStatus != null and status != ''">
+            and dr.auth_status = #{authStatus, jdbcType=VARCHAR}
+        </if>
         <if test="startTime != null and startTime != '' " >
             and DATE( dr.create_time) <![CDATA[ >= ]]> #{startTime,jdbcType=TIMESTAMP}
         </if>
@@ -139,6 +143,9 @@
         <if test="status != null and status != ''">
             and dr.status = #{status, jdbcType=VARCHAR}
         </if>
+        <if test="authStatus != null and status != ''">
+            and dr.auth_status = #{authStatus, jdbcType=VARCHAR}
+        </if>
         <if test="noReport != null and noReport != ''">
             and dr.id not in (
                 select driver_id from kwf_truck_report where del_flag = 0 and ent_id = #{entId, jdbcType=VARCHAR}
@@ -183,6 +190,9 @@
         <if test="status != null and status != ''">
             and status = #{status, jdbcType=VARCHAR}
         </if>
+        <if test="authStatus != null and status != ''">
+            and dr.auth_status = #{authStatus, jdbcType=VARCHAR}
+        </if>
         ORDER BY create_time desc
     </select>
 

sckw-modules/sckw-fleet/src/main/resources/mapper/KwfTruckMapper.xml

@@ -4,7 +4,7 @@
 
     <select id="statistics" resultType="com.sckw.fleet.model.vo.KwfTableTopCount" parameterType="java.util.Map" >
         SELECT
-            tr.`status` value, count(0) total
+            tr.`auth_status` value, count(0) total
         from kwf_truck tr
         left join kwf_truck_ent tre on tre.truck_id = tr.id
         left join kwf_truck_license trl on trl.truck_id = tr.id and trl.del_flag = 0
@@ -47,7 +47,7 @@
             tr.truck_no like concat('%',#{keywords},'%')
             )
         </if>
-        GROUP BY tr.`status`
+        GROUP BY tr.`auth_status`
     </select>
 
     <select id="findPage" resultType="com.sckw.fleet.model.vo.KwfTruckVo" parameterType="java.util.Map" >
@@ -55,7 +55,7 @@
         tr.id, tr.ent_id entId, tr.truck_no truckNo, tr.type, tr.energy_type energyType, tr.use_type useType,
         tr.spec, tr.actual_weight actualWeight, tr.gross_weight grossWeight, tr.tare_weight tareWeight,
         tr.color, tr.eev, tr.trailer_no trailerNo, tr.total_complete totalComplete, tr.total_take totalTake,
-        tr.total_weight totalWeight, tr.business_status businessStatus, tr.remark, tr.status,
+        tr.total_weight totalWeight, tr.business_status businessStatus, tr.remark, tr.status, tr.auth_status authStatus,
         tr.create_by createBy, tr.create_time createTime, tr.update_by updateBy, tr.update_time updateTime,
         trl.owner, trl.vin, trl.reg_time regTime, trl.grant_time grantTime, trl.grant_unit grantUnit,
         trl.driving_no drivingNo, tranl.road_tran_no roadTranNo, tranl.firm_name tranFirmName,
@@ -91,6 +91,9 @@
         <if test="status != null and status != ''">
             and tr.status = #{status, jdbcType=VARCHAR}
         </if>
+        <if test="authStatus != null and status != ''">
+            and tr.auth_status = #{authStatus, jdbcType=VARCHAR}
+        </if>
         <if test="startTime != null and startTime != '' " >
             and DATE( tr.create_time) <![CDATA[ >= ]]> #{startTime,jdbcType=TIMESTAMP}
         </if>
@@ -118,7 +121,7 @@
             tr.id, tre.ent_id entId, truck_no truckNo, type, energy_type energyType, use_type useType,
             spec, actual_weight actualWeight, gross_weight grossWeight, tare_weight tareWeight,
             color, eev, trailer_no trailerNo, total_complete totalComplete, total_take totalTake,
-            total_weight totalWeight, business_status businessStatus, tr.remark, tr.status,
+            total_weight totalWeight, business_status businessStatus, tr.remark, tr.status, tr.auth_status authStatus,
             tr.create_by createBy, tr.create_time createTime, tr.update_by updateBy, tr.update_time updateTime
         from kwf_truck tr
         left join kwf_truck_ent tre on tre.truck_id = tr.id
@@ -144,6 +147,9 @@
         <if test="status != null and status != ''">
             and tr.status = #{status, jdbcType=VARCHAR}
         </if>
+        <if test="authStatus != null and status != ''">
+            and tr.auth_status = #{authStatus, jdbcType=VARCHAR}
+        </if>
         <if test="startTime != null and startTime != '' " >
             and DATE( tr.create_time) <![CDATA[ >= ]]> #{startTime,jdbcType=TIMESTAMP}
         </if>
@@ -171,7 +177,7 @@
         id, ent_id entId, truck_no truckNo, type, energy_type energyType, use_type useType,
         spec, actual_weight actualWeight, gross_weight grossWeight, tare_weight tareWeight,
         color, eev, trailer_no trailerNo, total_complete totalComplete, total_take totalTake,
-        total_weight totalWeight, business_status businessStatus, remark, status
+        total_weight totalWeight, business_status businessStatus, remark, status, auth_status authStatus
         from kwf_truck tr
         where del_flag = 0
         <if test="entId != null and entId != ''">
@@ -192,6 +198,9 @@
         <if test="status != null and status != ''">
             and status = #{status, jdbcType=VARCHAR}
         </if>
+        <if test="authStatus != null and status != ''">
+            and auth_status = #{authStatus, jdbcType=VARCHAR}
+        </if>
         ORDER BY create_time desc
     </select>
 

sckw-modules/sckw-fleet/src/main/resources/mapper/KwfTruckReportMapper.xml

@@ -4,7 +4,7 @@
 
     <select id="statistics" resultType="com.sckw.fleet.model.vo.KwfTableTopCount" parameterType="java.util.Map" >
         SELECT
-            tr.`status` value, count(0) total
+            tr.`auth_status` value, count(0) total
         from kwf_truck_report trr
         left join kwf_truck tr on tr.id = trr.truck_id
         left join kwf_driver dr on dr.id = trr.driver_id
@@ -42,14 +42,14 @@
             or dr.phone like concat('%',#{keywords},'%')
             )
         </if>
-        GROUP BY tr.`status`
+        GROUP BY tr.`auth_status`
     </select>
 
     <select id="findPage" resultType="com.sckw.fleet.model.vo.KwfTruckReportVo" parameterType="java.util.Map" >
         SELECT
             trr.id, trr.ent_id entId, trr.truck_id truckId, driver_id driverId, trr.remark, tr.status,
             trr.create_by createBy, trr.create_time createTime, trr.update_time updateTime, trr.remark,
-            tr.truck_no truckNo, tr.actual_weight actualWeight, tr.business_status businessStatus,
+            tr.truck_no truckNo, tr.actual_weight actualWeight, tr.business_status businessStatus, tr.auth_status authStatus,
             dr.`name` driverName, dr.phone driverPhone, dr.idcard driverIdcard, dr.ent_id driverEntId,
             tr.ent_id truckEntId, fl.name truckFleetName, tr.type truckType, tr.color, tr.trailer_no trailerNo
         from kwf_truck_report trr
@@ -76,6 +76,9 @@
         <if test="status != null and status != ''">
             and tr.status = #{status, jdbcType=VARCHAR}
         </if>
+        <if test="authStatus != null and status != ''">
+            and tr.auth_status = #{authStatus, jdbcType=VARCHAR}
+        </if>
         <if test="startTime != null and startTime != '' " >
             and DATE( trr.create_time) <![CDATA[ >= ]]> #{startTime,jdbcType=TIMESTAMP}
         </if>
@@ -102,10 +105,10 @@
 
     <select id="findList" resultType="java.util.Map" parameterType="java.util.Map" >
         SELECT
-            trr.id, trr.ent_id entId, trr.status, dr.id driverId, dr.name driverName, dr.phone driverPhone, dr.idcard driverIdcard,
-            tr.id truckId, tr.truck_no truckNo, tr.type truckType, tr.energy_type truckEnergyType,
-            tr.use_type truckUseType, tr.color truckColor, tr.trailer_no truckTrailerNo,
-            tr.business_status businessStatus, tr.actual_weight actualWeight
+            trr.id, trr.ent_id entId, trr.status, dr.id driverId, dr.name driverName, dr.phone driverPhone,
+            dr.idcard driverIdcard, tr.id truckId, tr.truck_no truckNo, tr.type truckType, tr.energy_type truckEnergyType,
+            tr.use_type truckUseType, tr.color truckColor, tr.trailer_no truckTrailerNo, tr.auth_status authStatus,
+        tr.business_status businessStatus, tr.actual_weight actualWeight
         from kwf_truck_report trr
         left join kwf_truck tr on tr.id = trr.truck_id
         left join kwf_driver dr on dr.id = trr.driver_id
@@ -128,6 +131,9 @@
         <if test="businessStatus != null and businessStatus != ''">
             and tr.business_status = #{businessStatus, jdbcType=VARCHAR}
         </if>
+        <if test="authStatus != null and status != ''">
+            and tr.auth_status = #{authStatus, jdbcType=VARCHAR}
+        </if>
         <if test="status != null and status != ''">
             and trr.status = #{status, jdbcType=VARCHAR}
         </if>

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/KwtWaybillOrderService.java

@@ -533,7 +533,7 @@ public class KwtWaybillOrderService {
         waybillOrderAddressDao.insert(unloadAddress);
 
         /**车辆运单状态记录**/
-        this.setWaybillOrderTrack(waybillOrder.getId(), waybillOrder.getStatus(), null);
+        this.setWaybillOrderTrack(waybillOrder.getId(), waybillOrder.getUpdateTime(), waybillOrder.getStatus(), null);
     }
 
     /**
@@ -587,9 +587,10 @@ public class KwtWaybillOrderService {
      * @author zk
      * @date 2023/7/20
      **/
-    public KwtWaybillOrderTrack setWaybillOrderTrack(Long wOrderId, int status, String remark) {
+    public KwtWaybillOrderTrack setWaybillOrderTrack(Long wOrderId, Date operateTime, int status, String remark) {
         KwtWaybillOrderTrack orderTrack = new KwtWaybillOrderTrack();
         orderTrack.setWOrderId(wOrderId);
+        orderTrack.setOperateTime(operateTime);
         orderTrack.setStatus(status);
         orderTrack.setRemark(remark);
         int count = waybillOrderTrackDao.insert(orderTrack);
@@ -840,7 +841,7 @@ public class KwtWaybillOrderService {
                     waybillOrderDao.updateById(waybillOrder);
 
                     /**3新增运单状态记录**/
-                    setWaybillOrderTrack(waybillOrder.getId(), waybillOrder.getStatus(), null);
+                    setWaybillOrderTrack(waybillOrder.getId(), waybillOrder.getUpdateTime(), waybillOrder.getStatus(), null);
 
                     /**4回退承运订单entrustAmount**/
                     KwtLogisticsOrder logisticsOrder = logisticsOrderDao.selectById(waybillOrder.getLOrderId());
@@ -944,7 +945,7 @@ public class KwtWaybillOrderService {
             waybillOrderDao.updateById(waybillOrder);
 
             /**3新增运单状态记录**/
-            setWaybillOrderTrack(waybillOrder.getId(), waybillOrder.getStatus(), params.getRemark());
+            setWaybillOrderTrack(waybillOrder.getId(), params.getOperateTime(), waybillOrder.getStatus(), params.getRemark());
 
             /**4跟新司机/车辆数据**/
             //更新司机信息
@@ -1044,6 +1045,7 @@ public class KwtWaybillOrderService {
     public KwtWaybillOrderTrack setWaybillOrderTrack(KwtLogisticsOrderCirculate circulate, Long wOrderId) {
         KwtWaybillOrderTrack orderTrack = new KwtWaybillOrderTrack();
         orderTrack.setWOrderId(wOrderId);
+        orderTrack.setOperateTime(circulate.getCreateTime());
         orderTrack.setStatus(CarWaybillEnum.PENDING_ORDER.getCode());
         orderTrack.setCreateBy(circulate.getCreateBy());
         orderTrack.setCreateTime(circulate.getCreateTime());
@@ -1078,7 +1080,7 @@ public class KwtWaybillOrderService {
             waybillOrderDao.updateById(waybillOrder);
 
             /**3新增运单状态记录**/
-            setWaybillOrderTrack(waybillOrder.getId(), waybillOrder.getStatus(), params.getRemark());
+            setWaybillOrderTrack(waybillOrder.getId(), params.getOperateTime(), waybillOrder.getStatus(), params.getRemark());
 
             /**4回退承运订单entrustAmount**/
             KwtLogisticsOrder logisticsOrder = logisticsOrderDao.selectById(waybillOrder.getLOrderId());
@@ -1154,7 +1156,7 @@ public class KwtWaybillOrderService {
         waybillOrderDao.updateById(waybillOrder);
 
         /**3新增运单状态记录**/
-        setWaybillOrderTrack(waybillOrder.getId(), waybillOrder.getStatus(), params.getRemark());
+        setWaybillOrderTrack(waybillOrder.getId(), params.getOperateTime(), waybillOrder.getStatus(), params.getRemark());
 
         /**4Mongodb数据更新**/
         //1车辆运单
@@ -1190,7 +1192,7 @@ public class KwtWaybillOrderService {
         waybillOrderDao.updateById(waybillOrder);
 
         /**3新增运单状态记录**/
-        setWaybillOrderTrack(waybillOrder.getId(), waybillOrder.getStatus(), params.getRemark());
+        setWaybillOrderTrack(waybillOrder.getId(), params.getOperateTime(), waybillOrder.getStatus(), params.getRemark());
 
         /**4循环派车重置派车信息kwt_logistics_order_circulate**/
         if (waybillOrder.getType() == Global.NUMERICAL_TWO) {
@@ -1246,7 +1248,7 @@ public class KwtWaybillOrderService {
         waybillOrderDao.updateById(waybillOrder);
 
         /**3新增运单状态记录**/
-        setWaybillOrderTrack(waybillOrder.getId(), waybillOrder.getStatus(), params.getRemark());
+        setWaybillOrderTrack(waybillOrder.getId(), params.getOperateTime(), waybillOrder.getStatus(), params.getRemark());
 
         /**4Mongodb数据更新**/
         //1车辆运单
@@ -1283,7 +1285,7 @@ public class KwtWaybillOrderService {
         waybillOrderDao.updateById(waybillOrder);
 
         /**3新增运单状态记录**/
-        setWaybillOrderTrack(waybillOrder.getId(), waybillOrder.getStatus(), params.getRemark());
+        setWaybillOrderTrack(waybillOrder.getId(), params.getOperateTime(), waybillOrder.getStatus(), params.getRemark());
 
         /**4新增装卸货榜单信息**/
         KwtWaybillOrderTicket ticket = new KwtWaybillOrderTicket();
@@ -1351,7 +1353,7 @@ public class KwtWaybillOrderService {
         waybillOrderDao.updateById(waybillOrder);
 
         /**3新增运单状态记录**/
-        setWaybillOrderTrack(waybillOrder.getId(), waybillOrder.getStatus(), params.getRemark());
+        setWaybillOrderTrack(waybillOrder.getId(), params.getOperateTime(), waybillOrder.getStatus(), params.getRemark());
 
         /**4Mongodb数据更新**/
         //1车辆运单
@@ -1393,7 +1395,7 @@ public class KwtWaybillOrderService {
         waybillOrderDao.updateById(waybillOrder);
 
         /**3新增运单状态记录**/
-        setWaybillOrderTrack(waybillOrder.getId(), waybillOrder.getStatus(), params.getRemark());
+        setWaybillOrderTrack(waybillOrder.getId(), params.getOperateTime(), waybillOrder.getStatus(), params.getRemark());
 
         /**4新增装卸货榜单信息**/
         KwtWaybillOrderTicket ticket = new KwtWaybillOrderTicket();
@@ -1738,7 +1740,7 @@ public class KwtWaybillOrderService {
         waybillOrderDao.updateById(waybillOrder);
 
         /**3新增运单状态记录**/
-        setWaybillOrderTrack(waybillOrder.getId(), waybillOrder.getStatus(), params.getRemark());
+        setWaybillOrderTrack(waybillOrder.getId(), waybillOrder.getUpdateTime(), waybillOrder.getStatus(), params.getRemark());
 
         if (waybillOrder.getStatus() == CarWaybillEnum.APPROVAL_PASS.getCode()) {
             /**4跟新司机/车辆数据**/