From 2f07c0e336517efc48f0386eb04bee28804af5a7 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期二, 25 七月 2023 10:44:41 +0800
Subject: [PATCH] 增加app任务打卡 增加app按用户查询任务列表
---
ard-work/src/main/java/com/ruoyi/app/task/service/impl/ArdAppTaskServiceImpl.java | 56 +++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 49 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 b5cd85b..a8cf189 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
@@ -1,20 +1,15 @@
package com.ruoyi.app.task.service.impl;
import java.util.List;
-
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;
-
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.SecurityUtils;
import org.springframework.transaction.annotation.Transactional;
@@ -22,7 +17,6 @@
import com.ruoyi.app.task.mapper.ArdAppTaskMapper;
import com.ruoyi.app.task.domain.ArdAppTask;
import com.ruoyi.app.task.service.IArdAppTaskService;
-
import javax.annotation.Resource;
/**
@@ -59,6 +53,17 @@
@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());
+ return ardAppTaskMapper.selectArdAppTaskListWithDetail(ardAppTask);
}
/**
@@ -180,6 +185,10 @@
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 +198,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