serv-课程任务

schoolNewsServ/study/src/main/resources/mapper/TaskUserMapper.xml

@@ -16,6 +16,24 @@
         <result column="update_time" property="updateTime" jdbcType="TIMESTAMP"/>
     </resultMap>
 
+    <resultMap id="TaskItemResultMap" type="org.xyzh.common.vo.TaskItemVO">
+        <id column="id" property="id" jdbcType="VARCHAR"/>
+        <result column="task_id" property="taskID" jdbcType="VARCHAR"/>
+        <result column="course_id" property="courseID" jdbcType="VARCHAR"/>
+        <result column="course_name" property="courseName" jdbcType="VARCHAR"/>
+        <result column="resource_id" property="resourceID" jdbcType="VARCHAR"/>
+        <result column="resource_name" property="resourceName" jdbcType="VARCHAR"/>
+        <result column="user_id" property="userID" jdbcType="VARCHAR"/>
+        <result column="username" property="username" jdbcType="VARCHAR"/>
+        <result column="status" property="status" jdbcType="INTEGER"/>
+        <result column="progress" property="progress" jdbcType="DECIMAL"/>
+        <result column="complete_time" property="completeTime" jdbcType="TIMESTAMP"/>
+        <result column="required" property="required" jdbcType="BOOLEAN"/>
+        <result column="order_num" property="orderNum" jdbcType="INTEGER"/>
+        <result column="creator" property="creator" jdbcType="VARCHAR"/>
+        <result column="create_time" property="createTime" jdbcType="TIMESTAMP"/>
+    </resultMap>
+
     <!-- 基础字段 -->
     <sql id="Base_Column_List">
         id, task_id, user_id, dept_id, status, progress, complete_time, 
@@ -66,6 +84,16 @@
         ORDER BY create_time DESC
     </select>
 
+    <select id="selectTaskItemByTaskId" resultMap="TaskItemResultMap">
+        SELECT
+            ttu.*,
+            tu.username
+        FROM tb_task_user ttu
+        INNER JOIN tb_sys_user tu ON ttu.user_id = tu.id
+        WHERE ttu.task_id = #{taskId} and ttu.deleted = 0 and tu.deleted = 0
+        ORDER BY ttu.create_time ASC
+    </select>
+
     <!-- 根据用户ID查询任务关联列表 -->
     <select id="selectByUserId" resultMap="BaseResultMap">
         SELECT
@@ -115,64 +143,29 @@
     <insert id="insertTaskUser" parameterType="org.xyzh.common.dto.study.TbTaskUser">
         INSERT INTO tb_task_user (
             id, task_id, user_id, dept_id, status, progress, complete_time,
-            creator, create_time, update_time
+            creator, create_time
         ) VALUES (
             #{id}, #{taskID}, #{userID}, #{deptID}, #{status}, #{progress}, #{completeTime},
-            #{creator}, #{createTime}, #{updateTime}
+            #{creator}, #{createTime}
         )
     </insert>
 
-    <!-- 更新任务用户关联 -->
-    <update id="updateTaskUser" parameterType="org.xyzh.common.dto.study.TbTaskUser">
-        UPDATE tb_task_user
-        <set>
-            <if test="taskID != null and taskID != ''">
-                task_id = #{taskID},
-            </if>
-            <if test="userID != null and userID != ''">
-                user_id = #{userID},
-            </if>
-            <if test="deptID != null and deptID != ''">
-                dept_id = #{deptID},
-            </if>
-            <if test="status != null">
-                status = #{status},
-            </if>
-            <if test="progress != null">
-                progress = #{progress},
-            </if>
-            <if test="completeTime != null">
-                complete_time = #{completeTime},
-            </if>
-            <if test="creator != null and creator != ''">
-                creator = #{creator},
-            </if>
-            <if test="createTime != null">
-                create_time = #{createTime},
-            </if>
-            <if test="updateTime != null">
-                update_time = #{updateTime},
-            </if>
-        </set>
-        WHERE id = #{id}
-    </update>
-
     <!-- 删除任务用户关联 -->
     <delete id="deleteTaskUser" parameterType="org.xyzh.common.dto.study.TbTaskUser">
         DELETE FROM tb_task_user
-        WHERE id = #{id}
+        WHERE task_id = #{taskID}
     </delete>
 
     <!-- 批量插入任务用户关联 -->
     <insert id="batchInsertTaskUsers" parameterType="java.util.List">
         INSERT INTO tb_task_user (
             id, task_id, user_id, dept_id, status, progress, complete_time,
-            creator, create_time, update_time
+            creator, create_time
         ) VALUES
         <foreach collection="taskUserList" item="item" separator=",">
             (
                 #{item.id}, #{item.taskID}, #{item.userID}, #{item.deptID}, #{item.status}, 
-                #{item.progress}, #{item.completeTime}, #{item.creator}, #{item.createTime}, #{item.updateTime}
+                #{item.progress}, #{item.completeTime}, #{item.creator}, #{item.createTime}
             )
         </foreach>
     </insert>
@@ -180,9 +173,9 @@
     <!-- 批量删除任务用户关联 -->
     <delete id="batchDeleteTaskUsers">
         DELETE FROM tb_task_user
-        WHERE id IN
-        <foreach collection="ids" item="id" open="(" separator="," close=")">
-            #{id}
+        WHERE (task_id, user_id) IN
+        <foreach collection="userIds" item="userID" open="(" separator="," close=")">
+            (#{taskId}, #{userID})
         </foreach>
     </delete>