From 4cf1f2873839a0c9f0246fbf4f867e0ebb01ec6b Mon Sep 17 00:00:00 2001
From: lucky <srf428110@163.com>
Date: Thu, 27 Jan 2022 10:56:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B4=A2=E5=8A=A1=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E7=BB=9F=E8=AE=A1=E6=8E=A5=E5=8F=A3=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ccsens/ptccsens/bean/vo/ProjectFinanceVo.java     | 8 ++++----
 src/main/resources/mapper_dao/PluFinanceApplyDao.xml      | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/ccsens/ptccsens/bean/vo/ProjectFinanceVo.java b/src/main/java/com/ccsens/ptccsens/bean/vo/ProjectFinanceVo.java
index a2d962e..8bff631 100644
--- a/src/main/java/com/ccsens/ptccsens/bean/vo/ProjectFinanceVo.java
+++ b/src/main/java/com/ccsens/ptccsens/bean/vo/ProjectFinanceVo.java
@@ -136,16 +136,16 @@ public class ProjectFinanceVo {
     @Data
     @ApiModel("时间财务图-返参")
     public static class TimeFinancialChart {
-        @ApiModelProperty("时间")
-        private String time;
+        @ApiModelProperty("任务名称")
+        private String name;
         @ApiModelProperty("数据")
         private List<ChartData> data;
     }
     @Data
     @ApiModel("时间财务图-具体数据")
     public static class ChartData {
-        @ApiModelProperty("任务名称")
-        private String name;
+        @ApiModelProperty("时间")
+        private String time;
         @ApiModelProperty("支出")
         private Long expend;
     }
diff --git a/src/main/resources/mapper_dao/PluFinanceApplyDao.xml b/src/main/resources/mapper_dao/PluFinanceApplyDao.xml
index 20939b5..d8e686f 100644
--- a/src/main/resources/mapper_dao/PluFinanceApplyDao.xml
+++ b/src/main/resources/mapper_dao/PluFinanceApplyDao.xml
@@ -102,16 +102,16 @@
     </select>
 
     <resultMap id="TimeFinancialChart" type="com.ccsens.ptccsens.bean.vo.ProjectFinanceVo$TimeFinancialChart">
-        <id column="time" property="time"/>
+        <result column="name" property="name"/>
         <collection property="data" ofType="com.ccsens.ptccsens.bean.vo.ProjectFinanceVo$ChartData">
-            <id column="name" property="name"/>
+            <id column="time" property="time"/>
             <result column="expend" property="expend"/>
         </collection>
     </resultMap>
     <select id="timeFinancialChart" resultMap="TimeFinancialChart">
         SELECT
             task.`name`,
-            DATE_FORMAT(FROM_UNIXTIME (fa.apply_time/1000),'%Y-%m')  AS `time`,
+            DATE_FORMAT(FROM_UNIXTIME (fa.apply_time/1000),'%m')  AS `time`,
             SUM(fa.money) AS expend
         FROM
             (