From 99a76ca58268ea1258212ecfb814860d82870758 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期四, 21 九月 2023 10:28:52 +0800
Subject: [PATCH] 修改单兵端-新任务轮询 任务详情数量 改为任务数
---
ard-work/src/main/resources/mapper/app/ArdAppTaskMapper.xml | 14 +++++++++++---
1 files changed, 11 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 50e2d82..def4551 100644
--- a/ard-work/src/main/resources/mapper/app/ArdAppTaskMapper.xml
+++ b/ard-work/src/main/resources/mapper/app/ArdAppTaskMapper.xml
@@ -6,6 +6,7 @@
<resultMap type="ArdAppTask" id="ArdAppTaskResult">
<result property="id" column="id"/>
+ <result property="type" column="type"/>
<result property="name" column="name"/>
<result property="text" column="text"/>
<result property="voice" column="voice"/>
@@ -58,6 +59,7 @@
<sql id="selectArdAppTaskVo">
select c.id,
+ c.type,
c.name,
c.text,
c.voice,
@@ -73,6 +75,7 @@
</sql>
<sql id="selectArdAppTaskDto">
select a.id,
+ a.type,
a.name,
a.text,
a.voice,
@@ -108,6 +111,7 @@
<select id="selectArdAppTaskList" parameterType="ArdAppTask" resultMap="ArdAppTaskResult">
<include refid="selectArdAppTaskVo"/>
<where>
+ <if test="type != null and type != ''">and c.type = #{type}</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>
@@ -119,6 +123,7 @@
</if>
<if test="userId != null and userId != ''">and c.user_id = #{userId}</if>
</where>
+ order by c.create_time desc
</select>
<select id="selectArdAppTaskListWithDetail" parameterType="ArdAppTask" resultMap="ArdAppTaskSubResult">
@@ -188,6 +193,7 @@
insert into ard_app_task
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
+ <if test="type != null">type,</if>
<if test="name != null">name,</if>
<if test="text != null">text,</if>
<if test="voice != null">voice,</if>
@@ -200,6 +206,7 @@
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
+ <if test="type != null">#{type},</if>
<if test="name != null">#{name},</if>
<if test="text != null">#{text},</if>
<if test="voice != null">#{voice},</if>
@@ -215,6 +222,7 @@
<update id="updateArdAppTask" parameterType="ArdAppTask">
update ard_app_task
<trim prefix="SET" suffixOverrides=",">
+ <if test="type != null">type = #{type},</if>
<if test="name != null">name = #{name},</if>
<if test="text != null">text = #{text},</if>
<if test="voice != null">voice = #{voice},</if>
@@ -339,15 +347,15 @@
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)
+ SELECT COUNT(DISTINCT A.ID)
FROM ard_app_task A
- LEFT JOIN ard_app_task_detail C ON C.task_id = A.ID
+ 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}
--
Gitblit v1.9.3