From 4627b967c0105ef7bbc29f0d1b06bf67c5eac3c0 Mon Sep 17 00:00:00 2001
From: haha <lj7788@126.com>
Date: Sat, 23 Mar 2024 02:28:39 +0800
Subject: [PATCH] update code

---
 .../ProjectAttendanceController.java          |  3 ++-
 .../SurProjectAttendanceDataMapper.java       |  2 ++
 .../ISurProjectAttendanceDataService.java     |  2 ++
 .../SurProjectAttendanceDataServiceImpl.java  |  5 +++++
 .../SurProjectAttendanceDataMapper.xml        | 20 +++++++++++++++++++
 5 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectAttendanceController.java b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectAttendanceController.java
index e4bdf552..815ebf96 100644
--- a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectAttendanceController.java
+++ b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectAttendanceController.java
@@ -122,7 +122,8 @@ public class ProjectAttendanceController extends BaseController {
                 where.setPrjIds(getProjectIds());
             }
         }
-        List<SurProjectAttendanceData> list=attendanceDataService.groupByComany(where);
+        where.setAttendanceTime(DateUtil.formatDate(DateTime.now()));
+        List<SurProjectAttendanceData> list=attendanceDataService.groupTodayCompanyTypeId(where);
         return AjaxResult.success(list);
     }
 
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectAttendanceDataMapper.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectAttendanceDataMapper.java
index 0aaddcc3..c156d515 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectAttendanceDataMapper.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectAttendanceDataMapper.java
@@ -94,4 +94,6 @@ public interface SurProjectAttendanceDataMapper
     public String findHuaZhuCompanyType(String deptName);
 
     public List<SurProjectAttendanceData> todayAttendance(SurProjectAttendanceData where);
+
+    public List<SurProjectAttendanceData> groupTodayCompanyTypeId(SurProjectAttendanceData where);
 }
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectAttendanceDataService.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectAttendanceDataService.java
index 555f06bb..42bbc92f 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectAttendanceDataService.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectAttendanceDataService.java
@@ -95,4 +95,6 @@ public interface ISurProjectAttendanceDataService
     public List<Map<String,Object>> initHuaZhuData(Map<String,Object> data);
 
     List<SurProjectAttendanceData> todayAttendance(SurProjectAttendanceData where);
+
+    List<SurProjectAttendanceData> groupTodayCompanyTypeId(SurProjectAttendanceData where);
 }
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAttendanceDataServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAttendanceDataServiceImpl.java
index c03a9227..070d964d 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAttendanceDataServiceImpl.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAttendanceDataServiceImpl.java
@@ -292,4 +292,9 @@ public class SurProjectAttendanceDataServiceImpl implements ISurProjectAttendanc
     public List<SurProjectAttendanceData> todayAttendance(SurProjectAttendanceData where) {
         return surProjectAttendanceDataMapper.todayAttendance(where);
     }
+
+    @Override
+    public List<SurProjectAttendanceData> groupTodayCompanyTypeId(SurProjectAttendanceData where) {
+        return surProjectAttendanceDataMapper.groupTodayCompanyTypeId(where);
+    }
 }
diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceDataMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceDataMapper.xml
index 5aa915fd..97bfb44c 100644
--- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceDataMapper.xml
+++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceDataMapper.xml
@@ -382,4 +382,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
 
+    <select id="groupTodayCompanyTypeId" parameterType="SurProjectAttendanceData" resultMap="SurProjectAttendanceDataResult">
+        select companyTypeId,count(1) id from sur_project_attendance_data_${year}
+        <where>
+            <if test="projectId!=null and projectId>0">
+                and projectId=#{projectId}
+            </if>
+            <if test="deptId!=null and deptId>0">
+                and   deptid=#{deptId}
+            </if>
+            <if test="prjIds !=null and prjIds.size()>0">
+                and projectId in
+                <foreach collection="prjIds"  item="item" index="index" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="attendanceTime != null  and attendanceTime != ''"> and date(attendance_time) =date(#{attendanceTime})</if>
+        </where>
+        group by companyTypeId
+    </select>
+
 </mapper>
\ No newline at end of file