系统配置-配置项名字查询改为字典查询

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/planitem/PlanItemMapper.java

@@ -26,7 +26,10 @@ public interface PlanItemMapper extends BaseMapperX<PlanItemDO> {
 
 
 
-    IPage<OrderRespVOCopy> selectOrderList(@Param("page") IPage page, @Param(Constants.WRAPPER) Wrapper<OrderDO> wrapper);
+    List<OrderRespVOCopy> selectOrderList(@Param(Constants.WRAPPER) Wrapper<OrderDO> wrapper,@Param("pageNo") Integer pageNo,@Param("pageSize") Integer pageSize);
+
+
+    List<Long> selectOrderListCount(@Param(Constants.WRAPPER) Wrapper<OrderDO> wrapper);
 
 
 

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java

@@ -605,7 +605,6 @@ public class PlanServiceImpl implements PlanService {
 
     @Override
     public PageResult<OrderRespVOCopy> getOrderPage(OrderPageReqVOCopy pageReqVO) {
-        PageDTO<OrderRespVOCopy> page = new PageDTO<>(pageReqVO.getPageNo(), pageReqVO.getPageSize());
 
         List<Integer> statusList = new ArrayList<>();
 
@@ -626,6 +625,7 @@ public class PlanServiceImpl implements PlanService {
 
         }
 
+        Integer pageNo = (pageReqVO.getPageNo() - 1) * pageReqVO.getPageSize();
 
         QueryWrapperX<OrderDO> queryWrapperX = new QueryWrapperX<>();
         queryWrapperX
@@ -642,40 +642,18 @@ public class PlanServiceImpl implements PlanService {
                 .likeIfPresent(FIELD_CUSTOMER, pageReqVO.getConsignee())
                 .likeIfPresent(FIELD_CUSTOM_ORDER_NO, pageReqVO.getDefaultId())
                 .likeIfPresent(FIELD_ADDRESS, pageReqVO.getConsigneeAddress())
-                .betweenIfPresent(FIELD_ORDER_DATE, pageReqVO.getCreateTime())
-                .orderByDesc("o.id");
+                .betweenIfPresent(FIELD_ORDER_DATE, pageReqVO.getCreateTime());
 
-        IPage<OrderRespVOCopy> orderRespVOCopies = planItemMapper.selectOrderList(page,queryWrapperX);
+        List<OrderRespVOCopy> orderRespVOCopies = planItemMapper.selectOrderList(queryWrapperX,pageNo,pageReqVO.getPageSize());
 
-        List<OrderRespVOCopy> records = orderRespVOCopies.getRecords();
+        List<Long> sum = planItemMapper.selectOrderListCount(queryWrapperX);
 
-        if (CollUtil.isEmpty(records)) {
+
+        if (CollUtil.isEmpty(orderRespVOCopies)) {
             return new PageResult<>();
         }
 
-        List<Long> orderIds = records.stream().map(OrderRespVOCopy::getOrderId).toList();
-
-
-        QueryWrapperX<PlateDO> queryWrapperX2 = new QueryWrapperX<>();
-        queryWrapperX2
-                .eq("op.organ_id",getUserOrganId())
-                .inIfPresent("op.order_id",orderIds)
-                .eq(FIELD_OP_DELETED,false)
-                .eq("op.is_optimized",false)
-                .inIfPresent("op.goods_id",ids)
-                .isNull(FIELD_PLAN_ID);
-
-
-        List<PlatePage> plateList = plateMapper.selectNoPlanPlateList(queryWrapperX2);
-
-
-        orderRespVOCopies.getRecords().forEach(m->{
-            m.setNum((int) plateList.stream().filter(f->f.getOrderId().equals(m.getOrderId())).map(PlatePage::getPlateId).count());
-
-            m.setArea(plateList.stream().filter(f->f.getOrderId().equals(m.getOrderId())).map(PlatePage::getArea).reduce(BigDecimal.ZERO,BigDecimal::add));
-        });
-
-        return new PageResult<>(orderRespVOCopies.getRecords(), orderRespVOCopies.getTotal());
+        return new PageResult<>(orderRespVOCopies, (long) sum.size());
 
     }
 

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/planitem/PlanItemMapper.xml

@@ -28,7 +28,29 @@
             o.customer as customer,
             o.address as address,
             o.custom_order_no as defineId,
-            o.status as status
+            o.status as status,
+            count(op.id) as num,
+            sum(op.area) as area
+
+        from order_plan_item opi
+                 right join order_plate op on opi.organ_id = op.organ_id and opi.order_id = op.order_id and opi.goods_id = op.goods_id and opi.plate_id = op.id
+                 right join orders o on op.organ_id = o.organ_id and op.order_id = o.id
+
+            ${ew.customSqlSegment}
+
+        group by o.id
+        order by o.id desc
+        limit #{pageNo},#{pageSize};
+
+    </select>
+
+
+
+    <select id="selectOrderListCount" resultType="java.lang.Long">
+
+
+        select distinct
+            o.id
 
         from order_plan_item opi
                  right join order_plate op on opi.organ_id = op.organ_id and opi.order_id = op.order_id and opi.goods_id = op.goods_id and opi.plate_id = op.id