修改单兵端-新任务轮询 任务详情数量 改为任务数

‘liusuyi’

2023-09-21 99a76ca58268ea1258212ecfb814860d82870758

 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"/>
@@ -16,7 +17,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,17 +56,10 @@
        <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,
               c.type,
               c.name,
               c.text,
               c.voice,
@@ -63,15 +68,14 @@
               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
    </sql>
    <sql id="selectArdAppTaskDto">
        select a.id,
               a.type,
               a.name,
               a.text,
               a.voice,
@@ -97,31 +101,38 @@
               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="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>
            <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
                and create_time &gt;= to_timestamp(#{params.beginTime},'yyyy-MM-DD HH24:MI:ss')
                and c.create_time &gt;= to_timestamp(#{params.beginTime},'yyyy-MM-DD HH24:MI:ss')
            </if>
            <if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
                and create_time &lt;= to_timestamp(#{params.endTime},'yyyy-MM-DD HH24:MI:ss')
                and c.create_time &lt;= 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>
        order by c.create_time desc
    </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 +143,9 @@
                and a.create_time &lt;= 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,16 +163,37 @@
            </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
        <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>
@@ -172,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>
@@ -187,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>
@@ -263,10 +299,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
@@ -302,9 +347,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(DISTINCT 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>