From 25fa475f29791e80a2b533f8f52a9459bcce6a96 Mon Sep 17 00:00:00 2001
From: zhangjian <zhangjianrock@163.com>
Date: 星期六, 05 八月 2023 10:04:20 +0800
Subject: [PATCH] 加入日志
---
ard-work/src/main/resources/mapper/app/ArdAppTaskMapper.xml | 87 ++++++++++++++++++++++++++++---------------
1 files changed, 57 insertions(+), 30 deletions(-)
diff --git a/ard-work/src/main/resources/mapper/app/ArdAppTaskMapper.xml b/ard-work/src/main/resources/mapper/app/ArdAppTaskMapper.xml
index 29059e4..1f65a23 100644
--- a/ard-work/src/main/resources/mapper/app/ArdAppTaskMapper.xml
+++ b/ard-work/src/main/resources/mapper/app/ArdAppTaskMapper.xml
@@ -16,7 +16,18 @@
<result property="updateBy" column="update_by"/>
<result property="updateTime" column="update_time"/>
</resultMap>
+
<resultMap id="ArdAppTaskSubResult" type="ArdAppTask" extends="ArdAppTaskResult">
+ <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 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"
@@ -44,14 +55,6 @@
<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">
select c.id,
@@ -63,9 +66,7 @@
c.create_by,
c.create_time,
c.update_by,
- c.update_time,
- c.view_time,
- c.view_position
+ c.update_time
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
@@ -97,31 +98,36 @@
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
</sql>
+
<select id="selectArdAppTaskList" parameterType="ArdAppTask" resultMap="ArdAppTaskResult">
<include refid="selectArdAppTaskVo"/>
<where>
- <if test="name != null and name != ''">and name like '%'||#{name}||'%'</if>
- <if test="text != null and text != ''">and text = #{text}</if>
- <if test="voice != null and voice != ''">and voice = #{voice}</if>
+ <if test="name != null and name != ''">and c.name like '%'||#{name}||'%'</if>
+ <if test="text != null and text != ''">and c.text = #{text}</if>
+ <if test="voice != null and voice != ''">and c.voice = #{voice}</if>
<if test="params.beginTime != null and params.beginTime != ''"><!-- 寮�濮嬫椂闂存绱� -->
- and create_time >= to_timestamp(#{params.beginTime},'yyyy-MM-DD HH24:MI:ss')
+ and c.create_time >= to_timestamp(#{params.beginTime},'yyyy-MM-DD HH24:MI:ss')
</if>
<if test="params.endTime != null and params.endTime != ''"><!-- 缁撴潫鏃堕棿妫�绱� -->
- and create_time <= to_timestamp(#{params.endTime},'yyyy-MM-DD HH24:MI:ss')
+ and c.create_time <= to_timestamp(#{params.endTime},'yyyy-MM-DD HH24:MI:ss')
</if>
- <if test="userId != null and userId != ''">and user_id = #{userId}</if>
- <!-- 鏁版嵁鑼冨洿杩囨护 -->
- ${params.dataScope}
+ <if test="userId != null and userId != ''">and c.user_id = #{userId}</if>
</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>
@@ -132,7 +138,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>
@@ -150,11 +158,31 @@
</if>
</where>
</select>
-
- <select id="selectArdAppTaskById" parameterType="String" resultMap="ArdAppTaskSubResult">
+ <select id="selectArdAppTaskDetailListByTaskId" resultType="ArdAppTaskDetail">
+ select * from ard_app_task_detail where task_id=#{taskId}
+ </select>
+ <select id="selectArdAppTaskById" parameterType="String" resultMap="ArdAppTaskSub1Result">
<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>
+ <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
@@ -311,18 +339,17 @@
from ard_app_task_detail c
where c.id = #{id}
</select>
- <select id="selectNewArdAppTaskByUserId" parameterType="String" resultMap="ArdAppTaskSubResult">
+ <select id="selectNewArdAppTaskByUserId" parameterType="String" resultMap="ArdAppTaskSub1Result">
<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'
+ 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