Просмотр исходного кода

update 增加运单相关状态标签字符值

chenlin 2 лет назад
Родитель
Сommit
ba981e167a

+ 1 - 0
sckw-modules/sckw-report/src/main/java/com/sckw/report/service/KwTransportService.java

@@ -384,6 +384,7 @@ public class KwTransportService {
                 vo.setStatus(waybillOrder.getStatus() == null ?
                         null : String.valueOf(waybillOrder.getStatus()));
             }
+            vo.setStatusLabel(CarWaybillEnum.getName(waybillOrder.getStatus()));
             vo.setSendCarTime(waybillOrder.getCreateTime() == null ?
                     null : DateUtil.getDateTime(waybillOrder.getCreateTime()));
             vo.setStartTime(waybillOrder.getStartTime() == null ?

+ 5 - 0
sckw-modules/sckw-report/src/main/java/com/sckw/report/service/vo/CarWaybillVo.java

@@ -57,6 +57,11 @@ public class CarWaybillVo implements Serializable {
      */
     private String  status;
 
+    /**
+     * 运单状态字符
+     */
+    private String  statusLabel;
+
     /**
      * 承运车队
      */

+ 4 - 0
sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/vo/CarWaybillAppVo.java

@@ -56,6 +56,10 @@ public class CarWaybillAppVo implements Serializable {
      * 运单状态
      */
     private String  status;
+    /**
+     * 运单状态字符
+     */
+    private String  statusLabel;
 
     /**
      * 承运车队

+ 1 - 0
sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/WaybillManagementService.java

@@ -583,6 +583,7 @@ public class WaybillManagementService {
             vo.setTypeLabel(typeString);
             vo.setStatus(waybillOrder.getStatus() == null ?
                         null : String.valueOf(waybillOrder.getStatus()));
+            vo.setStatusLabel(CarWaybillEnum.getName(waybillOrder.getStatus()));
             vo.setSendCarTime(waybillOrder.getCreateTime() == null ?
                     null : DateUtil.getDateTime(waybillOrder.getCreateTime()));
             vo.setStartTime(waybillOrder.getStartTime() == null ?