首页大型更新，修正通信ui

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

@@ -22,6 +22,9 @@ 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="outType" column="out_type"/>
+        <result property="outMoney" column="out_money"/>
+
         <result property="receiveAccountId" column="receive_account_id"/>
         <result property="receiveAccountName" column="receive_account_name"/>
         <association property="project" column="project_id" javaType="SysOaProject" resultMap="SysOaProjectResult"/>
@@ -63,6 +66,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                a.update_time,
                b.detail_id,
                b.detail_title,
+               a.out_type,
                b.price,
                b.big_price,
                b.remark as detail_remark
@@ -93,6 +97,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                sof.create_time,
                sof.update_by,
                sof.update_time,
+               sof.out_type,
                b.detail_id,
                b.detail_title,
                b.price,
@@ -127,6 +132,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                sof.create_time,
                sof.update_by,
                sof.update_time,
+               sof.out_type,
                b.detail_id,
                b.detail_title,
                b.price,
@@ -145,7 +151,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <!--进出账查询-->
     <select id="selectFinanceByProjectId" 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
+               b.detail_id, b.detail_title, b.price, b.big_price, b.remark as detail_remark,a.out_type
         from sys_oa_finance a
                  left join sys_oa_detail b on a.finance_id = b.finance_id
         where a.project_id = #{projectId} and a.finance_type = #{financeType}
@@ -163,6 +169,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         and date_format(a.finance_time,'%Y-%m-%d %H:%i:%s') &lt;= date_format(#{endTime},'%Y-%m-%d %H:%i:%s')
     </select>
 
+    <select id="getPieData" resultMap="SysOaFinanceResult">
+        select
+            sum(b.price) as out_money,a.out_type
+        from sys_oa_finance a
+                 left join sys_oa_detail b on a.finance_id = b.finance_id
+        where a.finance_type = '0' AND YEAR(a.create_time) = YEAR(NOW()) and a.project_id = '0'
+        group by a.out_type
+    </select>
+
     <!--项目进出账查询-->
   <!--  <select id="findFinanceByTimeAndProjectId" resultMap="SysOaFinanceResult">
         <include refid="selectFinanceVo" />