From f49b0c814bdbe0e49538dab3db2f93765634316f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=AE=8F=E6=96=8C?= <2164406372@qq.com>
Date: Wed, 6 Aug 2025 17:18:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9TPM=E5=91=98=E5=B7=A5?=
 =?UTF-8?q?=E8=80=83=E5=8B=A4=E5=8A=9F=E8=83=BD=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/xujie/sys/modules/pms/data/AttendanceData.java   | 1 +
 .../sys/modules/pms/service/Impl/EamServiceImpl.java     | 9 +++++++++
 2 files changed, 10 insertions(+)

diff --git a/src/main/java/com/xujie/sys/modules/pms/data/AttendanceData.java b/src/main/java/com/xujie/sys/modules/pms/data/AttendanceData.java
index cebaf0e5..a2bacc1d 100644
--- a/src/main/java/com/xujie/sys/modules/pms/data/AttendanceData.java
+++ b/src/main/java/com/xujie/sys/modules/pms/data/AttendanceData.java
@@ -33,4 +33,5 @@ public class AttendanceData {
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date endDate;
     private String groupType;
+    private String roleId;
 }
diff --git a/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java b/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java
index ae2c7d6b..6612218c 100644
--- a/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java
+++ b/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java
@@ -3978,6 +3978,13 @@ public class EamServiceImpl implements EamService {
         String startDate = data.getStartDate() == null ? "" : DateUtil.getStringDate(data.getStartDate());
         String endDate = data.getStartDate() == null ? "" : DateUtil.getStringDate(data.getEndDate());
         String groupType = data.getGroupType();
+        String roleId = data.getRoleId();
+        String operatorName;
+        if (Objects.isNull(data.getOperatorName())){
+            operatorName ="";
+        }else {
+            operatorName = data.getOperatorName();
+        }
         List<Object> params = new ArrayList<>();
         params.add(site);
         params.add(operatorId);
@@ -3985,6 +3992,8 @@ public class EamServiceImpl implements EamService {
         params.add(startDate);
         params.add(endDate);
         params.add(groupType);
+        params.add(roleId);
+        params.add(operatorName);
         //执行方法
         List<Map<String, Object>> resultList = procedureDao.getProcedureData("Attendance_VS_RepairTime", params);
         List<AttendanceData> list = MapToObjectConverter.convertListMapToListObj(resultList, AttendanceData.class);