From 86109695279091d77048808a66c01ce178dbc6e1 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期二, 01 八月 2023 17:02:55 +0800
Subject: [PATCH] 增加打卡图片到单兵端 - 下发给我的任务详情
---
ard-work/src/main/java/com/ruoyi/app/task/service/impl/ArdAppTaskServiceImpl.java | 80 +++++++++++++++++++++++++++++++++------
1 files changed, 67 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 b6986bd..15e277d 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,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 +135,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);
@@ -249,8 +273,15 @@
*/
@Override
public int updateArdAppTaskDetail(ArdAppTaskDetail ardAppTaskDetail) {
+ ardAppTaskDetail.setClockInTime(DateUtils.getNowDate());
insertArdAppTaskPic(ardAppTaskDetail);
return ardAppTaskMapper.updateArdAppTaskDetail(ardAppTaskDetail);
+ }
+
+ @Override
+ public int updateArdAppTaskDetailView(ArdAppTaskDetail ardAppTaskDetail) {
+ ardAppTaskDetail.setViewTime(DateUtils.getNowDate());
+ return ardAppTaskMapper.updateArdAppTaskDetailView(ardAppTaskDetail);
}
/**
@@ -262,6 +293,7 @@
List<ArdAppTaskDetailPic> ardAppTaskDetailPicList = ardAppTaskDetail.getArdAppTaskDetailPic();
String detailId = ardAppTaskDetail.getId();
if (StringUtils.isNotNull(ardAppTaskDetailPicList)) {
+ ardAppTaskMapper.deleteArdAppTaskDetailPicByTaskDetailId(detailId);
List<ArdAppTaskDetailPic> list = new ArrayList<ArdAppTaskDetailPic>();
for (ArdAppTaskDetailPic ardAppTaskDetailPic : ardAppTaskDetailPicList) {
ardAppTaskDetailPic.setId(IdUtils.simpleUUID());
@@ -269,9 +301,31 @@
list.add(ardAppTaskDetailPic);
}
if (list.size() > 0) {
- ardAppTaskMapper.deleteArdAppTaskDetailPicByTaskDetailId(detailId);
ardAppTaskMapper.batchArdAppTaskDetailPic(list);
}
}
}
+
+ @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