From 92bc6dca274eb45dc330f63b5a3f90a01458e157 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期二, 27 五月 2025 14:48:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/BaseToolsController.java | 30 ++++++++++++++++++++++++++++++
1 files changed, 30 insertions(+), 0 deletions(-)
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/BaseToolsController.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/BaseToolsController.java
index 022303c..6690650 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/BaseToolsController.java
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/BaseToolsController.java
@@ -493,5 +493,35 @@
return Result.OK("");
}
}
+ @GetMapping("/listWithLedgerAndConfig")
+ public Result<IPage<StocktakingPoundVo>> listWithLedgerAndConfig(
+ StocktakingPoundVo stocktakingPoundVo,
+ @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+ HttpServletRequest req) {
+ // 浣跨敤 QueryGenerator 鏋勫缓 QueryWrapper
+ QueryWrapper<StocktakingPoundVo> queryWrapper = QueryGenerator.initQueryWrapper(stocktakingPoundVo, req.getParameterMap());
+
+ Page<StocktakingPoundVo> page = new Page<>(pageNo, pageSize);
+ IPage<StocktakingPoundVo> resultPage = baseToolsService.pageWithLedgerAndConfig(page, queryWrapper);
+ return Result.OK(resultPage);
+ }
+
+
+
+ @GetMapping("/listWithSharpedAndConfig")
+ public Result<IPage<SharpeeningVo>> listWithSharpedAndConfig(
+ SharpeeningVo sharpeeningVo,
+ @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+ HttpServletRequest req) {
+
+ // 浣跨敤 QueryGenerator 鏋勫缓 QueryWrapper
+ QueryWrapper<SharpeeningVo> queryWrapper = QueryGenerator.initQueryWrapper(sharpeeningVo, req.getParameterMap());
+
+ Page<SharpeeningVo> page = new Page<>(pageNo, pageSize);
+ IPage<SharpeeningVo> resultPage = baseToolsService.pageWithSharpedAndConfig(page, queryWrapper);
+ return Result.OK(resultPage);
+ }
}
--
Gitblit v1.9.3