From 3fe2aea7827eafc7513159db9a337fdf567584c8 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期一, 08 五月 2023 01:21:13 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-common/src/main/java/com/java110/common/smo/impl/AttendanceClassesTaskInnerServiceSMOImpl.java | 29 ++++++-----------------------
1 files changed, 6 insertions(+), 23 deletions(-)
diff --git a/service-common/src/main/java/com/java110/common/smo/impl/AttendanceClassesTaskInnerServiceSMOImpl.java b/service-common/src/main/java/com/java110/common/smo/impl/AttendanceClassesTaskInnerServiceSMOImpl.java
old mode 100644
new mode 100755
index 9997d85..97ab303
--- a/service-common/src/main/java/com/java110/common/smo/impl/AttendanceClassesTaskInnerServiceSMOImpl.java
+++ b/service-common/src/main/java/com/java110/common/smo/impl/AttendanceClassesTaskInnerServiceSMOImpl.java
@@ -11,6 +11,8 @@
import com.java110.intf.common.IAttendanceClassesTaskInnerServiceSMO;
import com.java110.intf.user.IUserInnerServiceSMO;
import com.java110.po.attendanceClassesTask.AttendanceClassesTaskPo;
+import com.java110.utils.cache.MappingCache;
+import com.java110.utils.constant.MappingConstant;
import com.java110.utils.util.BeanConvertUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
@@ -91,29 +93,6 @@
return;
}
- if (attendanceClassesTasks.size() > 20) {
- return;
- }
-
- List<String> staffIds = new ArrayList<>();
-
- for (AttendanceClassesTaskDto attendanceClassesTaskDto : attendanceClassesTasks) {
- staffIds.add(attendanceClassesTaskDto.getStaffId());
- }
-
- List<UserDto> userDtos = userInnerServiceSMOImpl.getUserInfo(staffIds.toArray(new String[staffIds.size()]));
-
- if (userDtos != null && userDtos.size() > 0) {
- for (AttendanceClassesTaskDto attendanceClassesTaskDto : attendanceClassesTasks) {
- for (UserDto userDto : userDtos) {
- if (attendanceClassesTaskDto.getStaffId().equals(userDto.getUserId())) {
- attendanceClassesTaskDto.setStaffName(userDto.getName());
- continue;
- }
- }
- }
- }
-
List<String> taskIds = new ArrayList<>();
for (AttendanceClassesTaskDto attendanceClassesTaskDto : attendanceClassesTasks) {
@@ -130,6 +109,10 @@
return;
}
List<AttendanceClassesTaskDetailDto> tmpAttendanceClassesTaskDetailDtos = null;
+ String imgUrl = MappingCache.getValue(MappingConstant.FILE_DOMAIN, "IMG_PATH");
+ for (AttendanceClassesTaskDetailDto tmpAttendanceClassesTaskDetailDto : attendanceClassesTaskDetailDtos) {
+ tmpAttendanceClassesTaskDetailDto.setFacePath(imgUrl + tmpAttendanceClassesTaskDetailDto.getFacePath());
+ }
for (AttendanceClassesTaskDto attendanceClassesTaskDto : attendanceClassesTasks) {
tmpAttendanceClassesTaskDetailDtos = new ArrayList<>();
for (AttendanceClassesTaskDetailDto tmpAttendanceClassesTaskDetailDto : attendanceClassesTaskDetailDtos) {
--
Gitblit v1.8.0