From f50f1839aaa33be713561da03cf056662ac44f18 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期五, 28 七月 2023 11:30:25 +0800
Subject: [PATCH] 增加app任务查看时间和查看位置 修改app任务详情为打卡时间和打卡位置
---
ard-work/src/main/resources/mapper/app/ArdAppTaskMapper.xml | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/ard-work/src/main/resources/mapper/app/ArdAppTaskMapper.xml b/ard-work/src/main/resources/mapper/app/ArdAppTaskMapper.xml
index 0805696..61ed850 100644
--- a/ard-work/src/main/resources/mapper/app/ArdAppTaskMapper.xml
+++ b/ard-work/src/main/resources/mapper/app/ArdAppTaskMapper.xml
@@ -15,6 +15,8 @@
<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"
@@ -61,7 +63,9 @@
c.create_by,
c.create_time,
c.update_by,
- c.update_time
+ c.update_time,
+ c.view_time,
+ c.view_position
from ard_app_task c
left join sys_dept d on d.dept_id = c.dept_id
left join sys_user u on u.user_id = c.user_id
@@ -77,6 +81,8 @@
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,
@@ -190,6 +196,8 @@
<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>
@@ -282,7 +290,7 @@
c.text,
c.voice,
c.status,
- c.clock_in_pic_url
+ c.clock_in_pic_url,
c.view_time,
c.view_position
from ard_app_task_detail c
--
Gitblit v1.9.3