From 6df8411e720cfef1b474f178825bdee32ef71a59 Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期五, 20 三月 2026 15:06:35 +0800
Subject: [PATCH] 新增回馈进度表
---
service/src/main/java/com/ruoyi/cwgl/controller/VoucherSubjectSettingController.java | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/service/src/main/java/com/ruoyi/cwgl/controller/VoucherSubjectSettingController.java b/service/src/main/java/com/ruoyi/cwgl/controller/VoucherSubjectSettingController.java
index 27c8b6a..2c733a3 100644
--- a/service/src/main/java/com/ruoyi/cwgl/controller/VoucherSubjectSettingController.java
+++ b/service/src/main/java/com/ruoyi/cwgl/controller/VoucherSubjectSettingController.java
@@ -68,9 +68,13 @@
*/
@PreAuthorize("@ss.hasPermi('cwgl:voucherSubjectSetting:query')")
@GetMapping(value = "/{id}")
- public AjaxResult getInfo(@PathVariable("id") Integer id)
+ public AjaxResult getInfo(@PathVariable Integer id)
{
- return AjaxResult.success(voucherSubjectSettingService.selectVoucherSubjectSettingById(id));
+ VoucherSubjectSetting subject = voucherSubjectSettingService.selectVoucherSubjectSettingById(id);
+ if (subject != null && subject.getAccountingItems() != null) {
+ subject.setAccountingItemsDesc(subject.getAccountingItemsDesc());
+ }
+ return AjaxResult.success(subject);
}
/**
@@ -96,11 +100,18 @@
@PutMapping
public AjaxResult edit(@RequestBody VoucherSubjectSetting voucherSubjectSetting)
{
- if (!"0".equals(voucherSubjectSettingService.checkSubjectCodeUnique(voucherSubjectSetting)))
- {
- return AjaxResult.error("淇敼绉戠洰'" + voucherSubjectSetting.getSubjectCode() + "'澶辫触锛岀鐩唬鐮佸凡瀛樺湪");
+ // 鑾峰彇鍘熷鏁版嵁鐢ㄤ簬姣旇緝绉戠洰浠ｇ爜鏄惁鏀瑰彉
+ VoucherSubjectSetting original = voucherSubjectSettingService.selectVoucherSubjectSettingById(voucherSubjectSetting.getId());
+
+ // 鍙湁褰撶鐩唬鐮佸彂鐢熸敼鍙樻椂鎵嶈繘琛屽敮涓�鎬ф牎楠�
+ if (original != null && !original.getSubjectCode().equals(voucherSubjectSetting.getSubjectCode())) {
+ if (!"0".equals(voucherSubjectSettingService.checkSubjectCodeUnique(voucherSubjectSetting)))
+ {
+ return AjaxResult.error("淇敼绉戠洰'" + voucherSubjectSetting.getSubjectCode() + "'澶辫触锛岀鐩唬鐮佸凡瀛樺湪");
+ }
}
- return toAjax(voucherSubjectSettingService.updateVoucherSubjectSetting(voucherSubjectSetting));
+
+ return toAjax(voucherSubjectSettingService.updateVoucherSubjectSetting(voucherSubjectSetting,original));
}
/**
--
Gitblit v1.8.0