1、新增车辆运单地址查询；

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/controller/WaybillManagementController.java

@@ -2,7 +2,9 @@ package com.sckw.transport.controller;
 
 import com.sckw.core.web.constant.HttpStatus;
 import com.sckw.core.web.response.HttpResult;
+import com.sckw.transport.model.dto.AddressDropListDTO;
 import com.sckw.transport.model.dto.WaybillOrderDTO;
+import com.sckw.transport.model.dto.WaybillOrderTicketApprovalDto;
 import com.sckw.transport.service.WaybillManagementService;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
@@ -68,4 +70,15 @@ public class WaybillManagementController {
             return HttpResult.error(HttpStatus.GLOBAL_EXCEPTION_CODE, e.getMessage());
         }
     }
+
+    /**
+     * @desc 获取企业地址信息
+     * @author zk
+     * @date 2023/9/1
+     **/
+    @GetMapping("/findAddressList")
+    public HttpResult findAddressList(){
+        AddressDropListDTO addresss = waybillManagementService.findAddressList();
+        return HttpResult.ok(addresss);
+    }
 }

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/dao/KwtWaybillOrderAddressMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.sckw.transport.model.KwtWaybillOrderAddress;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import java.util.List;
 
 @Mapper
 public interface KwtWaybillOrderAddressMapper extends BaseMapper<KwtWaybillOrderAddress> {
@@ -18,4 +19,13 @@ public interface KwtWaybillOrderAddressMapper extends BaseMapper<KwtWaybillOrder
      * @date 2023/7/20
      **/
     KwtWaybillOrderAddress findByAddress(@Param("wOrderId") Long wOrderId, @Param("addressType") Integer addressType);
+
+    /**
+     * @param entId 企业信息
+     * @param addressType 地址类型（1装货地址、2卸货地址）
+     * @desc 查询车辆运单装卸货地址CODE
+     * @author zk
+     * @date 2023/7/20
+     **/
+    List<Integer> findAddressCodeList(@Param("entId") Long entId, @Param("addressType") Integer addressType);
 }

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

@@ -16,11 +16,13 @@ import com.sckw.fleet.api.RemoteFleetService;
 import com.sckw.mongo.model.SckwWaybillOrder;
 import com.sckw.mongo.model.TableTops;
 import com.sckw.system.api.RemoteSystemService;
+import com.sckw.system.api.model.dto.res.AreaTreeFrontResDto;
 import com.sckw.system.api.model.dto.res.SysDictResDto;
 import com.sckw.system.api.model.dto.res.UserCacheResDto;
 import com.sckw.transport.dao.*;
 import com.sckw.transport.model.KwtLogisticsOrder;
 import com.sckw.transport.model.KwtWaybillOrderTrack;
+import com.sckw.transport.model.dto.AddressDropListDTO;
 import com.sckw.transport.model.dto.WayBillDetailDTO;
 import com.sckw.transport.model.dto.WaybillListAppDTO;
 import com.sckw.transport.model.dto.WaybillOrderDTO;
@@ -644,4 +646,25 @@ public class WaybillManagementService {
         }
         return _list;
     }
+
+    /**
+     * @desc 获取企业地址信息
+     * @author zk
+     * @date 2023/9/1
+     **/
+    public AddressDropListDTO findAddressList() {
+        AddressDropListDTO res = new AddressDropListDTO();
+       //装货地址树
+        List<Integer> loadAddressList = kwtWaybillOrderAddressMapper.findAddressCodeList(LoginUserHolder.getEntId(), Global.NUMERICAL_ONE);
+        //卸货地址树
+        List<Integer> unloadAddressList = kwtWaybillOrderAddressMapper.findAddressCodeList(LoginUserHolder.getEntId(), Global.NUMERICAL_TWO);
+
+        //装货地址下拉列表树
+        List<AreaTreeFrontResDto> loadTree = remoteSystemService.queryAreaTreeFrontByCodeList(loadAddressList);
+        res.setLoadAddressList(loadTree);
+        //卸货地址下拉列表树
+        List<AreaTreeFrontResDto> unloadTree = remoteSystemService.queryAreaTreeFrontByCodeList(unloadAddressList);
+        res.setUnloadAddressList(unloadTree);
+        return res;
+    }
 }

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

@@ -176,4 +176,15 @@
         and w_order_id = #{wOrderId, jdbcType=BIGINT}
         and address_type = #{addressType, jdbcType=INTEGER}
     </select>
+
+    <select id="findAddressCodeList" resultType="java.lang.Integer" >
+        SELECT
+        DISTINCT kwoa.city_code
+        from kwt_waybill_order kwo
+        left join kwt_waybill_order_address kwoa on kwoa.w_order_id = kwo.id
+        where kwo.del_flag = 0 and kwoa.del_flag = 0
+        and kwo.ent_id = #{entId, jdbcType=BIGINT}
+        and kwoa.address_type = #{addressType, jdbcType=INTEGER}
+    </select>
+
 </mapper>