wangys/schoolNews
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

serv-学习

Browse Source
This commit is contained in:
wangys
2025-10-24 18:28:26 +08:00
parent 6f5603dd8b
commit 8968409b2d
55 changed files with 2144 additions and 2570 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
schoolNewsServ/study/src/main/resources/mapper/LearningRecordMapper.xml
View File

@@ -6,9 +6,12 @@
<resultMap id="BaseResultMap" type="org.xyzh.common.dto.study.TbLearningRecord">
<id column="id" property="id" jdbcType="VARCHAR"/>
<result column="user_id" property="userID" jdbcType="VARCHAR"/>
<result column="task_id" property="taskID" jdbcType="VARCHAR"/>
<result column="resource_type" property="resourceType" jdbcType="INTEGER"/>
<result column="resource_id" property="resourceID" jdbcType="VARCHAR"/>
<result column="task_id" property="taskID" jdbcType="VARCHAR"/>
<result column="course_id" property="courseID" jdbcType="VARCHAR"/>
<result column="chapter_id" property="chapterID" jdbcType="VARCHAR"/>
<result column="node_id" property="nodeID" jdbcType="VARCHAR"/>
<result column="duration" property="duration" jdbcType="INTEGER"/>
<result column="progress" property="progress" jdbcType="DECIMAL"/>
<result column="is_complete" property="isComplete" jdbcType="BOOLEAN"/>
@@ -20,7 +23,7 @@
<!-- 基础字段 -->
<sql id="Base_Column_List">
id, user_id, resource_type, resource_id, task_id, duration, progress,
id, user_id, task_id, resource_type, resource_id, course_id, chapter_id, node_id, duration, progress,
is_complete, complete_time, last_learn_time, create_time, update_time
</sql>
@@ -30,14 +33,23 @@
<if test="userID != null and userID != ''">
AND user_id = #{userID}
</if>
<if test="taskID != null and taskID != ''">
AND task_id = #{taskID}
</if>
<if test="resourceType != null">
AND resource_type = #{resourceType}
</if>
<if test="resourceID != null and resourceID != ''">
AND resource_id = #{resourceID}
</if>
<if test="taskID != null and taskID != ''">
AND task_id = #{taskID}
<if test="courseID != null and courseID != ''">
AND course_id = #{courseID}
</if>
<if test="chapterID != null and chapterID != ''">
AND chapter_id = #{chapterID}
</if>
<if test="nodeID != null and nodeID != ''">
AND node_id = #{nodeID}
</if>
<if test="isComplete != null">
AND is_complete = #{isComplete}
@@ -85,7 +97,7 @@
SELECT
<include refid="Base_Column_List" />
FROM tb_learning_record
WHERE user_id = #{userId} AND resource_id = #{courseId}
WHERE user_id = #{userId} AND course_id = #{courseId} AND resource_type = 2
</select>
<!-- 根据状态查询学习记录列表 -->
@@ -113,11 +125,11 @@
<!-- 插入学习记录 -->
<insert id="insertLearningRecord" parameterType="org.xyzh.common.dto.study.TbLearningRecord">
INSERT INTO tb_learning_record (
id, user_id, resource_type, resource_id, task_id, duration, progress,
is_complete, complete_time, last_learn_time, create_time, update_time
id, user_id, task_id, resource_type, resource_id, course_id, chapter_id, node_id, duration, progress,
is_complete, complete_time, last_learn_time, create_time
) VALUES (
#{id}, #{userID}, #{resourceType}, #{resourceID}, #{taskID}, #{duration}, #{progress},
#{isComplete}, #{completeTime}, #{lastLearnTime}, #{createTime}, #{updateTime}
#{id}, #{userID}, #{taskID}, #{resourceType}, #{resourceID}, #{courseID}, #{chapterID}, #{nodeID}, #{duration}, #{progress},
#{isComplete}, #{completeTime}, #{lastLearnTime}, #{createTime}
)
</insert>
@@ -125,18 +137,6 @@
<update id="updateLearningRecord" parameterType="org.xyzh.common.dto.study.TbLearningRecord">
UPDATE tb_learning_record
<set>
<if test="userID != null and userID != ''">
user_id = #{userID},
</if>
<if test="resourceType != null">
resource_type = #{resourceType},
</if>
<if test="resourceID != null and resourceID != ''">
resource_id = #{resourceID},
</if>
<if test="taskID != null and taskID != ''">
task_id = #{taskID},
</if>
<if test="duration != null">
duration = #{duration},
</if>
@@ -152,6 +152,9 @@
<if test="lastLearnTime != null">
last_learn_time = #{lastLearnTime},
</if>
<if test="updater != null">
updater = #{updater},
</if>
<if test="updateTime != null">
update_time = #{updateTime},
</if>

2
schoolNewsServ/study/src/main/resources/mapper/LearningTaskMapper.xml
View File

@@ -226,7 +226,7 @@
<select id="selectUserLearningTasksPage" resultMap="BaseResultMap">
SELECT
tlt.id, tlt.task_id, tlt.name, tlt.description, tlt.start_time, tlt.end_time, tlt.status,
tlt.id, tlt.task_id, tlt.name, tlt.description, tlt.start_time, tlt.end_time, ttu.status,
tlt.creator, tlt.updater, tlt.create_time, tlt.update_time
FROM tb_task_user ttu
INNER JOIN tb_learning_task tlt ON ttu.task_id = tlt.task_id

209
schoolNewsServ/study/src/main/resources/mapper/TaskCourseMapper.xml
View File

@@ -1,209 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.xyzh.study.mapper.TaskCourseMapper">
<!-- 基础结果映射 -->
<resultMap id="BaseResultMap" type="org.xyzh.common.dto.study.TbTaskCourse">
<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="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>
<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="user_name" 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, course_id, required, order_num, creator, create_time
</sql>
<!-- 通用条件 -->
<sql id="Where_Clause">
<where>
<if test="taskID != null and taskID != ''">
AND task_id = #{taskID}
</if>
<if test="courseID != null and courseID != ''">
AND course_id = #{courseID}
</if>
<if test="required != null">
AND required = #{required}
</if>
</where>
</sql>
<!-- selectTaskCourses -->
<select id="selectTaskCourses" resultMap="BaseResultMap">
SELECT
<include refid="Base_Column_List"/>
FROM tb_task_course
<include refid="Where_Clause"/>
ORDER BY order_num ASC, create_time ASC
</select>
<!-- 根据关联ID查询关联信息 -->
<select id="selectByRelationId" resultMap="BaseResultMap">
SELECT
<include refid="Base_Column_List" />
FROM tb_task_course
WHERE id = #{relationId}
</select>
<select id="selectByTaskId" resultMap="BaseResultMap">
SELECT
<include refid="Base_Column_List" />
FROM tb_task_course
WHERE task_id = #{taskId}
ORDER BY order_num ASC, create_time ASC
</select>
<!-- 根据任务ID查询课程关联列表 -->
<select id="selectTaskItemByTaskId" resultMap="TaskItemResultMap">
SELECT
ttc.*,
tc.name as course_name
FROM tb_task_course ttc
INNER JOIN tb_course tc ON ttc.course_id = tc.course_id
WHERE ttc.task_id = #{taskId} and ttc.deleted = 0 and tc.deleted = 0
ORDER BY ttc.order_num ASC, ttc.create_time ASC
</select>
<!-- 根据课程ID查询任务关联列表 -->
<select id="selectByCourseId" resultMap="BaseResultMap">
SELECT
<include refid="Base_Column_List" />
FROM tb_task_course
WHERE course_id = #{courseId}
ORDER BY order_num ASC, create_time ASC
</select>
<!-- 根据任务ID和课程ID查询关联信息 -->
<select id="selectByTaskIdAndCourseId" resultMap="BaseResultMap">
SELECT
<include refid="Base_Column_List" />
FROM tb_task_course
WHERE task_id = #{taskId} AND course_id = #{courseId}
</select>
<!-- 检查任务课程关联是否存在 -->
<select id="countByTaskIdAndCourseId" resultType="int">
SELECT COUNT(1)
FROM tb_task_course
WHERE task_id = #{taskId} AND course_id = #{courseId}
<if test="excludeId != null and excludeId != ''">
AND id != #{excludeId}
</if>
</select>
<!-- 插入任务课程关联 -->
<insert id="insertTaskCourse" parameterType="org.xyzh.common.dto.study.TbTaskCourse">
INSERT INTO tb_task_course (
id, task_id, course_id, required, order_num, creator, create_time
) VALUES (
#{id}, #{taskID}, #{courseID}, #{required}, #{orderNum}, #{creator}, #{createTime}
)
</insert>
<!-- 更新任务课程关联 -->
<update id="updateTaskCourse" parameterType="org.xyzh.common.dto.study.TbTaskCourse">
UPDATE tb_task_course
<set>
<if test="taskID != null and taskID != ''">
task_id = #{taskID},
</if>
<if test="courseID != null and courseID != ''">
course_id = #{courseID},
</if>
<if test="required != null">
required = #{required},
</if>
<if test="orderNum != null">
order_num = #{orderNum},
</if>
<if test="creator != null and creator != ''">
creator = #{creator},
</if>
<if test="createTime != null">
create_time = #{createTime},
</if>
</set>
WHERE id = #{id}
</update>
<!-- 删除任务课程关联 -->
<delete id="deleteTaskCourse" parameterType="org.xyzh.common.dto.study.TbTaskCourse">
DELETE FROM tb_task_course
WHERE id = #{id}
</delete>
<!-- 批量插入任务课程关联 -->
<insert id="batchInsertTaskCourses" parameterType="java.util.List">
INSERT INTO tb_task_course (
id, task_id, course_id, required, order_num, creator, create_time
) VALUES
<foreach collection="taskCourseList" item="item" separator=",">
(
#{item.id}, #{item.taskID}, #{item.courseID}, #{item.required},
#{item.orderNum}, #{item.creator}, #{item.createTime}
)
</foreach>
</insert>
<!-- 批量删除任务课程关联 -->
<delete id="batchDeleteTaskCourses">
DELETE FROM tb_task_course
WHERE id IN
<foreach collection="ids" item="id" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
<!-- 根据任务ID批量删除课程关联 -->
<delete id="deleteByTaskId">
DELETE FROM tb_task_course
WHERE task_id = #{taskId}
</delete>
<!-- 根据课程ID批量删除任务关联 -->
<delete id="deleteByCourseId">
DELETE FROM tb_task_course
WHERE course_id = #{courseId}
</delete>
<!-- 分页查询任务课程关联 -->
<select id="selectTaskCoursesPage" resultMap="BaseResultMap">
SELECT
<include refid="Base_Column_List" />
FROM tb_task_course
<include refid="Where_Clause" />
ORDER BY order_num ASC, create_time ASC
LIMIT #{pageParam.pageSize} OFFSET #{pageParam.offset}
</select>
<!-- 统计任务课程关联总数 -->
<select id="countTaskCourses" resultType="long">
SELECT COUNT(1)
FROM tb_task_course
<include refid="Where_Clause" />
</select>
</mapper>

398
schoolNewsServ/study/src/main/resources/mapper/TaskItemMapper.xml Normal file
View File

@@ -0,0 +1,398 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.xyzh.study.mapper.TaskItemMapper">
<!-- 基础结果映射 -->
<resultMap id="BaseResultMap" type="org.xyzh.common.dto.study.TbTaskItem">
<id column="id" property="id" jdbcType="VARCHAR"/>
<result column="task_id" property="taskID" jdbcType="VARCHAR"/>
<result column="item_type" property="itemType" jdbcType="INTEGER"/>
<result column="item_id" property="itemID" jdbcType="VARCHAR"/>
<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"/>
<result column="updater" property="updater" jdbcType="VARCHAR"/>
<result column="update_time" property="updateTime" jdbcType="TIMESTAMP"/>
<result column="delete_time" property="deleteTime" jdbcType="TIMESTAMP"/>
<result column="deleted" property="deleted" jdbcType="BOOLEAN"/>
</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="item_type" property="itemType" jdbcType="INTEGER"/>
<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="user_name" 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, item_type, item_id, required, order_num, creator, create_time,
updater, update_time, delete_time, deleted
</sql>
<!-- 通用条件 -->
<sql id="Where_Clause">
<where>
deleted = 0
<if test="taskID != null and taskID != ''">
AND task_id = #{taskID}
</if>
<if test="itemType != null">
AND item_type = #{itemType}
</if>
<if test="itemID != null and itemID != ''">
AND item_id = #{itemID}
</if>
<if test="required != null">
AND required = #{required}
</if>
</where>
</sql>
<!-- selectTaskItems -->
<select id="selectTaskItems" resultMap="BaseResultMap">
SELECT
<include refid="Base_Column_List"/>
FROM tb_task_item
<include refid="Where_Clause"/>
ORDER BY order_num ASC, create_time ASC
</select>
<!-- 根据关联ID查询关联信息 -->
<select id="selectByRelationId" resultMap="BaseResultMap">
SELECT
<include refid="Base_Column_List" />
FROM tb_task_item
WHERE id = #{relationId} AND deleted = 0
</select>
<!-- 根据任务ID查询项关联列表 -->
<select id="selectByTaskId" resultMap="BaseResultMap">
SELECT
<include refid="Base_Column_List" />
FROM tb_task_item
WHERE task_id = #{taskId} AND deleted = 0
ORDER BY order_num ASC, create_time ASC
</select>
<!-- 根据任务ID和类型查询项关联列表 -->
<select id="selectByTaskIdAndType" resultMap="BaseResultMap">
SELECT
<include refid="Base_Column_List" />
FROM tb_task_item
WHERE task_id = #{taskId} AND item_type = #{itemType} AND deleted = 0
ORDER BY order_num ASC, create_time ASC
</select>
<!-- 根据任务ID查询任务项VO列表（带学习状态） -->
<select id="selectTaskItemVOByTaskId" resultMap="TaskItemResultMap">
SELECT
tti.*,
CASE
WHEN tti.item_type = 1 THEN tr.title
WHEN tti.item_type = 2 THEN tc.name
END as item_name,
CASE
WHEN tti.item_type = 1 THEN tti.item_id
ELSE NULL
END as resource_id,
CASE
WHEN tti.item_type = 1 THEN tr.title
ELSE NULL
END as resource_name,
CASE
WHEN tti.item_type = 2 THEN tti.item_id
ELSE NULL
END as course_id,
CASE
WHEN tti.item_type = 2 THEN tc.name
ELSE NULL
END as course_name,
-- 学习状态：0未开始 1进行中 2已完成
CASE
-- 资源类型：直接从学习记录查询
WHEN tti.item_type = 1 THEN
CASE
WHEN lr_resource.is_complete = 1 THEN 2
WHEN lr_resource.id IS NOT NULL THEN 1
ELSE 0
END
-- 课程类型：判断所有节点是否完成
WHEN tti.item_type = 2 THEN
CASE
WHEN course_stats.total_nodes = 0 THEN 0
WHEN course_stats.completed_nodes = course_stats.total_nodes THEN 2
WHEN course_stats.completed_nodes > 0 THEN 1
ELSE 0
END
ELSE 0
END as status,
-- 学习进度
CASE
WHEN tti.item_type = 1 THEN COALESCE(lr_resource.progress, 0)
WHEN tti.item_type = 2 THEN
CASE
WHEN course_stats.total_nodes = 0 THEN 0
ELSE ROUND((course_stats.completed_nodes * 100.0 / course_stats.total_nodes), 2)
END
ELSE 0
END as progress
FROM tb_task_item tti
LEFT JOIN tb_resource tr ON tti.item_type = 1 AND tti.item_id = tr.resource_id AND tr.deleted = 0
LEFT JOIN tb_course tc ON tti.item_type = 2 AND tti.item_id = tc.course_id AND tc.deleted = 0
-- 资源学习记录
LEFT JOIN tb_learning_record lr_resource ON tti.item_type = 1
AND lr_resource.resource_type = 1
AND lr_resource.resource_id = tti.item_id
AND lr_resource.task_id = tti.task_id
AND lr_resource.deleted = 0
-- 课程学习统计（统计课程下所有节点的完成情况）
LEFT JOIN (
SELECT
tti.item_id as course_id,
COUNT(DISTINCT tcn.node_id) as total_nodes,
COUNT(DISTINCT CASE WHEN lr.is_complete = 1 THEN lr.node_id END) as completed_nodes
FROM tb_task_item tti
INNER JOIN tb_course_chapter tcc ON tti.item_type = 2 AND tti.item_id = tcc.course_id AND tcc.deleted = 0
INNER JOIN tb_course_node tcn ON tcc.chapter_id = tcn.chapter_id AND tcn.deleted = 0
LEFT JOIN tb_learning_record lr ON lr.resource_type = 2
AND tti.item_id = lr.course_id
AND lr.node_id = tcn.node_id
AND lr.deleted = 0
WHERE tti.task_id = #{taskId} AND tti.deleted = 0
GROUP BY tti.item_id
) course_stats ON tti.item_type = 2 AND course_stats.course_id = tti.item_id
WHERE tti.task_id = #{taskId} AND tti.deleted = 0
ORDER BY tti.order_num ASC, tti.create_time ASC
</select>
<!-- 根据任务ID和用户ID查询任务项视图对象列表（包含该用户的学习状态） -->
<select id="selectTaskItemVOByTaskIdAndUserId" resultMap="TaskItemResultMap">
SELECT
tti.*,
CASE
WHEN tti.item_type = 1 THEN tr.title
WHEN tti.item_type = 2 THEN tc.name
END as item_name,
CASE
WHEN tti.item_type = 1 THEN tti.item_id
ELSE NULL
END as resource_id,
CASE
WHEN tti.item_type = 1 THEN tr.title
ELSE NULL
END as resource_name,
CASE
WHEN tti.item_type = 2 THEN tti.item_id
ELSE NULL
END as course_id,
CASE
WHEN tti.item_type = 2 THEN tc.name
ELSE NULL
END as course_name,
-- 学习状态：0未开始 1进行中 2已完成
CASE
-- 资源类型：直接从学习记录查询
WHEN tti.item_type = 1 THEN
CASE
WHEN lr_resource.is_complete = 1 THEN 2
WHEN lr_resource.id IS NOT NULL THEN 1
ELSE 0
END
-- 课程类型：判断所有节点是否完成
WHEN tti.item_type = 2 THEN
CASE
WHEN course_stats.total_nodes = 0 THEN 0
WHEN course_stats.completed_nodes = course_stats.total_nodes THEN 2
WHEN course_stats.completed_nodes > 0 THEN 1
ELSE 0
END
ELSE 0
END as status,
-- 学习进度
CASE
WHEN tti.item_type = 1 THEN COALESCE(lr_resource.progress, 0)
WHEN tti.item_type = 2 THEN
CASE
WHEN course_stats.total_nodes = 0 THEN 0
ELSE ROUND((course_stats.completed_nodes * 100.0 / course_stats.total_nodes), 2)
END
ELSE 0
END as progress
FROM tb_task_item tti
LEFT JOIN tb_resource tr ON tti.item_type = 1 AND tti.item_id = tr.resource_id AND tr.deleted = 0
LEFT JOIN tb_course tc ON tti.item_type = 2 AND tti.item_id = tc.course_id AND tc.deleted = 0
-- 资源学习记录（限定用户）
LEFT JOIN tb_learning_record lr_resource ON tti.item_type = 1
AND lr_resource.resource_type = 1
AND lr_resource.resource_id = tti.item_id
AND lr_resource.task_id = tti.task_id
AND lr_resource.user_id = #{userId}
AND lr_resource.deleted = 0
-- 课程学习统计（统计课程下所有节点的完成情况，限定用户）
LEFT JOIN (
SELECT
tti.item_id as course_id,
COUNT(DISTINCT tcn.node_id) as total_nodes,
COUNT(DISTINCT CASE WHEN lr.is_complete = 1 THEN lr.node_id END) as completed_nodes
FROM tb_task_item tti
INNER JOIN tb_course_chapter tcc ON tti.item_type = 2 AND tti.item_id = tcc.course_id AND tcc.deleted = 0
INNER JOIN tb_course_node tcn ON tcc.chapter_id = tcn.chapter_id AND tcn.deleted = 0
LEFT JOIN tb_learning_record lr ON lr.resource_type = 2
AND tti.item_id = lr.course_id
AND lr.node_id = tcn.node_id
AND lr.user_id = #{userId}
AND lr.deleted = 0
WHERE tti.task_id = #{taskId} AND tti.deleted = 0
GROUP BY tti.item_id
) course_stats ON tti.item_type = 2 AND course_stats.course_id = tti.item_id
WHERE tti.task_id = #{taskId} AND tti.deleted = 0
ORDER BY tti.order_num ASC, tti.create_time ASC
</select>
<!-- 根据项ID查询任务关联列表 -->
<select id="selectByItemId" resultMap="BaseResultMap">
SELECT
<include refid="Base_Column_List" />
FROM tb_task_item
WHERE item_id = #{itemId} AND item_type = #{itemType} AND deleted = 0
ORDER BY order_num ASC, create_time ASC
</select>
<!-- 根据任务ID和项ID查询关联信息 -->
<select id="selectByTaskIdAndItemId" resultMap="BaseResultMap">
SELECT
<include refid="Base_Column_List" />
FROM tb_task_item
WHERE task_id = #{taskId} AND item_id = #{itemId} AND item_type = #{itemType} AND deleted = 0
</select>
<!-- 检查任务项关联是否存在 -->
<select id="countByTaskIdAndItemId" resultType="int">
SELECT COUNT(1)
FROM tb_task_item
WHERE task_id = #{taskId} AND item_id = #{itemId} AND item_type = #{itemType} AND deleted = 0
<if test="excludeId != null and excludeId != ''">
AND id != #{excludeId}
</if>
</select>
<!-- 插入任务项关联 -->
<insert id="insertTaskItem" parameterType="org.xyzh.common.dto.study.TbTaskItem">
INSERT INTO tb_task_item (
id, task_id, item_type, item_id, required, order_num, creator, create_time
) VALUES (
#{id}, #{taskID}, #{itemType}, #{itemID}, #{required}, #{orderNum}, #{creator}, #{createTime}
)
</insert>
<!-- 更新任务项关联 -->
<update id="updateTaskItem" parameterType="org.xyzh.common.dto.study.TbTaskItem">
UPDATE tb_task_item
<set>
<if test="taskID != null and taskID != ''">
task_id = #{taskID},
</if>
<if test="itemType != null">
item_type = #{itemType},
</if>
<if test="itemID != null and itemID != ''">
item_id = #{itemID},
</if>
<if test="required != null">
required = #{required},
</if>
<if test="orderNum != null">
order_num = #{orderNum},
</if>
<if test="updater != null and updater != ''">
updater = #{updater},
</if>
<if test="updateTime != null">
update_time = #{updateTime},
</if>
<if test="deleteTime != null">
delete_time = #{deleteTime},
</if>
<if test="deleted != null">
deleted = #{deleted},
</if>
</set>
WHERE id = #{id}
</update>
<!-- 删除任务项关联（软删除） -->
<update id="deleteTaskItem" parameterType="org.xyzh.common.dto.study.TbTaskItem">
UPDATE tb_task_item
SET deleted = 1, delete_time = NOW()
WHERE id = #{id}
</update>
<!-- 批量插入任务项关联 -->
<insert id="batchInsertTaskItems" parameterType="java.util.List">
INSERT INTO tb_task_item (
id, task_id, item_type, item_id, required, order_num, creator, create_time
) VALUES
<foreach collection="taskItemList" item="item" separator=",">
(
#{item.id}, #{item.taskID}, #{item.itemType}, #{item.itemID}, #{item.required},
#{item.orderNum}, #{item.creator}, #{item.createTime}
)
</foreach>
</insert>
<!-- 批量删除任务项关联（软删除） -->
<update id="batchDeleteTaskItems">
UPDATE tb_task_item
SET deleted = 1, delete_time = NOW()
WHERE id IN
<foreach collection="ids" item="id" open="(" separator="," close=")">
#{id}
</foreach>
</update>
<!-- 根据任务ID批量删除项关联（软删除） -->
<update id="deleteByTaskId">
UPDATE tb_task_item
SET deleted = 1, delete_time = NOW()
WHERE task_id = #{taskId}
</update>
<!-- 根据项ID批量删除任务关联（软删除） -->
<update id="deleteByItemId">
UPDATE tb_task_item
SET deleted = 1, delete_time = NOW()
WHERE item_id = #{itemId} AND item_type = #{itemType}
</update>
<!-- 分页查询任务项关联 -->
<select id="selectTaskItemsPage" resultMap="BaseResultMap">
SELECT
<include refid="Base_Column_List" />
FROM tb_task_item
<include refid="Where_Clause" />
ORDER BY order_num ASC, create_time ASC
LIMIT #{pageParam.pageSize} OFFSET #{pageParam.offset}
</select>
<!-- 统计任务项关联总数 -->
<select id="countTaskItems" resultType="long">
SELECT COUNT(1)
FROM tb_task_item
<include refid="Where_Clause" />
</select>
</mapper>

208
schoolNewsServ/study/src/main/resources/mapper/TaskResourceMapper.xml
View File

@@ -1,208 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.xyzh.study.mapper.TaskResourceMapper">
<!-- 基础结果映射 -->
<resultMap id="BaseResultMap" type="org.xyzh.common.dto.study.TbTaskResource">
<id column="id" property="id" jdbcType="VARCHAR"/>
<result column="task_id" property="taskID" jdbcType="VARCHAR"/>
<result column="resource_id" property="resourceID" jdbcType="VARCHAR"/>
<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>
<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="user_name" 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, resource_id, required, order_num, creator, create_time
</sql>
<!-- 通用条件 -->
<sql id="Where_Clause">
<where>
<if test="taskID != null and taskID != ''">
AND task_id = #{taskID}
</if>
<if test="resourceID != null and resourceID != ''">
AND resource_id = #{resourceID}
</if>
<if test="required != null">
AND required = #{required}
</if>
</where>
</sql>
<!-- selectTaskResources -->
<select id="selectTaskResources" resultMap="BaseResultMap">
SELECT
<include refid="Base_Column_List"/>
FROM tb_task_resource
<include refid="Where_Clause"/>
ORDER BY order_num ASC, create_time ASC
</select>
<!-- 根据关联ID查询关联信息 -->
<select id="selectByRelationId" resultMap="BaseResultMap">
SELECT
<include refid="Base_Column_List" />
FROM tb_task_resource
WHERE id = #{relationId}
</select>
<!-- 根据任务ID查询资源关联列表 -->
<select id="selectByTaskId" resultMap="BaseResultMap">
SELECT
<include refid="Base_Column_List" />
FROM tb_task_resource
WHERE task_id = #{taskId}
ORDER BY order_num ASC, create_time ASC
</select>
<select id="selectTaskItemByTaskId" resultMap="TaskItemResultMap">
SELECT
ttr.*,
tr.title as resource_name
FROM tb_task_resource ttr
INNER JOIN tb_resource tr ON ttr.resource_id = tr.resource_id
WHERE ttr.task_id = #{taskId} and ttr.deleted = 0 and tr.deleted = 0
ORDER BY ttr.order_num ASC, ttr.create_time ASC
</select>
<!-- 根据资源ID查询任务关联列表 -->
<select id="selectByResourceId" resultMap="BaseResultMap">
SELECT
<include refid="Base_Column_List" />
FROM tb_task_resource
WHERE resource_id = #{resourceId}
ORDER BY order_num ASC, create_time ASC
</select>
<!-- 根据任务ID和资源ID查询关联信息 -->
<select id="selectByTaskIdAndResourceId" resultMap="BaseResultMap">
SELECT
<include refid="Base_Column_List" />
FROM tb_task_resource
WHERE task_id = #{taskId} AND resource_id = #{resourceId}
</select>
<!-- 检查任务资源关联是否存在 -->
<select id="countByTaskIdAndResourceId" resultType="int">
SELECT COUNT(1)
FROM tb_task_resource
WHERE task_id = #{taskId} AND resource_id = #{resourceId}
<if test="excludeId != null and excludeId != ''">
AND id != #{excludeId}
</if>
</select>
<!-- 插入任务资源关联 -->
<insert id="insertTaskResource" parameterType="org.xyzh.common.dto.study.TbTaskResource">
INSERT INTO tb_task_resource (
id, task_id, resource_id, required, order_num, creator, create_time
) VALUES (
#{id}, #{taskID}, #{resourceID}, #{required}, #{orderNum}, #{creator}, #{createTime}
)
</insert>
<!-- 更新任务资源关联 -->
<update id="updateTaskResource" parameterType="org.xyzh.common.dto.study.TbTaskResource">
UPDATE tb_task_resource
<set>
<if test="taskID != null and taskID != ''">
task_id = #{taskID},
</if>
<if test="resourceID != null and resourceID != ''">
resource_id = #{resourceID},
</if>
<if test="required != null">
required = #{required},
</if>
<if test="orderNum != null">
order_num = #{orderNum},
</if>
<if test="creator != null and creator != ''">
creator = #{creator},
</if>
<if test="createTime != null">
create_time = #{createTime},
</if>
</set>
WHERE id = #{id}
</update>
<!-- 删除任务资源关联 -->
<delete id="deleteTaskResource" parameterType="org.xyzh.common.dto.study.TbTaskResource">
DELETE FROM tb_task_resource
WHERE id = #{id}
</delete>
<!-- 批量插入任务资源关联 -->
<insert id="batchInsertTaskResources" parameterType="java.util.List">
INSERT INTO tb_task_resource (
id, task_id, resource_id, required, order_num, creator, create_time
) VALUES
<foreach collection="taskResourceList" item="item" separator=",">
(
#{item.id}, #{item.taskID}, #{item.resourceID}, #{item.required},
#{item.orderNum}, #{item.creator}, #{item.createTime}
)
</foreach>
</insert>
<!-- 批量删除任务资源关联 -->
<delete id="batchDeleteTaskResources">
DELETE FROM tb_task_resource
WHERE id IN
<foreach collection="ids" item="id" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
<!-- 根据任务ID批量删除资源关联 -->
<delete id="deleteByTaskId">
DELETE FROM tb_task_resource
WHERE task_id = #{taskId}
</delete>
<!-- 根据资源ID批量删除任务关联 -->
<delete id="deleteByResourceId">
DELETE FROM tb_task_resource
WHERE resource_id = #{resourceId}
</delete>
<!-- 分页查询任务资源关联 -->
<select id="selectTaskResourcesPage" resultMap="BaseResultMap">
SELECT
<include refid="Base_Column_List" />
FROM tb_task_resource
<include refid="Where_Clause" />
ORDER BY order_num ASC, create_time ASC
LIMIT #{pageParam.pageSize} OFFSET #{pageParam.offset}
</select>
<!-- 统计任务资源关联总数 -->
<select id="countTaskResources" resultType="long">
SELECT COUNT(1)
FROM tb_task_resource
<include refid="Where_Clause" />
</select>
</mapper>

37
schoolNewsServ/study/src/main/resources/mapper/TaskUserMapper.xml
View File

@@ -94,6 +94,16 @@
ORDER BY ttu.create_time ASC
</select>
<select id="selectUserTaskItem" 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.user_id = #{userId} and ttu.deleted = 0 and tu.deleted = 0
ORDER BY ttu.create_time ASC
</select>
<!-- 根据用户ID查询任务关联列表 -->
<select id="selectByUserId" resultMap="BaseResultMap">
SELECT
@@ -142,14 +152,33 @@
<!-- 插入任务用户关联 -->
<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
id, task_id, user_id, dept_id,creator, create_time
) VALUES (
#{id}, #{taskID}, #{userID}, #{deptID}, #{status}, #{progress}, #{completeTime},
#{creator}, #{createTime}
#{id}, #{taskID}, #{userID}, #{deptID}, #{creator}, #{createTime}
)
</insert>
<!-- 更新任务用户关联 -->
<update id="updateTaskUser" parameterType="org.xyzh.common.dto.study.TbTaskUser">
UPDATE tb_task_user
<set>
<if test="status != null">
status = #{status},
</if>
<if test="progress != null">
progress = #{progress},
</if>
<if test="completeTime != null">
complete_time = #{completeTime},
</if>
<if test="updater != null">
updater = #{updater},
</if>
update_time = NOW()
</set>
WHERE task_id = #{taskID} AND user_id = #{userID} AND deleted = 0
</update>
<!-- 删除任务用户关联 -->
<delete id="deleteTaskUser" parameterType="org.xyzh.common.dto.study.TbTaskUser">
DELETE FROM tb_task_user