From 018afbc1e754be7c8cb3c965b5fd095abb21c77b Mon Sep 17 00:00:00 2001
From: guoshengxiong <1923636941@qq.com>
Date: Mon, 10 Nov 2025 18:24:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=BF=BD=E7=95=A5=E5=91=98?=
 =?UTF-8?q?=E5=B7=A5=E6=89=93=E5=8D=A1=E6=97=B6=E7=9A=84=E2=80=9C=E8=BF=9B?=
 =?UTF-8?q?/=E5=87=BA=E2=80=9D=E6=96=B9=E5=90=91=E6=A0=87=E8=AF=86?=
 =?UTF-8?q?=E5=92=8Cbug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/worker/mapper/xml/WorkerAttendanceMapper.xml | 2 +-
 .../mapper/xml/WorkerMonthAttendanceStatisticsMapper.xml | 5 +++++
 .../impl/WorkerMonthAttendanceStatisticsServiceImpl.java | 9 +++------
 src/main/java/com/zhgd/xmgl/task/VideoTask.java          | 4 ++--
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerAttendanceMapper.xml b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerAttendanceMapper.xml
index f23080afb..5294c84ae 100644
--- a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerAttendanceMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerAttendanceMapper.xml
@@ -30,7 +30,7 @@
         group by a.id
     </select>
     <select id="selectOneWorkerAttendance" resultType="com.zhgd.jeecg.common.mybatis.EntityMap">
-        SELECT pass_type, create_time
+        SELECT pass_type, create_time, project_sn
         FROM worker_attendance
         WHERE person_sn = #{personSn}
         AND is_statistics = 0
diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerMonthAttendanceStatisticsMapper.xml b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerMonthAttendanceStatisticsMapper.xml
index 776d7445f..9775084b5 100644
--- a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerMonthAttendanceStatisticsMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerMonthAttendanceStatisticsMapper.xml
@@ -11,7 +11,12 @@
         IF(29>DAY(last_day(str_to_date(CONCAT(#{param.monthTime},'-01'),'%Y-%m-%d'))),NULL,day29) day29,
         IF(30>DAY(last_day(str_to_date(CONCAT(#{param.monthTime},'-01'),'%Y-%m-%d'))),NULL,day30) day30,
         IF(31>DAY(last_day(str_to_date(CONCAT(#{param.monthTime},'-01'),'%Y-%m-%d'))),NULL,day31) day31
+        ,a.enterprise_id enterprise_id
+        ,if(a.person_type=1,b.id,c1.id) dept_id
+        ,a.id worker_id
         from worker_info a
+        LEFT JOIN team_info b ON a.team_id = b.id and a.person_type=1
+        LEFT JOIN department_info c1 ON a.department_id = c1.id and a.person_type=2
         LEFT JOIN worker_month_attendance_statistics c ON a.person_sn=c.person_sn AND c.query_time=#{param.monthTime}
         where a.project_sn=#{param.projectSn} and a.inService_type=#{param.inserviceType}
         <if test="param.personType!=null and param.personType!=''">
diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerMonthAttendanceStatisticsServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerMonthAttendanceStatisticsServiceImpl.java
index 587e995aa..98b87fe3e 100644
--- a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerMonthAttendanceStatisticsServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerMonthAttendanceStatisticsServiceImpl.java
@@ -69,7 +69,9 @@ public class WorkerMonthAttendanceStatisticsServiceImpl extends ServiceImpl<Work
     private GovtOpenApiService govtOpenApiService;
     @Autowired
     private EnvironmentUtil environmentUtil;
-
+    @Lazy
+    @Autowired
+    private IProjectConfigService projectConfigService;
 
     @Override
     public IPage<EntityMap> selectMonthAttendanceByPage(Map<String, Object> map) {
@@ -141,7 +143,6 @@ public class WorkerMonthAttendanceStatisticsServiceImpl extends ServiceImpl<Work
         return workerMonthAttendanceStatisticsMapper.getListByProjectSn(projectSn);
     }
 
-
     @Override
     public void getMonthAttendanceStatistics(String inputTime) {
         try {
@@ -531,10 +532,6 @@ public class WorkerMonthAttendanceStatisticsServiceImpl extends ServiceImpl<Work
         }
     }
 
-    @Lazy
-    @Autowired
-    private IProjectConfigService projectConfigService;
-
     //判断考勤情况
     public Map<String, Integer> getWorkerAttendanceType(String personSn, Long workerAttendanceRuleId, String passTime) {
         int attendanceType = 0;
diff --git a/src/main/java/com/zhgd/xmgl/task/VideoTask.java b/src/main/java/com/zhgd/xmgl/task/VideoTask.java
index ae85f52f9..baa12b1af 100644
--- a/src/main/java/com/zhgd/xmgl/task/VideoTask.java
+++ b/src/main/java/com/zhgd/xmgl/task/VideoTask.java
@@ -17,8 +17,8 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.*;
 
@@ -29,7 +29,7 @@ import java.util.*;
  * @create: 2021-11-11 18:48
  **/
 @Slf4j
-@Controller
+@RestController
 @RequestMapping("/xmgl/task/")
 public class VideoTask {
     @Autowired