From 0be852043be57c9a0daba2e7d0e8aa531fdeedba Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期二, 01 八月 2023 16:06:09 +0800
Subject: [PATCH] 打卡时间格式化"yyyy-MM-dd HH:mm:ss"
---
ard-work/src/main/java/com/ruoyi/app/task/service/impl/ArdAppTaskServiceImpl.java | 46 ++++++++++++++++++++++++++++++++--------------
1 files changed, 32 insertions(+), 14 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/app/task/service/impl/ArdAppTaskServiceImpl.java b/ard-work/src/main/java/com/ruoyi/app/task/service/impl/ArdAppTaskServiceImpl.java
index 765a95f..3feb04c 100644
--- a/ard-work/src/main/java/com/ruoyi/app/task/service/impl/ArdAppTaskServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/app/task/service/impl/ArdAppTaskServiceImpl.java
@@ -9,11 +9,14 @@
import com.ruoyi.app.tasktext.domain.ArdAppTaskText;
import com.ruoyi.app.tasktext.mapper.ArdAppTaskTextMapper;
import com.ruoyi.common.annotation.DataScope;
+import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.uuid.IdUtils;
+import com.ruoyi.system.mapper.SysUserMapper;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
+import java.util.stream.Collectors;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.SecurityUtils;
@@ -39,6 +42,8 @@
private ArdAppTaskMapper ardAppTaskMapper;
@Resource
private ArdAppTaskTextMapper ardAppTaskTextMapper;
+ @Resource
+ private SysUserMapper sysUserMapper;
/**
* 鏌ヨapp浠诲姟绠＄悊
@@ -48,7 +53,28 @@
*/
@Override
public ArdAppTask selectArdAppTaskById(String id) {
- return ardAppTaskMapper.selectArdAppTaskById(id);
+ ArdAppTask ardAppTask = ardAppTaskMapper.selectArdAppTaskById(id);
+
+ List<ArdAppTaskDetail> ardAppTaskDetailList = ardAppTask.getArdAppTaskDetailList();
+ if(ardAppTaskDetailList.size()>0)
+ {
+ ardAppTaskDetailList = ardAppTaskDetailList.stream()
+ .collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new java.util.TreeSet<>(java.util.Comparator.comparing(ArdAppTaskDetail::getName))), ArrayList::new));
+ ardAppTask.setArdAppTaskDetailList(ardAppTaskDetailList);
+ }
+
+ List<String> userIds = ardAppTaskMapper.selectArdAppTaskDetailUserIdsByTaskId(id);
+ if (userIds.size() > 0) {
+ ardAppTask.setUserIds(userIds);
+ List<SysUser> sysUserList=new ArrayList<>();
+ for (String userId : userIds) {
+ SysUser sysUser = sysUserMapper.selectUserById(userId);
+ sysUserList.add(sysUser);
+ }
+ ardAppTask.setSysUserList(sysUserList);
+
+ }
+ return ardAppTask;
}
@Override
@@ -70,7 +96,6 @@
* @return app浠诲姟绠＄悊
*/
@Override
- @DataScope(deptAlias = "d", userAlias = "u")
public List<ArdAppTask> selectArdAppTaskList(ArdAppTask ardAppTask) {
return ardAppTaskMapper.selectArdAppTaskList(ardAppTask);
}
@@ -83,20 +108,13 @@
*/
@Override
public List<ArdAppTask> selectArdAppTaskListWithDetail(ArdAppTask ardAppTask) {
- ardAppTask.setUserId(SecurityUtils.getUserId());
- List<ArdAppTask> list1 = ardAppTaskMapper.selectArdAppTaskListWithDetail(ardAppTask);
- List<ArdAppTask> list = new ArrayList<>();
- list.addAll(list1);
+ List<ArdAppTask> list = ardAppTaskMapper.selectArdAppTaskListWithDetail(ardAppTask);
return list;
-
}
@Override
public List<ArdAppTask> selectArdAppTaskListWithDetailById(ArdAppTask ardAppTask) {
- ardAppTask.setUserId(SecurityUtils.getUserId());
- List<ArdAppTask> list1 = ardAppTaskMapper.selectArdAppTaskListWithDetailById(ardAppTask);
- List<ArdAppTask> list = new ArrayList<>();
- list.addAll(list1);
+ List<ArdAppTask> list = ardAppTaskMapper.selectArdAppTaskListWithDetail(ardAppTask);
return list;
}
@@ -285,7 +303,7 @@
@Override
public ArdAppTask selectNewArdAppTaskByUserId(String userId) {
ArdAppTask ardAppTask = ardAppTaskMapper.selectNewArdAppTaskByUserId(userId);
- if(StringUtils.isNotNull(ardAppTask)) {
+ if (StringUtils.isNotNull(ardAppTask)) {
ArdAppTaskDetail detail = new ArdAppTaskDetail();
detail.setViewFlag("1");
detail.setTaskId(ardAppTask.getId());
@@ -293,6 +311,7 @@
}
return ardAppTask;
}
+
/**
* 鏌ヨ宸插脊绐椾絾鏈鐨勪换鍔℃暟閲�
*
@@ -300,8 +319,7 @@
* @return 缁撴灉
*/
@Override
- public int selectUnreadArdAppTaskCount(String userId)
- {
+ public int selectUnreadArdAppTaskCount(String userId) {
return ardAppTaskMapper.selectUnreadArdAppTaskCount(userId);
}
}
--
Gitblit v1.9.3