From da6bdcbfbe7c37b643f7bd1f4711e69f050172a8 Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期一, 02 二月 2026 10:29:12 +0800
Subject: [PATCH] 修改申请开票代码

---
 service/src/main/java/com/ruoyi/cwgl/service/impl/VoucherSubjectSettingServiceImpl.java |   28 +++++++++++++++++++++++++++-
 1 files changed, 27 insertions(+), 1 deletions(-)

diff --git a/service/src/main/java/com/ruoyi/cwgl/service/impl/VoucherSubjectSettingServiceImpl.java b/service/src/main/java/com/ruoyi/cwgl/service/impl/VoucherSubjectSettingServiceImpl.java
index e2cc9b1..4448fd9 100644
--- a/service/src/main/java/com/ruoyi/cwgl/service/impl/VoucherSubjectSettingServiceImpl.java
+++ b/service/src/main/java/com/ruoyi/cwgl/service/impl/VoucherSubjectSettingServiceImpl.java
@@ -19,6 +19,7 @@
 import com.ruoyi.cwgl.domain.VoucherSubjectSetting;
 import com.ruoyi.cwgl.service.IVoucherSubjectSettingService;
 import com.ruoyi.common.core.text.Convert;
+import com.ruoyi.common.utils.StringUtils;
 
 /**
  * 鍑瘉绉戠洰璁剧疆Service涓氬姟灞傚鐞�
@@ -71,7 +72,14 @@
     @Override
     public List<VoucherSubjectSetting> selectVoucherSubjectSettingList(VoucherSubjectSetting voucherSubjectSetting)
     {
-        return voucherSubjectSettingMapper.selectVoucherSubjectSettingList(voucherSubjectSetting);
+        List<VoucherSubjectSetting> list = voucherSubjectSettingMapper.selectVoucherSubjectSettingList(voucherSubjectSetting);
+        // 璁剧疆鏍哥畻椤圭洰鎻忚堪
+        for (VoucherSubjectSetting subject : list) {
+            if (subject.getAccountingItems() != null) {
+                subject.setAccountingItemsDesc(subject.getAccountingItemsDesc());
+            }
+        }
+        return list;
     }
 
     /**
@@ -179,4 +187,22 @@
     {
         return voucherSubjectSettingMapper.deleteVoucherSubjectSettingById(id);
     }
+
+    /**
+     * 鏍¢獙绉戠洰浠g爜鏄惁鍞竴
+     *
+     * @param voucherSubjectSetting 鍑瘉绉戠洰璁剧疆
+     * @return 缁撴灉
+     */
+    @Override
+    public String checkSubjectCodeUnique(VoucherSubjectSetting voucherSubjectSetting)
+    {
+        Integer id = StringUtils.isNull(voucherSubjectSetting.getId()) ? -1 : voucherSubjectSetting.getId();
+        VoucherSubjectSetting info = voucherSubjectSettingMapper.checkSubjectCodeUnique(voucherSubjectSetting.getSubjectCode(), voucherSubjectSetting.getAccountSet());
+        if (StringUtils.isNotNull(info) && info.getId().intValue() != id.intValue())
+        {
+            return "1";
+        }
+        return "0";
+    }
 }

--
Gitblit v1.8.0