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 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> resultList = procedureDao.getProcedureData("Attendance_VS_RepairTime", params); List list = MapToObjectConverter.convertListMapToListObj(resultList, AttendanceData.class);