From 602f670d6b67aafae164af65213103e722beb79d Mon Sep 17 00:00:00 2001
From: zy_Java <654600784@qq.com>
Date: Fri, 28 Jan 2022 16:43:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=92=E4=BB=B6=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E7=9A=84=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ptccsens/bean/vo/ProjectFinanceVo.java    |  6 ++--
 .../ptccsens/service/FinanceService.java      |  1 +
 .../service/ProjectFinanceService.java        |  2 +-
 src/main/resources/mapper_dao/FinanceDao.xml  | 32 +++++++++++++++----
 .../resources/mapper_dao/ProClockingInDao.xml |  8 ++---
 5 files changed, 35 insertions(+), 14 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 8bff631..885f2ab 100644
--- a/src/main/java/com/ccsens/ptccsens/bean/vo/ProjectFinanceVo.java
+++ b/src/main/java/com/ccsens/ptccsens/bean/vo/ProjectFinanceVo.java
@@ -34,11 +34,11 @@ public class ProjectFinanceVo {
         @ApiModelProperty("任务名")
         private String name;
         @ApiModelProperty("任务财务信息id")
-        private Long taskFinanceId;
+        private Long taskFinanceId = 0L;
         @ApiModelProperty("预算")
-        private Long budget;
+        private Long budget = 0L;
         @ApiModelProperty("奖金")
-        private Long bonus;
+        private Long bonus = 0L;
     }
 
     @Data
diff --git a/src/main/java/com/ccsens/ptccsens/service/FinanceService.java b/src/main/java/com/ccsens/ptccsens/service/FinanceService.java
index c839357..6e9e3c1 100644
--- a/src/main/java/com/ccsens/ptccsens/service/FinanceService.java
+++ b/src/main/java/com/ccsens/ptccsens/service/FinanceService.java
@@ -2,6 +2,7 @@ package com.ccsens.ptccsens.service;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.lang.Snowflake;
+import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.ccsens.ptccsens.bean.dto.FinanceDto;
 import com.ccsens.ptccsens.bean.po.*;
diff --git a/src/main/java/com/ccsens/ptccsens/service/ProjectFinanceService.java b/src/main/java/com/ccsens/ptccsens/service/ProjectFinanceService.java
index b812111..ae0e37b 100644
--- a/src/main/java/com/ccsens/ptccsens/service/ProjectFinanceService.java
+++ b/src/main/java/com/ccsens/ptccsens/service/ProjectFinanceService.java
@@ -148,7 +148,7 @@ public class ProjectFinanceService implements IProjectFinanceService{
             proTaskPlugin.setCode(Constant.PLUGIN_FINANCE);
             proTaskPlugin.setPluginInner(pluginByCodeAndName.getInner());
             proTaskPlugin.setPlginCol(1);
-            proTaskPlugin.setPlginRow((row == null || row == 0) ? 1 : row);
+            proTaskPlugin.setPlginRow((row == null || row == 0) ? 1 : row + 1);
             proTaskPlugin.setColspan(1);
             proTaskPlugin.setRowspan(1);
             proTaskPlugin.setTaskDetailId(taskId);
diff --git a/src/main/resources/mapper_dao/FinanceDao.xml b/src/main/resources/mapper_dao/FinanceDao.xml
index cc86f2e..06c2db4 100644
--- a/src/main/resources/mapper_dao/FinanceDao.xml
+++ b/src/main/resources/mapper_dao/FinanceDao.xml
@@ -23,12 +23,32 @@
         group by f.id
     </select>
     <select id="getExpenseByTaskId" resultType="com.ccsens.ptccsens.bean.vo.FinanceVo$FinanceExpense">
-        select f.id as financeId, t.name as type, sum(a.money) as money from
-        t_plu_finance f
-        left join t_plu_finance_apply a on f.id = a.finance_id and a.rec_status = 0
-        left join t_plu_finance_type t on a.type_id = t.id and t.rec_status = 0
-        where f.task_id = #{taskId} and f.rec_status = 0
-        GROUP BY f.id, t.id
+        SELECT
+            f.id AS financeId,
+            a.NAME AS type,
+            sum( a.money ) AS money
+        FROM
+            t_plu_finance f,
+            (
+            SELECT
+                t.id,
+                a.finance_id,
+                a.money,
+                t.NAME
+            FROM
+                t_plu_finance_apply a
+                LEFT JOIN t_plu_finance_type t ON a.type_id = t.id
+                AND t.rec_status = 0
+            WHERE
+                a.rec_status = 0
+            ) a
+        WHERE
+            f.id = a.finance_id
+            AND f.task_id = #{taskId}
+            AND f.rec_status = 0
+        GROUP BY
+            f.id,
+            a.id
     </select>
     <select id="queryType" resultType="com.ccsens.ptccsens.bean.vo.FinanceVo$Type">
         select id, name from t_plu_finance_type where level = #{type} and parent_id = #{parentId} and rec_status = 0
diff --git a/src/main/resources/mapper_dao/ProClockingInDao.xml b/src/main/resources/mapper_dao/ProClockingInDao.xml
index c0cf194..40c0cd0 100644
--- a/src/main/resources/mapper_dao/ProClockingInDao.xml
+++ b/src/main/resources/mapper_dao/ProClockingInDao.xml
@@ -17,7 +17,7 @@
             c.night_remark,
             if(morning != 0,FROM_UNIXTIME(morning / 1000, '%Y-%m-%d'),FROM_UNIXTIME(night / 1000, '%Y-%m-%d')) as `day`
         FROM
-            t_pro_clocking_in AS c
+            t_plu_clocking_in AS c
             LEFT JOIN t_pro_member AS m ON m.id = c.member_id and m.rec_status = 0
             LEFT JOIN t_pro_member AS m2 ON m2.id = c.checker_id and m2.rec_status = 0
         WHERE
@@ -54,7 +54,7 @@
             night_status,
             created_at
         FROM
-            t_pro_clocking_in
+            t_plu_clocking_in
         WHERE
             rec_status = 0
         AND member_id = #{memberId}
@@ -80,7 +80,7 @@
             checker_id AS lastCheckerId,
             m.`name` AS lastCheckerName
         FROM
-            t_pro_clocking_in AS c
+            t_plu_clocking_in AS c
         LEFT JOIN t_pro_member AS m ON m.id = c.checker_id
         WHERE
             c.rec_status = 0
@@ -161,7 +161,7 @@
         FROM
         t_pro_member m
         LEFT JOIN t_pro_role_member rm ON m.id = rm.member_id
-        LEFT JOIN t_pro_clocking_in c on m.id = c.member_id and c.rec_status = 0
+        LEFT JOIN t_plu_clocking_in c on m.id = c.member_id and c.rec_status = 0
         WHERE
         rm.role_id = #{roleId}
         <if test="memberIdList != null and memberIdList.size() > 0" >