oa二期内容更新添加账户检索出入账数据，存在问题物料品牌规格的多字段查询需要重新确立独立接口

ruoyi-oa/src/main/resources/mapper/oa/SysOaFinanceMapper.xml

@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.oa.mapper.SysOaFinanceMapper">
 
-    <resultMap type="com.ruoyi.oa.domain.SysOaFinance" id="SysOaFinanceResult">
+    <resultMap type="com.ruoyi.oa.domain.vo.SysOaFinanceVo" id="SysOaFinanceResult">
         <result property="financeId" column="finance_id"/>
         <result property="projectId" column="project_id"/>
         <result property="financeTitle" column="finance_title"/>
@@ -22,6 +22,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="createTime" column="create_time"/>
         <result property="updateBy" column="update_by"/>
         <result property="updateTime" column="update_time"/>
+        <result property="receiveAccountId" column="receive_account_id"/>
+        <result property="receiveAccountName" column="receive_account_name"/>
         <association property="project" column="project_id" javaType="SysOaProject" resultMap="SysOaProjectResult"/>
         <association property="detailList" javaType="java.util.List" resultMap="detailResult"/>
     </resultMap>
@@ -74,23 +76,71 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectFinanceList" resultMap="SysOaFinanceResult">
-        select a.finance_id, a.project_id, a.finance_title, a.finance_parties, a.pay_type, a.finance_type, a.finance_time, a.make_ratio, a.make_price, a.make_time, a.make_explain, a.accessory, a.remark as finance_remark, a.create_by, a.create_time, a.update_by, a.update_time,
-               b.detail_id, b.detail_title, b.price, b.big_price, b.remark as detail_remark,
-               p.project_id,p.project_name
-        from sys_oa_finance a
-                 left join sys_oa_detail b on a.finance_id = b.finance_id
-                 left join sys_oa_project p on a.project_id = p.project_id
+        select sof.finance_id,
+               sof.project_id,
+               sof.finance_title,
+               sof.finance_parties,
+               sof.pay_type,
+               sof.finance_type,
+               sof.finance_time,
+               sof.make_ratio,
+               sof.make_price,
+               sof.make_time,
+               sof.make_explain,
+               sof.accessory,
+               sof.remark as finance_remark,
+               sof.create_by,
+               sof.create_time,
+               sof.update_by,
+               sof.update_time,
+               b.detail_id,
+               b.detail_title,
+               b.price,
+               b.big_price,
+               b.remark as detail_remark,
+               p.project_id,
+               p.project_name,
+               sora.receive_account_name,
+               sora.receive_account_id
+        from sys_oa_finance sof
+                 left join sys_oa_detail b on sof.finance_id = b.finance_id
+                 left join sys_oa_project p on sof.project_id = p.project_id
+                left join sys_oa_receive_account sora on sof.receive_account_id = sora.receive_account_id
             ${ew.getCustomSqlSegment}
     </select>
 
     <select id="selectFinanceById" parameterType="Long" resultMap="SysOaFinanceResult">
-        select a.finance_id, a.project_id, a.finance_title, a.finance_parties, a.pay_type, a.finance_type, a.finance_time, a.make_ratio, a.make_price, a.make_time, a.make_explain,  a.accessory, a.remark as finance_remark, a.create_by, a.create_time, a.update_by, a.update_time,
-               b.detail_id, b.detail_title, b.price, b.big_price, b.remark as detail_remark,
-               p.project_id,p.project_name
-        from sys_oa_finance a
-                 left join sys_oa_detail b on a.finance_id = b.finance_id
-                 left join sys_oa_project p on a.project_id = p.project_id
-        where a.finance_id = #{financeId}
+        select sof.finance_id,
+               sof.project_id,
+               sof.finance_title,
+               sof.finance_parties,
+               sof.pay_type,
+               sof.finance_type,
+               sof.finance_time,
+               sof.make_ratio,
+               sof.make_price,
+               sof.make_time,
+               sof.make_explain,
+               sof.accessory,
+               sof.remark as finance_remark,
+               sof.create_by,
+               sof.create_time,
+               sof.update_by,
+               sof.update_time,
+               b.detail_id,
+               b.detail_title,
+               b.price,
+               b.big_price,
+               b.remark as detail_remark,
+               p.project_id,
+               p.project_name,
+               sora.receive_account_name,
+               sora.receive_account_id
+        from sys_oa_finance sof
+                 left join sys_oa_detail b on sof.finance_id = b.finance_id
+                 left join sys_oa_project p on sof.project_id = p.project_id
+                 left join sys_oa_receive_account sora on sof.receive_account_id = sora.receive_account_id
+        where sof.finance_id = #{financeId}
     </select>
     <!--进出账查询-->
     <select id="selectFinanceByProjectId" resultMap="SysOaFinanceResult">