From b44b174f656aac1fe03e7f96851e564c3982f67d Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 28 三月 2025 16:52:25 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/boymi/YiFeiNN

---
 medicalWaste-admin/src/main/java/com/sinata/web/controller/backend/MwProtectionEquipmentController.java |   40 +++++++++++++++++++++++++++++++++-------
 1 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/medicalWaste-admin/src/main/java/com/sinata/web/controller/backend/MwProtectionEquipmentController.java b/medicalWaste-admin/src/main/java/com/sinata/web/controller/backend/MwProtectionEquipmentController.java
index 66a0642..c730c06 100644
--- a/medicalWaste-admin/src/main/java/com/sinata/web/controller/backend/MwProtectionEquipmentController.java
+++ b/medicalWaste-admin/src/main/java/com/sinata/web/controller/backend/MwProtectionEquipmentController.java
@@ -5,6 +5,8 @@
 import com.sinata.system.domain.dto.MwProtectionEquipmentDTO;
 import com.sinata.system.domain.dto.MwProtectionEquipmentRecordDTO;
 import com.sinata.system.domain.query.MwProtectionEquipmentQuery;
+import com.sinata.system.domain.query.MwProtectionEquipmentRecordQuery;
+import com.sinata.system.domain.vo.MwProtectionEquipmentRecordVO;
 import com.sinata.system.domain.vo.MwProtectionEquipmentVO;
 import com.sinata.system.service.MwProtectionEquipmentService;
 import io.swagger.annotations.Api;
@@ -21,6 +23,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -44,8 +47,8 @@
      * @param query
      * @return
      */
-    @PostMapping("/page")
     @ApiOperation("防护器具分页列表")
+    @PostMapping("/page")
     public R<PageDTO<MwProtectionEquipmentVO>> pageList(@Valid @RequestBody MwProtectionEquipmentQuery query) {
         return R.ok(mwProtectionEquipmentService.pageList(query));
     }
@@ -56,8 +59,8 @@
      * @param id
      * @return
      */
-    @GetMapping("/{id}")
     @ApiOperation("详情")
+    @GetMapping("/{id}")
     public R<MwProtectionEquipmentVO> detail(@ApiParam(name = "id", value = "防护器具id", required = true) @PathVariable("id") Long id) {
         return R.ok(mwProtectionEquipmentService.detail(id));
     }
@@ -68,8 +71,8 @@
      * @param dto
      * @return
      */
-    @PostMapping("/add")
     @ApiOperation("新增防护器具")
+    @PostMapping("/add")
     public R<?> add(@Valid @RequestBody MwProtectionEquipmentDTO dto) {
         mwProtectionEquipmentService.add(dto);
         return R.ok();
@@ -81,21 +84,22 @@
      * @param dto
      * @return
      */
-    @PostMapping("/edit")
     @ApiOperation("编辑")
+    @PostMapping("/edit")
     public R<?> edit(@Valid @RequestBody MwProtectionEquipmentDTO dto) {
         mwProtectionEquipmentService.edit(dto);
         return R.ok();
     }
 
     /**
+     * 删除
      * @param id
      * @return
      */
-    @DeleteMapping("/{id}")
     @ApiOperation("删除")
+    @DeleteMapping("/{id}")
     public R<?> delete(@ApiParam(name = "id", value = "防护器具id", required = true) @PathVariable("id") Long id) {
-        mwProtectionEquipmentService.removeById(id);
+        mwProtectionEquipmentService.delete(id);
         return R.ok();
     }
 
@@ -104,11 +108,33 @@
      *
      * @param dto
      */
-    @PostMapping("/addStock")
     @ApiOperation("增加库存")
+    @PostMapping("/addStock")
     public R<?> addStock(@Valid @RequestBody MwProtectionEquipmentRecordDTO dto) {
         mwProtectionEquipmentService.addStock(dto);
         return R.ok();
     }
 
+    /**
+     * 增减记录分页列表
+     *
+     * @param query
+     * @return
+     */
+    @ApiOperation("增减记录")
+    @PostMapping("/recordPage")
+    public R<PageDTO<MwProtectionEquipmentRecordVO>> recordPage(@Valid @RequestBody MwProtectionEquipmentRecordQuery query) {
+        return R.ok(mwProtectionEquipmentService.recordPage(query));
+    }
+
+    /**
+     * 防护器具列表
+     *
+     * @return
+     */
+    @ApiOperation("防护器具列表")
+    @GetMapping("/list")
+    public R<List<MwProtectionEquipmentVO>> queryList() {
+        return R.ok(mwProtectionEquipmentService.queryList());
+    }
 }

--
Gitblit v1.7.1