From 1d915922d8197aa5d5dc3e40e3088d983dd6e141 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 13 三月 2026 17:57:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_kthg' into dev_New_kthg
---
src/main/java/com/ruoyi/consumables/controller/ConsumablesInRecordController.java | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 51 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/consumables/controller/ConsumablesInRecordController.java b/src/main/java/com/ruoyi/consumables/controller/ConsumablesInRecordController.java
new file mode 100644
index 0000000..a7d9921
--- /dev/null
+++ b/src/main/java/com/ruoyi/consumables/controller/ConsumablesInRecordController.java
@@ -0,0 +1,51 @@
+package com.ruoyi.consumables.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.consumables.dto.ConsumablesInRecordDto;
+import com.ruoyi.consumables.service.ConsumablesInRecordService;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+@RestController
+@Api(tags = "鑰楁潗鍏ュ簱")
+@RequestMapping("/consumablesInRecord")
+public class ConsumablesInRecordController {
+ @Autowired
+ private ConsumablesInRecordService consumablesInRecordService;
+
+ @GetMapping("/listPage")
+ @Log(title = "鐢熶骇鍏ュ簱-鍏ュ簱绠＄悊-鍒楄〃", businessType = BusinessType.OTHER)
+ @ApiOperation(value = "鍏ュ簱绠＄悊鍒楄〃")
+ public AjaxResult listPage(Page page, ConsumablesInRecordDto ConsumablesInRecordDto) {
+ IPage<ConsumablesInRecordDto> result = consumablesInRecordService.listPage(page, ConsumablesInRecordDto);
+ return AjaxResult.success(result);
+ }
+
+
+
+ @DeleteMapping("")
+ @Log(title = "鍏ュ簱绠＄悊-鍒犻櫎鍏ュ簱", businessType = BusinessType.DELETE)
+ public AjaxResult delete(@RequestBody List<Long> ids) {
+ if(CollectionUtils.isEmpty(ids)){
+ return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ }
+ return AjaxResult.success(consumablesInRecordService.batchDelete(ids));
+ }
+
+ @PostMapping("/exportConsumablesInRecord")
+ @ApiOperation("瀵煎嚭鍏ュ簱璁板綍")
+ public void exportConsumablesInRecord(HttpServletResponse response, ConsumablesInRecordDto ConsumablesInRecordDto) {
+ consumablesInRecordService.exportConsumablesInRecord(response,ConsumablesInRecordDto);
+ }
+
+}
--
Gitblit v1.9.3