From 0d7d874912d0147376826b55667a1deb6547ed91 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 21 五月 2026 15:25:27 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' into dev_宁夏_英泽防锈

---
 src/main/java/com/ruoyi/measuringinstrumentledger/controller/MeasuringInstrumentLedgerController.java |   34 +++++++++++++++++-----------------
 1 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/main/java/com/ruoyi/measuringinstrumentledger/controller/MeasuringInstrumentLedgerController.java b/src/main/java/com/ruoyi/measuringinstrumentledger/controller/MeasuringInstrumentLedgerController.java
index e092741..1104c15 100644
--- a/src/main/java/com/ruoyi/measuringinstrumentledger/controller/MeasuringInstrumentLedgerController.java
+++ b/src/main/java/com/ruoyi/measuringinstrumentledger/controller/MeasuringInstrumentLedgerController.java
@@ -6,7 +6,7 @@
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
 import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
 import com.ruoyi.measuringinstrumentledger.dto.MeasuringInstrumentLedgerDto;
 import com.ruoyi.measuringinstrumentledger.mapper.MeasuringInstrumentLedgerRecordMapper;
 import com.ruoyi.measuringinstrumentledger.pojo.MeasuringInstrumentLedger;
@@ -43,9 +43,9 @@
     @GetMapping("/listPage")
     @Operation(summary = "璁￠噺鍣ㄥ叿鍙拌处-鍒嗛〉鏌ヨ")
     @Log(title = "璁￠噺鍣ㄥ叿鍙拌处-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
-    public AjaxResult listPage(Page page, MeasuringInstrumentLedger measuringInstrumentLedger) {
+    public R<?> listPage(Page page, MeasuringInstrumentLedger measuringInstrumentLedger) {
         IPage<MeasuringInstrumentLedger> listPage = measuringInstrumentLedgerService.listPage(page, measuringInstrumentLedger);
-        return AjaxResult.success(listPage);
+        return R.ok(listPage);
     }
 
 
@@ -53,59 +53,59 @@
     @Operation(summary = "璁￠噺鍣ㄥ叿鍙拌处-鏂板")
     @Log(title = "璁￠噺鍣ㄥ叿鍙拌处-鏂板", businessType = BusinessType.INSERT)
     @Transactional(rollbackFor = Exception.class)
-    public AjaxResult add(@RequestBody MeasuringInstrumentLedger measuringInstrumentLedger) throws IOException {
+    public R<?> add(@RequestBody MeasuringInstrumentLedger measuringInstrumentLedger) throws IOException {
         boolean save = measuringInstrumentLedgerService.add(measuringInstrumentLedger);
         if (save) {
-            return AjaxResult.success();
+            return R.ok();
         }
-        return AjaxResult.error();
+        return R.fail();
     }
 
     @PostMapping("/update")
     @Operation(summary = "璁￠噺鍣ㄥ叿鍙拌处-淇敼")
     @Log(title = "璁￠噺鍣ㄥ叿鍙拌处-淇敼", businessType = BusinessType.UPDATE)
     @Transactional(rollbackFor = Exception.class)
-    public AjaxResult update(@RequestBody MeasuringInstrumentLedger measuringInstrumentLedger) {
+    public R<?> update(@RequestBody MeasuringInstrumentLedger measuringInstrumentLedger) {
         SysUser sysUser = sysUserMapper.selectUserById(measuringInstrumentLedger.getUserId());
         if (sysUser == null) {
-            return AjaxResult.error("鐢ㄦ埛涓嶅瓨鍦�");
+            return R.fail("鐢ㄦ埛涓嶅瓨鍦�");
         }
         measuringInstrumentLedger.setUserName(sysUser.getUserName());
         boolean update = measuringInstrumentLedgerService.updateById(measuringInstrumentLedger);
         if (update) {
-            return AjaxResult.success();
+            return R.ok();
         }
-        return AjaxResult.error();
+        return R.fail();
     }
 
     @DeleteMapping("/delete")
     @Operation(summary = "璁￠噺鍣ㄥ叿鍙拌处-鍒犻櫎")
     @Log(title = "璁￠噺鍣ㄥ叿鍙拌处-鍒犻櫎", businessType = BusinessType.DELETE)
     @Transactional(rollbackFor = Exception.class)
-    public AjaxResult delete(@RequestBody List<Long> ids) {
-        if(CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+    public R<?> delete(@RequestBody List<Long> ids) {
+        if(CollectionUtils.isEmpty(ids)) return R.fail("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
         for (Long id : ids) {
             LambdaQueryWrapper<MeasuringInstrumentLedgerRecord> queryWrapper = new LambdaQueryWrapper<>();
             queryWrapper.eq(MeasuringInstrumentLedgerRecord::getMeasuringInstrumentLedgerId,id);
             List<MeasuringInstrumentLedgerRecord> measuringInstrumentLedgerRecords = measuringInstrumentLedgerRecordMapper.selectList(queryWrapper);
             if(!CollectionUtils.isEmpty(measuringInstrumentLedgerRecords)){
-                return AjaxResult.error("璇峰厛鍒犻櫎閫変腑璁￠噺鍣ㄥ叿鍙拌处涓嬬殑鎵�鏈夋瀹氳褰�");
+                return R.fail("璇峰厛鍒犻櫎閫変腑璁￠噺鍣ㄥ叿鍙拌处涓嬬殑鎵�鏈夋瀹氳褰�");
             }
         }
         boolean delete = measuringInstrumentLedgerService.removeBatchByIds(ids);
         if (delete) {
-            return AjaxResult.success();
+            return R.ok();
         }
-        return AjaxResult.error();
+        return R.fail();
     }
 
     @PostMapping("/verifying")
     @Operation(summary = "璁￠噺鍣ㄥ叿鍙拌处-妫�瀹�")
     @Log(title = "璁￠噺鍣ㄥ叿鍙拌处-妫�瀹�", businessType = BusinessType.UPDATE)
     @Transactional(rollbackFor = Exception.class)
-    public AjaxResult verifying(@RequestBody MeasuringInstrumentLedgerDto measuringInstrumentLedger) throws IOException {
+    public R<?> verifying(@RequestBody MeasuringInstrumentLedgerDto measuringInstrumentLedger) throws IOException {
         boolean update = measuringInstrumentLedgerService.verifying(measuringInstrumentLedger);
-        return update ? AjaxResult.success("妫�瀹氭垚鍔�") : AjaxResult.error("妫�瀹氬け璐�");
+        return update ? R.ok(null, "妫�瀹氭垚鍔�") : R.fail("妫�瀹氬け璐�");
     }
 
     /**

--
Gitblit v1.9.3