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

样式修改

Browse Source
This commit is contained in:
wangys
2025-10-31 13:17:57 +08:00
parent a881f57e30
commit 9ad9507a72
19 changed files with 693 additions and 971 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,6 +19,18 @@
<result column="deleted" property="deleted" jdbcType="BOOLEAN"/>
</resultMap>
<!-- TaskItemVO 结果映射 -->
<resultMap id="TaskItemResultMap" type="org.xyzh.common.vo.TaskItemVO" extends="BaseResultMap">
<result column="user_id" property="userID" jdbcType="VARCHAR"/>
<result column="username" property="username" jdbcType="VARCHAR"/>
<result column="dept_id" property="deptID" jdbcType="VARCHAR"/>
<result column="dept_name" property="deptName" jdbcType="VARCHAR"/>
<result column="parent_id" property="parentID" jdbcType="VARCHAR"/>
<result column="user_status" property="status" jdbcType="INTEGER"/>
<result column="progress" property="progress" jdbcType="DECIMAL"/>
<result column="complete_time" property="completeTime" jdbcType="TIMESTAMP"/>
</resultMap>
<!-- 基础字段 -->
<sql id="Base_Column_List">
id, task_id, name, description, start_time, end_time, status,
@@ -282,12 +294,15 @@
</select>
<!-- selectUserLearningTasksPage - 添加权限过滤 -->
<select id="selectUserLearningTasksPage" resultMap="BaseResultMap">
<select id="selectUserLearningTasksPage" resultMap="TaskItemResultMap">
SELECT DISTINCT
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
tlt.id, tlt.task_id, tlt.name, tlt.description, tlt.start_time, tlt.end_time,
tlt.creator, tlt.updater, tlt.create_time, tlt.update_time,
ttu.user_id, ttu.status AS user_status, ttu.progress, ttu.complete_time,
ttu.dept_id, d.name AS dept_name, d.parent_id
FROM tb_task_user ttu
INNER JOIN tb_learning_task tlt ON ttu.task_id = tlt.task_id
LEFT JOIN tb_sys_dept d ON ttu.dept_id = d.dept_id AND d.deleted = 0
INNER JOIN tb_resource_permission rp ON tlt.task_id = rp.resource_id
AND rp.resource_type = 3
AND rp.deleted = 0
@@ -311,6 +326,9 @@
WHERE ttu.user_id = #{filter.userID}
AND tlt.deleted = 0
AND ttu.deleted = 0
<if test="filter.status != null">
AND ttu.status = #{filter.status}
</if>
ORDER BY tlt.create_time DESC
LIMIT #{pageParam.pageSize} OFFSET #{pageParam.offset}
</select>