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 @@
+
@@ -38,6 +39,7 @@
, t.tax_year_month
, t.tenant_key
, t.update_time
+ , t.income_category
@@ -108,6 +110,9 @@
AND update_time = #{updateTime}
+
+ AND income_category = #{incomeCategory}
+
AND id IN
@@ -168,6 +173,9 @@
update_time,
+
+ income_category,
+
@@ -215,6 +223,9 @@
#{updateTime},
+
+ #{incomeCategory},
+
@@ -237,6 +248,7 @@
tax_year_month=#{taxYearMonth},
tenant_key=#{tenantKey},
update_time=#{updateTime},
+ income_category=#{incomeCategory},
WHERE id = #{id} AND delete_type = 0
@@ -288,6 +300,9 @@
update_time=#{updateTime},
+
+ income_category=#{incomeCategory},
+
WHERE id = #{id} AND delete_type = 0
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 @@
+
@@ -44,6 +45,7 @@
, t.tenant_key
, t.update_time
, t.year_premium
+ , t.income_category
@@ -123,6 +125,9 @@
AND year_premium = #{yearPremium}
+
+ AND income_category = #{incomeCategory}
+
AND id IN
@@ -192,6 +197,9 @@
year_premium,
+
+ income_category,
+
@@ -248,6 +256,9 @@
#{yearPremium},
+
+ #{incomeCategory},
+
@@ -273,6 +284,7 @@
tenant_key=#{tenantKey},
update_time=#{updateTime},
year_premium=#{yearPremium},
+ income_category=#{incomeCategory},
WHERE id = #{id} AND delete_type = 0
@@ -333,6 +345,9 @@
year_premium=#{yearPremium},
+
+ income_category=#{incomeCategory},
+
WHERE id = #{id} AND delete_type = 0
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 @@
+
@@ -46,6 +47,7 @@
, t.tax_year_month
, t.tenant_key
, t.update_time
+ , t.income_category
@@ -128,6 +130,9 @@
AND update_time = #{updateTime}
+
+ AND income_category = #{incomeCategory}
+
AND id IN
@@ -200,6 +205,9 @@
update_time,
+
+ income_category,
+
@@ -259,6 +267,9 @@
#{updateTime},
+
+ #{incomeCategory},
+
@@ -285,6 +296,7 @@
tax_year_month=#{taxYearMonth},
tenant_key=#{tenantKey},
update_time=#{updateTime},
+ income_category=#{incomeCategory},
WHERE id = #{id} AND delete_type = 0
@@ -348,6 +360,9 @@
update_time=#{updateTime},
+
+ income_category=#{incomeCategory},
+
WHERE id = #{id} AND delete_type = 0
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 @@
+
@@ -42,6 +43,7 @@
, t.tenant_key
, t.update_time
, t.year_premium
+ , t.income_category
@@ -118,6 +120,9 @@
AND year_premium = #{yearPremium}
+
+ AND income_category = #{incomeCategory}
+
AND id IN
@@ -184,6 +189,9 @@
year_premium,
+
+ income_category,
+
@@ -237,6 +245,9 @@
#{yearPremium},
+
+ #{incomeCategory},
+
@@ -261,6 +272,7 @@
tenant_key=#{tenantKey},
update_time=#{updateTime},
year_premium=#{yearPremium},
+ income_category=#{incomeCategory},
WHERE id = #{id} AND delete_type = 0
@@ -318,6 +330,9 @@
year_premium=#{yearPremium},
+
+ income_category=#{incomeCategory},
+
WHERE id = #{id} AND delete_type = 0
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 @@
+
@@ -36,6 +37,7 @@
, t.tax_year_month
, t.tenant_key
, t.update_time
+ , t.income_category
@@ -103,6 +105,9 @@
AND update_time = #{updateTime}
+
+ AND income_category = #{incomeCategory}
+
AND id IN
@@ -160,6 +165,9 @@
update_time,
+
+ income_category,
+
@@ -204,6 +212,9 @@
#{updateTime},
+
+ #{incomeCategory},
+
@@ -225,6 +236,7 @@
tax_year_month=#{taxYearMonth},
tenant_key=#{tenantKey},
update_time=#{updateTime},
+ income_category=#{incomeCategory},
WHERE id = #{id} AND delete_type = 0
@@ -273,6 +285,9 @@
update_time=#{updateTime},
+
+ income_category=#{incomeCategory},
+
WHERE id = #{id} AND delete_type = 0
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 @@
+
@@ -48,6 +49,7 @@
, t.voucher_no
, t.voucher_type
, t.voucher_type_name
+ , t.income_category
@@ -133,6 +135,9 @@
AND voucher_type_name = #{voucherTypeName}
+
+ AND income_category = #{incomeCategory}
+
AND id IN
@@ -208,6 +213,9 @@
voucher_type_name,
+
+ income_category,
+
@@ -270,6 +278,9 @@
#{voucherTypeName},
+
+ #{incomeCategory},
+
@@ -297,6 +308,7 @@
voucher_no=#{voucherNo},
voucher_type=#{voucherType},
voucher_type_name=#{voucherTypeName},
+ income_category=#{incomeCategory},
WHERE id = #{id} AND delete_type = 0
@@ -363,6 +375,9 @@
voucher_type_name=#{voucherTypeName},
+
+ income_category=#{incomeCategory},
+
WHERE id = #{id} AND delete_type = 0