修复单兵端 - 下发给我的任务列表分页问题

‘liusuyi’

2023-07-31 690b5ff07ace78fa1f3f4fa1b0508481cf182919

 ard-work/src/main/resources/mapper/app/ArdAppTaskMapper.xml

@@ -36,6 +36,8 @@
        <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"/>
        <result property="viewFlag" column="sub1_view_flag"/>
    </resultMap>
    <resultMap type="ArdAppTaskPic" id="ArdAppTaskPicResult">
        <result property="id" column="sub2_id"/>
@@ -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,21 +81,23 @@
               a.create_time,
               a.update_by,
               a.update_time,
               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,
               c.clock_in_time    as sub1_clock_in_time,
               c.view_flag        as sub1_view_flag
        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
@@ -126,6 +132,7 @@
                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"/>
@@ -257,9 +264,26 @@
            <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="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
        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
@@ -282,10 +306,24 @@
               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
        where c.id = #{id}
    </select>
    <select id="selectNewArdAppTaskByUserId" parameterType="String" resultMap="ArdAppTaskSubResult">
        <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'
          AND C.user_id = #{userId}
    </select>
</mapper>