From 0cb87e5f72febf26b3a17b4eb61e8d1b8c079279 Mon Sep 17 00:00:00 2001
From: Houjie <714924425@qq.com>
Date: 星期一, 26 五月 2025 10:03:44 +0800
Subject: [PATCH] 刀具刃磨-刃磨刀具选择列表接口/ 工具报损-审批、提交   工具盘点-审批 ，提交

---
 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ToolSharpeningController.java |   57 +++++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 39 insertions(+), 18 deletions(-)

diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ToolSharpeningController.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ToolSharpeningController.java
index fde6ac2..67bed48 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ToolSharpeningController.java
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ToolSharpeningController.java
@@ -1,8 +1,15 @@
 package org.jeecg.modules.tms.controller;
 
 import java.util.List;
+import java.util.Map;
+
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.modules.tms.entity.ToolLedger;
 import org.jeecg.modules.tms.entity.ToolSharpening;
+import org.jeecg.modules.tms.entity.ToolsLossBoundDetail;
+import org.jeecg.modules.tms.entity.vo.ToolSharpeningVo;
 import org.jeecg.modules.tms.service.IToolsSharpeningService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -12,6 +19,8 @@
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+
+import javax.servlet.http.HttpServletRequest;
 
 /**
  * @Description: 鍒�鍏峰垉纾ㄨ褰� 鎺у埗鍣�
@@ -29,15 +38,29 @@
     /**
      * 鍒嗛〉鏌ヨ
      */
-    @GetMapping("/list")
-    @ApiOperation(value = "鍒嗛〉鏌ヨ", notes = "鍒嗛〉鏌ヨ")
-    public Result<IPage<ToolSharpening>> queryPageList(ToolSharpening toolSharpening,
-                                                       @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-                                                       @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) {
-        Page<ToolSharpening> page = new Page<>(pageNo, pageSize);
-        QueryWrapper<ToolSharpening> queryWrapper = new QueryWrapper<>(toolSharpening);
-        IPage<ToolSharpening> iPage = toolSharpeningService.page(page, queryWrapper);
-        return Result.OK(iPage);
+//    @GetMapping("/list")
+//    @ApiOperation(value = "鍒嗛〉鏌ヨ", notes = "鍒嗛〉鏌ヨ")
+//    public Result<IPage<ToolSharpening>> queryPageList(ToolSharpening toolSharpening,
+//                                                       @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+//                                                       @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) {
+//        Page<ToolSharpening> page = new Page<>(pageNo, pageSize);
+//        QueryWrapper<ToolSharpening> queryWrapper = new QueryWrapper<>(toolSharpening);
+//        IPage<ToolSharpening> iPage = toolSharpeningService.page(page, queryWrapper);
+//        return Result.OK(iPage);
+//    }
+
+
+    @ApiOperation(value="鎶ユ崯鐢宠鍗曟槑缁�-閫氳繃涓昏〃ID鏌ヨ", notes="鎶ユ崯鐢宠鍗曟槑缁�-閫氳繃涓昏〃ID鏌ヨ")
+    @GetMapping(value = "/listToolSharpening")
+    public Result<IPage<ToolSharpeningVo>> listToolSharpening(ToolSharpeningVo toolSharpeningVo,
+                                                              @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                              @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                              HttpServletRequest req) {
+        Map<String, String[]> parameterMap = req.getParameterMap();
+        QueryWrapper<ToolSharpeningVo> queryWrapper = QueryGenerator.initQueryWrapper(toolSharpeningVo, parameterMap);
+        Page<ToolSharpeningVo> page = new Page<ToolSharpeningVo>(pageNo, pageSize);
+        IPage<ToolSharpeningVo> pageList = toolSharpeningService.queryPageList(page, parameterMap);
+        return Result.OK(pageList);
     }
 
     /**
@@ -60,16 +83,14 @@
         return Result.OK(entity);
     }
 
-    /**
-     * 鏂板
-     */
-    @PostMapping
-    @ApiOperation(value = "鏂板", notes = "鏂板")
-    public Result<ToolSharpening> add(@RequestBody ToolSharpening toolSharpening) {
-        toolSharpeningService.save(toolSharpening);
-        return Result.OK(toolSharpening);
-    }
 
+    @AutoLog(value = "tms_tool_sharpening-娣诲姞")
+    @ApiOperation(value="tms_tool_sharpening-娣诲姞", notes="tms_tool_sharpening-娣诲姞")
+    @PostMapping(value = "/add")
+    public Result<String> add(@RequestBody ToolSharpening toolSharpening) {
+        toolSharpeningService.save(toolSharpening);
+        return Result.OK("娣诲姞鎴愬姛锛�");
+    }
     /**
      * 淇敼
      */

--
Gitblit v1.9.3