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

sckw-common/sckw-common-core/src/main/java/com/sckw/core/filter/RequestCheckFilter.java

@@ -40,12 +40,12 @@ public class RequestCheckFilter implements Filter {
     CustomConfig customConfig;
 
     /**
-     * 直接放行不需要校验token的请求
+     * 直接放行不需要校验Access-Token的请求
      */
     private static final List<String> EXCLUDEPATH = new ArrayList<>();
 
     /**
-     * 直接放行不需要校验token的请求
+     * 直接放行不需要校验Access-Special的请求
      */
     private static final List<String> IMPORT_PASS_PATH = new ArrayList<>();
 

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/enuma/ApproveStatusEnum.java

@@ -0,0 +1,44 @@
+package com.sckw.transport.model.enuma;
+
+import lombok.Getter;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author zk
+ * @desc 车辆运单详情状态查询枚举
+ * @date 2024/3/8 0008
+ */
+@Getter
+public enum ApproveStatusEnum {
+    /**
+     * 待审核
+     */
+    TREAT_APPROVE(0, "待审核"),
+    /**
+     * 审核驳回
+     */
+    TREAT_REJECTION(1, "审核驳回"),
+    /**
+     * 审核成功
+     */
+    TREAT_SUCCESSFUL(2, "审核成功");
+
+    private final Integer code;
+    private final String name;
+
+    ApproveStatusEnum(Integer code, String name) {
+        this.code = code;
+        this.name = name;
+    }
+
+    public static String getName(Integer code) {
+        for (ApproveStatusEnum entity : ApproveStatusEnum.values()) {
+            if (entity.getCode().equals(code)) {
+                return entity.getName();
+            }
+        }
+        return null;
+    }
+}

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/enuma/CarWaybillDetailEnum.java

@@ -1,7 +1,6 @@
 package com.sckw.transport.model.enuma;
 
-import com.sckw.core.model.enums.CarWaybillEnum;
-
+import lombok.Getter;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -10,6 +9,7 @@ import java.util.List;
  * @desc 车辆运单详情状态查询枚举
  * @date 2024/3/8 0008
  */
+@Getter
 public enum CarWaybillDetailEnum {
     /**
      * 待接单

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/enuma/CarWaybillNdexTopEnum.java

@@ -1,10 +1,13 @@
 package com.sckw.transport.model.enuma;
 
+import lombok.Getter;
+
 /**
  * @author zk
  * @desc 车辆运单看板表头状态查询枚举
  * @date 2024/3/8 0008
  */
+@Getter
 public enum CarWaybillNdexTopEnum {
     /**
      * 待接单

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/enuma/CarWaybillTableTopEnum.java

@@ -1,11 +1,13 @@
 package com.sckw.transport.model.enuma;
 
+import lombok.Getter;
+
 /**
  * @author zk
  * @desc 车辆运单表头状态查询枚举
  * @date 2024/3/8 0008
  */
-
+@Getter
 public enum CarWaybillTableTopEnum {
     /**
      * 待接单

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

@@ -34,6 +34,7 @@ import com.sckw.system.api.model.dto.res.UserCacheResDto;
 import com.sckw.transport.dao.*;
 import com.sckw.transport.model.*;
 import com.sckw.transport.model.dto.*;
+import com.sckw.transport.model.enuma.ApproveStatusEnum;
 import com.sckw.transport.model.enuma.CarWaybillDetailEnum;
 import com.sckw.transport.model.enuma.CarWaybillNdexTopEnum;
 import com.sckw.transport.model.enuma.CarWaybillTableTopEnum;
@@ -299,6 +300,8 @@ public class KwtWaybillOrderV1Service {
             addressData.put("urls", ticket != null ? FileUtils.spliceBatch(ticket.getUrls()) : null);
             addressData.put("operateStatus", ticket != null);
             addressData.put("operateTime", ticket != null ? DateUtils.format(address.getPlanTime(), DateUtils.FORMAT11) : null);
+            addressData.put("status", ticket != null ? ticket.getStatus() : null);
+            addressData.put("statusName", ticket != null ? ApproveStatusEnum.getName(ticket.getStatus()) : null);
             addressList.add(addressData);
         }