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 | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 58 insertions(+), 1 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 b63b66a..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
@@ -4,14 +4,21 @@
import com.java110.common.dao.IAttendanceClassesTaskServiceDao;
import com.java110.core.base.smo.BaseServiceSMO;
import com.java110.dto.PageDto;
-import com.java110.dto.attendanceClassesTask.AttendanceClassesTaskDto;
+import com.java110.dto.attendanceClasses.AttendanceClassesTaskDto;
+import com.java110.dto.attendanceClasses.AttendanceClassesTaskDetailDto;
+import com.java110.dto.user.UserDto;
+import com.java110.intf.common.IAttendanceClassesTaskDetailInnerServiceSMO;
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;
import org.springframework.web.bind.annotation.RestController;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -27,6 +34,12 @@
@Autowired
private IAttendanceClassesTaskServiceDao attendanceClassesTaskServiceDaoImpl;
+
+ @Autowired
+ private IAttendanceClassesTaskDetailInnerServiceSMO attendanceClassesTaskDetailInnerServiceSMOImpl;
+
+ @Autowired
+ private IUserInnerServiceSMO userInnerServiceSMOImpl;
@Override
@@ -64,9 +77,53 @@
List<AttendanceClassesTaskDto> attendanceClassesTasks = BeanConvertUtil.covertBeanList(attendanceClassesTaskServiceDaoImpl.getAttendanceClassesTaskInfo(BeanConvertUtil.beanCovertMap(attendanceClassesTaskDto)), AttendanceClassesTaskDto.class);
+ //杈撳叆鍛樺伐鍚嶇О
+ refreshAttendanceClassesTasks(attendanceClassesTasks);
return attendanceClassesTasks;
}
+ /**
+ * 杈撳叆 鍛樺伐 鍜� 鏄庣粏
+ *
+ * @param attendanceClassesTasks
+ */
+ private void refreshAttendanceClassesTasks(List<AttendanceClassesTaskDto> attendanceClassesTasks) {
+
+ if (attendanceClassesTasks == null || attendanceClassesTasks.size() < 1) {
+ return;
+ }
+
+ List<String> taskIds = new ArrayList<>();
+
+ for (AttendanceClassesTaskDto attendanceClassesTaskDto : attendanceClassesTasks) {
+ taskIds.add(attendanceClassesTaskDto.getTaskId());
+ }
+
+ AttendanceClassesTaskDetailDto attendanceClassesTaskDetailDto = new AttendanceClassesTaskDetailDto();
+ attendanceClassesTaskDetailDto.setTaskIds(taskIds.toArray(new String[taskIds.size()]));
+ attendanceClassesTaskDetailDto.setStoreId(attendanceClassesTasks.get(0).getStoreId());
+ List<AttendanceClassesTaskDetailDto> attendanceClassesTaskDetailDtos
+ = attendanceClassesTaskDetailInnerServiceSMOImpl.queryAttendanceClassesTaskDetails(attendanceClassesTaskDetailDto);
+
+ if (attendanceClassesTaskDetailDtos == null || attendanceClassesTaskDetailDtos.size() < 1) {
+ 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) {
+ if (attendanceClassesTaskDto.getTaskId().equals(tmpAttendanceClassesTaskDetailDto.getTaskId())) {
+ tmpAttendanceClassesTaskDetailDtos.add(tmpAttendanceClassesTaskDetailDto);
+ }
+ }
+ attendanceClassesTaskDto.setAttendanceClassesTaskDetails(tmpAttendanceClassesTaskDetailDtos);
+ }
+ }
+
@Override
public int queryAttendanceClassesTasksCount(@RequestBody AttendanceClassesTaskDto attendanceClassesTaskDto) {
--
Gitblit v1.8.0