Merge branch 'master' of ssh://101.201.226.163:50022/ccsens_wiki/pt_ccsens

src/main/java/com/ccsens/ptccsens/bean/vo/ProjectFinanceVo.java

@@ -136,16 +136,16 @@ public class ProjectFinanceVo {
     @Data
     @ApiModel("时间财务图-返参")
     public static class TimeFinancialChart {
-        @ApiModelProperty("时间")
+        @ApiModelProperty("任务名称")
-        private String time;
+        private String name;
         @ApiModelProperty("数据")
         private List<ChartData> data;
     }
     @Data
     @ApiModel("时间财务图-具体数据")
     public static class ChartData {
-        @ApiModelProperty("任务名称")
+        @ApiModelProperty("时间")
-        private String name;
+        private String time;
         @ApiModelProperty("支出")
         private Long expend;
     }

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
             (
@@ -137,7 +137,7 @@
             ) AS task
         LEFT JOIN t_plu_finance AS f ON f.task_id = task.taskId
         LEFT JOIN t_plu_finance_apply AS fa ON f.id = fa.finance_id
-        AND f.rec_status = 0 AND fa.rec_status = 0
+        AND f.rec_status = 0 AND fa.rec_status = 0 AND (fa.apply_type !=0 OR fa.apply_type !=2)
         GROUP BY task.`name`,DATE_FORMAT(FROM_UNIXTIME (fa.apply_time/1000),'%Y-%m')
     </select>