From cabaed627bd66679529a5696f2de8d8641766027 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Wed, 2 Jul 2025 13:42:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=B6=E4=BB=96=E9=99=84=E5=8A=A0=E6=89=A3?=
 =?UTF-8?q?=E9=99=A4=E5=A2=9E=E5=8A=A0=E7=94=B3=E6=8A=A5=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../datacollection/DerateDeductionMapper.xml      | 15 +++++++++++++++
 .../datacollection/EndowmentInsuranceMapper.xml   | 15 +++++++++++++++
 .../mapper/datacollection/GrantDonationMapper.xml | 15 +++++++++++++++
 .../datacollection/HealthInsuranceMapper.xml      | 15 +++++++++++++++
 .../datacollection/OtherDerateDeductionMapper.xml | 15 +++++++++++++++
 .../datacollection/PersonalPensionMapper.xml      | 15 +++++++++++++++
 6 files changed, 90 insertions(+)

diff --git a/src/com/engine/salary/mapper/datacollection/DerateDeductionMapper.xml b/src/com/engine/salary/mapper/datacollection/DerateDeductionMapper.xml
index e3585c01f..824c2466e 100644
--- a/src/com/engine/salary/mapper/datacollection/DerateDeductionMapper.xml
+++ b/src/com/engine/salary/mapper/datacollection/DerateDeductionMapper.xml
@@ -17,6 +17,7 @@
         <result column="tax_year_month" property="taxYearMonth"/>
         <result column="tenant_key" property="tenantKey"/>
         <result column="update_time" property="updateTime"/>
+        <result column="income_category" property="incomeCategory"/>
     </resultMap>
 
     <!-- 表字段 -->
@@ -38,6 +39,7 @@
         , t.tax_year_month
         , t.tenant_key
         , t.update_time
+        , t.income_category
     </sql>
 
     <!-- 查询全部 -->
@@ -108,6 +110,9 @@
         <if test="updateTime != null">
             AND update_time = #{updateTime}
         </if>
+        <if test="incomeCategory != null">
+            AND income_category = #{incomeCategory}
+        </if>
         <if test="ids != null and ids.size()>0">
             AND id IN
             <foreach collection="ids" open="(" item="id" separator="," close=")">
@@ -168,6 +173,9 @@
             <if test="updateTime != null">
                 update_time,
             </if>
+            <if test="incomeCategory != null">
+                income_category,
+            </if>
         </trim>
         <trim prefix="VALUES (" suffix=")" suffixOverrides=",">
             <if test="createTime != null">
@@ -215,6 +223,9 @@
             <if test="updateTime != null">
                 #{updateTime},
             </if>
+            <if test="incomeCategory != null">
+                #{incomeCategory},
+            </if>
         </trim>
     </insert>
 
@@ -237,6 +248,7 @@
             tax_year_month=#{taxYearMonth},
             tenant_key=#{tenantKey},
             update_time=#{updateTime},
+            income_category=#{incomeCategory},
         </set>
         WHERE id = #{id} AND delete_type = 0
     </update>
@@ -288,6 +300,9 @@
             <if test="updateTime != null">
                 update_time=#{updateTime},
             </if>
+            <if test="incomeCategory != null">
+                income_category=#{incomeCategory},
+            </if>
         </set>
         WHERE id = #{id} AND delete_type = 0
     </update>
diff --git a/src/com/engine/salary/mapper/datacollection/EndowmentInsuranceMapper.xml b/src/com/engine/salary/mapper/datacollection/EndowmentInsuranceMapper.xml
index 8d673f35b..30f404db9 100644
--- a/src/com/engine/salary/mapper/datacollection/EndowmentInsuranceMapper.xml
+++ b/src/com/engine/salary/mapper/datacollection/EndowmentInsuranceMapper.xml
@@ -20,6 +20,7 @@
         <result column="tenant_key" property="tenantKey"/>
         <result column="update_time" property="updateTime"/>
         <result column="year_premium" property="yearPremium"/>
+        <result column="income_category" property="incomeCategory"/>
     </resultMap>
 
     <!-- 表字段 -->
@@ -44,6 +45,7 @@
         , t.tenant_key
         , t.update_time
         , t.year_premium
+        , t.income_category
     </sql>
 
     <!-- 查询全部 -->
@@ -123,6 +125,9 @@
         <if test="yearPremium != null">
             AND year_premium = #{yearPremium}
         </if>
+        <if test="incomeCategory != null">
+            AND income_category = #{incomeCategory}
+        </if>
         <if test="ids != null and ids.size()>0">
             AND id IN
             <foreach collection="ids" open="(" item="id" separator="," close=")">
@@ -192,6 +197,9 @@
             <if test="yearPremium != null">
                 year_premium,
             </if>
+            <if test="incomeCategory != null">
+                income_category,
+            </if>
         </trim>
         <trim prefix="VALUES (" suffix=")" suffixOverrides=",">
             <if test="accountNumber != null">
@@ -248,6 +256,9 @@
             <if test="yearPremium != null">
                 #{yearPremium},
             </if>
+            <if test="incomeCategory != null">
+                #{incomeCategory},
+            </if>
         </trim>
     </insert>
 
@@ -273,6 +284,7 @@
             tenant_key=#{tenantKey},
             update_time=#{updateTime},
             year_premium=#{yearPremium},
+            income_category=#{incomeCategory},
         </set>
         WHERE id = #{id} AND delete_type = 0
     </update>
@@ -333,6 +345,9 @@
             <if test="yearPremium != null">
                 year_premium=#{yearPremium},
             </if>
+            <if test="incomeCategory != null">
+                income_category=#{incomeCategory},
+            </if>
         </set>
         WHERE id = #{id} AND delete_type = 0
     </update>
diff --git a/src/com/engine/salary/mapper/datacollection/GrantDonationMapper.xml b/src/com/engine/salary/mapper/datacollection/GrantDonationMapper.xml
index 8fa17414e..96a5dab18 100644
--- a/src/com/engine/salary/mapper/datacollection/GrantDonationMapper.xml
+++ b/src/com/engine/salary/mapper/datacollection/GrantDonationMapper.xml
@@ -21,6 +21,7 @@
         <result column="tax_year_month" property="taxYearMonth"/>
         <result column="tenant_key" property="tenantKey"/>
         <result column="update_time" property="updateTime"/>
+        <result column="income_category" property="incomeCategory"/>
     </resultMap>
 
     <!-- 表字段 -->
@@ -46,6 +47,7 @@
         , t.tax_year_month
         , t.tenant_key
         , t.update_time
+        , t.income_category
     </sql>
 
     <!-- 查询全部 -->
@@ -128,6 +130,9 @@
         <if test="updateTime != null">
             AND update_time = #{updateTime}
         </if>
+        <if test="incomeCategory != null">
+            AND income_category = #{incomeCategory}
+        </if>
         <if test="ids != null and ids.size()>0">
             AND id IN
             <foreach collection="ids" open="(" item="id" separator="," close=")">
@@ -200,6 +205,9 @@
             <if test="updateTime != null">
                 update_time,
             </if>
+            <if test="incomeCategory != null">
+                income_category,
+            </if>
         </trim>
         <trim prefix="VALUES (" suffix=")" suffixOverrides=",">
             <if test="actualDeduction != null">
@@ -259,6 +267,9 @@
             <if test="updateTime != null">
                 #{updateTime},
             </if>
+            <if test="incomeCategory != null">
+                #{incomeCategory},
+            </if>
         </trim>
     </insert>
 
@@ -285,6 +296,7 @@
             tax_year_month=#{taxYearMonth},
             tenant_key=#{tenantKey},
             update_time=#{updateTime},
+            income_category=#{incomeCategory},
         </set>
         WHERE id = #{id} AND delete_type = 0
     </update>
@@ -348,6 +360,9 @@
             <if test="updateTime != null">
                 update_time=#{updateTime},
             </if>
+            <if test="incomeCategory != null">
+                income_category=#{incomeCategory},
+            </if>
         </set>
         WHERE id = #{id} AND delete_type = 0
     </update>
diff --git a/src/com/engine/salary/mapper/datacollection/HealthInsuranceMapper.xml b/src/com/engine/salary/mapper/datacollection/HealthInsuranceMapper.xml
index 4ed0bd9a1..a071f7426 100644
--- a/src/com/engine/salary/mapper/datacollection/HealthInsuranceMapper.xml
+++ b/src/com/engine/salary/mapper/datacollection/HealthInsuranceMapper.xml
@@ -19,6 +19,7 @@
         <result column="tenant_key" property="tenantKey"/>
         <result column="update_time" property="updateTime"/>
         <result column="year_premium" property="yearPremium"/>
+        <result column="income_category" property="incomeCategory"/>
     </resultMap>
 
     <!-- 表字段 -->
@@ -42,6 +43,7 @@
         , t.tenant_key
         , t.update_time
         , t.year_premium
+        , t.income_category
     </sql>
 
     <!-- 查询全部 -->
@@ -118,6 +120,9 @@
         <if test="yearPremium != null">
             AND year_premium = #{yearPremium}
         </if>
+        <if test="incomeCategory != null">
+            AND income_category = #{incomeCategory}
+        </if>
         <if test="ids != null and ids.size()>0">
             AND id IN
             <foreach collection="ids" open="(" item="id" separator="," close=")">
@@ -184,6 +189,9 @@
             <if test="yearPremium != null">
                 year_premium,
             </if>
+            <if test="incomeCategory != null">
+                income_category,
+            </if>
         </trim>
         <trim prefix="VALUES (" suffix=")" suffixOverrides=",">
             <if test="createTime != null">
@@ -237,6 +245,9 @@
             <if test="yearPremium != null">
                 #{yearPremium},
             </if>
+            <if test="incomeCategory != null">
+                #{incomeCategory},
+            </if>
         </trim>
     </insert>
 
@@ -261,6 +272,7 @@
             tenant_key=#{tenantKey},
             update_time=#{updateTime},
             year_premium=#{yearPremium},
+            income_category=#{incomeCategory},
         </set>
         WHERE id = #{id} AND delete_type = 0
     </update>
@@ -318,6 +330,9 @@
             <if test="yearPremium != null">
                 year_premium=#{yearPremium},
             </if>
+            <if test="incomeCategory != null">
+                income_category=#{incomeCategory},
+            </if>
         </set>
         WHERE id = #{id} AND delete_type = 0
     </update>
diff --git a/src/com/engine/salary/mapper/datacollection/OtherDerateDeductionMapper.xml b/src/com/engine/salary/mapper/datacollection/OtherDerateDeductionMapper.xml
index 330fb74f8..397b091c0 100644
--- a/src/com/engine/salary/mapper/datacollection/OtherDerateDeductionMapper.xml
+++ b/src/com/engine/salary/mapper/datacollection/OtherDerateDeductionMapper.xml
@@ -16,6 +16,7 @@
         <result column="tax_year_month" property="taxYearMonth"/>
         <result column="tenant_key" property="tenantKey"/>
         <result column="update_time" property="updateTime"/>
+        <result column="income_category" property="incomeCategory"/>
     </resultMap>
 
     <!-- 表字段 -->
@@ -36,6 +37,7 @@
         , t.tax_year_month
         , t.tenant_key
         , t.update_time
+        , t.income_category
     </sql>
 
     <!-- 查询全部 -->
@@ -103,6 +105,9 @@
         <if test="updateTime != null">
             AND update_time = #{updateTime}
         </if>
+        <if test="incomeCategory != null">
+            AND income_category = #{incomeCategory}
+        </if>
         <if test="ids != null and ids.size()>0">
             AND id IN
             <foreach collection="ids" open="(" item="id" separator="," close=")">
@@ -160,6 +165,9 @@
             <if test="updateTime != null">
                 update_time,
             </if>
+            <if test="incomeCategory != null">
+                income_category,
+            </if>
         </trim>
         <trim prefix="VALUES (" suffix=")" suffixOverrides=",">
             <if test="createTime != null">
@@ -204,6 +212,9 @@
             <if test="updateTime != null">
                 #{updateTime},
             </if>
+            <if test="incomeCategory != null">
+                #{incomeCategory},
+            </if>
         </trim>
     </insert>
 
@@ -225,6 +236,7 @@
             tax_year_month=#{taxYearMonth},
             tenant_key=#{tenantKey},
             update_time=#{updateTime},
+            income_category=#{incomeCategory},
         </set>
         WHERE id = #{id} AND delete_type = 0
     </update>
@@ -273,6 +285,9 @@
             <if test="updateTime != null">
                 update_time=#{updateTime},
             </if>
+            <if test="income_category != null">
+                income_category=#{incomeCategory},
+            </if>
         </set>
         WHERE id = #{id} AND delete_type = 0
     </update>
diff --git a/src/com/engine/salary/mapper/datacollection/PersonalPensionMapper.xml b/src/com/engine/salary/mapper/datacollection/PersonalPensionMapper.xml
index da3185d56..1db068c24 100644
--- a/src/com/engine/salary/mapper/datacollection/PersonalPensionMapper.xml
+++ b/src/com/engine/salary/mapper/datacollection/PersonalPensionMapper.xml
@@ -22,6 +22,7 @@
         <result column="voucher_no" property="voucherNo"/>
         <result column="voucher_type" property="voucherType"/>
         <result column="voucher_type_name" property="voucherTypeName"/>
+        <result column="income_category" property="incomeCategory"/>
     </resultMap>
 
     <!-- 表字段 -->
@@ -48,6 +49,7 @@
         , t.voucher_no
         , t.voucher_type
         , t.voucher_type_name
+        , t.income_category
     </sql>
 
     <!-- 查询全部 -->
@@ -133,6 +135,9 @@
         <if test="voucherTypeName != null">
             AND voucher_type_name = #{voucherTypeName}
         </if>
+        <if test="incomeCategory != null">
+            AND income_category = #{incomeCategory}
+        </if>
         <if test="ids != null and ids.size()>0">
             AND id IN
             <foreach collection="ids" open="(" item="id" separator="," close=")">
@@ -208,6 +213,9 @@
             <if test="voucherTypeName != null">
                 voucher_type_name,
             </if>
+            <if test="incomeCategory != null">
+                income_category,
+            </if>
         </trim>
         <trim prefix="VALUES (" suffix=")" suffixOverrides=",">
             <if test="collectSource != null">
@@ -270,6 +278,9 @@
             <if test="voucherTypeName != null">
                 #{voucherTypeName},
             </if>
+            <if test="incomeCategory != null">
+                #{incomeCategory},
+            </if>
         </trim>
     </insert>
 
@@ -297,6 +308,7 @@
             voucher_no=#{voucherNo},
             voucher_type=#{voucherType},
             voucher_type_name=#{voucherTypeName},
+            income_category=#{incomeCategory},
         </set>
         WHERE id = #{id} AND delete_type = 0
     </update>
@@ -363,6 +375,9 @@
             <if test="voucherTypeName != null">
                 voucher_type_name=#{voucherTypeName},
             </if>
+            <if test="incomeCategory != null">
+                income_category=#{incomeCategory},
+            </if>
         </set>
         WHERE id = #{id} AND delete_type = 0
     </update>