From 86109695279091d77048808a66c01ce178dbc6e1 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期二, 01 八月 2023 17:02:55 +0800
Subject: [PATCH] 增加打卡图片到单兵端 - 下发给我的任务详情
---
ard-work/src/main/resources/mapper/app/ArdAppTaskMapper.xml | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
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