From 973db3d9d601e538e2dca651fd16af53908faffb Mon Sep 17 00:00:00 2001
From: Administrator <1144154118@qq.com>
Date: 星期四, 10 八月 2023 13:28:35 +0800
Subject: [PATCH] 日历
---
ard-work/src/main/java/com/ruoyi/app/task/service/impl/ArdAppTaskServiceImpl.java | 91 +++++++++++++++++++++++++++++++++++++++------
1 files changed, 78 insertions(+), 13 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 29c1389..d6ab9f7 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,15 @@
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.Optional;
+import java.util.stream.Collectors;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.SecurityUtils;
@@ -39,6 +43,8 @@
private ArdAppTaskMapper ardAppTaskMapper;
@Resource
private ArdAppTaskTextMapper ardAppTaskTextMapper;
+ @Resource
+ private SysUserMapper sysUserMapper;
/**
* 鏌ヨapp浠诲姟绠＄悊
@@ -48,7 +54,31 @@
*/
@Override
public ArdAppTask selectArdAppTaskById(String id) {
- return ardAppTaskMapper.selectArdAppTaskById(id);
+ ArdAppTask ardAppTask = ardAppTaskMapper.selectArdAppTaskById(id);
+ if(StringUtils.isNull(ardAppTask))
+ {
+ return null;
+ }
+ 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,9 +100,22 @@
* @return app浠诲姟绠＄悊
*/
@Override
- @DataScope(deptAlias = "d", userAlias = "u")
public List<ArdAppTask> selectArdAppTaskList(ArdAppTask ardAppTask) {
- return ardAppTaskMapper.selectArdAppTaskList(ardAppTask);
+ List<ArdAppTask> parentList = ardAppTaskMapper.selectArdAppTaskList(ardAppTask);
+
+ if(StringUtils.isNotNull(ardAppTask.getAppUserId())) {
+ //濡傛灉app鐢ㄦ埛id涓嶄负绌�,鏌ヨ鍑烘墍鏈変换鍔＄殑瀛愪换鍔″垪琛�
+ for(ArdAppTask appTask:parentList)
+ {
+ List<ArdAppTaskDetail> ardAppTaskDetails = ardAppTaskMapper.selectArdAppTaskDetailListByTaskId(appTask.getId());
+ appTask.setArdAppTaskDetailList(ardAppTaskDetails);
+ }
+ //閫氳繃app鐢ㄦ埛id杩囨护瀛愪换鍔″垪琛ㄦ潵杩囨护鍑虹埗浠诲姟鍒楄〃
+ parentList = parentList.stream()
+ .filter(parent -> parent.getArdAppTaskDetailList().stream().anyMatch(child -> child.getUserId().equals(ardAppTask.getAppUserId())))
+ .collect(Collectors.toList());
+ }
+ return parentList;
}
/**
@@ -83,20 +126,19 @@
*/
@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);
+ for(ArdAppTaskDetail detail : list.get(0).getArdAppTaskDetailList()) {
+ ArdAppTaskDetailPic ardAppTaskDetailPic =new ArdAppTaskDetailPic();
+ ardAppTaskDetailPic.setTaskDetailId(detail.getId());
+ List<ArdAppTaskDetailPic> ardAppTaskDetailPicList = ardAppTaskDetailPicMapper.selectArdAppTaskDetailPicList(ardAppTaskDetailPic);
+ detail.setArdAppTaskDetailPic(ardAppTaskDetailPicList);
+ }
return list;
}
@@ -111,7 +153,7 @@
public int insertArdAppTask(ArdAppTask ardAppTask) {
ardAppTask.setId(IdUtils.simpleUUID());
ardAppTask.setUserId(SecurityUtils.getUserId());
- ardAppTask.setCreateBy(SecurityUtils.getUsername());
+ ardAppTask.setCreateBy(SecurityUtils.getLoginUser().getUser().getNickName());
ardAppTask.setCreateTime(DateUtils.getNowDate());
int rows = ardAppTaskMapper.insertArdAppTask(ardAppTask);
insertArdAppTaskPic(ardAppTask);
@@ -281,4 +323,27 @@
}
}
}
+
+ @Override
+ public ArdAppTask selectNewArdAppTaskByUserId(String userId) {
+ ArdAppTask ardAppTask = ardAppTaskMapper.selectNewArdAppTaskByUserId(userId);
+ if (StringUtils.isNotNull(ardAppTask)) {
+ ArdAppTaskDetail detail = new ArdAppTaskDetail();
+ detail.setViewFlag("1");
+ detail.setTaskId(ardAppTask.getId());
+ int i = ardAppTaskMapper.updateArdAppTaskDetailByTaskId(detail);
+ }
+ return ardAppTask;
+ }
+
+ /**
+ * 鏌ヨ宸插脊绐椾絾鏈鐨勪换鍔℃暟閲�
+ *
+ * @param userId app鐢ㄦ埛Id
+ * @return 缁撴灉
+ */
+ @Override
+ public int selectUnreadArdAppTaskCount(String userId) {
+ return ardAppTaskMapper.selectUnreadArdAppTaskCount(userId);
+ }
}
--
Gitblit v1.9.3