Merge remote-tracking branch 'origin/dev' into dev

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

@@ -835,7 +835,7 @@ public class KwTransportService {
      * @return
      */
     public List<WaybillOrderListExport> wayBillOrderExport(WaybillOrderQuery query) {
-        Criteria criteria = buildWaybillOrdersQuery(query);
+        Criteria criteria = newBuildWaybillOrdersQuery(query);
         Query queryFormat = new Query(criteria);
         List<Long> wOrderIds = StringUtils.splitStrToList(query.getIds(), ",", Long.class);
         if (CollectionUtils.isNotEmpty(wOrderIds)) {

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/vo/WaybillTrackVO.java

@@ -45,4 +45,9 @@ public class WaybillTrackVO {
      * 记录时间
      */
     private String createTime;
+
+    /**
+     * 操作时间
+     */
+    private String operateTime;
 }

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/ManagementWaybillOrderService.java

@@ -275,6 +275,7 @@ public class ManagementWaybillOrderService {
     public List<ManagementWaybillOrderExcelVO> exportWaybillOrder(ManagementWaybillOrderQuery query) {
         Criteria criteria = newBuildWaybillOrdersQuery(query);
         Query queryFormat = new Query(criteria);
+        // in查询
         List<Long> wOrderIds = StringUtils.splitStrToList(query.getIds(), ",", Long.class);
         if (CollectionUtils.isNotEmpty(wOrderIds)) {
             queryFormat.addCriteria(Criteria.where("wOrderId").in(wOrderIds));

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

@@ -246,7 +246,8 @@ public class WaybillManagementService {
                         .setCreateBy(track.getCreateBy())
                         .setCreateByPhone(userPhoneMap.get(track.getCreateBy()))
                         .setCreateByName(userNameMap.get(track.getCreateBy()))
-                        .setCreateTime(DateUtil.getDateTime(track.getCreateTime()));
+                        .setCreateTime(DateUtil.getDateTime(track.getCreateTime()))
+                        .setOperateTime(DateUtil.getDateTime(track.getOperateTime()));
                 waybillTrackVOS.add(waybillTrackVO);
             }
         }