From bfc9d5ca46948fbe0623211c030de200df04aba2 Mon Sep 17 00:00:00 2001 From: ‘liusuyi’ <1951119284@qq.com> Date: 星期五, 28 七月 2023 12:39:05 +0800 Subject: [PATCH] 删除任务查看时间和查看位置 增加任务详情打卡时间 --- ard-work/src/main/resources/mapper/app/ArdAppTaskMapper.xml | 45 ++++++++++++++++++++++++--------------------- 1 files changed, 24 insertions(+), 21 deletions(-) diff --git a/ard-work/src/main/resources/mapper/app/ArdAppTaskMapper.xml b/ard-work/src/main/resources/mapper/app/ArdAppTaskMapper.xml index 61ed850..de83c72 100644 --- a/ard-work/src/main/resources/mapper/app/ArdAppTaskMapper.xml +++ b/ard-work/src/main/resources/mapper/app/ArdAppTaskMapper.xml @@ -15,8 +15,6 @@ <result property="createTime" column="create_time"/> <result property="updateBy" column="update_by"/> <result property="updateTime" column="update_time"/> - <result property="viewTime" column="view_time"/> - <result property="viewPosition" column="view_position"/> </resultMap> <resultMap id="ArdAppTaskSubResult" type="ArdAppTask" extends="ArdAppTaskResult"> <collection property="ardAppTaskPicList" notNullColumn="sub2_id" javaType="java.util.List" @@ -38,6 +36,7 @@ <result property="clockInPicUrl" column="sub1_clock_in_pic_url"/> <result property="viewTime" column="sub1_view_time"/> <result property="viewPosition" column="sub1_view_position"/> + <result property="clockInTime" column="sub1_clock_in_time"/> </resultMap> <resultMap type="ArdAppTaskPic" id="ArdAppTaskPicResult"> <result property="id" column="sub2_id"/> @@ -81,23 +80,21 @@ a.create_time, a.update_by, a.update_time, - a.view_time, - a.view_position, - b.id as sub2_id, - b.task_id as sub2_task_id, - b.pic_url as sub2_pic_url, - c.id as sub1_id, - c.name as sub1_name, - c.longitude as sub1_longitude, - c.latitude as sub1_latitude, - c.altitude as sub1_altitude, - c.user_id as sub1_user_id, - c.text as sub1_text, - c.voice as sub1_voice, - c.status as sub1_status, + b.id as sub2_id, + b.task_id as sub2_task_id, + b.pic_url as sub2_pic_url, + c.id as sub1_id, + c.name as sub1_name, + c.longitude as sub1_longitude, + c.latitude as sub1_latitude, + c.altitude as sub1_altitude, + c.user_id as sub1_user_id, + c.text as sub1_text, + c.voice as sub1_voice, + 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_time as sub1_view_time, + c.view_position as sub1_view_position 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 @@ -196,8 +193,6 @@ <if test="createTime != null">create_time = #{createTime},</if> <if test="updateBy != null">update_by = #{updateBy},</if> <if test="updateTime != null">update_time = #{updateTime},</if> - <if test="viewTime != null">view_time = #{viewTime},</if> - <if test="viewPosition != null">view_position = #{viewPosition},</if> </trim> where id = #{id} </update> @@ -265,10 +260,18 @@ <if test="text != null">text = #{text},</if> <if test="voice != null">voice = #{voice},</if> <if test="viewTime != null">view_time = #{viewTime},</if> - <if test="viewPosition != null">view_position = #{vviewPosition},</if> + <if test="viewPosition != null">view_position = #{viewPosition},</if> + <if test="clockInTime != null">clock_in_time = #{clockInTime},</if> </trim> where id = #{id} </update> + <update id="updateArdAppTaskDetailView" parameterType="ArdAppTaskDetail"> + update ard_app_task_detail + set view_time=#{viewTime}, + view_position=#{viewPosition} + where task_id = #{taskId} + and user_id = #{userId} + </update> <insert id="batchArdAppTaskDetailPic"> insert into ard_app_task_detail_pic( id, task_detail_id, pic_url) values <foreach item="item" index="index" collection="list" separator=","> -- Gitblit v1.9.3