From 0533bbabfe22484a84c85d13a391a1fd5cb949c2 Mon Sep 17 00:00:00 2001
From: Administrator <1144154118@qq.com>
Date: 星期二, 25 七月 2023 14:48:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/app/task/service/impl/ArdAppTaskServiceImpl.java | 84 ++++++++++++++++++++++++++++++++++++++---
1 files changed, 77 insertions(+), 7 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 0a3fc0c..b084327 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,15 +2,14 @@
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.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;
@@ -46,10 +45,7 @@
*/
@Override
public ArdAppTask selectArdAppTaskById(String id) {
- ArdAppTask task = ardAppTaskMapper.selectArdAppTaskByIdWithPic(id);
- ArdAppTask temp = ardAppTaskMapper.selectArdAppTaskByIdWithDetail(id);
- task.setArdAppTaskDetailList(temp.getArdAppTaskDetailList());
- return task;
+ return ardAppTaskMapper.selectArdAppTaskById(id);
}
/**
@@ -62,6 +58,42 @@
@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;
+// boolean flag=false;
+// List<ArdAppTask> ardAppTasks = ardAppTaskMapper.selectArdAppTaskList(ardAppTask);
+// ardAppTask.setUserId(SecurityUtils.getUserId());
+// List<ArdAppTask> ardAppTasksNew=new ArrayList<>();
+// for (ArdAppTask appTask : ardAppTasks) {
+// ArdAppTask task = ardAppTaskMapper.selectArdAppTaskById(appTask.getId());
+// List<ArdAppTaskDetail> ardAppTaskDetailListNew = new ArrayList<>();
+// List<ArdAppTaskDetail> ardAppTaskDetailList = task.getArdAppTaskDetailList();
+// for (ArdAppTaskDetail appTaskDetail : ardAppTaskDetailList) {
+// if (appTaskDetail.getUserId().equals(ardAppTask.getUserId())) {
+// ardAppTaskDetailListNew.add(appTaskDetail);
+// flag=true;
+// }
+// }
+// if(flag) {
+// appTask.setArdAppTaskDetailList(ardAppTaskDetailListNew);
+// ardAppTasksNew.add(appTask);
+// }
+// flag=false;
+// }
+// return ardAppTasksNew;
}
/**
@@ -112,6 +144,7 @@
@Override
public int deleteArdAppTaskByIds(String[] ids) {
ardAppTaskMapper.deleteArdAppTaskPicByTaskIds(ids);
+ ardAppTaskMapper.deleteArdAppTaskDetailByTaskIds(ids);
return ardAppTaskMapper.deleteArdAppTaskByIds(ids);
}
@@ -163,6 +196,7 @@
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);
@@ -182,6 +216,9 @@
public void insertArdAppTaskText(ArdAppTask ardAppTask) {
String userId = ardAppTask.getUserId();
String text = ardAppTask.getText();
+ if (StringUtils.isEmpty(text)) {
+ return;
+ }
ArdAppTaskText ardAppTaskText = new ArdAppTaskText();
ardAppTaskText.setId(IdUtils.simpleUUID());
ardAppTaskText.setUserId(userId);
@@ -191,4 +228,37 @@
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