From 64bce2eb858b95e7851b6c05fa34938dbfb701e6 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 30 五月 2024 16:49:13 +0800
Subject: [PATCH] 修改因算税时间一税，导致获取历史数据不准的问题（加上xh字段） 个税汇总里的功能，删除时一个fund时，将相应的fund的“算税时间” 和"funddetail"表里的“算税时间”、“序号”置空
---
ruoyi-project/src/main/resources/mapper/project/BaseFinancesubjectMapper.xml | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/ruoyi-project/src/main/resources/mapper/project/BaseFinancesubjectMapper.xml b/ruoyi-project/src/main/resources/mapper/project/BaseFinancesubjectMapper.xml
index f4bbca5..63b84ed 100644
--- a/ruoyi-project/src/main/resources/mapper/project/BaseFinancesubjectMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/BaseFinancesubjectMapper.xml
@@ -23,10 +23,12 @@
<result property="itemunit" column="ItemUnit" />
<result property="usestate" column="UseState" />
<result property="orderno" column="OrderNo" />
+ <result property="expensetype" column="ExpenseType" />
+ <result property="expensetypename" column="ExpenseTypeName" />
</resultMap>
<sql id="selectBaseFinancesubjectVo">
- select ID, del_flag, create_by, create_time, update_by, update_time, SubjectType, ItemType, ItemTypeName, Remark, ItemName, ItemDescribe, ItemUnit, UseState, SubjectTypeName, ItemPinYin, ItemCode, OrderNo from base_financesubject
+ select ID, del_flag, create_by, create_time, update_by, update_time, SubjectType, ItemType, ItemTypeName, Remark, ItemName, ItemDescribe, ItemUnit, UseState, SubjectTypeName, ItemPinYin, ItemCode, OrderNo,ExpenseType,ExpenseTypeName from base_financesubject
</sql>
<select id="selectBaseFinancesubjectList" parameterType="com.ruoyi.project.domain.BaseFinancesubject" resultMap="BaseFinancesubjectResult">
@@ -39,7 +41,7 @@
order by OrderNo
</select>
<select id="getItemName" resultType="com.ruoyi.project.domain.vo.FinanceSubjectVO">
- select ItemName as itemname, ID as id, ItemPinYin as itempinyin, ItemDescribe as itemdescribe, ItemCode as itemcode from base_financesubject
+ select ItemName as itemname, ID as id, ItemPinYin as itempinyin, ItemDescribe as itemdescribe, ItemCode as itemcode,ExpenseType as expensetype,ExpenseTypeName as expensetypename from base_financesubject
where ItemType = #{itemType} AND del_flag=0
order by ID
</select>
--
Gitblit v1.9.3