控货详情列表

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

@@ -7,6 +7,7 @@ import cn.iocoder.yudao.framework.mybatis.core.vo.PageVO;
 import cn.iocoder.yudao.module.order.dal.dataobject.orderCargoControlPick.OrderCargoControlPickDO;
 import cn.iocoder.yudao.module.order.dto.OrderCargoControlReleaseInfoDto;
 import cn.iocoder.yudao.module.order.vo.order.OrderQueryVO;
+import cn.iocoder.yudao.module.order.vo.order.StatisticsOrderVO;
 import cn.iocoder.yudao.module.order.vo.orderCargoControlPick.OrderCargoControlPickBackVO;
 import cn.iocoder.yudao.module.order.vo.orderCargoControlPick.OrderCargoControlPickQueryVO;
 import org.apache.ibatis.annotations.*;
@@ -162,8 +163,19 @@ public interface OrderCargoControlPickMapper extends AbstractMapper<OrderCargoCo
     @Select("SELECT IFNULL(a.num,0) FROM (select SUM(pick_num) as num FROM ecw_order_cargo_control_pick where order_id = #{orderId} and status in(3,4)) as a ")
     int getPickNumByOrderId(@Param("orderId") Long orderId);
 
-    long orderDetailListCount(@Param("query") OrderQueryVO query);
+    /**
+     控货订单详情列表数量
+    */
+    long orderCargoControlDetailListCount(@Param("query") OrderQueryVO query);
 
-    List<OrderCargoControlReleaseInfoDto> orderDetailList(@Param("start") int start, @Param("size") int size, @Param("query") OrderQueryVO query,
+    /**
+     控货订单详情列表
+    */
+    List<OrderCargoControlReleaseInfoDto> orderCargoControlDetailList(@Param("start") int start, @Param("size") int size, @Param("query") OrderQueryVO query,
                                                           @Param("sort") String sort);
+
+    /**
+     * 查询控货订单列表统计
+     */
+    StatisticsOrderVO statisticsOrderControl(@Param("query") OrderQueryVO query);
 }

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

@@ -6,6 +6,7 @@ import cn.iocoder.yudao.framework.mybatis.core.vo.PageVO;
 import cn.iocoder.yudao.module.order.dal.dataobject.orderCargoControlPick.OrderCargoControlPickDO;
 import cn.iocoder.yudao.module.order.dto.OrderCargoControlReleaseInfoDto;
 import cn.iocoder.yudao.module.order.vo.order.OrderQueryVO;
+import cn.iocoder.yudao.module.order.vo.order.StatisticsOrderVO;
 import cn.iocoder.yudao.module.order.vo.orderCargoControlPick.OrderCargoControlPickApplyVO;
 import cn.iocoder.yudao.module.order.vo.orderCargoControlPick.OrderCargoControlPickCreateReqVO;
 import cn.iocoder.yudao.module.order.vo.orderCargoControlPick.OrderCargoControlPickQueryVO;
@@ -155,8 +156,13 @@ public interface OrderCargoControlPickService extends IService<OrderCargoControl
      */
     void cancelApprovalByOrderApprovalId(Long orderApprovalId, String reason);
 
-    /*
+    /**
      控货订单详情列表
      */
-    PageResult<OrderCargoControlReleaseInfoDto> orderDetailList(OrderQueryVO query, PageVO page);
+    PageResult<OrderCargoControlReleaseInfoDto> orderCargoControlDetailList(OrderQueryVO query, PageVO page);
+
+    /**
+     * 查询控货订单列表统计
+     */
+    StatisticsOrderVO statisticsOrderControl(OrderQueryVO query);
 }

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

@@ -45,6 +45,7 @@ import cn.iocoder.yudao.module.order.service.order.OrderService;
 import cn.iocoder.yudao.module.order.service.orderCargoControl.OrderCargoControlService;
 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.StatisticsOrderVO;
 import cn.iocoder.yudao.module.order.vo.orderCargoControlPick.OrderCargoControlPickApplyVO;
 import cn.iocoder.yudao.module.order.vo.orderCargoControlPick.OrderCargoControlPickCreateReqVO;
 import cn.iocoder.yudao.module.order.vo.orderCargoControlPick.OrderCargoControlPickQueryVO;
@@ -1471,14 +1472,13 @@ public class OrderCargoControlPickServiceImpl extends AbstractService<OrderCargo
         bpmCreateServiceFactory.cancelBmpById(userId, approvalDO.getFormId(), reason);
     }
 
-    /*
+    /**
      控货订单详情列表
     */
     @Override
-    public PageResult<OrderCargoControlReleaseInfoDto> orderDetailList(OrderQueryVO query, PageVO page) {
-        query.setLang(I18nMessage.getLang());
+    public PageResult<OrderCargoControlReleaseInfoDto> orderCargoControlDetailList(OrderQueryVO query, PageVO page) {
         IPage<OrderCargoControlReleaseInfoDto> mpPage = MyBatisUtils.buildPage(page);
-        long total = orderCargoControlPickMapper.orderDetailListCount(query);
+        long total = orderCargoControlPickMapper.orderCargoControlDetailListCount(query);
         int start = (page.getPage() - 1) * page.getRows();
         int size = page.getRows();
         String sort = null;
@@ -1490,8 +1490,16 @@ public class OrderCargoControlPickServiceImpl extends AbstractService<OrderCargo
             sort= CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, field) + " " + (reversed?"DESC":"ASC");
         }
         List<OrderCargoControlReleaseInfoDto> list =
-                orderCargoControlPickMapper.orderDetailList(start, size, query,sort);
+                orderCargoControlPickMapper.orderCargoControlDetailList(start, size, query,sort);
         return new PageResult<>(list, total, mpPage.getSize(), page.getPage(), (total + mpPage.getSize() - 1) / mpPage.getSize());
     }
 
+    /**
+     * 查询控货订单列表统计
+     */
+    @Override
+    public StatisticsOrderVO statisticsOrderControl(OrderQueryVO query) {
+        return orderCargoControlPickMapper.statisticsOrderControl(query);
+    }
+
 }

yudao-module-order/yudao-module-order-rest/src/main/java/cn/iocoder/yudao/module/order/controller/admin/orderCargoControlPick/OrderCargoControlPickController.java

@@ -13,6 +13,7 @@ import cn.iocoder.yudao.module.order.service.orderCargoControl.OrderCargoControl
 import cn.iocoder.yudao.module.order.service.orderCargoControlPick.OrderCargoControlPickService;
 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.StatisticsOrderVO;
 import cn.iocoder.yudao.module.order.vo.orderCargoControlPick.OrderCargoControlPickApplyVO;
 import cn.iocoder.yudao.module.order.vo.orderCargoControlPick.OrderCargoControlPickCreateReqVO;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -50,12 +51,18 @@ public class OrderCargoControlPickController {
      */
     @GetMapping("/cargo/control/orderDetail")
     @ApiOperation("获得控货订单列表查询订单分页")
-    public CommonResult<PageResult<OrderCargoControlReleaseInfoDto>> orderDetailList(OrderQueryVO query, PageVO page) {
+    public CommonResult<PageResult<OrderCargoControlReleaseInfoDto>> orderCargoControlDetailList(OrderQueryVO query, PageVO page) {
         PageResult<OrderCargoControlReleaseInfoDto> pageResult =
-                orderCargoControlPickService.orderDetailList(query, page);
+                orderCargoControlPickService.orderCargoControlDetailList(query, page);
         return success(pageResult);
     }
 
+    @GetMapping("/cargo/control/statistics")
+    @ApiOperation("查询控货订单列表统计")
+    public CommonResult<StatisticsOrderVO> statisticsOrderControl(OrderQueryVO query) {
+        return success(orderCargoControlPickService.statisticsOrderControl(query));
+    }
+
     @PostMapping("/create")
     @ApiOperation("创建订单控货人放货记录")
     @Idempotent(timeout = 5)