From 48032a9bf0b5e560fd438ae7ba12ad6f4c8183ed Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期一, 02 二月 2026 16:16:45 +0800
Subject: [PATCH] 新增日志

---
 service/src/main/resources/mapper/cwgl/VoucherSubjectSettingMapper.xml |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/service/src/main/resources/mapper/cwgl/VoucherSubjectSettingMapper.xml b/service/src/main/resources/mapper/cwgl/VoucherSubjectSettingMapper.xml
index dc4b0a1..4a6c481 100644
--- a/service/src/main/resources/mapper/cwgl/VoucherSubjectSettingMapper.xml
+++ b/service/src/main/resources/mapper/cwgl/VoucherSubjectSettingMapper.xml
@@ -17,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"    />
@@ -37,7 +40,7 @@
     </resultMap>
 
     <sql id="selectVoucherSubjectSettingVo">
-        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.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
@@ -57,6 +60,9 @@
         <if test="accountingItems != null "> and thisTab.accounting_items = #{accountingItems}</if>
         <if test="accountingItemsContains != null "> and (thisTab.accounting_items &amp; #{accountingItemsContains}) = #{accountingItemsContains}</if>
         <if test="accountingItemsAny != null "> and (thisTab.accounting_items &amp; #{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>
@@ -96,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>
@@ -124,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