生产端工作台 - 今日要完成订单/逾期订单 还原为平铺

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/order/OrderMapper.java

@@ -183,13 +183,11 @@ public interface OrderMapper extends BaseMapperX<OrderDO> {
      * @param orderDate
      * @param organId
      * @param page
-     * @param orderIds  父级订单数组
      * @return
      */
     IPage<OrderOverdueRespVO> selectOrderNear(@Param("orderDate") LocalDate orderDate,
                                               @Param("organId") Long organId,
-                                              @Param("page") IPage<OrderOverdueRespVO> page,
-                                              @Param("orderIds") Long... orderIds);
+                                              @Param("page") IPage<OrderOverdueRespVO> page);
 
 
     /**

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java

@@ -881,30 +881,11 @@ public class OrderServiceImpl implements OrderService {
         IPage<OrderOverdueRespVO> orderNearVOS = orderMapper.selectOrderNear(tomorrow, organId, page);
         List<OrderOverdueRespVO> records = orderNearVOS.getRecords();
 
-        // 查询子单
         if (CollUtil.isNotEmpty(records)) {
-            // 主单id列表
-            Long[] mainOrderIds = records.stream().map(OrderOverdueRespVO::getId).toArray(Long[]::new);
-            PageDTO<OrderOverdueRespVO> childPage = new PageDTO<>(pageParam.getPageNo(), PageParam.PAGE_SIZE_NONE);
-            IPage<OrderOverdueRespVO> childOrderNearVOS = orderMapper.selectOrderNear(tomorrow, organId, childPage, mainOrderIds);
-
-            List<OrderOverdueRespVO> childList = childOrderNearVOS.getRecords();
-
-            if (CollUtil.isNotEmpty(childList)) {
-                // 按 parentId 分组
-                Map<Long, List<OrderOverdueRespVO>> childMap = childList.stream()
-                        .collect(Collectors.groupingBy(OrderOverdueRespVO::getParentId));
-
-                // 回填 child
-                for (OrderOverdueRespVO order : records) {
-                    order.setChild(childMap.getOrDefault(order.getId(), null));
-                }
-            }
             return new PageResult<>(records, orderNearVOS.getTotal());
-
         }
 
-        return new PageResult<>(records, orderNearVOS.getTotal());
+        return PageResult.empty();
     }
 
     @Override

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/order/OrderMapper.xml

@@ -299,17 +299,6 @@
         and o.deleted = 0
         and o.status != 4
         and o.delivery_date = #{orderDate}
-        <choose>
-            <when test="orderIds != null and orderIds.length > 0">
-                AND parent_id IN
-                <foreach item="orderId" collection="orderIds" open="(" separator="," close=")">
-                    #{orderId}
-                </foreach>
-            </when>
-            <otherwise>
-                AND parent_id = 0
-            </otherwise>
-        </choose>
     </select>
 
     <select id="selectOrderOverdue" resultType="com.cf.imes.module.executor.controller.admin.order.vo.order.OrderOverdueRespVO">