From 3ffbb4756bbddcf101d367fdde3dfc7f7ced6bb6 Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期五, 20 三月 2026 11:26:18 +0800
Subject: [PATCH] 新增字段
---
service/src/main/java/com/ruoyi/cwgl/domain/VoucherSubjectSetting.java | 144 ++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 138 insertions(+), 6 deletions(-)
diff --git a/service/src/main/java/com/ruoyi/cwgl/domain/VoucherSubjectSetting.java b/service/src/main/java/com/ruoyi/cwgl/domain/VoucherSubjectSetting.java
index 06e3025..30ee268 100644
--- a/service/src/main/java/com/ruoyi/cwgl/domain/VoucherSubjectSetting.java
+++ b/service/src/main/java/com/ruoyi/cwgl/domain/VoucherSubjectSetting.java
@@ -3,7 +3,10 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import com.baomidou.mybatisplus.annotation.TableField;
+import com.ruoyi.cwgl.enums.AccountingItemEnum;
import java.util.Date;
+import java.util.ArrayList;
+import java.util.List;
import lombok.Data;
/**
* 鍑瘉绉戠洰璁剧疆瀵硅薄 voucher_subject_setting
@@ -25,6 +28,18 @@
@TableField("parent_id")
private Integer parentId;
+
+ /** 涓婄骇绉戠洰浠ｇ爜 */
+ @Excel(name = "涓婄骇绉戠洰浠ｇ爜")
+
+ @TableField("parent_subject_code")
+ private String parentSubjectCode;
+
+ /** 涓婄骇绉戠洰鍚嶇О */
+ @Excel(name = "涓婄骇绉戠洰鍚嶇О")
+
+ @TableField("parent_subject_name")
+ private String parentSubjectName;
/** 绁栫骇鍒楄〃 */
@@ -56,7 +71,7 @@
/** 绉戠洰绫诲埆 */
- @Excel(name = "绉戠洰绫诲埆")
+ @Excel(name = "绉戠洰绫诲埆",dictType = "sys_subject_category")
@TableField("subject_type")
private String subjectType;
@@ -70,17 +85,35 @@
/** 浣欓鏂瑰悜锛堝��/璐凤級 */
- @Excel(name = "浣欓鏂瑰悜", readConverterExp = "鍊�=/璐�")
+ @Excel(name = "浣欓鏂瑰悜", dictType = "sys_balance_direction")
@TableField("balance_direction")
private String balanceDirection;
- /** 鏍哥畻椤圭洰 */
- @Excel(name = "鏍哥畻椤圭洰")
+ /** 鏍哥畻椤圭洰锛堜綅杩愮畻鍊硷級 */
+ @Excel(name = "鏍哥畻椤圭洰",dictType = "sys_accounting_item_name")
@TableField("accounting_items")
- private String accountingItems;
+ private Integer accountingItems;
+
+ /** 寰�鏉ュ崟浣嶏紙0鍚� 1鏄級 */
+ @Excel(name = "寰�鏉ュ崟浣�", readConverterExp = "0=鍚�,1=鏄�")
+
+ @TableField("contact_unit")
+ private String contactUnit;
+
+ /** 閮ㄩ棬锛�0鍚� 1鏄級 */
+ @Excel(name = "閮ㄩ棬", readConverterExp = "0=鍚�,1=鏄�")
+
+ @TableField("department")
+ private String department;
+
+ /** 鍝佸悕锛�0鍚� 1鏄級 */
+ @Excel(name = "鍝佸悕", readConverterExp = "0=鍚�,1=鏄�")
+
+ @TableField("product_name")
+ private String productName;
/** 鏁伴噺閲戦鏍哥畻锛�1鏄� 0鍚︼級 */
@@ -188,10 +221,109 @@
/** 甯愬绫诲瀷锛�0鐝犳捣姹囩晠锛�1骞跨彔鐗╂祦锛� */
- @Excel(name = "甯愬绫诲瀷", readConverterExp = "0=鐝犳捣姹囩晠锛�1骞跨彔鐗╂祦")
+ @Excel(name = "甯愬绫诲瀷", dictType = "sys_accounting_typ")
@TableField("type")
private String type;
+ /** 鏍哥畻椤圭洰鎻忚堪锛堥潪鏁版嵁搴撳瓧娈碉級 */
+ @TableField(exist = false)
+ private String accountingItemsDesc;
+
+ /** 鏍哥畻椤圭洰鍒楄〃锛堥潪鏁版嵁搴撳瓧娈碉級 */
+ @TableField(exist = false)
+ private List<String> accountingItemList;
+
+ /** 鏍哥畻椤圭洰鍖呭惈鏌ヨ锛堥潪鏁版嵁搴撳瓧娈碉級 */
+ @TableField(exist = false)
+ private Integer accountingItemsContains;
+
+ /** 鏍哥畻椤圭洰浠绘剰鍖呭惈鏌ヨ锛堥潪鏁版嵁搴撳瓧娈碉級 */
+ @TableField(exist = false)
+ private Integer accountingItemsAny;
+
+ /**
+ * 鑾峰彇鏍哥畻椤圭洰鐨勬弿杩板瓧绗︿覆
+ */
+ public String getAccountingItemsDesc() {
+ if (accountingItems == null) {
+ return "";
+ }
+ return AccountingItemEnum.getDescriptions(accountingItems);
+ }
+
+ /**
+ * 璁剧疆鏍哥畻椤圭洰鎻忚堪瀛楃涓�
+ */
+ public void setAccountingItemsDesc(String accountingItemsDesc) {
+ this.accountingItemsDesc = accountingItemsDesc;
+ if (accountingItemsDesc != null && !accountingItemsDesc.trim().isEmpty()) {
+ this.accountingItems = AccountingItemEnum.getValueByDescriptions(accountingItemsDesc);
+ }
+ }
+
+ /**
+ * 鑾峰彇鏍哥畻椤圭洰鍒楄〃
+ */
+ public List<String> getAccountingItemList() {
+ if (accountingItems == null) {
+ return new ArrayList<>();
+ }
+ List<String> list = new ArrayList<>();
+ for (AccountingItemEnum item : AccountingItemEnum.values()) {
+ if (AccountingItemEnum.contains(accountingItems, item)) {
+ list.add(item.getDescription());
+ }
+ }
+ return list;
+ }
+
+ /**
+ * 璁剧疆鏍哥畻椤圭洰鍒楄〃
+ */
+ public void setAccountingItemList(List<String> accountingItemList) {
+ this.accountingItemList = accountingItemList;
+ if (accountingItemList != null && !accountingItemList.isEmpty()) {
+ int value = 0;
+ for (String desc : accountingItemList) {
+ for (AccountingItemEnum item : AccountingItemEnum.values()) {
+ if (item.getDescription().equals(desc.trim())) {
+ value = AccountingItemEnum.addItem(value, item);
+ break;
+ }
+ }
+ }
+ this.accountingItems = value;
+ }
+ }
+
+ /**
+ * 妫�鏌ユ槸鍚﹀寘鍚煇涓牳绠楅」鐩�
+ */
+ public boolean containsAccountingItem(AccountingItemEnum item) {
+ if (accountingItems == null) {
+ return false;
+ }
+ return AccountingItemEnum.contains(accountingItems, item);
+ }
+
+ /**
+ * 娣诲姞鏍哥畻椤圭洰
+ */
+ public void addAccountingItem(AccountingItemEnum item) {
+ if (accountingItems == null) {
+ accountingItems = 0;
+ }
+ accountingItems = AccountingItemEnum.addItem(accountingItems, item);
+ }
+
+ /**
+ * 绉婚櫎鏍哥畻椤圭洰
+ */
+ public void removeAccountingItem(AccountingItemEnum item) {
+ if (accountingItems != null) {
+ accountingItems = AccountingItemEnum.removeItem(accountingItems, item);
+ }
+ }
}
--
Gitblit v1.8.0