From 079797c04caafcd53366338dba0bcf1a75f7044b Mon Sep 17 00:00:00 2001
From: memorylkf <312904636@qq.com>
Date: Tue, 7 Apr 2026 10:57:03 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20[=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83]?=
 =?UTF-8?q?=20[=E5=B7=A5=E4=BD=9C=E5=8F=B0]=20TFM=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=89=80=E6=9C=89=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/service/impl/StudyServiceImpl.java    |  7 +++-
 .../main/resources/mapper/business/StudyMapper.xml | 45 ++++++++++++++++++----
 2 files changed, 43 insertions(+), 9 deletions(-)

diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyServiceImpl.java
index 28ddab8..4bceca6 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyServiceImpl.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyServiceImpl.java
@@ -501,8 +501,11 @@ public class StudyServiceImpl extends ServiceImpl<StudyMapper, Study> implements
 
     @Override
     public HomeCountDto queryHomeCount() {
-        HomeCountDto formCount = baseMapper.queryHomeFormCount(SecurityUtils.getUserId());
-        HomeCountDto studyCount = baseMapper.queryHomeStudyCount(SecurityUtils.getUserId());
+        String tmfRole = "TFM";
+        //TFM看所有数据，不根据用户id过滤
+        Long userId = AuthUtil.hasRole(tmfRole)?null:SecurityUtils.getUserId();
+        HomeCountDto formCount = baseMapper.queryHomeFormCount(userId);
+        HomeCountDto studyCount = baseMapper.queryHomeStudyCount(userId);
 
         formCount.setStudyWeekCount(studyCount.getStudyWeekCount());
         formCount.setStudyFinishCount(studyCount.getStudyFinishCount());
diff --git a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyMapper.xml b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyMapper.xml
index 1cd599a..84a3280 100644
--- a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyMapper.xml
+++ b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyMapper.xml
@@ -49,7 +49,10 @@
         COUNT(IF(bdzt>1,id,NULL)) AS formYtjCount,
         COUNT(IF(bdzt=1,id,NULL)) AS formTbzCount
         FROM `t_study_form_fill` WHERE del_flag='0'
-        AND user_id=#{userId}
+        <if test="userId!=null">
+            AND user_id=#{userId}
+        </if>
+
 
         UNION ALL
 
@@ -58,7 +61,33 @@
         COUNT(IF(bdzt>1,id,NULL)) AS formYtjCount,
         COUNT(IF(bdzt=1,id,NULL)) AS formTbzCount
         FROM `t_study_form_pre` WHERE del_flag='0'
-        AND user_id=#{userId}
+        <if test="userId!=null">
+            AND user_id=#{userId}
+        </if>
+
+
+        UNION ALL
+
+        SELECT
+        COUNT(IF(DATE(create_time)=DATE(NOW()),id,NULL)) AS formTodayCount,
+        COUNT(IF(bdzt>1,id,NULL)) AS formYtjCount,
+        COUNT(IF(bdzt=1,id,NULL)) AS formTbzCount
+        FROM `t_study_form_apply` WHERE del_flag='0'
+        <if test="userId!=null">
+            AND user_id=#{userId}
+        </if>
+
+
+        UNION ALL
+
+        SELECT
+        COUNT(IF(DATE(create_time)=DATE(NOW()),id,NULL)) AS formTodayCount,
+        COUNT(IF(bdzt>1,id,NULL)) AS formYtjCount,
+        COUNT(IF(bdzt=1,id,NULL)) AS formTbzCount
+        FROM `t_study_form_plan` WHERE del_flag='0'
+        <if test="userId!=null">
+            AND user_id=#{userId}
+        </if>
         )a
     </select>
 
@@ -69,11 +98,13 @@
         FROM `t_study` s
 
         WHERE s.del_flag=0 AND s.`type`=1
-        AND
-        (s.leader=#{userId}
-        OR EXISTS (SELECT ss.id FROM `t_study_subject` ss WHERE ss.`del_flag`='0' AND ss.`study_id`=s.`id` AND ss.leader=#{userId})
-        OR EXISTS (SELECT ssu.id FROM `t_study_subject_user` ssu WHERE ssu.`del_flag`='0' AND ssu.`study_id`=s.`id` AND ssu.user_id=#{userId})
-        )
+        <if test="userId!=null">
+            AND
+            (s.leader=#{userId}
+            OR EXISTS (SELECT ss.id FROM `t_study_subject` ss WHERE ss.`del_flag`='0' AND ss.`study_id`=s.`id` AND ss.leader=#{userId})
+            OR EXISTS (SELECT ssu.id FROM `t_study_subject_user` ssu WHERE ssu.`del_flag`='0' AND ssu.`study_id`=s.`id` AND ssu.user_id=#{userId})
+            )
+        </if>
     </select>
 
     <!--    档案相关-->