运单分页列表

src/main/java/com/aoyang/tms/service/impl/WorkOrderServiceImpl.java

@@ -1,6 +1,7 @@
 package com.aoyang.tms.service.impl;
 
 import com.aoyang.common.param.PageParam;
+import com.aoyang.tms.common.WorkOrderEnum;
 import com.aoyang.tms.controller.param.WorkOrderPageParam;
 import com.aoyang.tms.controller.vo.TruckDeptListVO;
 import com.aoyang.tms.controller.vo.WorkOrderPageListVO;
@@ -73,16 +74,22 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
             workOrderPageListVO.setSpotName(workOrder.getSpotName());
             workOrderPageListVO.setCreateDate(workOrder.getCreateDate());
             workOrderPageListVO.setCompleteDate(workOrder.getCompleteDate());
-
-            //TODO运单作业状态
-            workOrderPageListVO.setWorkOrderType(null);
-            //TODO执行运力(车牌号-挂车车牌号)
             workOrderPageListVO.setCarAndTrailerNumber("[" + workOrder.getCarNumber() + "]");
             if (workOrder.getTrailerNumber() != null) {
                 workOrderPageListVO.setCarAndTrailerNumber(workOrderPageListVO.getCarAndTrailerNumber() + "-[" + workOrder.getTrailerNumber() + "]");
             }
             workOrderPageListVO.setTruckDeptName(workOrder.getDeptName());
 
+            //TODO运单作业状态
+            //装车
+            if (workOrder.getType() == 1) {
+                workOrderPageListVO.setWorkOrderType("装车·"+ WorkOrderEnum.getOrderStatusName(workOrder.getOrderStatus()));
+            }
+            if (workOrder.getType() == 2) {
+                workOrderPageListVO.setWorkOrderType("卸车·"+ WorkOrderEnum.getOrderStatusName(workOrder.getOrderStatus()));
+            }
+
+
             listVo.add(workOrderPageListVO);
         }
         workOrderPageListVOIPage.setRecords(listVo);