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 fac5eea..62fca97 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,12 +48,6 @@ public class StatisticsController extends BaseController { @RequestMapping("numberEarlyWarning") public Result> numberEarlyWarning() { -// QueryWrapper inventoryQuery = new QueryWrapper<>(); -// inventoryQuery.select("good_id,name,packaging_unit,min_packaging_unit,sum(whole_number) as whole_number,sum(fragment_number) as fragment_number"); -// inventoryQuery.groupBy("good_id,name,packaging_unit,min_packaging_unit"); -// inventoryQuery.having(" sum(whole_number)<"+ Constants.numberWarningLimit); -// inventoryQuery.orderByAsc("whole_number"); -// List> maps = iInventoryService.listMaps(inventoryQuery); QueryWrapper goodsQuery = new QueryWrapper<>(); goodsQuery.apply("inventory_whole_number <= inventory_warn_number"); List list = goodsService.list(goodsQuery); @@ -61,13 +55,14 @@ public class StatisticsController extends BaseController { } @RequestMapping("expiryDateWarning") - public Result>> expiryDateWarning0() { + public Result>> expiryDateWarning() { // QueryWrapper inventoryQuery = new QueryWrapper<>(); // inventoryQuery.select("*,EXTRACT(EPOCH FROM AGE(expiry_date,CURRENT_DATE))/" + Constants.OneDaySecond + " as remaining_days"); // inventoryQuery.apply("CURRENT_DATE + INTERVAL '1 day' * expiry_warn_days >= expiry_date"); // inventoryQuery.orderByAsc("expiry_date"); // // List> maps = iInventoryGoodsViewService.listMaps(inventoryQuery); + inventoryService.expiryDateWarning(); // return success(maps); return success(); } diff --git a/src/main/java/com/syjiaer/clinic/server/service/inventory/InventoryService.java b/src/main/java/com/syjiaer/clinic/server/service/inventory/InventoryService.java index 4b2bb41..3c57c13 100644 --- a/src/main/java/com/syjiaer/clinic/server/service/inventory/InventoryService.java +++ b/src/main/java/com/syjiaer/clinic/server/service/inventory/InventoryService.java @@ -246,6 +246,12 @@ public class InventoryService extends BaseService { + public void expiryDateWarning() { +// inventoryMapper.selectListB + + } + + @Accessors(chain = true) @Getter @Setter