From ec1d61de19f0fe6c3efc781e5d7a6af2ed65ae5d Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期二, 10 六月 2025 10:51:49 +0800
Subject: [PATCH] DNC 文档导入、回传文档、解析文档、取消原有设备
---
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ToolLedgerDetailController.java | 43 +++++++++++++++++++++++++++++++++++++++++--
1 files changed, 41 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..d7b84a1 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,42 @@
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);
+ }
+
}
--
Gitblit v1.9.3