From fb4d7127cd860b39e1c1c4242cfbbc09a659fc7a Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 26 七月 2024 17:54:35 +0800
Subject: [PATCH] 变更
---
ruoyi-project/src/main/resources/mapper/project/ServiceFundtaxMapper.xml | 9 +++++++--
1 files changed, 7 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..472b313 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceFundtaxMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceFundtaxMapper.xml
@@ -35,7 +35,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 +43,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">
@@ -83,6 +85,8 @@
update_time,
uploadflag,
uploadtime,
+ tax_money,
+ istax,
updownremark
from service_fundtax
</sql>
@@ -104,6 +108,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,7 +139,7 @@
<select id="getMaxFundTaxId" resultType="integer">
select max(id) maxid
- from service_fund
+ from service_fundtax
where del_flag = 0;
</select>
--
Gitblit v1.9.3