From 35d9446131124e12616c7b6b9dfd79e23d20e1c9 Mon Sep 17 00:00:00 2001
From: cuijian <cuijian@xalxzn.com>
Date: 星期五, 06 六月 2025 17:23:11 +0800
Subject: [PATCH] 工具台账功能

---
 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ToolLedgerDetailController.java |   62 ++++++++++++++++++++++++++++++-
 1 files changed, 60 insertions(+), 2 deletions(-)

diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ToolLedgerDetailController.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ToolLedgerDetailController.java
index 4e4a785..45e226a 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ToolLedgerDetailController.java
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ToolLedgerDetailController.java
@@ -66,9 +66,10 @@
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
-		QueryWrapper<ToolLedgerDetail> queryWrapper = QueryGenerator.initQueryWrapper(toolLedgerDetail, req.getParameterMap());
+		Map<String, String[]> parameterMap = req.getParameterMap();
+		QueryWrapper<ToolLedgerDetail> queryWrapper = QueryGenerator.initQueryWrapper(toolLedgerDetail, parameterMap);
 		Page<ToolLedgerDetail> page = new Page<ToolLedgerDetail>(pageNo, pageSize);
-		IPage<ToolLedgerDetail> pageList = toolLedgerDetailService.page(page, queryWrapper);
+		IPage<ToolLedgerDetail> pageList = toolLedgerDetailService.queryPageList(page, parameterMap);
 		return Result.OK(pageList);
 	}
 	
@@ -174,4 +175,61 @@
         return super.importExcel(request, response, ToolLedgerDetail.class);
     }
 
+	 /**
+	  * 宸ュ叿鍏ュ簱-閫夋嫨鍊熷嚭宸ュ叿
+	  *
+	  * @param toolLedgerDetail
+	  * @param pageNo
+	  * @param pageSize
+	  * @param query
+	  * @return
+	  */
+	 @ApiOperation(value="宸ュ叿鍏ュ簱-閫夋嫨鍊熷嚭宸ュ叿", notes="宸ュ叿鍏ュ簱-閫夋嫨鍊熷嚭宸ュ叿")
+	 @GetMapping(value = "/queryLendTool")
+	 public Result<?> queryLendTool(ToolLedgerDetail toolLedgerDetail,
+														  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+														  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+										@RequestParam Map<String, String> query) {
+		 IPage<Map<String, Object>> pageList = toolLedgerDetailService.queryLendTool(pageNo, pageSize, query);
+		 return Result.OK(pageList);
+	 }
+
+	 /**
+	  * 宸ュ叿鍏ュ簱-閫夋嫨鍒冪(宸ュ叿
+	  *
+	  * @param toolLedgerDetail
+	  * @param pageNo
+	  * @param pageSize
+	  * @param query
+	  * @return
+	  */
+	 @ApiOperation(value="宸ュ叿鍏ュ簱-閫夋嫨鍒冪(宸ュ叿", notes="宸ュ叿鍏ュ簱-閫夋嫨鍒冪(宸ュ叿")
+	 @GetMapping(value = "/querySharpenTool")
+	 public Result<?> querySharpenTool(ToolLedgerDetail toolLedgerDetail,
+										@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+										@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+										@RequestParam Map<String, String> query) {
+		 IPage<Map<String, Object>> pageList = toolLedgerDetailService.querySharpenTool(pageNo, pageSize, query);
+		 return Result.OK(pageList);
+	 }
+
+	 /**
+	  * 宸ュ叿鍙拌处-鏌ヨ鎶婂彿
+	  *
+	  * @param toolLedgerDetail
+	  * @param pageNo
+	  * @param pageSize
+	  * @param query
+	  * @return
+	  */
+	 @ApiOperation(value="宸ュ叿鍙拌处-鏌ヨ鎶婂彿", notes="宸ュ叿鍙拌处-鏌ヨ鎶婂彿")
+	 @GetMapping(value = "/queryToolLedgerDetailList")
+	 public Result<?> queryToolLedgerDetailList(ToolLedgerDetail toolLedgerDetail,
+														  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+														  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+																	  @RequestParam Map<String, String> query) {
+		 IPage<Map<String, Object>> pageList = toolLedgerDetailService.queryToolLedgerDetailList(pageNo, pageSize, query);
+		 return Result.OK(pageList);
+	 }
+
 }

--
Gitblit v1.9.3