承运订单-托运订单-统计/导出代码修改

统计增加默认值
导出修改增加选择项导出

sckw-common/sckw-common-core/src/main/java/com/sckw/core/model/enums/LogisticsOrderEnum.java

@@ -1,20 +1,49 @@
 package com.sckw.core.model.enums;
 
+import com.sckw.core.common.enums.NumberConstant;
+
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * @author lfdc
  * @description 物流订单-单据状态
  * @date 2023-07-07 14:07:23
  */
 public enum LogisticsOrderEnum {
+    /**
+     * 物流订单-待签约
+     */
     TO_BE_PLANNED(0, "waitingSigning", "0", "待签约"),
+    /**
+     * 物流订单-待接单
+     */
     PENDING_ORDER(1, "pendingOrder", "1", "待接单"),
+    /**
+     * 物流订单-待派车
+     */
     WAIT_DELIVERY(2, "waitDelivery", "2", "待派车"),
+    /**
+     * 物流订单-运输中
+     */
     IN_TRANSIT(3, "inTransit", "3", "运输中"),
+    /**
+     * 物流订单-已完成
+     */
     //    WAIT_LOADING(4, "waitLoading", "4", "待装货"),
 //    WAIT_UNLOADING(5, "waitUnLoading", "5", "待卸货"),
     HAVE_FINISHED(4, "haveFinished", "4", "已完成"),
+    /**
+     * 物流订单-已对账
+     */
     HAVE_RECONCILED(5, "haveReconciled", "5", "已对账"),
+    /**
+     * 物流订单-已结算
+     */
     HAVE_ALREADY_SETTLED(6, "haveAlreadySettled", "6", "已结算"),
+    /**
+     * 物流订单-已退回
+     */
     SEND_BACK(7, "sendBack", "7", "已退回");
 
     private final Integer code;
@@ -62,4 +91,20 @@ public enum LogisticsOrderEnum {
         }
         return null;
     }
+
+    public static List<Integer> getCodeList() {
+        List<Integer> codeList = new ArrayList<>(NumberConstant.SIXTEEN);
+        for (LogisticsOrderEnum value : LogisticsOrderEnum.values()) {
+            codeList.add(value.getCode());
+        }
+        return codeList;
+    }
+
+    public static List<String> getCodeStringList() {
+        List<String> codeList = new ArrayList<>(NumberConstant.SIXTEEN);
+        for (LogisticsOrderEnum value : LogisticsOrderEnum.values()) {
+            codeList.add(value.getStatus());
+        }
+        return codeList;
+    }
 }

sckw-common/sckw-common-excel/src/main/java/com/sckw/excel/annotation/ExcelContext.java

@@ -3,8 +3,10 @@ package com.sckw.excel.annotation;
 import java.lang.annotation.*;
 
 /**
- *
- * 导出的文件全局属性
+ * @author lfdc
+ * @version v1
+ * @create 2020-11-28 15:37:35
+ * @copyright
  */
 @Target({ElementType.TYPE})
 @Retention(RetentionPolicy.RUNTIME)

sckw-common/sckw-common-excel/src/main/java/com/sckw/excel/annotation/ExcelSelected.java

@@ -4,6 +4,11 @@ import java.lang.annotation.*;
 
 /**
  * easy导出下拉框注解
+ *
+ * @author lfdc
+ * @version v1
+ * @create 2020-11-28 15:37:35
+ * @copyright
  */
 
 /**

sckw-common/sckw-common-mongo/src/main/java/com/sckw/mongo/model/TobleTop.java

@@ -11,5 +11,5 @@ import lombok.Data;
 public class TobleTop {
     private String name;
     private String value;
-    private int total;
+    private Integer total;
 }

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

@@ -1,6 +1,7 @@
 package com.sckw.report.service;
 
 import com.sckw.core.common.enums.NumberConstant;
+import com.sckw.core.model.enums.LogisticsOrderEnum;
 import com.sckw.core.model.page.PageResult;
 import com.sckw.core.utils.CollectionUtils;
 import com.sckw.core.utils.StringUtils;
@@ -35,6 +36,7 @@ import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
 /**
  * @author zk
@@ -53,6 +55,7 @@ public class KwTransportService {
 
     @DubboReference(version = "2.0.0", group = "design", check = false)
     TransportDubboService transportDubboService;
+
     public HttpResult list(ConsignOrderQuery query) throws ParseException {
         //模糊匹配
         //根据条件查询所有并排序，且分页
@@ -160,9 +163,56 @@ public class KwTransportService {
                 Aggregation.project("total").and("value").previousOperation()
         );
         AggregationResults<TobleTop> outputTypeCount = mongoTemplate.aggregate(aggregation, SckwLogisticsOrder.class, TobleTop.class);
-        List<TobleTop> results = (List<TobleTop>) outputTypeCount.getRawResults().get("results");
+        List<TobleTop> mappedResults = outputTypeCount.getMappedResults();
+        List<TobleTop> arrayList = new ArrayList<>();
+        arrayList.addAll(mappedResults);
+        /**补全数据状态不齐的情况*/
+        packageReturnStatistics(mappedResults, arrayList);
         // 查询结果
-        return HttpResult.ok(results);
+        return HttpResult.ok(arrayList);
+    }
+
+    /**
+     * 组装返回数据
+     *
+     * @param mappedResults
+     * @param arrayList
+     */
+    private void packageReturnStatistics(List<TobleTop> mappedResults, List<TobleTop> arrayList) {
+        List<String> codeList = LogisticsOrderEnum.getCodeStringList();
+        List<String> collect = mappedResults.stream().map(e -> e.getValue()).collect(Collectors.toList());
+        List<String> diffrentList = getDiffrentList(collect, codeList);
+        if (CollectionUtils.isNotEmpty(mappedResults)) {
+            if (CollectionUtils.isNotEmpty(diffrentList)) {
+                for (String s : diffrentList) {
+                    TobleTop top = new TobleTop();
+                    top.setValue(s);
+                    top.setTotal(NumberConstant.ZERO);
+                    arrayList.add(top);
+                }
+            }
+            for (TobleTop top : arrayList) {
+                top.setName(LogisticsOrderEnum.getName(Integer.valueOf(top.getValue())));
+            }
+        } else {
+            for (LogisticsOrderEnum logisticsOrderEnum : LogisticsOrderEnum.values()) {
+                TobleTop top = new TobleTop();
+                top.setName(logisticsOrderEnum.getDestination());
+                top.setValue(logisticsOrderEnum.getStatus());
+                top.setTotal(NumberConstant.ZERO);
+                arrayList.add(top);
+            }
+        }
+    }
+
+    /**
+     * @param sourceList 源数据  [1,2,3]
+     * @param targetList 目标数据 [1]
+     * @Description: 获取targetList中在sourceList中不存在的项
+     * @return: List<String>    [2,3]
+     */
+    public static List<String> getDiffrentList(List<String> sourceList, List<String> targetList) {
+        return targetList.stream().filter(item -> sourceList.stream().allMatch(each -> !item.equals(each))).collect(Collectors.toList());
     }
 
     public List<ConsignOrderVo> export(ConsignOrderQuery query) {
@@ -172,44 +222,51 @@ public class KwTransportService {
         // 创建条件对象
         Criteria criteria = new Criteria();
         // 1. 全等于
+        Query query1 =new Query();
         criteria.and("entId").is(LoginUserHolder.getEntId());
-        if (StringUtils.isNotBlank(query.getLoadAddress())) {
-            criteria.and("loadDetailAddress").is(query.getLoadAddress());
-        }
-        if (StringUtils.isNotBlank(query.getUnloadAddress())) {
-            criteria.and("unloadDetailAddress").is(query.getUnloadAddress());
-        }
-        if (StringUtils.isNotBlank(query.getStatus())) {
-            criteria.and("status").is(query.getStatus());
-        }
         criteria.and("delFlag").is(String.valueOf(NumberConstant.ZERO));
-        // 4. 日期范围
-        if (StringUtils.isNotEmpty(query.getStartDateTime()) && StringUtils.isNotEmpty(query.getEndDateTime())) {
-            criteria.andOperator(Criteria.where("createTime").gte(query.getStartDateTime()), Criteria.where("createTime")
-                    .lte(query.getEndDateTime()));
-        }
-        //多条件模糊查询
-        Criteria c1 = new Criteria();
-        Criteria c2 = new Criteria();
-        Criteria c3 = new Criteria();
-        Criteria c4 = new Criteria();
-        Criteria c5 = new Criteria();
-        if (StringUtils.isNotBlank(query.getKeywords())) {
-            Pattern pattern = Pattern.compile("^.*" + query.getKeywords() + ".*$", Pattern.CASE_INSENSITIVE);
-            c1 = Criteria.where("firmName").regex(pattern);
-            c2 = Criteria.where("carrierFirmName").regex(pattern);
-            c3 = Criteria.where("checkFirmName").regex(pattern);
-            c4 = Criteria.where("tOrderNo").regex(pattern);
-            c5 = Criteria.where("lOrderNo").regex(pattern);
-            criteria.orOperator(c1, c2, c3, c4, c5);
-        }
-        Query query1 = new Query(criteria);
-        if (CollectionUtils.isNotEmpty(query.getIds())) {
-            query1.addCriteria(Criteria.where("lOrderId").in(query.getIds()));
+        if (CollectionUtils.isEmpty(query.getIds())) {
+            if (StringUtils.isNotBlank(query.getLoadAddress())) {
+                criteria.and("loadDetailAddress").is(query.getLoadAddress());
+            }
+            if (StringUtils.isNotBlank(query.getUnloadAddress())) {
+                criteria.and("unloadDetailAddress").is(query.getUnloadAddress());
+            }
+            if (StringUtils.isNotBlank(query.getStatus())) {
+                criteria.and("status").is(query.getStatus());
+            }
+            // 4. 日期范围
+            if (StringUtils.isNotEmpty(query.getStartDateTime()) && StringUtils.isNotEmpty(query.getEndDateTime())) {
+                criteria.andOperator(Criteria.where("createTime").gte(query.getStartDateTime()), Criteria.where("createTime")
+                        .lte(query.getEndDateTime()));
+            }
+            //多条件模糊查询
+            Criteria c1 = new Criteria();
+            Criteria c2 = new Criteria();
+            Criteria c3 = new Criteria();
+            Criteria c4 = new Criteria();
+            Criteria c5 = new Criteria();
+            if (StringUtils.isNotBlank(query.getKeywords())) {
+                Pattern pattern = Pattern.compile("^.*" + query.getKeywords() + ".*$", Pattern.CASE_INSENSITIVE);
+                c1 = Criteria.where("firmName").regex(pattern);
+                c2 = Criteria.where("carrierFirmName").regex(pattern);
+                c3 = Criteria.where("checkFirmName").regex(pattern);
+                c4 = Criteria.where("tOrderNo").regex(pattern);
+                c5 = Criteria.where("lOrderNo").regex(pattern);
+                criteria.orOperator(c1, c2, c3, c4, c5);
+            }
+            query1.addCriteria(criteria);
+            if (CollectionUtils.isNotEmpty(query.getIds())) {
+                query1.addCriteria(Criteria.where("lOrderId").in(query.getIds()));
+            }
+        }else {
+            query1.addCriteria(criteria);
+            if (CollectionUtils.isNotEmpty(query.getIds())) {
+                query1.addCriteria(Criteria.where("lOrderId").in(query.getIds()));
+            }
         }
         // 执行查询
         List<SckwLogisticsOrder> list = mongoTemplate.find(query1, SckwLogisticsOrder.class);
-//        PageResult build = PageResult.build(query.getPage(), query.getPageSize(), total, list);
         List<ConsignOrderVo> returnList = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(list)) {
             packageReturnList(list, returnList);
@@ -278,6 +335,7 @@ public class KwTransportService {
 
     /**
      * 司机端 运单详情页面-【作废】
+     *
      * @param id
      * @param type
      * @return
@@ -401,7 +459,7 @@ public class KwTransportService {
      * @author jc
      * @date 2023/07/21
      */
-    public HttpResult getWayBillStatistics(WaybillOrderQuery query){
+    public HttpResult getWayBillStatistics(WaybillOrderQuery query) {
         //模糊匹配
         //根据条件查询所有并排序，且分页
         //设置模糊查询匹配规则  忽略大小写
@@ -454,14 +512,14 @@ public class KwTransportService {
         List<TobleTop> results = outputTypeCount.getMappedResults();
         // 填充默认值
         List<TobleTop> list = new ArrayList<>();
-        for (CarWaybillEnum status:CarWaybillEnum.values()) {
+        for (CarWaybillEnum status : CarWaybillEnum.values()) {
             TobleTop top = new TobleTop();
             top.setName(status.getDestination());
             top.setValue(String.valueOf(status.getCode()));
             top.setTotal(0);
-            if(CollectionUtils.isNotEmpty(results)) {
-                for (TobleTop result:results) {
-                    if(StringUtils.isNotEmpty(result.getValue()) && String.valueOf(result.getValue()).equals(String.valueOf(status.getCode()))) {
+            if (CollectionUtils.isNotEmpty(results)) {
+                for (TobleTop result : results) {
+                    if (StringUtils.isNotEmpty(result.getValue()) && String.valueOf(result.getValue()).equals(String.valueOf(status.getCode()))) {
                         top.setTotal(result.getTotal());
                         continue;
                     }
@@ -481,7 +539,7 @@ public class KwTransportService {
      * @author jc
      * @date 2023/07/21
      */
-    public HttpResult wayBillTotalCount(WaybillOrderQuery query){
+    public HttpResult wayBillTotalCount(WaybillOrderQuery query) {
         // 统计项字段
         Criteria criteria = new Criteria();
         criteria.and("entId").is(LoginUserHolder.getEntId());
@@ -531,14 +589,14 @@ public class KwTransportService {
         List<TobleTop> results = outputTypeCount.getMappedResults();
         // 填充默认值
         List<TobleTop> list = new ArrayList<>();
-        for (CarWaybillEnum status:CarWaybillEnum.values()) {
+        for (CarWaybillEnum status : CarWaybillEnum.values()) {
             TobleTop top = new TobleTop();
             top.setName(status.getDestination());
             top.setValue(String.valueOf(status.getCode()));
             top.setTotal(0);
-            if(CollectionUtils.isNotEmpty(results)) {
-                for (TobleTop result:results) {
-                    if(StringUtils.isNotEmpty(result.getValue()) && String.valueOf(result.getValue()).equals(String.valueOf(status.getCode()))) {
+            if (CollectionUtils.isNotEmpty(results)) {
+                for (TobleTop result : results) {
+                    if (StringUtils.isNotEmpty(result.getValue()) && String.valueOf(result.getValue()).equals(String.valueOf(status.getCode()))) {
                         top.setTotal(result.getTotal());
                         continue;
                     }
@@ -553,6 +611,7 @@ public class KwTransportService {
 
     /**
      * 处理运单查询结果
+     *
      * @param list
      * @param returnList
      */
@@ -583,13 +642,14 @@ public class KwTransportService {
             vo.setLoadTime(waybillOrder.getLoadTime() == null ?
                     null : DateUtil.getDateTime(waybillOrder.getLoadTime()));
             vo.setUnloadTime(waybillOrder.getUnloadTime() == null ?
-                    null :DateUtil.getDateTime(waybillOrder.getUnloadTime()));
+                    null : DateUtil.getDateTime(waybillOrder.getUnloadTime()));
             returnList.add(vo);
         }
     }
 
     /**
      * 承运订单-分包托运列表数据展示
+     *
      * @param lOrderId
      * @param page
      * @param pageSize

sckw-modules/sckw-report/src/main/java/com/sckw/report/service/vo/ConsignOrderVo.java

@@ -1,7 +1,6 @@
 package com.sckw.report.service.vo;
 
 import com.alibaba.excel.annotation.ExcelProperty;
-import com.sckw.core.model.page.PageResult;
 import com.sckw.excel.annotation.ExcelContext;
 import lombok.Data;
 
@@ -14,7 +13,7 @@ import java.io.Serializable;
  */
 @Data
 @ExcelContext(fileName = "托运订单列表", sheetName = "托运订单列表")
-public class ConsignOrderVo extends PageResult implements Serializable {
+public class ConsignOrderVo implements Serializable {
     /**
      * 结算周期
      */

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

@@ -8,17 +8,17 @@ import com.sckw.core.utils.StringUtils;
 import com.sckw.core.web.context.LoginUserHolder;
 import com.sckw.core.web.response.HttpResult;
 import com.sckw.excel.utils.DateUtil;
+import com.sckw.mongo.model.SckwWaybillOrder;
 import com.sckw.system.api.RemoteSystemService;
 import com.sckw.transport.dao.*;
 import com.sckw.transport.model.*;
 import com.sckw.transport.model.dto.OrderDTO;
-import com.sckw.transport.model.param.ConsignOrderQuery;
 import com.sckw.transport.model.vo.CarDataVO;
 import com.sckw.transport.model.vo.CarWaybillVO;
-import com.sckw.transport.model.vo.ConsignOrderVO;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 
@@ -39,6 +39,9 @@ public class ConsignOrderService {
     @DubboReference(version = "2.0.0", group = "design", check = false)
     RemoteSystemService remoteSystemService;
 
+    @Autowired
+    public MongoTemplate mongoTemplate;
+
     @Autowired
     public KwtLogisticsOrderMapper kwtLogisticsOrderMapper;
 
@@ -60,25 +63,6 @@ public class ConsignOrderService {
     @Autowired
     public KwtLogisticsOrderCirculateMapper kwtLogisticsOrderCirculateMapper;
 
-    public HttpResult list(ConsignOrderQuery query) {
-//        ConsignOrderVo consignOrderVo = new ConsignOrderVo();
-//        LambdaQueryWrapper<KwtLogisticsOrder> wrapper = new LambdaQueryWrapper<>();
-////        kwtLogisticsOrderMapper.selectPage(new Page<>(query.getPage(), query.getPageSize()),
-////                wrapper.like(StringUtils.isNotBlank(query.getKeywords()),KwtLogisticsOrder::getLOrderNo,query.getKeywords())
-////                        .like(StringUtils.isNotBlank(query.getKeywords()),KwtLogisticsOrder::getc))
-//        List<KwtLogisticsOrder> kwtLogisticsOrders = kwtLogisticsOrderMapper.selectList(new LambdaQueryWrapper<KwtLogisticsOrder>().like(StringUtils.isNotBlank(query.getKeywords()), KwtLogisticsOrder::getLOrderNo, query.getKeywords()));
-//        List<Long> ids = kwtLogisticsOrders.stream().map(KwtLogisticsOrder::getId).collect(Collectors.toList());
-//        List<KwtLogisticsOrderUnit> list = kwtLogisticsOrderUnitMapper.selectCompanyBylOrderId(ids, NumberConstant.ONE);
-        return null;
-    }
-
-    public HttpResult statistics(ConsignOrderQuery query) {
-        return null;
-    }
-
-    public List<ConsignOrderVO> export(ConsignOrderQuery query) {
-        return new ArrayList<ConsignOrderVO>();
-    }
 
     public HttpResult getCarWaybillByOrder(OrderDTO orderDto) {
         List<CarWaybillVO> returnList = new ArrayList<>();
@@ -113,13 +97,14 @@ public class ConsignOrderService {
                 }
                 carWaybillVo.setId(String.valueOf(kwtWaybillOrder.getId()));
                 carWaybillVo.setWaybillNumber(order.getLOrderNo());
-                carWaybillVo.setTruckNo(kwtWaybillOrder == null ? null : kwtWaybillOrder.getTruckNo());
+                carWaybillVo.setTruckNo(kwtWaybillOrder.getTruckNo());
                 carWaybillVo.setStatus(track == null ? null : String.valueOf(track.getStatus()));
                 carWaybillVo.setWaybillType(kwtWaybillOrder.getType());
-                //todo 调用司机服务 dubbo
-                carWaybillVo.setDriverName(null);
+                carWaybillVo.setDriverName(kwtWaybillOrder.getDriverName());
                 //todo 取mongo
-                carWaybillVo.setConsignMotorcade(null);
+                SckwWaybillOrder sckwWaybillOrder = mongoTemplate.findById(kwtWaybillOrder.getId(), SckwWaybillOrder.class);
+                /** 2023-07-24 原值为承运车队-去除后更换展示为承运公司*/
+                carWaybillVo.setConsignMotorcade(sckwWaybillOrder == null ? null : sckwWaybillOrder.getCarrierFirmName());
                 carWaybillVo.setSendCarWeigh(kwtWaybillOrder.getEntrustAmount() == null ? null : String.valueOf(kwtWaybillOrder.getEntrustAmount()));
                 if (circulate != null) {
                     carWaybillVo.setSendCarDate(circulate.getCreateTime() == null ? null : DateUtil.getDateTime(circulate.getCreateTime()));

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

@@ -11,6 +11,7 @@ import com.sckw.core.web.constant.HttpStatus;
 import com.sckw.core.web.context.LoginUserHolder;
 import com.sckw.core.web.response.HttpResult;
 import com.sckw.excel.utils.ValidUtil;
+import com.sckw.fleet.api.RemoteFleetService;
 import com.sckw.mongo.enums.BusinessTypeEnum;
 import com.sckw.mongo.model.SckwWaybillOrder;
 import com.sckw.mongo.model.TobleTop;
@@ -50,6 +51,9 @@ public class DriverService {
     @DubboReference(version = "2.0.0", group = "design", check = false)
     RemoteSystemService remoteSystemService;
 
+    @DubboReference(version = "2.0.0", group = "design", check = false)
+    RemoteFleetService remoteFleetService;
+
     @Autowired
     MongoTemplate mongoTemplate;
 
@@ -178,6 +182,12 @@ public class DriverService {
         return HttpResult.ok(orderVOList);
     }
 
+    /**
+     * 组装循环单据信息
+     * @param id
+     * @param loopStatus
+     * @param orderVOList
+     */
     private void loopPackageData(Long id, List<Long> loopStatus, List<WaybillOrderVO> orderVOList) {
         if (CollectionUtils.isEmpty(loopStatus)) {
             List<KwtLogisticsOrderCirculate> list = logisticsOrderCirculateMapper.selectList(new LambdaQueryWrapper<KwtLogisticsOrderCirculate>()
@@ -211,10 +221,11 @@ public class DriverService {
                         vo.setCreateTime(waybill.getCreateTime());
                         vo.setStartTime(waybill.getStartTime());
                         vo.setEndTime(waybill.getEndTime());
-                        //todo 查询车队服务dubbo
-//                    vo.setFleetName();
-//                    vo.setFleetId();
-//                    vo.setTruckFleetName();
+                        /**查询车队服务dubbo 2023-07-24 司机端不展示 车队信息改为展示物流公司*/
+//                        remoteFleetService.findTruck()
+//                        vo.setFleetName();
+//                        vo.setFleetId();
+//                        vo.setTruckFleetName();
                         vo.setEntrustAmount(waybill.getEntrustAmount());
                         vo.setType(waybill.getType());
                         vo.setTruckNo(waybill.getTruckNo());
@@ -251,7 +262,7 @@ public class DriverService {
                         vo.setCreateTime(waybill.getCreateTime());
                         vo.setStartTime(waybill.getStartTime());
                         vo.setEndTime(waybill.getEndTime());
-                        //todo 查询车队服务dubbo
+                        /**查询车队服务dubbo 2023-07-24 司机端不展示 车队信息改为展示物流公司*/
 //                    vo.setFleetName();
 //                    vo.setFleetId();
 //                    vo.setTruckFleetName();
@@ -265,6 +276,12 @@ public class DriverService {
         }
     }
 
+    /**
+     * 趟次展示数据组装
+     * @param id
+     * @param tripStatus
+     * @param orderVOList
+     */
     private void tripPackageData(Long id, List<Long> tripStatus, List<WaybillOrderVO> orderVOList) {
         List<Long> list = waybillOrderMapper.selectDriverOrder(id, tripStatus);
         if (CollectionUtils.isNotEmpty(list)) {