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

运力详情,添加已经装卸车运单数

guoyong 4 лет назад
Родитель
Сommit
fc98b92639

+ 2 - 2
src/main/java/com/aoyang/tms/controller/vo/WorkerInfo.java

@@ -85,10 +85,10 @@ public class WorkerInfo {
     private String isZhongche;
     private String isZhongche;
 
 
     @ApiModelProperty(value = "装车运单数量")
     @ApiModelProperty(value = "装车运单数量")
-    private int zhuangcheNumber;
+    private int zhuangcheNumber = 0;
 
 
     @ApiModelProperty(value = "卸车运单数量")
     @ApiModelProperty(value = "卸车运单数量")
-    private int xiecheNumber;
+    private int xiecheNumber = 0;
 
 
     @ApiModelProperty(value = "位置经度")
     @ApiModelProperty(value = "位置经度")
     private String longitude;
     private String longitude;

+ 11 - 9
src/main/java/com/aoyang/tms/service/impl/CommonServiceImpl.java

@@ -149,15 +149,17 @@ public class CommonServiceImpl implements CommonService {
 
 
         //查询当前行车周期
         //查询当前行车周期
         WorkCycle workCycle = workCycleService.findCurrentWorkCycle(truckId);
         WorkCycle workCycle = workCycleService.findCurrentWorkCycle(truckId);
-        //完成订单列表
-        List<WorkOrder> list =
-                workOrderService.findCycleOrderList(workCycle.getId(), 1, WorkOrderEnum.COMPLETED.orderStatus());
-        if (list != null && list.size() > 0) {
-            workerInfo.setZhuangcheNumber(list.size());
-        }
-        list = workOrderService.findCycleOrderList(workCycle.getId(), 2, WorkOrderEnum.COMPLETED.orderStatus());
-        if (list != null && list.size() > 0) {
-            workerInfo.setXiecheNumber(list.size());
+        if (workCycle != null) {
+            //完成订单列表
+            List<WorkOrder> list =
+                    workOrderService.findCycleOrderList(workCycle.getId(), 1, WorkOrderEnum.COMPLETED.orderStatus());
+            if (list != null && list.size() > 0) {
+                workerInfo.setZhuangcheNumber(list.size());
+            }
+            list = workOrderService.findCycleOrderList(workCycle.getId(), 2, WorkOrderEnum.COMPLETED.orderStatus());
+            if (list != null && list.size() > 0) {
+                workerInfo.setXiecheNumber(list.size());
+            }
         }
         }
         //位置信息
         //位置信息
         LocationVO locationVO = getLocationByDate(truckId, LocalDateTime.now());
         LocationVO locationVO = getLocationByDate(truckId, LocalDateTime.now());