From f1e1115bd10c15dec59f8770538ad1642fb3a2e8 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期四, 27 七月 2023 17:28:51 +0800
Subject: [PATCH] 提交
---
ard-work/src/main/java/com/ruoyi/app/task/service/impl/ArdAppTaskServiceImpl.java | 97 ++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 88 insertions(+), 9 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 79c86b7..ca958c8 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
@@ -2,16 +2,17 @@
import java.util.List;
+import com.github.pagehelper.PageHelper;
import com.ruoyi.app.task.domain.ArdAppTaskDetail;
+import com.ruoyi.app.taskdetail.domain.ArdAppTaskDetailPic;
+import com.ruoyi.app.taskdetail.mapper.ArdAppTaskDetailPicMapper;
import com.ruoyi.app.tasktext.domain.ArdAppTaskText;
import com.ruoyi.app.tasktext.mapper.ArdAppTaskTextMapper;
import com.ruoyi.common.annotation.DataScope;
import com.ruoyi.common.utils.DateUtils;
-
import com.ruoyi.common.utils.uuid.IdUtils;
-import com.ruoyi.common.utils.uuid.UUID;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+
import java.util.ArrayList;
import com.ruoyi.common.utils.StringUtils;
@@ -33,9 +34,12 @@
@Service
public class ArdAppTaskServiceImpl implements IArdAppTaskService {
@Resource
+ ArdAppTaskDetailPicMapper ardAppTaskDetailPicMapper;
+ @Resource
private ArdAppTaskMapper ardAppTaskMapper;
@Resource
private ArdAppTaskTextMapper ardAppTaskTextMapper;
+
/**
* 鏌ヨapp浠诲姟绠＄悊
*
@@ -45,6 +49,19 @@
@Override
public ArdAppTask selectArdAppTaskById(String id) {
return ardAppTaskMapper.selectArdAppTaskById(id);
+ }
+
+ @Override
+ public ArdAppTaskDetail selectArdAppTaskDetailById(String id) {
+ ArdAppTaskDetail appTaskDetail = ardAppTaskMapper.selectArdAppTaskDetailById(id);
+ ArdAppTaskDetailPic ardAppTaskDetailPic = new ArdAppTaskDetailPic();
+ ardAppTaskDetailPic.setTaskDetailId(id);
+ List<ArdAppTaskDetailPic> ardAppTaskDetailPicList = ardAppTaskDetailPicMapper.selectArdAppTaskDetailPicList(ardAppTaskDetailPic);
+ if(ardAppTaskDetailPicList.size()>0)
+ {
+ appTaskDetail.setArdAppTaskDetailPic(ardAppTaskDetailPicList);
+ }
+ return appTaskDetail;
}
/**
@@ -57,6 +74,31 @@
@DataScope(deptAlias = "d", userAlias = "u")
public List<ArdAppTask> selectArdAppTaskList(ArdAppTask ardAppTask) {
return ardAppTaskMapper.selectArdAppTaskList(ardAppTask);
+ }
+
+ /**
+ * 鏌ヨapp浠诲姟璇︽儏绠＄悊鍒楄〃
+ *
+ * @param ardAppTask app浠诲姟瀵硅薄
+ * @return app浠诲姟璇︽儏鍒楄〃
+ */
+ @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);
+ 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);
+ return list;
}
/**
@@ -107,6 +149,7 @@
@Override
public int deleteArdAppTaskByIds(String[] ids) {
ardAppTaskMapper.deleteArdAppTaskPicByTaskIds(ids);
+ ardAppTaskMapper.deleteArdAppTaskDetailByTaskIds(ids);
return ardAppTaskMapper.deleteArdAppTaskByIds(ids);
}
@@ -133,8 +176,7 @@
String id = ardAppTask.getId();
if (StringUtils.isNotNull(ardAppTaskPicList)) {
List<ArdAppTaskPic> list = new ArrayList<ArdAppTaskPic>();
- for (ArdAppTaskPic ardAppTaskPic :ardAppTaskPicList)
- {
+ for (ArdAppTaskPic ardAppTaskPic : ardAppTaskPicList) {
ardAppTaskPic.setId(IdUtils.simpleUUID());
ardAppTaskPic.setTaskId(id);
list.add(ardAppTaskPic);
@@ -152,13 +194,14 @@
*/
public void insertArdAppTaskDetail(ArdAppTask ardAppTask) {
List<String> userIds = ardAppTask.getUserIds();
- for(String userId:userIds) {
+ for (String userId : userIds) {
List<ArdAppTaskDetail> ardAppTaskDetailList = ardAppTask.getArdAppTaskDetailList();
String id = ardAppTask.getId();
if (StringUtils.isNotNull(ardAppTaskDetailList)) {
List<ArdAppTaskDetail> list = new ArrayList<ArdAppTaskDetail>();
for (ArdAppTaskDetail ardAppTaskDetail : ardAppTaskDetailList) {
ardAppTaskDetail.setId(IdUtils.simpleUUID());
+ ardAppTaskDetail.setStatus("0");
ardAppTaskDetail.setTaskId(id);
ardAppTaskDetail.setUserId(userId);
list.add(ardAppTaskDetail);
@@ -169,6 +212,7 @@
}
}
}
+
/**
* 鏂板app浠诲姟鎻忚堪淇℃伅
*
@@ -177,14 +221,49 @@
public void insertArdAppTaskText(ArdAppTask ardAppTask) {
String userId = ardAppTask.getUserId();
String text = ardAppTask.getText();
- ArdAppTaskText ardAppTaskText=new ArdAppTaskText();
+ if (StringUtils.isEmpty(text)) {
+ return;
+ }
+ ArdAppTaskText ardAppTaskText = new ArdAppTaskText();
ardAppTaskText.setId(IdUtils.simpleUUID());
ardAppTaskText.setUserId(userId);
ardAppTaskText.setText(text);
List<ArdAppTaskText> ardAppTaskTexts = ardAppTaskTextMapper.selectArdAppTaskTextList(ardAppTaskText);
- if(ardAppTaskTexts.size()==0)
- {
+ if (ardAppTaskTexts.size() == 0) {
ardAppTaskTextMapper.insertArdAppTaskText(ardAppTaskText);
}
}
+
+ /**
+ * 淇敼app浠诲姟璇︽儏
+ *
+ * @param ardAppTaskDetail app浠诲姟璇︽儏瀵硅薄
+ */
+ @Override
+ public int updateArdAppTaskDetail(ArdAppTaskDetail ardAppTaskDetail) {
+ insertArdAppTaskPic(ardAppTaskDetail);
+ return ardAppTaskMapper.updateArdAppTaskDetail(ardAppTaskDetail);
+ }
+
+ /**
+ * 鏂板app浠诲姟璇︽儏鍥剧墖淇℃伅
+ *
+ * @param ardAppTaskDetail app浠诲姟璇︽儏瀵硅薄
+ */
+ public void insertArdAppTaskPic(ArdAppTaskDetail ardAppTaskDetail) {
+ List<ArdAppTaskDetailPic> ardAppTaskDetailPicList = ardAppTaskDetail.getArdAppTaskDetailPic();
+ String detailId = ardAppTaskDetail.getId();
+ if (StringUtils.isNotNull(ardAppTaskDetailPicList)) {
+ List<ArdAppTaskDetailPic> list = new ArrayList<ArdAppTaskDetailPic>();
+ for (ArdAppTaskDetailPic ardAppTaskDetailPic : ardAppTaskDetailPicList) {
+ ardAppTaskDetailPic.setId(IdUtils.simpleUUID());
+ ardAppTaskDetailPic.setTaskDetailId(detailId);
+ list.add(ardAppTaskDetailPic);
+ }
+ if (list.size() > 0) {
+ ardAppTaskMapper.deleteArdAppTaskDetailPicByTaskDetailId(detailId);
+ ardAppTaskMapper.batchArdAppTaskDetailPic(list);
+ }
+ }
+ }
}
--
Gitblit v1.9.3