From d828d6f8f842a3122070f2b0602fec9b38b14791 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期二, 01 八月 2023 14:22:37 +0800
Subject: [PATCH] 增加通过ID查询app任务详情接口
---
ard-work/src/main/java/com/ruoyi/app/task/service/impl/ArdAppTaskServiceImpl.java | 24 ++++++++++--
ard-work/src/main/java/com/ruoyi/app/task/mapper/ArdAppTaskMapper.java | 7 +++
ard-work/src/main/resources/mapper/app/ArdAppTaskMapper.xml | 16 ++++++-
ard-work/src/main/java/com/ruoyi/app/task/controller/ArdAppTaskController.java | 4 +
ard-work/src/main/java/com/ruoyi/app/task/domain/ArdAppTask.java | 16 +++++++-
5 files changed, 57 insertions(+), 10 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/app/task/controller/ArdAppTaskController.java b/ard-work/src/main/java/com/ruoyi/app/task/controller/ArdAppTaskController.java
index 0acaf8f..b3a69c0 100644
--- a/ard-work/src/main/java/com/ruoyi/app/task/controller/ArdAppTaskController.java
+++ b/ard-work/src/main/java/com/ruoyi/app/task/controller/ArdAppTaskController.java
@@ -44,6 +44,7 @@
@Autowired
private IArdAppTaskService ardAppTaskService;
+
/**
* 鏌ヨapp浠诲姟绠＄悊鍒楄〃
*/
@@ -88,9 +89,10 @@
/**
* 鑾峰彇app浠诲姟绠＄悊璇︾粏淇℃伅
*/
+ @ApiOperation("鎸囨尌绔�-鑾峰彇app浠诲姟绠＄悊璇︾粏淇℃伅")
@PreAuthorize("@ss.hasPermi('app:task:query')")
@GetMapping(value = "/{id}")
- public AjaxResult getInfoWithPic(@PathVariable("id") String id) {
+ public AjaxResult getInfo(@PathVariable("id") String id) {
return success(ardAppTaskService.selectArdAppTaskById(id));
}
diff --git a/ard-work/src/main/java/com/ruoyi/app/task/domain/ArdAppTask.java b/ard-work/src/main/java/com/ruoyi/app/task/domain/ArdAppTask.java
index fc615b0..ce4e2af 100644
--- a/ard-work/src/main/java/com/ruoyi/app/task/domain/ArdAppTask.java
+++ b/ard-work/src/main/java/com/ruoyi/app/task/domain/ArdAppTask.java
@@ -4,6 +4,7 @@
import java.util.List;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.entity.SysUser;
import io.swagger.annotations.ApiModelProperty;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
@@ -42,17 +43,28 @@
/** 鐢ㄦ埛ID */
@Excel(name = "鐢ㄦ埛ID")
private String userId;
+
/** app浠诲姟鍥剧墖淇℃伅 */
@ApiModelProperty(notes = "app浠诲姟鍥剧墖淇℃伅")
private List<ArdAppTaskPic> ardAppTaskPicList;
- /** app浠诲姟鍏宠仈澶氱敤鎴� */
+ /** app浠诲姟鍏宠仈澶氱敤鎴穒d鍒楄〃 */
private List<String> userIds;
-
+ /** app浠诲姟鍏宠仈澶氱敤鎴� */
+ private List<SysUser> sysUserList;
/** app浠诲姟璇︽儏淇℃伅 */
@ApiModelProperty(notes = "app浠诲姟璇︽儏淇℃伅")
private List<ArdAppTaskDetail> ardAppTaskDetailList;
+
+ public List<SysUser> getSysUserList() {
+ return sysUserList;
+ }
+
+ public void setSysUserList(List<SysUser> sysUserList) {
+ this.sysUserList = sysUserList;
+ }
+
public List<ArdAppTaskPic> getArdAppTaskPicList()
{
return ardAppTaskPicList;
diff --git a/ard-work/src/main/java/com/ruoyi/app/task/mapper/ArdAppTaskMapper.java b/ard-work/src/main/java/com/ruoyi/app/task/mapper/ArdAppTaskMapper.java
index 4e8ae7f..2ebed97 100644
--- a/ard-work/src/main/java/com/ruoyi/app/task/mapper/ArdAppTaskMapper.java
+++ b/ard-work/src/main/java/com/ruoyi/app/task/mapper/ArdAppTaskMapper.java
@@ -43,6 +43,13 @@
*/
public List<ArdAppTask> selectArdAppTaskListWithDetail(ArdAppTask ardAppTask);
public List<ArdAppTask> selectArdAppTaskListWithDetailById(ArdAppTask ardAppTask);
+
+ /**
+ * 鎸変换鍔d鏌ヨ涓嬪彂鐨刟pp鐢ㄦ埛id鍒楄〃
+ *
+ */
+ public List<String> selectArdAppTaskDetailUserIdsByTaskId(String task_id);
+
/**
* 鏂板app浠诲姟绠＄悊
*
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 09c1a93..a6b4d80 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,8 +9,10 @@
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;
@@ -39,6 +41,8 @@
private ArdAppTaskMapper ardAppTaskMapper;
@Resource
private ArdAppTaskTextMapper ardAppTaskTextMapper;
+ @Resource
+ private SysUserMapper sysUserMapper;
/**
* 鏌ヨapp浠诲姟绠＄悊
@@ -48,7 +52,19 @@
*/
@Override
public ArdAppTask selectArdAppTaskById(String id) {
- return ardAppTaskMapper.selectArdAppTaskById(id);
+ ArdAppTask ardAppTask = ardAppTaskMapper.selectArdAppTaskById(id);
+ 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
@@ -277,7 +293,7 @@
@Override
public ArdAppTask selectNewArdAppTaskByUserId(String userId) {
ArdAppTask ardAppTask = ardAppTaskMapper.selectNewArdAppTaskByUserId(userId);
- if(StringUtils.isNotNull(ardAppTask)) {
+ if (StringUtils.isNotNull(ardAppTask)) {
ArdAppTaskDetail detail = new ArdAppTaskDetail();
detail.setViewFlag("1");
detail.setTaskId(ardAppTask.getId());
@@ -285,6 +301,7 @@
}
return ardAppTask;
}
+
/**
* 鏌ヨ宸插脊绐椾絾鏈鐨勪换鍔℃暟閲�
*
@@ -292,8 +309,7 @@
* @return 缁撴灉
*/
@Override
- public int selectUnreadArdAppTaskCount(String userId)
- {
+ public int selectUnreadArdAppTaskCount(String userId) {
return ardAppTaskMapper.selectUnreadArdAppTaskCount(userId);
}
}
diff --git a/ard-work/src/main/resources/mapper/app/ArdAppTaskMapper.xml b/ard-work/src/main/resources/mapper/app/ArdAppTaskMapper.xml
index 106e9c4..f535c75 100644
--- a/ard-work/src/main/resources/mapper/app/ArdAppTaskMapper.xml
+++ b/ard-work/src/main/resources/mapper/app/ArdAppTaskMapper.xml
@@ -27,7 +27,12 @@
<!-- <collection property="ardAppTaskDetailList" notNullColumn="sub1_id" javaType="java.util.List"-->
<!-- resultMap="ArdAppTaskDetailResult"/>-->
</resultMap>
-
+ <resultMap id="ArdAppTaskSub1Result" type="ArdAppTask" extends="ArdAppTaskResult">
+ <collection property="ardAppTaskPicList" notNullColumn="sub2_id" javaType="java.util.List"
+ resultMap="ArdAppTaskPicResult"/>
+ <collection property="ardAppTaskDetailList" notNullColumn="sub1_id" javaType="java.util.List"
+ resultMap="ArdAppTaskDetailResult"/>
+ </resultMap>
<resultMap type="ArdAppTaskDetail" id="ArdAppTaskDetailResult">
<result property="id" column="sub1_id"/>
<result property="name" column="sub1_name"/>
@@ -93,7 +98,8 @@
c.view_time as sub1_view_time,
c.view_position as sub1_view_position,
c.clock_in_time as sub1_clock_in_time,
- c.view_flag as sub1_view_flag
+ c.view_flag as sub1_view_flag,
+ c.task_id as sub1_task_id
from ard_app_task a
left join ard_app_task_pic b on b.task_id = a.id
left join ard_app_task_detail c on c.task_id = a.id
@@ -153,7 +159,7 @@
</where>
</select>
- <select id="selectArdAppTaskById" parameterType="String" resultMap="ArdAppTaskSubResult">
+ <select id="selectArdAppTaskById" parameterType="String" resultMap="ArdAppTaskSub1Result">
<include refid="selectArdAppTaskDto"/>
where a.id = #{id}
</select>
@@ -165,6 +171,10 @@
<select id="selectArdAppTaskPicListById" resultType="ArdAppTaskPic">
select * from ard_app_task_pic d where d.task_id = #{id}
</select>
+ <select id="selectArdAppTaskDetailUserIdsByTaskId" parameterType="String" resultType="java.lang.String">
+ select DISTINCT(user_id) from ard_app_task_detail where task_id=#{taskId}
+ </select>
+
<insert id="insertArdAppTask" parameterType="ArdAppTask">
insert into ard_app_task
--
Gitblit v1.9.3