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

update 增加运单列表类型字段

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

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

@@ -365,6 +365,7 @@ public class KwTransportService {
             vo.setTruckNo(waybillOrder.getTruckNo());
             vo.setDriverName(waybillOrder.getDriverName() == null ?
                     null : String.valueOf(waybillOrder.getDriverName()));
+            vo.setType(String.valueOf(waybillOrder.getType()));
             String typeString = "";
             if (waybillOrder.getType().equals(NumberConstant.ONE)) {
                 typeString = "趟次";
@@ -372,7 +373,7 @@ public class KwTransportService {
             if (waybillOrder.getType().equals(NumberConstant.TWO)) {
                 typeString = "循环";
             }
-            vo.setType(typeString);
+            vo.setTypeLabel(typeString);
             if(status.equals(String.valueOf(NumberConstant.ONE_ZERO_ZERO))) {
                 vo.setStatus(String.valueOf(NumberConstant.ONE_ZERO_ZERO));
             } else {

+ 6 - 1
sckw-modules/sckw-report/src/main/java/com/sckw/report/service/vo/CarWaybillVo.java

@@ -46,10 +46,15 @@ public class CarWaybillVo implements Serializable {
     private String driverName;
 
     /**
-     * 运单类型
+     * 运单类型数字
      */
     private String type;
 
+    /**
+     * 运单类型字符
+     */
+    private String typeLabel;
+
     /**
      * 运单状态
      */