Merge branch 'release-org' into release

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/dal/mysql/order/OrderMapper.java

@@ -8,7 +8,6 @@ import cn.iocoder.yudao.module.order.dal.dataobject.order.OrderDO;
 import cn.iocoder.yudao.module.order.dal.dataobject.orderItem.OrderItemDO;
 import cn.iocoder.yudao.module.order.dto.OrderExportBackDTO;
 import cn.iocoder.yudao.module.order.dto.OrderBackInfoDto;
-import cn.iocoder.yudao.module.order.dto.OrderQueryDTO;
 import cn.iocoder.yudao.module.order.dto.SearchBackDto;
 import cn.iocoder.yudao.module.order.vo.order.*;
 import cn.iocoder.yudao.module.order.vo.orderException.OrderExceptionStatisticsExcelVo;
@@ -662,11 +661,11 @@ public interface OrderMapper extends AbstractMapper<OrderDO> {
      * @param query
      * @return
      */
-    List<OrderExcelVO> exportMyOrderExcelList(@Param("start")int start, @Param("size") int size,@Param("query") OrderQueryDTO query);
+    List<OrderExcelVO> exportMyOrderExcelList(@Param("start")int start, @Param("size") int size,@Param("query") OrderQueryVO query);
 
     long exportOrderExcelCount(@Param("query") OrderQueryVO query);
 
-    long exportMyOrderExcelCount(@Param("query") OrderQueryDTO query);
+    long exportMyOrderExcelCount(@Param("query") OrderQueryVO query);
 
     @ResultType(OrderBackPageVO.class)
     @Select({
@@ -1091,11 +1090,11 @@ public interface OrderMapper extends AbstractMapper<OrderDO> {
 
     List<OrderBackPageVO> deptOrderList(@Param("start") int start, @Param("size") int size, @Param("query") OrderQueryVO query);
 
-    List<OrderBackPageVO> deptOrderList1(@Param("start") int start, @Param("size") int size, @Param("query") OrderQueryDTO query);
+    List<OrderBackPageVO> deptOrderList1(@Param("start") int start, @Param("size") int size, @Param("query") OrderQueryVO query);
 
     long deptOrderCount(@Param("query") OrderQueryVO query);
 
-    long deptOrderCount1(@Param("query") OrderQueryDTO query);
+    long deptOrderCount1(@Param("query") OrderQueryVO query);
 
     @ResultType(OrderBackPageVO.class)
     @Select({
@@ -1922,11 +1921,11 @@ public interface OrderMapper extends AbstractMapper<OrderDO> {
 
     List<OrderBackPageVO> adminCargoControlOrderList(@Param("start") int start, @Param("size") int size, @Param("query") OrderQueryVO query);
 
-    List<OrderBackPageVO> adminCargoControlMyOrderList(@Param("start") int start, @Param("size") int size, @Param("query") OrderQueryDTO query);
+    List<OrderBackPageVO> adminCargoControlMyOrderList(@Param("start") int start, @Param("size") int size, @Param("query") OrderQueryVO query);
 
     long adminCargoControlOrderCount(@Param("query") OrderQueryVO query);
 
-    long adminCargoControlMyOrderCount(@Param("query") OrderQueryDTO query);
+    long adminCargoControlMyOrderCount(@Param("query") OrderQueryVO query);
     @ResultType(OrderBackPageVO.class)
     @Select({
             "<script>",
@@ -3842,7 +3841,7 @@ public interface OrderMapper extends AbstractMapper<OrderDO> {
      * @param query
      * @return
      */
-    List<OrderExceptionStatisticsExcelVo> getOrderExceptionStatisticsList(@Param("query") OrderQueryDTO query);
+    List<OrderExceptionStatisticsExcelVo> getOrderExceptionStatisticsList(@Param("query") OrderQueryVO query);
 
     /**
      * 重货统计
@@ -3850,7 +3849,7 @@ public interface OrderMapper extends AbstractMapper<OrderDO> {
      * @param query
      * @return
      */
-    List<OrderHeavyExcelVo> getHeavyOrderExcelList(@Param("query") OrderQueryDTO query);
+    List<OrderHeavyExcelVo> getHeavyOrderExcelList(@Param("query") OrderQueryVO query);
 
     /**
      * 退仓统计
@@ -3858,7 +3857,7 @@ public interface OrderMapper extends AbstractMapper<OrderDO> {
      * @param query
      * @return
      */
-    List<OrderReturnOrderExcelVo> getReturnOrderExcelList(@Param("query") OrderQueryDTO query);
+    List<OrderReturnOrderExcelVo> getReturnOrderExcelList(@Param("query") OrderQueryVO query);
 
     /**
      * 售后赔付
@@ -3866,7 +3865,7 @@ public interface OrderMapper extends AbstractMapper<OrderDO> {
      * @param query
      * @return
      */
-    List<OrderSaleRepayExcelVo> getSaleRepayExcelList(@Param("query") OrderQueryDTO query);
+    List<OrderSaleRepayExcelVo> getSaleRepayExcelList(@Param("query") OrderQueryVO query);
 
     /**
      * 报关数据
@@ -3874,7 +3873,7 @@ public interface OrderMapper extends AbstractMapper<OrderDO> {
      * @param query
      * @return
      */
-    List<OrderCustomsDatasExcelVo> getCustomsDatasExcelList(@Param("query") OrderQueryDTO query);
+    List<OrderCustomsDatasExcelVo> getCustomsDatasExcelList(@Param("query") OrderQueryVO query);
 
     /**
      * 出货量
@@ -3882,7 +3881,7 @@ public interface OrderMapper extends AbstractMapper<OrderDO> {
      * @param query
      * @return
      */
-    List<OrderShipDataExcelVo> getShipDatasExcelList(@Param("query") OrderQueryDTO query);
+    List<OrderShipDataExcelVo> getShipDatasExcelList(@Param("query") OrderQueryVO query);
 
     /**
      * 预付运费
@@ -3890,7 +3889,7 @@ public interface OrderMapper extends AbstractMapper<OrderDO> {
      * @param query
      * @return
      */
-    List<OrderShipFeeExcelVo> getShipFeeExcelList(@Param("query") OrderQueryDTO query);
+    List<OrderShipFeeExcelVo> getShipFeeExcelList(@Param("query") OrderQueryVO query);
 
     @ResultType(OrderDO.class)
     @Select({

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/listener/export/AdvanceOrderExcelExportListener.java

@@ -6,7 +6,6 @@ import cn.iocoder.yudao.framework.excel.util.ExcelUtils;
 import cn.iocoder.yudao.framework.i18n.core.I18nMessage;
 import cn.iocoder.yudao.module.infra.dal.dataobject.file.FileDO;
 import cn.iocoder.yudao.module.infra.service.file.FileService;
-import cn.iocoder.yudao.module.order.dto.OrderQueryDTO;
 import cn.iocoder.yudao.module.order.service.order.OrderQueryService;
 import cn.iocoder.yudao.module.order.vo.order.OrderQueryVO;
 import cn.iocoder.yudao.module.order.vo.order.OrderShipDataExcelVo;
@@ -52,7 +51,7 @@ public class AdvanceOrderExcelExportListener {
             try {
                 DateTimeFormatter formatter = DateTimeFormatter.ofPattern(DATA_FORMAT);
                 String nowTime = formatter.format(LocalDateTime.now());
-                OrderQueryDTO query  = JSONObject.parseObject(event.getRequestParams(), OrderQueryDTO.class);
+                OrderQueryVO query  = JSONObject.parseObject(event.getRequestParams(), OrderQueryVO.class);
                 query.setLang(event.getLang());
                 List<OrderShipFeeExcelVo> list = orderQueryService.getShipFeeExcelList(query);
                 String sheetName = event.getLang() == 0 ? "预付运费统计" : "advance fee statistics";

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/listener/export/ContainerNumberOrderExcelExportListener.java

@@ -10,7 +10,6 @@ import cn.iocoder.yudao.framework.mybatis.core.vo.PageVO;
 import cn.iocoder.yudao.module.infra.dal.dataobject.file.FileDO;
 import cn.iocoder.yudao.module.infra.service.file.FileService;
 import cn.iocoder.yudao.module.order.dto.OrderCostSummaryDto;
-import cn.iocoder.yudao.module.order.dto.OrderQueryDTO;
 import cn.iocoder.yudao.module.order.service.order.OrderQueryService;
 import cn.iocoder.yudao.module.order.vo.order.OrderBackPageVO;
 import cn.iocoder.yudao.module.order.vo.order.OrderQueryVO;

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/listener/export/CustomsOrderExcelExportListener.java

@@ -6,7 +6,6 @@ import cn.iocoder.yudao.framework.excel.util.ExcelUtils;
 import cn.iocoder.yudao.framework.i18n.core.I18nMessage;
 import cn.iocoder.yudao.module.infra.dal.dataobject.file.FileDO;
 import cn.iocoder.yudao.module.infra.service.file.FileService;
-import cn.iocoder.yudao.module.order.dto.OrderQueryDTO;
 import cn.iocoder.yudao.module.order.service.order.OrderQueryService;
 import cn.iocoder.yudao.module.order.vo.order.OrderCustomsDatasExcelVo;
 import cn.iocoder.yudao.module.order.vo.order.OrderQueryVO;
@@ -51,7 +50,7 @@ public class CustomsOrderExcelExportListener {
             try {
                 DateTimeFormatter formatter = DateTimeFormatter.ofPattern(DATA_FORMAT);
                 String nowTime = formatter.format(LocalDateTime.now());
-                OrderQueryDTO query = JSONObject.parseObject(event.getRequestParams(), OrderQueryDTO.class);
+                OrderQueryVO query = JSONObject.parseObject(event.getRequestParams(), OrderQueryVO.class);
                 query.setLang(event.getLang());
                 List<OrderCustomsDatasExcelVo> list = orderQueryService.getCustomsDatasExcelList(query);
                 String sheetName = event.getLang() == 0 ? "报关数据统计" : "customs data statistics";

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/listener/export/ExceptionOrderStatisticsExcelExportListener.java

@@ -5,7 +5,6 @@ import cn.iocoder.yudao.framework.apollo.core.event.export.ExceptionOrderStatist
 import cn.iocoder.yudao.framework.excel.util.ExcelUtils;
 import cn.iocoder.yudao.module.infra.dal.dataobject.file.FileDO;
 import cn.iocoder.yudao.module.infra.service.file.FileService;
-import cn.iocoder.yudao.module.order.dto.OrderQueryDTO;
 import cn.iocoder.yudao.module.order.service.order.OrderQueryService;
 import cn.iocoder.yudao.module.order.vo.order.OrderQueryVO;
 import cn.iocoder.yudao.module.order.vo.orderException.OrderExceptionStatisticsExcelVo;
@@ -51,7 +50,7 @@ public class ExceptionOrderStatisticsExcelExportListener {
             try {
                 DateTimeFormatter formatter = DateTimeFormatter.ofPattern(DATA_FORMAT);
                 String nowTime = formatter.format(LocalDateTime.now());
-                OrderQueryDTO query = JSONObject.parseObject(event.getRequestParams(), OrderQueryDTO.class);
+                OrderQueryVO query = JSONObject.parseObject(event.getRequestParams(), OrderQueryVO.class);
                 query.setLang(event.getLang());
                 List<OrderExceptionStatisticsExcelVo> list = orderQueryService.getOrderExceptionStatisticsExcel(query);
                 String sheetName = event.getLang() == 0 ? "异常单统计" : "Order exception statistics";

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/listener/export/HeavyOrderExcelExportListener.java

@@ -6,7 +6,6 @@ import cn.iocoder.yudao.framework.excel.util.ExcelUtils;
 import cn.iocoder.yudao.framework.i18n.core.I18nMessage;
 import cn.iocoder.yudao.module.infra.dal.dataobject.file.FileDO;
 import cn.iocoder.yudao.module.infra.service.file.FileService;
-import cn.iocoder.yudao.module.order.dto.OrderQueryDTO;
 import cn.iocoder.yudao.module.order.service.order.OrderQueryService;
 import cn.iocoder.yudao.module.order.vo.order.OrderHeavyExcelVo;
 import cn.iocoder.yudao.module.order.vo.order.OrderQueryVO;
@@ -51,7 +50,7 @@ public class HeavyOrderExcelExportListener {
             try {
                 DateTimeFormatter formatter = DateTimeFormatter.ofPattern(DATA_FORMAT);
                 String nowTime = formatter.format(LocalDateTime.now());
-                OrderQueryDTO query = JSONObject.parseObject(event.getRequestParams(), OrderQueryDTO.class);
+                OrderQueryVO query = JSONObject.parseObject(event.getRequestParams(), OrderQueryVO.class);
                 query.setLang(event.getLang());
                 List<OrderHeavyExcelVo> list = orderQueryService.getHeavyOrderExcelList(query);
                 String sheetName = event.getLang() == 0 ? "重货单统计" : "heavy order statistics";

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/listener/export/OrderCargoControlExcelExportListener.java

@@ -2,7 +2,6 @@ package cn.iocoder.yudao.module.order.listener.export;
 
 import cn.iocoder.yudao.framework.apollo.core.event.export.OrderCargoControlExcelExportEvent;
 import cn.iocoder.yudao.module.infra.dal.dataobject.file.FileDO;
-import cn.iocoder.yudao.module.order.dto.OrderQueryDTO;
 import cn.iocoder.yudao.module.order.service.orderCargoControl.OrderCargoControlService;
 import cn.iocoder.yudao.module.order.vo.order.OrderQueryVO;
 import com.alibaba.fastjson.JSONObject;
@@ -33,7 +32,7 @@ public class OrderCargoControlExcelExportListener {
     public void orderCargoControlExcelExportEvent(OrderCargoControlExcelExportEvent event) {
         if (StringUtils.isNotBlank(event.getRequestParams())){
             try {
-                OrderQueryDTO query = JSONObject.parseObject(event.getRequestParams(), OrderQueryDTO.class);
+                OrderQueryVO query = JSONObject.parseObject(event.getRequestParams(), OrderQueryVO.class);
                 query.setLang(event.getLang());
                 FileDO fileDO = orderCargoControlService.makeCargoControlOrderExcelFile(event.getUserId(), event.getUserType(), query);
                 event.setPath(fileDO.getPath());

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/listener/export/OrderExcelExportListener.java

@@ -2,7 +2,6 @@ package cn.iocoder.yudao.module.order.listener.export;
 
 import cn.iocoder.yudao.framework.apollo.core.event.export.OrderExcelExportEvent;
 import cn.iocoder.yudao.module.infra.dal.dataobject.file.FileDO;
-import cn.iocoder.yudao.module.order.dto.OrderQueryDTO;
 import cn.iocoder.yudao.module.order.service.order.OrderQueryService;
 import cn.iocoder.yudao.module.order.vo.order.OrderQueryVO;
 import com.alibaba.fastjson.JSONObject;
@@ -59,7 +58,7 @@ public class OrderExcelExportListener {
     public void MyOrderExcelExportEvent(OrderExcelExportEvent event) throws IOException {
         if (StringUtils.isNotBlank(event.getRequestParams())){
             try {
-                OrderQueryDTO query = JSONObject.parseObject(event.getRequestParams(), OrderQueryDTO.class);
+                OrderQueryVO query = JSONObject.parseObject(event.getRequestParams(), OrderQueryVO.class);
                 query.setLang(event.getLang());
                 FileDO fileDO = orderQueryService.makeMyOrderExcelFile(event.getUserId(), event.getUserType(), query);
                 event.setPath(fileDO.getPath());

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/listener/export/ReturnOrderExcelExportListener.java

@@ -3,10 +3,8 @@ package cn.iocoder.yudao.module.order.listener.export;
 import cn.hutool.core.util.StrUtil;
 import cn.iocoder.yudao.framework.apollo.core.event.export.ReturnOrderExcelExportEvent;
 import cn.iocoder.yudao.framework.excel.util.ExcelUtils;
-import cn.iocoder.yudao.framework.i18n.core.I18nMessage;
 import cn.iocoder.yudao.module.infra.dal.dataobject.file.FileDO;
 import cn.iocoder.yudao.module.infra.service.file.FileService;
-import cn.iocoder.yudao.module.order.dto.OrderQueryDTO;
 import cn.iocoder.yudao.module.order.service.order.OrderQueryService;
 import cn.iocoder.yudao.module.order.vo.order.OrderQueryVO;
 import cn.iocoder.yudao.module.order.vo.order.OrderReturnOrderExcelVo;
@@ -51,7 +49,7 @@ public class ReturnOrderExcelExportListener {
             try {
                 DateTimeFormatter formatter = DateTimeFormatter.ofPattern(DATA_FORMAT);
                 String nowTime = formatter.format(LocalDateTime.now());
-                OrderQueryDTO query = JSONObject.parseObject(event.getRequestParams(), OrderQueryDTO.class);
+                OrderQueryVO query = JSONObject.parseObject(event.getRequestParams(), OrderQueryVO.class);
                 query.setLang(event.getLang());
                 List<OrderReturnOrderExcelVo> list = orderQueryService.getReturnOrderExcelList(query);
                 String sheetName = event.getLang() == 0 ? "重货单统计" : "heavy order statistics";

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/listener/export/SaleRepayOrderExcelExportListener.java

@@ -6,7 +6,6 @@ import cn.iocoder.yudao.framework.excel.util.ExcelUtils;
 import cn.iocoder.yudao.framework.i18n.core.I18nMessage;
 import cn.iocoder.yudao.module.infra.dal.dataobject.file.FileDO;
 import cn.iocoder.yudao.module.infra.service.file.FileService;
-import cn.iocoder.yudao.module.order.dto.OrderQueryDTO;
 import cn.iocoder.yudao.module.order.service.order.OrderQueryService;
 import cn.iocoder.yudao.module.order.vo.order.OrderQueryVO;
 import cn.iocoder.yudao.module.order.vo.order.OrderSaleRepayExcelVo;
@@ -51,7 +50,7 @@ public class SaleRepayOrderExcelExportListener {
             try {
                 DateTimeFormatter formatter = DateTimeFormatter.ofPattern(DATA_FORMAT);
                 String nowTime = formatter.format(LocalDateTime.now());
-                OrderQueryDTO query = JSONObject.parseObject(event.getRequestParams(), OrderQueryDTO.class);
+                OrderQueryVO query = JSONObject.parseObject(event.getRequestParams(), OrderQueryVO.class);
                 query.setLang(event.getLang());
                 List<OrderSaleRepayExcelVo> list = orderQueryService.getSaleRepayExcelList(query);
                 String sheetName = event.getLang() == 0 ? "售后赔偿金额统计" : "sale repay statistics";

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/listener/export/ShippingOrderExcelExportListener.java

@@ -6,7 +6,6 @@ import cn.iocoder.yudao.framework.excel.util.ExcelUtils;
 import cn.iocoder.yudao.framework.i18n.core.I18nMessage;
 import cn.iocoder.yudao.module.infra.dal.dataobject.file.FileDO;
 import cn.iocoder.yudao.module.infra.service.file.FileService;
-import cn.iocoder.yudao.module.order.dto.OrderQueryDTO;
 import cn.iocoder.yudao.module.order.service.order.OrderQueryService;
 import cn.iocoder.yudao.module.order.vo.order.OrderCustomsDatasExcelVo;
 import cn.iocoder.yudao.module.order.vo.order.OrderQueryVO;
@@ -52,7 +51,7 @@ public class ShippingOrderExcelExportListener {
             try {
                 DateTimeFormatter formatter = DateTimeFormatter.ofPattern(DATA_FORMAT);
                 String nowTime = formatter.format(LocalDateTime.now());
-                OrderQueryDTO query = JSONObject.parseObject(event.getRequestParams(), OrderQueryDTO.class);
+                OrderQueryVO query = JSONObject.parseObject(event.getRequestParams(), OrderQueryVO.class);
                 query.setLang(event.getLang());
                 List<OrderShipDataExcelVo> list = orderQueryService.getShipDatasExcelList(query);
                 String sheetName = event.getLang() == 0 ? "客户出货量统计" : "shipping data statistics";

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/order/OrderQueryService.java

@@ -161,7 +161,7 @@ public interface OrderQueryService {
 
     PageResult<OrderBackPageVO> deptOrderPage(OrderQueryVO query, PageVO page);
 
-    PageResult<OrderBackPageVO> deptOrderPage1(OrderQueryDTO query, PageVO page);
+    PageResult<OrderBackPageVO> deptOrderPage1(OrderQueryVO query, PageVO page);
 
     PageResult<OrderBackPageVO> myIssuedOrderPage(OrderQueryVO query, PageVO page);
 
@@ -186,7 +186,7 @@ public interface OrderQueryService {
 
     PageResult<OrderBackPageVO> adminCargoControlOrderPage(OrderQueryVO query, PageVO page);
 
-    PageResult<OrderBackPageVO> adminCargoControlMyOrderPage(OrderQueryDTO query, PageVO page);
+    PageResult<OrderBackPageVO> adminCargoControlMyOrderPage(OrderQueryVO query, PageVO page);
 
     PageResult<OrderBackPageVO> appCargoControlOrderPage(OrderQueryVO query, PageVO page);
 
@@ -320,21 +320,21 @@ public interface OrderQueryService {
 
     FileDO makeOrderExcelFile(Long userId, Integer userType, OrderQueryVO query) throws Exception;
 
-    FileDO makeMyOrderExcelFile(Long userId, Integer userType, OrderQueryDTO query) throws Exception;
+    FileDO makeMyOrderExcelFile(Long userId, Integer userType, OrderQueryVO query) throws Exception;
 
-    List<OrderExceptionStatisticsExcelVo> getOrderExceptionStatisticsExcel(OrderQueryDTO query);
+    List<OrderExceptionStatisticsExcelVo> getOrderExceptionStatisticsExcel(OrderQueryVO query);
 
-    List<OrderHeavyExcelVo> getHeavyOrderExcelList(OrderQueryDTO query);
+    List<OrderHeavyExcelVo> getHeavyOrderExcelList(OrderQueryVO query);
 
-    List<OrderReturnOrderExcelVo> getReturnOrderExcelList(OrderQueryDTO query);
+    List<OrderReturnOrderExcelVo> getReturnOrderExcelList(OrderQueryVO query);
 
-    List<OrderSaleRepayExcelVo> getSaleRepayExcelList(OrderQueryDTO query);
+    List<OrderSaleRepayExcelVo> getSaleRepayExcelList(OrderQueryVO query);
 
-    List<OrderCustomsDatasExcelVo> getCustomsDatasExcelList(OrderQueryDTO query);
+    List<OrderCustomsDatasExcelVo> getCustomsDatasExcelList(OrderQueryVO query);
 
-    List<OrderShipDataExcelVo> getShipDatasExcelList(OrderQueryDTO query);
+    List<OrderShipDataExcelVo> getShipDatasExcelList(OrderQueryVO query);
 
-    List<OrderShipFeeExcelVo> getShipFeeExcelList(OrderQueryDTO query);
+    List<OrderShipFeeExcelVo> getShipFeeExcelList(OrderQueryVO query);
 
     /**
      * 查询订单的身份信息

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/orderCargoControl/OrderCargoControlService.java

@@ -7,17 +7,14 @@ import cn.iocoder.yudao.module.infra.dal.dataobject.file.FileDO;
 import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO;
 import cn.iocoder.yudao.module.order.dal.dataobject.orderCargoControl.OrderCargoControlDO;
 import cn.iocoder.yudao.module.order.dto.OrderCargoControlReleaseInfoDto;
-import cn.iocoder.yudao.module.order.dto.OrderQueryDTO;
 import cn.iocoder.yudao.module.order.vo.order.OrderBackPageVO;
 import cn.iocoder.yudao.module.order.vo.order.OrderQueryVO;
 import cn.iocoder.yudao.module.order.vo.order.OrderSendSmsReqVO;
 import cn.iocoder.yudao.module.order.vo.orderCargoControl.*;
-import cn.iocoder.yudao.module.order.vo.orderCargoControlPick.OrderCargoControlPickApplyVO;
 
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.io.IOException;
-import java.io.UnsupportedEncodingException;
 import java.util.Collection;
 import java.util.List;
 
@@ -123,7 +120,7 @@ public interface OrderCargoControlService extends IService<OrderCargoControlDO>
 
     // FileDO makeCargoControlOrderExcelFile(Long userId, Integer userType, OrderQueryVO query) throws Exception;
 
-    FileDO makeCargoControlOrderExcelFile(Long userId, Integer userType, OrderQueryDTO query) throws Exception;
+    FileDO makeCargoControlOrderExcelFile(Long userId, Integer userType, OrderQueryVO query) throws Exception;
 
     /**
      * 判断是否控货人是否设置了控货密码

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/orderCargoControl/OrderCargoControlServiceImpl.java

@@ -30,7 +30,6 @@ import cn.iocoder.yudao.module.order.dal.dataobject.orderConsignor.OrderConsigno
 import cn.iocoder.yudao.module.order.dal.mysql.approval.OrderApprovalMapper;
 import cn.iocoder.yudao.module.order.dal.mysql.orderCargoControl.OrderCargoControlMapper;
 import cn.iocoder.yudao.module.order.dto.OrderCargoControlReleaseInfoDto;
-import cn.iocoder.yudao.module.order.dto.OrderQueryDTO;
 import cn.iocoder.yudao.module.order.enums.OrderApprovalTypeResultEnum;
 import cn.iocoder.yudao.module.order.enums.OrderStatusEnum;
 import cn.iocoder.yudao.module.order.service.order.OrderBusinessService;
@@ -407,7 +406,7 @@ public class OrderCargoControlServiceImpl extends AbstractService<OrderCargoCont
     }
 
     @Override
-    public FileDO makeCargoControlOrderExcelFile(Long userId, Integer userType, OrderQueryDTO query) throws Exception {
+    public FileDO makeCargoControlOrderExcelFile(Long userId, Integer userType, OrderQueryVO query) throws Exception {
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern(DATA_FORMAT);
         String nowTime = formatter.format(LocalDateTime.now());
 

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/vo/order/OrderQueryVO.java

@@ -590,8 +590,6 @@ public class OrderQueryVO {
     @ApiModelProperty(value = "内部转换状态字段")
     private List<Integer> asStatusList;
 
-
-
     @ApiModelProperty(value = "是否预警控货订单： 1 是")
     private Integer warningOrder;
 

yudao-module-order/yudao-module-order-core/src/main/resources/mapper/order/OrderMapper.xml

@@ -1214,7 +1214,7 @@
         limit #{start}, #{size}
     </select>
 
-    <select id="myOrderPageList" resultType="cn.iocoder.yudao.module.order.vo.order.OrderBackPageVO" parameterType="cn.iocoder.yudao.module.order.dto.OrderQueryDTO">
+    <select id="myOrderPageList" resultType="cn.iocoder.yudao.module.order.vo.order.OrderBackPageVO" parameterType="cn.iocoder.yudao.module.order.vo.OrderQueryVO">
         select o.order_id,
         o.package_type as advance_type,
         o.package_remarks,