From 8f98ff2e202e5d7a39be484753db63d0165d70d7 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期六, 10 一月 2026 15:12:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_tide_sbjkxt' into dev_tide_sbjkxt_xindao
---
src/main/java/com/ruoyi/measuringinstrumentledger/controller/MeasuringInstrumentLedgerRecordController.java | 28 ++++++++++++++++++++++++++++
1 files changed, 28 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/measuringinstrumentledger/controller/MeasuringInstrumentLedgerRecordController.java b/src/main/java/com/ruoyi/measuringinstrumentledger/controller/MeasuringInstrumentLedgerRecordController.java
index 09237a5..1f6ce23 100644
--- a/src/main/java/com/ruoyi/measuringinstrumentledger/controller/MeasuringInstrumentLedgerRecordController.java
+++ b/src/main/java/com/ruoyi/measuringinstrumentledger/controller/MeasuringInstrumentLedgerRecordController.java
@@ -12,10 +12,12 @@
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
+import java.util.List;
/**
* @author :yys
@@ -38,6 +40,18 @@
return AjaxResult.success(listPage);
}
+ @DeleteMapping("/delete")
+ @ApiOperation("璁￠噺鍣ㄥ叿鍙拌处璁板綍-鍒犻櫎")
+ @Log(title = "璁￠噺鍣ㄥ叿鍙拌处璁板綍-鍒犻櫎", businessType = BusinessType.DELETE)
+ @Transactional(rollbackFor = Exception.class)
+ public AjaxResult delete(@RequestBody List<Long> ids) throws IOException {
+ if(CollectionUtils.isEmpty(ids)){
+ return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ }
+ //鍒犻櫎妫�楠屽崟
+ return AjaxResult.success(measuringInstrumentLedgerRecordService.removeBatchByIds(ids));
+ }
+
@PostMapping("/update")
@ApiOperation("璁￠噺鍣ㄥ叿鍙拌处璁板綍-淇敼")
@Log(title = "璁￠噺鍣ㄥ叿鍙拌处璁板綍-淇敼", businessType = BusinessType.UPDATE)
@@ -50,6 +64,20 @@
return AjaxResult.error();
}
+ @DeleteMapping("/delete")
+ @ApiOperation("璁￠噺鍣ㄥ叿鍙拌处璁板綍-鍒犻櫎")
+ @Log(title = "璁￠噺鍣ㄥ叿鍙拌处璁板綍-鍒犻櫎", businessType = BusinessType.DELETE)
+ @Transactional(rollbackFor = Exception.class)
+ public AjaxResult delete(@RequestBody List<Long> ids) throws IOException {
+ if(CollectionUtils.isEmpty(ids)){
+ return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ }
+ //鍒犻櫎妫�楠屽崟
+ return AjaxResult.success(measuringInstrumentLedgerRecordService.removeBatchByIds(ids));
+ }
+
+
+
/**
* 瀵煎嚭璁￠噺鍣ㄥ叿鍙拌处
*/
--
Gitblit v1.9.3