From 5f73eb1fb9d04040fe6ba377d5ae582024429f2f Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期日, 20 九月 2026 14:15:02 +0800
Subject: [PATCH] feat(sales): 添加客户交易详情中的付款金额字段

---
 src/main/java/com/ruoyi/collaborativeApproval/controller/RulesRegulationsManagementController.java |   42 +++++++++++++++++++++++-------------------
 1 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/src/main/java/com/ruoyi/collaborativeApproval/controller/RulesRegulationsManagementController.java b/src/main/java/com/ruoyi/collaborativeApproval/controller/RulesRegulationsManagementController.java
index 2496515..effb42a 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/controller/RulesRegulationsManagementController.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/controller/RulesRegulationsManagementController.java
@@ -7,9 +7,9 @@
 import com.ruoyi.collaborativeApproval.pojo.RulesRegulationsManagement;
 import com.ruoyi.collaborativeApproval.pojo.SealApplicationManagement;
 import com.ruoyi.collaborativeApproval.service.RulesRegulationsManagementService;
+import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Operation;
 import lombok.AllArgsConstructor;
@@ -18,63 +18,67 @@
 import org.springframework.web.bind.annotation.*;
 
 import jakarta.servlet.http.HttpServletResponse;
+import java.time.LocalDateTime;
 import java.util.List;
 
 @RestController
 @RequestMapping("/rulesRegulationsManagement")
 @AllArgsConstructor
 @Tag(name = "鍒跺害绠＄悊")
-public class RulesRegulationsManagementController extends BaseController {
+public class RulesRegulationsManagementController {
     private RulesRegulationsManagementService rulesRegulationsManagementService;
     private ReadingStatusMapper readingStatusMapper;
 
     @GetMapping("/getList")
     @Operation(summary = "鍒嗛〉鏌ヨ")
-    public R<?> listPage(Page page, RulesRegulationsManagement rulesRegulationsManagement){
-        return R.ok(rulesRegulationsManagementService.listPage(page, rulesRegulationsManagement));
+    public AjaxResult listPage(Page page, RulesRegulationsManagement rulesRegulationsManagement){
+        return AjaxResult.success(rulesRegulationsManagementService.listPage(page, rulesRegulationsManagement));
     }
 
     @PostMapping("/add")
     @Operation(summary = "鏂板")
-    public R<?> add(@RequestBody RulesRegulationsManagement rulesRegulationsManagement){
+    public AjaxResult add(@RequestBody RulesRegulationsManagement rulesRegulationsManagement){
         rulesRegulationsManagementService.save(rulesRegulationsManagement);
-        return R.ok(rulesRegulationsManagement.getId());
+        return AjaxResult.success(rulesRegulationsManagement.getId());
     }
 
     @PostMapping("/update")
     @Operation(summary = "淇敼")
-    public R<?> update(@RequestBody RulesRegulationsManagement rulesRegulationsManagement){
-        return R.ok(rulesRegulationsManagementService.updateById(rulesRegulationsManagement));
+    public AjaxResult update(@RequestBody RulesRegulationsManagement rulesRegulationsManagement){
+        // 鍓嶇鍥炰紶鏁磋浼氬甫涓婃棫鐨� updateTime/updateUser锛屽鑷磋嚜鍔ㄥ～鍏呰璺宠繃锛岄渶鏄惧紡鍚屾涓哄綋鍓嶆搷浣滀汉涓庢椂闂�
+        rulesRegulationsManagement.setUpdateTime(LocalDateTime.now());
+        rulesRegulationsManagement.setUpdateUser(SecurityUtils.getUserId().intValue());
+        return AjaxResult.success(rulesRegulationsManagementService.updateById(rulesRegulationsManagement));
     }
 
     @DeleteMapping("/delete")
     @Operation(summary = "鍒犻櫎")
-    public R<?> delete(@PathVariable("ids") List<Long> ids){
+    public AjaxResult delete(@PathVariable("ids") List<Long> ids){
         if (CollectionUtils.isEmpty(ids)) {
             throw new RuntimeException("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
         }
-        return R.ok(rulesRegulationsManagementService.removeBatchByIds(ids));
+        return AjaxResult.success(rulesRegulationsManagementService.removeBatchByIds(ids));
     }
     //瑙勫垯鏌ョ湅鏃舵柊澧為槄璇荤姸鎬�
     @PostMapping("/addReadingStatus")
     @Operation(summary = "鏂板闃呰鐘舵��")
-    public R<?> addReadingStatus(@RequestBody ReadingStatus readingStatus){
-        return R.ok(readingStatusMapper.insert(readingStatus));
+    public AjaxResult addReadingStatus(@RequestBody ReadingStatus readingStatus){
+        return AjaxResult.success(readingStatusMapper.insert(readingStatus));
     }
     @PostMapping("/updateReadingStatus")
     @Operation(summary = "淇敼闃呰鐘舵��")
-    public R<?> updateReadingStatus(@RequestBody ReadingStatus readingStatus){
-        return R.ok(readingStatusMapper.updateById(readingStatus));
+    public AjaxResult updateReadingStatus(@RequestBody ReadingStatus readingStatus){
+        return AjaxResult.success(readingStatusMapper.updateById(readingStatus));
     }
     @GetMapping("/getReadingStatusList")
     @Operation(summary = "鍒嗛〉鏌ヨ闃呰鐘舵��")
-    public R<?> listPage(Page page, ReadingStatus readingStatus){
-        return R.ok(readingStatusMapper.selectPage(page,new QueryWrapper<ReadingStatus>(readingStatus)));
+    public AjaxResult listPage(Page page, ReadingStatus readingStatus){
+        return AjaxResult.success(readingStatusMapper.selectPage(page,new QueryWrapper<ReadingStatus>(readingStatus)));
     }
     @GetMapping("/getReadingStatusByRuleId/{ruleId}")
     @Operation(summary = "鏍规嵁鍒跺害id鏌ヨ闃呰鐘舵��")
-    public R<?> getReadingStatusByRuleId(@PathVariable Long ruleId){
-        return R.ok(readingStatusMapper.selectList(new QueryWrapper<ReadingStatus>().eq("rule_id", ruleId)));
+    public AjaxResult getReadingStatusByRuleId(@PathVariable Long ruleId){
+        return AjaxResult.success(readingStatusMapper.selectList(new QueryWrapper<ReadingStatus>().eq("rule_id", ruleId)));
     }
 
     @Operation(summary = "瑙勭珷鍒跺害绠＄悊瀵煎嚭")

--
Gitblit v1.9.3