From ed16e4ea431dca5090faddc1768a57592c4b6105 Mon Sep 17 00:00:00 2001 From: LiJianZhao Date: Mon, 19 May 2025 10:59:08 +0800 Subject: [PATCH] dev --- .../server/controller/statistics/StatisticsController.java | 1 - .../clinic/server/mapper/inventory/InventoryMapper.java | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/syjiaer/clinic/server/controller/statistics/StatisticsController.java b/src/main/java/com/syjiaer/clinic/server/controller/statistics/StatisticsController.java index 194c58d..8f11ea8 100644 --- a/src/main/java/com/syjiaer/clinic/server/controller/statistics/StatisticsController.java +++ b/src/main/java/com/syjiaer/clinic/server/controller/statistics/StatisticsController.java @@ -48,7 +48,6 @@ public class StatisticsController extends BaseController { QueryWrapper goodsQuery = new QueryWrapper<>(); goodsQuery.apply("inventory_whole_number <= inventory_warn_number"); goodsQuery.orderByAsc("inventory_whole_number","type"); - goodsQuery.last("limit 100"); Page page = goodsService.page(goodsQuery, pageNum, pageSize); return success(page); } diff --git a/src/main/java/com/syjiaer/clinic/server/mapper/inventory/InventoryMapper.java b/src/main/java/com/syjiaer/clinic/server/mapper/inventory/InventoryMapper.java index 80f8dc7..79702d1 100644 --- a/src/main/java/com/syjiaer/clinic/server/mapper/inventory/InventoryMapper.java +++ b/src/main/java/com/syjiaer/clinic/server/mapper/inventory/InventoryMapper.java @@ -25,9 +25,9 @@ public interface InventoryMapper extends BaseMapper { " WHERE CURRENT_DATE + INTERVAL '1 day' * goods.expiry_warn_days >= inventory.expiry_date AND inventory.whole_number !=0 ORDER BY inventory.expiry_date ASC LIMIT #{limit} offset #{offset} ") List> selectExpiryWarn(@Param("limit") Integer limit, @Param("offset") Integer offset); @Select("SELECT" + - "count(1)" + + " count(1)" + " FROM inventory LEFT JOIN goods ON inventory.good_id = goods.id" + - " WHERE CURRENT_DATE + INTERVAL '1 day' * goods.expiry_warn_days >= inventory.expiry_date AND inventory.whole_number !=0") + " WHERE CURRENT_DATE + INTERVAL '1 day' * goods.expiry_warn_days >= inventory.expiry_date AND inventory.whole_number !=0 ") Long countExpiryWarn(); }