From 48d56c0780ddcd28a19f306064e1dd21f0c425c0 Mon Sep 17 00:00:00 2001 From: liusheng <337615773@qq.com> Date: 星期一, 11 三月 2024 18:23:23 +0800 Subject: [PATCH] 代码提交 --- ruoyi-project/src/main/resources/mapper/project/BaseFinancesubjectMapper.xml | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ruoyi-project/src/main/resources/mapper/project/BaseFinancesubjectMapper.xml b/ruoyi-project/src/main/resources/mapper/project/BaseFinancesubjectMapper.xml index df5e2ee..63b84ed 100644 --- a/ruoyi-project/src/main/resources/mapper/project/BaseFinancesubjectMapper.xml +++ b/ruoyi-project/src/main/resources/mapper/project/BaseFinancesubjectMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.ruoyi.project.mapper.BaseFinancesubjectMapper"> - <resultMap type="BaseFinancesubject" id="BaseFinancesubjectResult"> + <resultMap type="com.ruoyi.project.domain.BaseFinancesubject" id="BaseFinancesubjectResult"> <result property="id" column="ID" /> <result property="del_flag" column="del_flag" /> <result property="createBy" column="create_by" /> @@ -23,13 +23,15 @@ <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="BaseFinancesubject" resultMap="BaseFinancesubjectResult"> + <select id="selectBaseFinancesubjectList" parameterType="com.ruoyi.project.domain.BaseFinancesubject" resultMap="BaseFinancesubjectResult"> <include refid="selectBaseFinancesubjectVo"/> <where> <if test="itemtype != null and itemtype != ''"> and ItemType = #{itemtype}</if> @@ -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