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 |   83 ++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 80 insertions(+), 3 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 b5cd85b..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,15 +2,15 @@
 
 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;
@@ -34,6 +34,8 @@
 @Service
 public class ArdAppTaskServiceImpl implements IArdAppTaskService {
     @Resource
+    ArdAppTaskDetailPicMapper ardAppTaskDetailPicMapper;
+    @Resource
     private ArdAppTaskMapper ardAppTaskMapper;
     @Resource
     private ArdAppTaskTextMapper ardAppTaskTextMapper;
@@ -49,6 +51,19 @@
         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;
+    }
+
     /**
      * 鏌ヨapp浠诲姟绠＄悊鍒楄〃
      *
@@ -59,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;
     }
 
     /**
@@ -161,6 +201,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);
@@ -180,6 +221,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);
@@ -189,4 +233,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