From daec14944050351be0cee651d06253892b773f8c Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期二, 01 八月 2023 11:34:12 +0800
Subject: [PATCH] 推送app用户实时位置增加用户名到parmas
---
ard-work/src/main/resources/mapper/app/ArdAppTaskMapper.xml | 67 ++++++++++++++++++++++++++-------
1 files changed, 53 insertions(+), 14 deletions(-)
diff --git a/ard-work/src/main/resources/mapper/app/ArdAppTaskMapper.xml b/ard-work/src/main/resources/mapper/app/ArdAppTaskMapper.xml
index de83c72..8d800fb 100644
--- a/ard-work/src/main/resources/mapper/app/ArdAppTaskMapper.xml
+++ b/ard-work/src/main/resources/mapper/app/ArdAppTaskMapper.xml
@@ -16,12 +16,18 @@
<result property="updateBy" column="update_by"/>
<result property="updateTime" column="update_time"/>
</resultMap>
+
<resultMap id="ArdAppTaskSubResult" 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"/>
+ <collection property="ardAppTaskDetailList" column="{id=id,detailUserId=detail_user_id}"
+ select="selectArdAppTaskDetailListByIdAndUserId"/>
+ <collection property="ardAppTaskPicList" column="id"
+ select="selectArdAppTaskPicListById"/>
+ <!-- <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"/>
@@ -37,19 +43,12 @@
<result property="viewTime" column="sub1_view_time"/>
<result property="viewPosition" column="sub1_view_position"/>
<result property="clockInTime" column="sub1_clock_in_time"/>
+ <result property="viewFlag" column="sub1_view_flag"/>
</resultMap>
<resultMap type="ArdAppTaskPic" id="ArdAppTaskPicResult">
<result property="id" column="sub2_id"/>
<result property="taskId" column="sub2_task_id"/>
<result property="picUrl" column="sub2_pic_url"/>
- </resultMap>
- <resultMap id="ArdAppTaskArdAppTaskPicResult" type="ArdAppTask" extends="ArdAppTaskResult">
- <collection property="ardAppTaskPicList" notNullColumn="sub_id" javaType="java.util.List"
- resultMap="ArdAppTaskPicResult"/>
- </resultMap>
- <resultMap id="ArdAppTaskArdAppTaskDetailResult" type="ArdAppTask" extends="ArdAppTaskResult">
- <collection property="ardAppTaskDetailList" notNullColumn="sub_id" javaType="java.util.List"
- resultMap="ArdAppTaskDetailResult"/>
</resultMap>
<sql id="selectArdAppTaskVo">
@@ -94,11 +93,14 @@
c.status as sub1_status,
c.clock_in_pic_url as sub1_clock_in_pic_url,
c.view_time as sub1_view_time,
- c.view_position as sub1_view_position
+ c.view_position as sub1_view_position,
+ c.clock_in_time as sub1_clock_in_time,
+ c.view_flag as sub1_view_flag
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
</sql>
+
<select id="selectArdAppTaskList" parameterType="ArdAppTask" resultMap="ArdAppTaskResult">
<include refid="selectArdAppTaskVo"/>
<where>
@@ -116,9 +118,14 @@
${params.dataScope}
</where>
</select>
+
<select id="selectArdAppTaskListWithDetail" parameterType="ArdAppTask" resultMap="ArdAppTaskSubResult">
- <include refid="selectArdAppTaskDto"/>
+ select DISTINCT(a.id)as idd,c.user_id as detail_user_id,a.* from ard_app_task a
+ LEFT JOIN ard_app_task_detail c on c.task_id=a.id
<where>
+ <if test="id != null and id != ''">
+ and a.id = #{id}
+ </if>
<if test="userId != null and userId != ''">
and c.user_id = #{userId}
</if>
@@ -129,7 +136,9 @@
and a.create_time <= to_timestamp(#{params.endTime},'yyyy-MM-DD HH24:MI:ss')
</if>
</where>
+ order by a.create_time desc
</select>
+
<select id="selectArdAppTaskListWithDetailById" parameterType="ArdAppTask" resultMap="ArdAppTaskSubResult">
<include refid="selectArdAppTaskDto"/>
<where>
@@ -151,6 +160,14 @@
<select id="selectArdAppTaskById" parameterType="String" resultMap="ArdAppTaskSubResult">
<include refid="selectArdAppTaskDto"/>
where a.id = #{id}
+ </select>
+
+ <select id="selectArdAppTaskDetailListByIdAndUserId" resultType="ArdAppTaskDetail">
+ select * from ard_app_task_detail d
+ where d.task_id = #{id} and d.user_id = #{detailUserId}
+ </select>
+ <select id="selectArdAppTaskPicListById" resultType="ArdAppTaskPic">
+ select * from ard_app_task_pic d where d.task_id = #{id}
</select>
<insert id="insertArdAppTask" parameterType="ArdAppTask">
@@ -260,10 +277,19 @@
<if test="text != null">text = #{text},</if>
<if test="voice != null">voice = #{voice},</if>
<if test="viewTime != null">view_time = #{viewTime},</if>
+ <if test="viewFlag != null">view_flag = #{viewFlag},</if>
<if test="viewPosition != null">view_position = #{viewPosition},</if>
<if test="clockInTime != null">clock_in_time = #{clockInTime},</if>
+ <if test="taskId != null">task_id = #{taskId},</if>
</trim>
where id = #{id}
+ </update>
+ <update id="updateArdAppTaskDetailByTaskId" parameterType="ArdAppTaskDetail">
+ update ard_app_task_detail
+ <trim prefix="SET" suffixOverrides=",">
+ <if test="viewFlag != null">view_flag = #{viewFlag},</if>
+ </trim>
+ where task_id = #{taskId}
</update>
<update id="updateArdAppTaskDetailView" parameterType="ArdAppTaskDetail">
update ard_app_task_detail
@@ -299,4 +325,17 @@
from ard_app_task_detail c
where c.id = #{id}
</select>
+ <select id="selectNewArdAppTaskByUserId" parameterType="String" resultMap="ArdAppTaskSubResult">
+ <include refid="selectArdAppTaskDto"/>
+ where c.user_id = #{userId} AND c.view_flag is null
+ order by create_time desc limit 1
+ </select>
+ <select id="selectUnreadArdAppTaskCount" resultType="Integer">
+ SELECT COUNT(A.ID)
+ FROM ard_app_task A
+ LEFT JOIN ard_app_task_detail C ON C.task_id = A.ID
+ WHERE C.view_time IS NULL
+ AND C.view_flag = '1'
+ AND C.user_id = #{userId}
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3