From d43f063f6f3349902d601458cab690e18c34f344 Mon Sep 17 00:00:00 2001
From: hdka <823267011@qq.com>
Date: Tue, 1 Apr 2025 17:22:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=BA=E5=A4=A9=E8=AE=A1?=
 =?UTF-8?q?=E7=AE=97=E6=96=B9=E6=B3=95=EF=BC=8C=E9=81=BF=E5=85=8D=E7=AC=9B?=
 =?UTF-8?q?=E5=8D=A1=E5=B0=94=E7=A7=AF=E9=97=AE=E9=A2=98=E5=AF=BC=E8=87=B4?=
 =?UTF-8?q?=E4=BA=BA=E5=A4=A9=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/oa/SysOaAttendanceMapper.xml       | 64 ++++++++++++++-----
 .../mapper/oa/SysOaProjectMapper.xml          | 55 +++++++++-------
 2 files changed, 80 insertions(+), 39 deletions(-)

diff --git a/ruoyi-oa/src/main/resources/mapper/oa/SysOaAttendanceMapper.xml b/ruoyi-oa/src/main/resources/mapper/oa/SysOaAttendanceMapper.xml
index 7a62ddb..535b714 100644
--- a/ruoyi-oa/src/main/resources/mapper/oa/SysOaAttendanceMapper.xml
+++ b/ruoyi-oa/src/main/resources/mapper/oa/SysOaAttendanceMapper.xml
@@ -97,28 +97,58 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
     <select id="selectVoListAndTime" resultType="com.ruoyi.oa.domain.vo.SysOaAttendanceVo">
-        SELECT ANY_VALUE(id),
-               user_id,
-               ANY_VALUE(attendance_day),
-               project_id,
-               ANY_VALUE(day_length),
-               ANY_VALUE(hour),
-               ANY_VALUE(create_time),
-               ANY_VALUE(create_by),
-               ANY_VALUE(update_time),
-               ANY_VALUE(update_by),
-               ANY_VALUE(remark),
-               ANY_VALUE(del_flag),
-               count(id) AS count,
-               SUM(day_length) + CEILING(SUM(hour) / 9) AS work_times,
-               (SUM(day_length) + CEILING(SUM(hour) / 9)) * 9 AS hour_work_times,
-               FLOOR(SUM(hour) / 9) AS overTime
+        SELECT
+            ANY_VALUE(id)          AS id,
+            user_id,
+            ANY_VALUE(attendance_day) AS attendance_day,
+            project_id,
+            ANY_VALUE(day_length)  AS day_length,
+            ANY_VALUE(hour)        AS hour,
+            ANY_VALUE(create_time) AS create_time,
+            ANY_VALUE(create_by)   AS create_by,
+            ANY_VALUE(update_time) AS update_time,
+            ANY_VALUE(update_by)   AS update_by,
+            ANY_VALUE(remark)      AS remark,
+            ANY_VALUE(del_flag)    AS del_flag,
+            COUNT(id)              AS count,
+
+            /*
+              1）如果这条记录是按天统计 (day_length>0)，就直接用 day_length。
+              2）如果这条记录是按小时统计 (hour>0)，那么就算作 1 天。
+              这样就不会把多日的小时相加再去整除 9。
+            */
+            SUM(
+                    CASE
+                        WHEN day_length > 0 THEN day_length
+                        WHEN hour > 0 THEN 1
+                        ELSE 0
+                        END
+            ) AS work_times,
+            SUM(
+                    CASE
+                        WHEN day_length > 0 THEN day_length
+                        WHEN hour > 0 THEN 1
+                        ELSE 0
+                        END
+            ) *9  AS hour_work_times,
+            /*
+              overTime：如果是按小时统计，且 hour>9，才有加班 = (hour - 9)。
+              如果是 day_length 统计，则一般不会再去算小时加班（你如果有需要，也可以自己按其它规则）。
+            */
+            SUM(
+                    CASE
+                        WHEN hour > 9 THEN hour - 9
+                        ELSE 0
+                        END
+            ) AS overTime
+
         FROM sys_oa_attendance soa
         WHERE user_id = #{userId}
           AND #{lastDay} > create_time
           AND create_time > #{firstDay}
           AND del_flag = '0'
-        GROUP BY soa.project_id
+        GROUP BY soa.project_id;
+
 
     </select>
 
diff --git a/ruoyi-oa/src/main/resources/mapper/oa/SysOaProjectMapper.xml b/ruoyi-oa/src/main/resources/mapper/oa/SysOaProjectMapper.xml
index 59d8e2a..262a886 100644
--- a/ruoyi-oa/src/main/resources/mapper/oa/SysOaProjectMapper.xml
+++ b/ruoyi-oa/src/main/resources/mapper/oa/SysOaProjectMapper.xml
@@ -96,30 +96,41 @@
     </select>
 
     <select id="getProjectDataByMonth" resultType="com.ruoyi.oa.domain.vo.SysOaProjectVo">
-        SELECT sop.project_id,
-               sop.project_name,
-               sop.color,
-            ROUND(SUM(soa.day_length + soa.hour / 9), 2) AS labor_cost,
+        SELECT
+            p.project_id,
+            p.project_name,
+            p.color,
+            -- 子查询里已经聚合完 labor_cost
+            a.labor_cost,
+            -- 同理财务部分
+            f.total_price
+        FROM sys_oa_project AS p
+                 LEFT JOIN (
+            SELECT
+                project_id,
+                ROUND(SUM(day_length + hour / 9), 2) AS labor_cost
+            FROM sys_oa_attendance
+            WHERE create_time BETWEEN #{firstDay} AND #{lastDay}
+              AND del_flag = '0'
+            GROUP BY project_id
+        ) AS a ON p.project_id = a.project_id
+                 LEFT JOIN (
+            SELECT
+                sof.project_id,
                 SUM(
-                        CASE
-                            WHEN sof.finance_type = 0 THEN sod.price
-                            ELSE 0
-                            END
+                        CASE WHEN sof.finance_type = 0 THEN sod.price ELSE 0 END
                 ) AS total_price
-        FROM sys_oa_project AS sop
-                 LEFT JOIN sys_oa_attendance AS soa
-                           ON sop.project_id = soa.project_id
-                               AND soa.create_time BETWEEN #{firstDay} AND #{lastDay}
-                               AND soa.del_flag = '0'
-                 LEFT JOIN sys_oa_finance AS sof
-                           ON sop.project_id = sof.project_id
-                               AND sof.create_time BETWEEN #{firstDay} AND #{lastDay}
-                 LEFT JOIN sys_oa_detail AS sod
-                           ON sof.finance_id = sod.finance_id
-                               AND sod.create_time BETWEEN #{firstDay} AND #{lastDay}
-        GROUP BY sop.project_id,
-                 sop.project_name,
-                 sop.color
+            FROM sys_oa_finance sof
+                     JOIN sys_oa_detail sod ON sof.finance_id = sod.finance_id
+                AND sod.create_time BETWEEN #{firstDay} AND #{lastDay}
+            WHERE sof.create_time BETWEEN #{firstDay} AND #{lastDay}
+            GROUP BY sof.project_id
+        ) AS f ON p.project_id = f.project_id
+
+-- 最后只要在这里加一个 WHERE 条件，过滤掉 labor_cost=0 或者为空
+        WHERE a.labor_cost > 0
+
+
     </select>
 
     <select id="getProjectDataByMonthAndDate" resultType="com.ruoyi.oa.domain.vo.SysOaProjectVo">