clinic-v2
/
server
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
牛子源 2025-04-27 13:53:33 +08:00
parent 976a95991b 9a69bdf8fc
commit 11036f83c8
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/syjiaer/clinic/server/controller/statistics/StatisticsController.java
View File

@ -48,12 +48,6 @@ public class StatisticsController extends BaseController {
@RequestMapping("numberEarlyWarning") @RequestMapping("numberEarlyWarning")
public Result<List<Goods>> numberEarlyWarning() { public Result<List<Goods>> numberEarlyWarning() {
// QueryWrapper<Inventory> 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<Map<String,Object>> maps = iInventoryService.listMaps(inventoryQuery);
QueryWrapper<Goods> goodsQuery = new QueryWrapper<>(); QueryWrapper<Goods> goodsQuery = new QueryWrapper<>();
goodsQuery.apply("inventory_whole_number <= inventory_warn_number"); goodsQuery.apply("inventory_whole_number <= inventory_warn_number");
List<Goods> list = goodsService.list(goodsQuery); List<Goods> list = goodsService.list(goodsQuery);
@ -61,13 +55,14 @@ public class StatisticsController extends BaseController {
} }
@RequestMapping("expiryDateWarning") @RequestMapping("expiryDateWarning")
public Result<List<Map<String, Object>>> expiryDateWarning0() { public Result<List<Map<String, Object>>> expiryDateWarning() {
// QueryWrapper<InventoryGoodsView> inventoryQuery = new QueryWrapper<>(); // QueryWrapper<InventoryGoodsView> inventoryQuery = new QueryWrapper<>();
// inventoryQuery.select("*,EXTRACT(EPOCH FROM AGE(expiry_date,CURRENT_DATE))/" + Constants.OneDaySecond + " as remaining_days"); // 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.apply("CURRENT_DATE + INTERVAL '1 day' * expiry_warn_days >= expiry_date");
// inventoryQuery.orderByAsc("expiry_date"); // inventoryQuery.orderByAsc("expiry_date");
// //
// List<Map<String, Object>> maps = iInventoryGoodsViewService.listMaps(inventoryQuery); // List<Map<String, Object>> maps = iInventoryGoodsViewService.listMaps(inventoryQuery);
inventoryService.expiryDateWarning();
// return success(maps); // return success(maps);
return success(); return success();
} }

6
src/main/java/com/syjiaer/clinic/server/service/inventory/InventoryService.java
View File

@ -246,6 +246,12 @@ public class InventoryService extends BaseService {
public void expiryDateWarning() {
// inventoryMapper.selectListB
}
@Accessors(chain = true) @Accessors(chain = true)
@Getter @Getter
@Setter @Setter