From ee089a8ac4a9d99ef0a0491bbf1d80a2d4fbc393 Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期二, 10 十一月 2026 09:15:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-project/src/main/resources/mapper/project/ServiceFundtaxMapper.xml | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceFundtaxMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceFundtaxMapper.xml
index 7648ac3..2b057b0 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceFundtaxMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceFundtaxMapper.xml
@@ -15,6 +15,10 @@
<result property="managerno" column="ManagerNo"/>
<result property="managername" column="ManagerName"/>
<result property="pretaxamount" column="Pretaxamount"/>
+ <result property="vatAmount" column="vat_amount"/>
+ <result property="cityTaxAmount" column="city_tax_amount"/>
+ <result property="laborPretaxAmount" column="labor_pretax_amount"/>
+ <result property="taxVersion" column="tax_version"/>
<result property="taxedamount" column="TaxedAmount"/>
<result property="taxamount" column="TaxAmount"/>
<result property="medicalcost" column="MedicalCost"/>
@@ -35,7 +39,7 @@
<result property="officedirector" column="OfficeDirector"/>
<result property="financedirector" column="FinanceDirector"/>
<result property="financechecher" column="FinanceChecher"/>
- <result property="delFlag" column="del_flag"/>
+ <result property="del_flag" column="del_flag"/>
<result property="createBy" column="create_by"/>
<result property="createTime" column="create_time"/>
<result property="updateBy" column="update_by"/>
@@ -43,6 +47,8 @@
<result property="uploadflag" column="uploadflag"/>
<result property="uploadtime" column="uploadtime"/>
<result property="updownremark" column="updownremark"/>
+ <result property="istax" column="istax"/>
+ <result property="taxMoney" column="tax_money"/>
</resultMap>
<sql id="selectServiceFundtaxVo">
@@ -58,6 +64,10 @@
Pretaxamount,
TaxedAmount,
TaxAmount,
+ vat_amount,
+ city_tax_amount,
+ labor_pretax_amount,
+ tax_version,
MedicalCost,
BodyMaintainCost,
OrganGainCost,
@@ -83,6 +93,8 @@
update_time,
uploadflag,
uploadtime,
+ tax_money,
+ istax,
updownremark
from service_fundtax
</sql>
@@ -104,6 +116,7 @@
'%')
</if>
<if test="pretaxamount != null ">and Pretaxamount = #{pretaxamount}</if>
+ <if test="istax != null ">and istax = #{istax}</if>
<if test="taxedamount != null ">and TaxedAmount = #{taxedamount}</if>
<if test="taxamount != null ">and TaxAmount = #{taxamount}</if>
<if test="medicalcost != null ">and MedicalCost = #{medicalcost}</if>
@@ -134,8 +147,14 @@
<select id="getMaxFundTaxId" resultType="integer">
select max(id) maxid
- from service_fund
+ from service_fundtax
where del_flag = 0;
</select>
+ <select id="selectByIdForUpdate" resultMap="ServiceFundtaxResult">
+ <include refid="selectServiceFundtaxVo"/>
+ where ID = #{id}
+ for update
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3