update 增加运单装卸货地址查询

sckw-modules/sckw-report/src/main/java/com/sckw/report/controller/KwTransportController.java

@@ -14,6 +14,7 @@ import com.sckw.report.service.vo.AcceptCarriageOrderExcelVo;
 import com.sckw.report.service.vo.ConsignOrderExcelVo;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -237,4 +238,19 @@ public class KwTransportController {
             return HttpResult.error(HttpStatus.GLOBAL_EXCEPTION_CODE, e.getMessage());
         }
     }
+
+    /**
+     * 运单管理-运单列表 运单地址查询接口
+     * @param tag
+     * @return
+     */
+    @RequestMapping(value = "/wayBillAddresses", method = RequestMethod.GET)
+    public HttpResult wayBillAddresses( @RequestParam("tag") @NotNull(message = "类型不能为空") int tag) {
+        try {
+            return transportService.getWayBillAddresses(tag);
+        } catch (Exception e) {
+            log.error("运单管理-运单地址查询接口 {}", e.getMessage(), e);
+            return HttpResult.error(HttpStatus.GLOBAL_EXCEPTION_CODE, e.getMessage());
+        }
+    }
 }

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.common.enums.enums.DictEnum;
 import com.sckw.core.common.enums.enums.DictTypeEnum;
 import com.sckw.core.model.enums.CarWaybillEnum;
 import com.sckw.core.model.enums.LogisticsOrderEnum;
@@ -292,6 +293,7 @@ public class KwTransportService {
         expiredStatuses.add(CarWaybillEnum.REJECT_ORDER.getCode().longValue());
         expiredStatuses.add(CarWaybillEnum.REFUSE_TRAFFIC.getCode().longValue());
         expiredStatuses.add(CarWaybillEnum.REVOKED.getCode().longValue());
+        expiredStatuses.add(CarWaybillEnum.APPROVAL_NO_PASS.getCode().longValue());
         for (CarWaybillEnum status : CarWaybillEnum.values()) {
             boolean expiredFlag = expiredStatuses.contains(status.getCode().longValue());
             TableTops top = new TableTops();
@@ -379,8 +381,8 @@ public class KwTransportService {
             vo.setEndTime(waybillOrder.getEndTime() == null ?
                     null : DateUtil.getDateTime(waybillOrder.getEndTime()));
             vo.setEntrustAmount(String.valueOf(waybillOrder.getEntrustAmount()));
-            vo.setLoadingAddress(waybillOrder.getLoadDetailAddress());
-            vo.setUnloadingAddress(waybillOrder.getUnloadDetailAddress());
+            vo.setLoadingAddress(waybillOrder.getLoadCityName().concat(waybillOrder.getLoadDetailAddress()));
+            vo.setUnloadingAddress(waybillOrder.getUnloadCityName().concat(waybillOrder.getUnloadDetailAddress()));
             vo.setLoadAmount(waybillOrder.getLoadAmount() == null ?
                     null : String.valueOf(waybillOrder.getLoadAmount()));
             vo.setUnloadAmount(waybillOrder.getUnloadAmount() == null ?
@@ -447,8 +449,8 @@ public class KwTransportService {
      * 托运合同-根据合同id获取托运订单列表
      *
      * @param contractId 合同id
-     * @param page  当前页
-     * @param pageSize  每页条数
+     * @param page       当前页
+     * @param pageSize   每页条数
      * @return
      */
     public HttpResult getLogisticsOrderByContractId(String contractId, int page, int pageSize) {
@@ -458,11 +460,11 @@ public class KwTransportService {
         // 创建条件对象
         Criteria criteria = new Criteria();
         // 1. 全等于
-       if (StringUtils.isBlank(contractId)){
-           return HttpResult.error("合同id为空");
-       }else {
-           criteria.and("contractId").is(contractId);
-       }
+        if (StringUtils.isBlank(contractId)) {
+            return HttpResult.error("合同id为空");
+        } else {
+            criteria.and("contractId").is(contractId);
+        }
         criteria.and("delFlag").is(String.valueOf(NumberConstant.ZERO));
         Query query1 = new Query(criteria);
         // 12. 总记录数
@@ -492,4 +494,27 @@ public class KwTransportService {
         PageResult build = PageResult.build(page, pageSize, total, list);
         return HttpResult.ok(build);
     }
+
+    /**
+     * 运单管理-运单列表 运单地址查询接口
+     * @param type
+     * @return
+     */
+    public HttpResult getWayBillAddresses(int type) {
+        Criteria criteria = new Criteria();
+        criteria.and("entId").is(LoginUserHolder.getEntId());
+        criteria.and("delFlag").is(NumberConstant.ZERO);
+        Query query = new Query(criteria);
+        String field;
+        if(type == NumberConstant.ONE) {
+            field = "loadCityCode";
+        } else {
+            field = "unloadCityCode";
+        }
+        List<Integer> list  = mongoTemplate.findDistinct(query, field ,SckwWaybillOrder.class, Integer.class);
+        if (CollectionUtils.isNotEmpty(list)) {
+            // RPC 请求数据 获取多级结构信息
+        }
+        return HttpResult.ok(list);
+    }
 }