排序

njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/pojo/entity/OrderInfoEntity.java

@@ -76,6 +76,10 @@ public class OrderInfoEntity {
      * 开始清运时间
      */
     private LocalDateTime transTime;
+    private LocalDateTime checkTime;
+    private LocalDateTime assignmentTransTime;
+    private LocalDateTime assignmentDriverTime;
+    private LocalDateTime driverConfirmTime;
 
     /**
      * 下单人 Id; sys_user.id

njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/pojo/result/OrderPagingResult.java

@@ -47,7 +47,10 @@ public class OrderPagingResult {
      */
     private String sn;
     private String projectName;
-
+    private LocalDateTime checkTime;
+    private LocalDateTime assignmentTransTime;
+    private LocalDateTime assignmentDriverTime;
+    private LocalDateTime driverConfirmTime;
     /**
      * 站点 Id
      */

njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/service/OrderInfoService.java

@@ -123,7 +123,8 @@ public class OrderInfoService extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
                 .setCargoPlaceId(cargoPlaceId)
                 .setUserId(userId)
                 .setOrderStatus(orderStatus)
-                .setGoodsId(orderGoodsId);
+                .setGoodsId(orderGoodsId)
+                .setAssignmentTransTime(transCompanyId == null ? null : LocalDateTime.now());
         this.save(orderInfoEntity);
 
         if (transCompanyId != null) {
@@ -182,7 +183,6 @@ public class OrderInfoService extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
         LocalDateTime startTime = orderPagingSearchParam.getStartTime();
         LocalDateTime endTime = orderPagingSearchParam.getEndTime();
         Page<OrderPagingResult> page = pageParam.toPage();
-        page.addOrder(OrderItem.desc("a.create_time"));
         QueryWrapper<OrderPagingResult> ew = Wrappers.<OrderPagingResult>query()
                 .like(StrUtil.isNotBlank(sn), "a.sn", sn)
                 .like(StrUtil.isNotBlank(licensePlate), "e.license_plate", licensePlate)
@@ -194,32 +194,32 @@ public class OrderInfoService extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
         Assert.notNull(type, () -> Exceptions.clierr("订单类型不能为空"));
         switch (type) {
             case DaiPaiDan:
-                dispatchEW(orderPagingSearchParam, ew);
+                dispatchEW(orderPagingSearchParam, page, ew);
                 break;
             case YuYue:
-                bookingEW(orderPagingSearchParam, ew);
+                bookingEW(orderPagingSearchParam, page, ew);
                 break;
             case LiShi:
-                historyEW(orderPagingSearchParam, ew);
+                historyEW(orderPagingSearchParam, page, ew);
                 break;
             case QuXiao:
-                cancelEW(orderPagingSearchParam, ew);
+                cancelEW(orderPagingSearchParam, page, ew);
                 break;
             case ShouGong:
-                autoEW(orderPagingSearchParam, ew);
+                autoEW(orderPagingSearchParam, page, ew);
                 break;
             case ShiShi:
-                realtimeEW(orderPagingSearchParam, ew);
+                realtimeEW(orderPagingSearchParam, page, ew);
                 break;
             case KanLiao:
-                checkEW(orderPagingSearchParam, ew);
+                checkEW(orderPagingSearchParam, page, ew);
                 break;
         }
-
+        page.addOrder(OrderItem.desc("a.create_time"), OrderItem.desc("a.id"));
         return PageResult.of(baseMapper.paging(page, ew));
     }
 
-    private void dispatchEW(OrderPagingSearchParam orderPagingSearchParam, QueryWrapper<OrderPagingResult> ew) {
+    private void dispatchEW(OrderPagingSearchParam orderPagingSearchParam, Page<OrderPagingResult> page, QueryWrapper<OrderPagingResult> ew) {
         MyResult userDetail = SecurityUtil.loginUser();
         Long userId = SecurityUtil.currentUserId();
         BizObj bizObj = userDetail.getBizObj();
@@ -248,10 +248,11 @@ public class OrderInfoService extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
         }
     }
 
-    private void bookingEW(OrderPagingSearchParam orderPagingSearchParam, QueryWrapper<OrderPagingResult> ew) {
+    private void bookingEW(OrderPagingSearchParam orderPagingSearchParam, Page<OrderPagingResult> page, QueryWrapper<OrderPagingResult> ew) {
         MyResult userDetail = SecurityUtil.loginUser();
         Long userId = SecurityUtil.currentUserId();
         BizObj bizObj = userDetail.getBizObj();
+        page.addOrder(OrderItem.desc("a.assignment_trans_time"), OrderItem.desc("a.assignment_driver_time"));
 
         if (BizObj.isWaste(bizObj)) {
             ew
@@ -273,10 +274,11 @@ public class OrderInfoService extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
         }
     }
 
-    private void realtimeEW(OrderPagingSearchParam orderPagingSearchParam, QueryWrapper<OrderPagingResult> ew) {
+    private void realtimeEW(OrderPagingSearchParam orderPagingSearchParam, Page<OrderPagingResult> page, QueryWrapper<OrderPagingResult> ew) {
         MyResult userDetail = SecurityUtil.loginUser();
         Long userId = SecurityUtil.currentUserId();
         BizObj bizObj = userDetail.getBizObj();
+        page.addOrder(OrderItem.desc("a.driver_confirm_time"));
 
         if (BizObj.isWaste(bizObj)) {
             ew
@@ -312,11 +314,13 @@ public class OrderInfoService extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
         }
     }
 
-    private void historyEW(OrderPagingSearchParam orderPagingSearchParam, QueryWrapper<OrderPagingResult> ew) {
+    private void historyEW(OrderPagingSearchParam orderPagingSearchParam, Page<OrderPagingResult> page, QueryWrapper<OrderPagingResult> ew) {
         MyResult userDetail = SecurityUtil.loginUser();
         Long userId = SecurityUtil.currentUserId();
         BizObj bizObj = userDetail.getBizObj();
 
+        page.addOrder(OrderItem.desc("d.out_time"));
+
         if (BizObj.isWaste(bizObj)) {
             ew
                     .eq("a.order_status", OrderStatus.YiWanCheng)
@@ -352,7 +356,7 @@ public class OrderInfoService extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
         }
     }
 
-    private void cancelEW(OrderPagingSearchParam orderPagingSearchParam, QueryWrapper<OrderPagingResult> ew) {
+    private void cancelEW(OrderPagingSearchParam orderPagingSearchParam, Page<OrderPagingResult> page, QueryWrapper<OrderPagingResult> ew) {
         MyResult userDetail = SecurityUtil.loginUser();
         Long userId = SecurityUtil.currentUserId();
         BizObj bizObj = userDetail.getBizObj();
@@ -377,7 +381,7 @@ public class OrderInfoService extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
         }
     }
 
-    private void autoEW(OrderPagingSearchParam orderPagingSearchParam, QueryWrapper<OrderPagingResult> ew) {
+    private void autoEW(OrderPagingSearchParam orderPagingSearchParam, Page<OrderPagingResult> page, QueryWrapper<OrderPagingResult> ew) {
         UserDetail userDetail = SecurityUtil.loginUser();
         Set<String> roles = userDetail.getRoles();
         if (SecurityUtil.isAdmin() || roles.contains(Constant.ROLE_STATION_MANAGE)) {
@@ -391,7 +395,7 @@ public class OrderInfoService extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
         }
     }
 
-    private void checkEW(OrderPagingSearchParam orderPagingSearchParam, QueryWrapper<OrderPagingResult> ew) {
+    private void checkEW(OrderPagingSearchParam orderPagingSearchParam, Page<OrderPagingResult> page, QueryWrapper<OrderPagingResult> ew) {
         MyResult userDetail = SecurityUtil.loginUser();
         BizObj bizObj = userDetail.getBizObj();
         if (BizObj.isSiBang(bizObj)) {
@@ -562,6 +566,7 @@ public class OrderInfoService extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
         this.updateById(new OrderInfoEntity()
                 .setId(orderId)
                 .setCheckPhoto(checkGoodsParam.getCheckPhoto())
+                .setCheckTime(LocalDateTime.now())
                 .setCheckStatus(CheckStatus.YiKanLiao)
                 .setCheckerId(SecurityUtil.currentUserId())
         );
@@ -591,6 +596,7 @@ public class OrderInfoService extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
         this.updateById(new OrderInfoEntity()
                 .setId(orderInfo.getId())
                 .setDriverId(driverId)
+                .setAssignmentDriverTime(LocalDateTime.now())
                 .setOrderStatus(OrderStatus.DaiJieDan)
         );
     }
@@ -605,6 +611,7 @@ public class OrderInfoService extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
         this.updateById(new OrderInfoEntity()
                 .setId(orderInfoId)
                 .setTransCompanyId(transCompanyId)
+                .setAssignmentTransTime(LocalDateTime.now())
                 .setOrderStatus(OrderStatus.DaiPaiDan)
         );
         OrderInfoEntity orderInfoEntity = this.getById(orderInfoId);
@@ -639,6 +646,7 @@ public class OrderInfoService extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
         }
         this.updateById(new OrderInfoEntity()
                 .setId(orderInfo.getId())
+                .setDriverConfirmTime(LocalDateTime.now())
                 .setAuditStatus(auditStatus)
                 .setTruckId(truckId)
                 .setOrderStatus(OrderStatus.YiJieDan)
@@ -743,6 +751,8 @@ public class OrderInfoService extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
         Assert.isTrue(orderStatus == OrderStatus.YiYuYue
                 || orderStatus == OrderStatus.DaiPaiDan
                 || orderStatus == OrderStatus.DaiJieDan, () -> Exceptions.clierr("当前订单状态，无法取消"));
+        AuditStatus auditStatus = orderInfo.getAuditStatus();
+        Assert.isFalse(auditStatus == AuditStatus.TongGuo || auditStatus == AuditStatus.BoHui, () -> Exceptions.clierr("当前订单状态，无法取消"));
         this.updateById(new OrderInfoEntity()
                 .setId(orderInfo.getId())
                 .setOrderStatus(OrderStatus.YiQuXiao)

njzscloud-svr/src/main/resources/mapper/order/OrderInfoMapper.xml

@@ -125,6 +125,10 @@
                m.contacts           station_contacts,
                m.phone              station_phone,
                a.contacts,
+               a.check_time,
+               a.assignment_trans_time,
+               a.assignment_driver_time,
+               a.driver_confirm_time,
                a.phone,
                a.expect_time,
                a.estimated_quantity,
@@ -132,8 +136,8 @@
                e.qualification_date truck_qualification_date,
                f.licence_start_time driver_licence_start_time,
                f.licence_end_time   driver_licence_end_time,
-               j.license_start_time trans_license_start_time,
+               j.license_start_time,
-               j.license_end_time   trans_license_start_time,
+               j.license_end_time,
                g.idcard             trans_idcard,
                g.idcard_start_time  trans_idcard_start_time,
                g.idcard_end_time    trans_idcard_end_time