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/resources/mapper/cwgl/VoucherSubjectSettingMapper.xml | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/service/src/main/resources/mapper/cwgl/VoucherSubjectSettingMapper.xml b/service/src/main/resources/mapper/cwgl/VoucherSubjectSettingMapper.xml
index 93edfd5..4a6c481 100644
--- a/service/src/main/resources/mapper/cwgl/VoucherSubjectSettingMapper.xml
+++ b/service/src/main/resources/mapper/cwgl/VoucherSubjectSettingMapper.xml
@@ -7,6 +7,8 @@
<resultMap type="com.ruoyi.cwgl.domain.VoucherSubjectSetting" id="VoucherSubjectSettingResult">
<result property="id" column="id" />
<result property="parentId" column="parent_id" />
+ <result property="parentSubjectCode" column="parent_subject_code" />
+ <result property="parentSubjectName" column="parent_subject_name" />
<result property="ancestors" column="ancestors" />
<result property="accountSet" column="account_set" />
<result property="subjectCode" column="subject_code" />
@@ -15,6 +17,9 @@
<result property="enabled" column="enabled" />
<result property="balanceDirection" column="balance_direction" />
<result property="accountingItems" column="accounting_items" />
+ <result property="contactUnit" column="contact_unit" />
+ <result property="department" column="department" />
+ <result property="productName" column="product_name" />
<result property="quantityAmountAccounting" column="quantity_amount_accounting" />
<result property="cashSubject" column="cash_subject" />
<result property="bankSubject" column="bank_subject" />
@@ -35,7 +40,7 @@
</resultMap>
<sql id="selectVoucherSubjectSettingVo">
- select thisTab.id, thisTab.parent_id, thisTab.ancestors, thisTab.account_set, thisTab.subject_code, thisTab.subject_name, thisTab.subject_type, thisTab.enabled, thisTab.balance_direction, thisTab.accounting_items, thisTab.quantity_amount_accounting, thisTab.cash_subject, thisTab.bank_subject, thisTab.cash_flow_subject, thisTab.expense_name, thisTab.mnemonic_code, thisTab.foreign_currency_accounting, thisTab.unit_of_measurement, thisTab.order_num, thisTab.status, thisTab.del_flag, thisTab.create_by, thisTab.create_time, thisTab.update_by, thisTab.update_time, thisTab.remark, thisTab.type from voucher_subject_setting AS thisTab
+ select thisTab.id, thisTab.parent_id, thisTab.parent_subject_code, thisTab.parent_subject_name, thisTab.ancestors, thisTab.account_set, thisTab.subject_code, thisTab.subject_name, thisTab.subject_type, thisTab.enabled, thisTab.balance_direction, thisTab.accounting_items, thisTab.contact_unit, thisTab.department, thisTab.product_name, thisTab.quantity_amount_accounting, thisTab.cash_subject, thisTab.bank_subject, thisTab.cash_flow_subject, thisTab.expense_name, thisTab.mnemonic_code, thisTab.foreign_currency_accounting, thisTab.unit_of_measurement, thisTab.order_num, thisTab.status, thisTab.del_flag, thisTab.create_by, thisTab.create_time, thisTab.update_by, thisTab.update_time, thisTab.remark, thisTab.type from voucher_subject_setting AS thisTab
</sql>
<sql id="selectVoucherSubjectSettingVoCount">
select count(0) from voucher_subject_setting as thisTab
@@ -43,6 +48,8 @@
<sql id="whereCondition">
<if test="parentId != null "> and thisTab.parent_id = #{parentId}</if>
+ <if test="parentSubjectCode != null and parentSubjectCode != ''"> and thisTab.parent_subject_code like concat('%', #{parentSubjectCode}, '%')</if>
+ <if test="parentSubjectName != null and parentSubjectName != ''"> and thisTab.parent_subject_name like concat('%', #{parentSubjectName}, '%')</if>
<if test="ancestors != null and ancestors != ''"> and thisTab.ancestors = #{ancestors}</if>
<if test="accountSet != null and accountSet != ''"> and thisTab.account_set = #{accountSet}</if>
<if test="subjectCode != null and subjectCode != ''"> and thisTab.subject_code = #{subjectCode}</if>
@@ -50,7 +57,12 @@
<if test="subjectType != null and subjectType != ''"> and thisTab.subject_type = #{subjectType}</if>
<if test="enabled != null and enabled != ''"> and thisTab.enabled = #{enabled}</if>
<if test="balanceDirection != null and balanceDirection != ''"> and thisTab.balance_direction = #{balanceDirection}</if>
- <if test="accountingItems != null and accountingItems != ''"> and thisTab.accounting_items = #{accountingItems}</if>
+ <if test="accountingItems != null "> and thisTab.accounting_items = #{accountingItems}</if>
+ <if test="accountingItemsContains != null "> and (thisTab.accounting_items & #{accountingItemsContains}) = #{accountingItemsContains}</if>
+ <if test="accountingItemsAny != null "> and (thisTab.accounting_items & #{accountingItemsAny}) != 0</if>
+ <if test="contactUnit != null and contactUnit != ''"> and thisTab.contact_unit = #{contactUnit}</if>
+ <if test="department != null and department != ''"> and thisTab.department = #{department}</if>
+ <if test="productName != null and productName != ''"> and thisTab.product_name = #{productName}</if>
<if test="quantityAmountAccounting != null and quantityAmountAccounting != ''"> and thisTab.quantity_amount_accounting = #{quantityAmountAccounting}</if>
<if test="cashSubject != null and cashSubject != ''"> and thisTab.cash_subject = #{cashSubject}</if>
<if test="bankSubject != null and bankSubject != ''"> and thisTab.bank_subject = #{bankSubject}</if>
@@ -90,6 +102,8 @@
insert into voucher_subject_setting
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="parentId != null">parent_id,</if>
+ <if test="parentSubjectCode != null and parentSubjectCode != ''">parent_subject_code,</if>
+ <if test="parentSubjectName != null and parentSubjectName != ''">parent_subject_name,</if>
<if test="ancestors != null">ancestors,</if>
<if test="accountSet != null and accountSet != ''">account_set,</if>
<if test="subjectCode != null and subjectCode != ''">subject_code,</if>
@@ -118,6 +132,8 @@
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="parentId != null">#{parentId},</if>
+ <if test="parentSubjectCode != null and parentSubjectCode != ''">#{parentSubjectCode},</if>
+ <if test="parentSubjectName != null and parentSubjectName != ''">#{parentSubjectName},</if>
<if test="ancestors != null">#{ancestors},</if>
<if test="accountSet != null and accountSet != ''">#{accountSet},</if>
<if test="subjectCode != null and subjectCode != ''">#{subjectCode},</if>
--
Gitblit v1.8.0