1.托运订单/承运订单列表查询修改

2.托运订单/承运订单列表统计修改
3.托运订单/承运订单列表导出修改

sckw-common/sckw-common-core/src/main/java/com/sckw/core/utils/StringUtils.java

@@ -656,6 +656,28 @@ public class StringUtils {
         return ret.toString();
     }
 
+    /**
+     * 分字符串拼接
+     *
+     * @param list 字符串数组
+     * @return 拼接字符串 "," 分割
+     */
+    public static String stringListSpliceToString(List<String> list) {
+        StringBuilder sb = new StringBuilder();
+        if (CollectionUtils.isEmpty(list)) {
+            return null;
+        }
+        for (int i = 0; i < list.size(); i++) {
+            if (i != (list.size() - 1)) {
+                sb.append(list.get(i).trim()).append(";");
+            } else {
+                sb.append(list.get(i).trim());
+            }
+        }
+        return sb.toString();
+    }
+
+
     /**
      * 替换字符串${xxxx}
      *
@@ -816,6 +838,13 @@ public class StringUtils {
     }
 
     public static void main(String[] args) {
+        String s = stringListSpliceToString(new ArrayList<>() {{
+            add("张三");
+            add("李四");
+            add("aaaa");
+            add("bbbb");
+            add("cccc");
+        }});
         Map<String, Object> param = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         param.put("account", "17358629955");
         param.put("pwd", "123456");

sckw-modules-api/sckw-transport-api/src/main/java/com/sckw/transport/api/dubbo/RemoteTransportLineFreightRateService.java

@@ -2,6 +2,14 @@ package com.sckw.transport.api.dubbo;
 
 import java.util.List;
 
+/**
+ * @author lfdc
+ * @version 1.0
+ * @className RemoteTransportLineFreightRateService
+ * @description 物流订单线路dubbo
+ * @company sckw
+ * @date 2024-03-13 10:06:27
+ */
 public interface RemoteTransportLineFreightRateService {
 
     /**

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

@@ -2675,6 +2675,10 @@ public class KwtAcceptCarriageOrderService {
         longs.add(LoginUserHolder.getUserId());
         List<Long> longList = longs.stream().distinct().collect(Collectors.toList());
         List<AcceptCarriageOrderVO> list = logisticsOrderMapper.selectLogisticsOrderListByAcceptCarriage(query, orderList, type, entId, longList, longList, idsList);
+        List<AcceptCarriageOrderExcelVo> exportList = new ArrayList<>();
+        if (list.size() < 1) {
+            return exportList;
+        }
         /**计量单位*/
         Map<String, String> unitTypeDictData = getDictData(DictTypeEnum.UNIT_TYPE.getType());
         /**计费方式*/
@@ -2696,7 +2700,6 @@ public class KwtAcceptCarriageOrderService {
                 longUserMap = remoteSystemService.queryUserCacheMapByIds(collect);
             }
         }
-        List<AcceptCarriageOrderExcelVo> exportList = new ArrayList<>();
         for (AcceptCarriageOrderVO vo : list) {
             AcceptCarriageOrderExcelVo carriageOrderExcelVo = new AcceptCarriageOrderExcelVo();
             BeanUtils.copyProperties(vo, carriageOrderExcelVo);
@@ -2708,10 +2711,43 @@ public class KwtAcceptCarriageOrderService {
             carriageOrderExcelVo.setBillingModeLabel(chargingDictData.get(vo.getBillingMode()));
 //            carriageOrderExcelVo.setSigningLabel(signingWay.get(vo.getSigning()));
             carriageOrderExcelVo.setStatusLabel(LogisticsOrderEnum.getName(vo.getStatus()));
-            carriageOrderExcelVo.setLoadAddress(vo.getLoadCityName() + vo.getLoadAddress());
-            carriageOrderExcelVo.setUnloadAddress(vo.getUnloadCityName() + vo.getUnloadAddress());
-            carriageOrderExcelVo.setLoadAddress(vo.getLoadName());
-            carriageOrderExcelVo.setUnloadAddress(vo.getUnloadName());
+
+            String lOrderId = vo.getLOrderId();
+            List<String> loadName = new ArrayList<String>();
+            List<String> loadAddressList = new ArrayList<String>();
+            List<KwtLogisticsOrderAddress> loadAddress = logisticsOrderAddressMapper.selectList(new LambdaQueryWrapper<KwtLogisticsOrderAddress>()
+                    .eq(KwtLogisticsOrderAddress::getAddressType, NumberConstant.ONE)
+                    .eq(KwtLogisticsOrderAddress::getDelFlag, NumberConstant.ZERO)
+                    .eq(KwtLogisticsOrderAddress::getLOrderId, lOrderId)
+            );
+            loadAddress.forEach(address -> {
+                loadName.add(address.getName());
+                loadAddressList.add(address.getDetailAddress());
+            });
+
+            List<String> unloadName = new ArrayList<String>();
+            List<String> unloadAddressList = new ArrayList<String>();
+            List<KwtLogisticsOrderAddress> unloadAddress = logisticsOrderAddressMapper.selectList(new LambdaQueryWrapper<KwtLogisticsOrderAddress>()
+                    .eq(KwtLogisticsOrderAddress::getAddressType, NumberConstant.TWO)
+                    .eq(KwtLogisticsOrderAddress::getDelFlag, NumberConstant.ZERO)
+                    .eq(KwtLogisticsOrderAddress::getLOrderId, lOrderId)
+            );
+            unloadAddress.forEach(address -> {
+                unloadName.add(address.getName());
+                unloadAddressList.add(address.getDetailAddress());
+            });
+
+//            carriageOrderExcelVo.setLoadAddress(vo.getLoadCityName() + vo.getLoadAddress());
+//            carriageOrderExcelVo.setUnloadAddress(vo.getUnloadCityName() + vo.getUnloadAddress());
+//            carriageOrderExcelVo.setLoadAddress(vo.getLoadName());
+//            carriageOrderExcelVo.setUnloadAddress(vo.getUnloadName());
+
+            carriageOrderExcelVo.setLoadAddress(StringUtils.stringListSpliceToString(loadName));
+            carriageOrderExcelVo.setLoadAddressDetail(StringUtils.stringListSpliceToString(loadAddressList));
+            carriageOrderExcelVo.setUnloadAddress(StringUtils.stringListSpliceToString(unloadName));
+            carriageOrderExcelVo.setUnloadAddressDetail(StringUtils.stringListSpliceToString(unloadAddressList));
+
+
             carriageOrderExcelVo.setOrderSourceLabel(orderSource == null ? null : orderSource.get(vo.getOrderSource()));
             String unitLabel = unitTypeDictData == null ? vo.getUnit() : (unitTypeDictData.get(vo.getUnit()) == null ? vo.getUnit() : unitTypeDictData.get(vo.getUnit()));
             carriageOrderExcelVo.setLoadAmount(carriageOrderExcelVo.getLoadAmount() + unitLabel);

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

@@ -2062,10 +2062,42 @@ public class KwtConsignOrderService {
             consignOrderExcelVo.setBillingModeLabel(chargingDictData.get(vo.getBillingMode()));
 //            consignOrderExcelVo.setSigningLabel(signingWay.get(vo.getSigning()));
             consignOrderExcelVo.setStatusLabel(LogisticsOrderEnum.getName(vo.getStatus()));
-            consignOrderExcelVo.setLoadAddress(vo.getLoadCityName() + vo.getLoadAddress());
-            consignOrderExcelVo.setUnloadAddress(vo.getUnloadCityName() + vo.getUnloadAddress());
-            consignOrderExcelVo.setLoadName(vo.getLoadName());
-            consignOrderExcelVo.setUnloadName(vo.getUnloadName());
+
+//            consignOrderExcelVo.setLoadAddress(vo.getLoadCityName() + vo.getLoadAddress());
+//            consignOrderExcelVo.setUnloadAddress(vo.getUnloadCityName() + vo.getUnloadAddress());
+//            consignOrderExcelVo.setLoadName(vo.getLoadName());
+//            consignOrderExcelVo.setUnloadName(vo.getUnloadName());
+
+            String lOrderId = vo.getLOrderId();
+            List<String> loadName = new ArrayList<String>();
+            List<String> loadAddressList = new ArrayList<String>();
+            List<KwtLogisticsOrderAddress> loadAddress = logisticsOrderAddressMapper.selectList(new LambdaQueryWrapper<KwtLogisticsOrderAddress>()
+                    .eq(KwtLogisticsOrderAddress::getAddressType, NumberConstant.ONE)
+                    .eq(KwtLogisticsOrderAddress::getDelFlag, NumberConstant.ZERO)
+                    .eq(KwtLogisticsOrderAddress::getLOrderId, lOrderId)
+            );
+            loadAddress.forEach(address -> {
+                loadName.add(address.getName());
+                loadAddressList.add(address.getDetailAddress());
+            });
+
+            List<String> unloadName = new ArrayList<String>();
+            List<String> unloadAddressList = new ArrayList<String>();
+            List<KwtLogisticsOrderAddress> unloadAddress = logisticsOrderAddressMapper.selectList(new LambdaQueryWrapper<KwtLogisticsOrderAddress>()
+                    .eq(KwtLogisticsOrderAddress::getAddressType, NumberConstant.TWO)
+                    .eq(KwtLogisticsOrderAddress::getDelFlag, NumberConstant.ZERO)
+                    .eq(KwtLogisticsOrderAddress::getLOrderId, lOrderId)
+            );
+            unloadAddress.forEach(address -> {
+                unloadName.add(address.getName());
+                unloadAddressList.add(address.getDetailAddress());
+            });
+
+            consignOrderExcelVo.setLoadAddress(StringUtils.stringListSpliceToString(loadAddressList));
+            consignOrderExcelVo.setUnloadAddress(StringUtils.stringListSpliceToString(unloadAddressList));
+            consignOrderExcelVo.setLoadName(StringUtils.stringListSpliceToString(loadName));
+            consignOrderExcelVo.setUnloadName(StringUtils.stringListSpliceToString(unloadName));
+
             String unitLabel = unitTypeDictData == null ? vo.getUnit() : (unitTypeDictData.get(vo.getUnit()) == null ? vo.getUnit() : unitTypeDictData.get(vo.getUnit()));
             consignOrderExcelVo.setLoadAmount(consignOrderExcelVo.getLoadAmount() + unitLabel);
             consignOrderExcelVo.setUnloadAmount(consignOrderExcelVo.getUnloadAmount() + unitLabel);

sckw-modules/sckw-transport/src/main/resources/mapper/KwtLogisticsOrderMapper.xml

@@ -1154,7 +1154,7 @@
     </sql>
 
     <sql id="Query_Column_List_Accept_Carriage">
-        a.id                                                AS lOrderId,
+        DISTINCT a.id                                                AS lOrderId,
         a.l_order_no                                        AS lOrderNo,
         a.t_order_id                                        AS tOrderId,
         a.t_order_no                                        AS tOrderNo,
@@ -1312,7 +1312,7 @@
     </sql>
 
     <sql id="Query_Column_List_Cogsign">
-        a.id                                                AS lOrderId,
+        distinct a.id                                                AS lOrderId,
         a.l_order_no                                        AS lOrderNo,
         a.t_order_id                                        AS tOrderId,
         a.t_order_no                                        AS tOrderNo,