From 2c11fb72cbb6eafa132ee4c81aad199d31e1fce0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?=
 <7507756+jiang_yuqi@user.noreply.gitee.com>
Date: Fri, 27 Jun 2025 01:11:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/manage/AttendanceUbiDataMapper.xml   | 4 ++--
 .../mapper/manage/SurProjectAttendanceDataMapper.xml      | 8 ++++----
 .../manage/controller/wechat/WXAttendanceController.java  | 2 +-
 .../manage/service/impl/AttendanceUbiDataServiceImpl.java | 7 -------
 .../service/impl/SurProjectAttendanceDataServiceImpl.java | 7 -------
 5 files changed, 7 insertions(+), 21 deletions(-)

diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/AttendanceUbiDataMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/AttendanceUbiDataMapper.xml
index 61bcf44e..b05e8d9a 100644
--- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/AttendanceUbiDataMapper.xml
+++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/AttendanceUbiDataMapper.xml
@@ -230,7 +230,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="projectId != null "> and d.projectId = #{projectId}</if>
             <if test="subDeptId != null "> and d.sub_dept_id = #{subDeptId}</if>
             <if test="subDeptGroup != null "> and d.sub_dept_group = #{subDeptGroup}</if>
-            and u.use_status = '0' and date(d.create_time) = CURDATE()
+            and date(d.create_time) = CURDATE()
         </where>
         group by u.craft_type
     </select>
@@ -242,7 +242,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 <if test="projectId != null "> and d.projectId = #{projectId}</if>
                 <if test="subDeptId != null "> and d.sub_dept_id = #{subDeptId}</if>
                 <if test="subDeptGroup != null "> and d.sub_dept_group = #{subDeptGroup}</if>
-                <if test="params.beginTime != null and params.beginTime != '' and params.endTime != null and params.endTime != ''"> and date(d.create_time) between #{params.beginTime} and #{params.endTime}</if>
+                and date(d.create_time) &gt;= CURDATE() - INTERVAL 7 DAY
             </where>
             group by attendanceTime
             order by attendanceTime
diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/SurProjectAttendanceDataMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/SurProjectAttendanceDataMapper.xml
index 5efccac3..c0b362fe 100644
--- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/SurProjectAttendanceDataMapper.xml
+++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/SurProjectAttendanceDataMapper.xml
@@ -674,13 +674,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="statsAttendanceDaysByProId" parameterType="SurProjectAttendanceData" resultType="Map">
         select '1' as craftType,count(1) as total from sur_project_attendance_data_${year}
-        where projectId=#{projectId} and specWorkType = 1 and companyTypeId != 1
+        where projectId=#{projectId} and specWorkType = 1 and companyTypeId != 1 and date(create_time) = CURDATE()
         UNION ALL
         select '2' as craftType,count(1) as total from sur_project_attendance_data_${year}
-        where projectId=#{projectId} and specWorkType = 0 and companyTypeId != 1
+        where projectId=#{projectId} and specWorkType = 0 and companyTypeId != 1 and date(create_time) = CURDATE()
         UNION ALL
         select '3' as craftType,count(1) as total from sur_project_attendance_data_${year}
-        where projectId=#{projectId} and companyTypeId = 1
+        where projectId=#{projectId} and companyTypeId = 1 and date(create_time) = CURDATE()
     </select>
 
     <select id="statsAttendanceViewByProId" parameterType="SurProjectAttendanceData" resultType="Map">
@@ -688,7 +688,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select date(d.create_time) as attendanceTime, count(1) as total from sur_project_attendance_data_${year} d
         <where>
             <if test="projectId != null "> and d.projectId = #{projectId}</if>
-            <if test="params.beginTime != null and params.beginTime != '' and params.endTime != null and params.endTime != ''"> and date(d.create_time) between #{params.beginTime} and #{params.endTime}</if>
+            and date(d.create_time) &gt;= CURDATE() - INTERVAL 7 DAY
         </where>
         group by attendanceTime
         order by attendanceTime
diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/wechat/WXAttendanceController.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/wechat/WXAttendanceController.java
index d309da45..ee4e0046 100644
--- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/wechat/WXAttendanceController.java
+++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/wechat/WXAttendanceController.java
@@ -93,7 +93,7 @@ public class WXAttendanceController extends BaseController {
      */
     @GetMapping("/v1/findSubDeptsAttendanceView/{proId}")
     public AjaxResult findSubDeptsAttendanceView(@PathVariable("proId") Long proId){
-        List<Map<String, Object>> list = new ArrayList<>();
+        List<Map<String, Object>> list;
         AttendanceCfg attendanceCfgQuery = new AttendanceCfg();
         attendanceCfgQuery.setProjectId(proId);
         List<AttendanceCfg> cfgList = attendanceCfgService.selectAttendanceCfgList(attendanceCfgQuery);
diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/AttendanceUbiDataServiceImpl.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/AttendanceUbiDataServiceImpl.java
index 764e64a1..021c7101 100644
--- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/AttendanceUbiDataServiceImpl.java
+++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/AttendanceUbiDataServiceImpl.java
@@ -246,13 +246,6 @@ public class AttendanceUbiDataServiceImpl implements IAttendanceUbiDataService
                 }
             }
         }
-        Map<String, Object> params = new HashMap<>();
-        Calendar calendar = Calendar.getInstance();
-        calendar.add(Calendar.DAY_OF_MONTH, -1);
-        params.put("beginTime",DateUtil.format(calendar.getTime(),DateUtils.YYYY_MM_DD));
-        calendar.add(Calendar.DAY_OF_MONTH, -6);
-        params.put("endTime",DateUtil.format(calendar.getTime(),DateUtils.YYYY_MM_DD));
-        attendanceQuery.setParams(params);
         return attendanceUbiDataMapper.statsAttendanceView(attendanceQuery);
     }
 
diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/SurProjectAttendanceDataServiceImpl.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/SurProjectAttendanceDataServiceImpl.java
index f54d542a..7a01b04e 100644
--- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/SurProjectAttendanceDataServiceImpl.java
+++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/SurProjectAttendanceDataServiceImpl.java
@@ -351,13 +351,6 @@ public class SurProjectAttendanceDataServiceImpl implements ISurProjectAttendanc
     public List<Map<String, Object>> statsAttendanceViewByProId(Long proId){
         SurProjectAttendanceData query = new SurProjectAttendanceData();
         query.setProjectId(proId);
-        Map<String, Object> params = new HashMap<>();
-        Calendar calendar = Calendar.getInstance();
-        calendar.add(Calendar.DAY_OF_MONTH, -1);
-        params.put("beginTime",DateUtil.format(calendar.getTime(),DateUtils.YYYY_MM_DD));
-        calendar.add(Calendar.DAY_OF_MONTH, -6);
-        params.put("endTime",DateUtil.format(calendar.getTime(),DateUtils.YYYY_MM_DD));
-        query.setParams(params);
         return surProjectAttendanceDataMapper.statsAttendanceViewByProId(query);
     }