feat(oa): 添加项目置顶功能和任务关联项目进度字段
- 在项目实体类 SysOaProject 及其相关 BO、VO 类中增加 isTop 字段,用于标识项目是否置顶- 更新 SysOaProjectMapper.xml 查询语句,将 is_top 字段纳入查询结果 - 修改 SysOaProjectServiceImpl 中的查询逻辑,优先展示置顶项目,并按创建时间排序 - 在任务实体类 SysOaTask 及其相关 BO、VO 类中新增 trackId 字段,用于关联项目进度- 更新 SysOaTaskMapper.xml 查询语句,联查 oa_project_schedule_step 表获取节点信息 - 优化 SQL 查询中的字段对齐格式,提升可读性
This commit is contained in:
@@ -77,12 +77,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
sot.update_time,
|
||||
sot.del_flag,
|
||||
sot.own_rank,
|
||||
sot.track_id,
|
||||
stepAgg.tab_node AS tabNode,
|
||||
stepAgg.first_level_node AS firstLevelNode,
|
||||
stepAgg.second_level_node AS secondLevelNode,
|
||||
sop.project_name,
|
||||
sop.project_num,
|
||||
sop.project_code,
|
||||
su1.nick_name AS createUserNickName,
|
||||
su2.nick_name AS workerNickName,
|
||||
sd.dept_name AS deptName,
|
||||
su1.nick_name AS createUserNickName,
|
||||
su2.nick_name AS workerNickName,
|
||||
sd.dept_name AS deptName,
|
||||
IF(
|
||||
sot.completed_time IS NULL,
|
||||
IF(
|
||||
@@ -93,7 +97,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
WHERE a.task_id = sot.task_id
|
||||
AND a.completed_time IS NULL
|
||||
LIMIT 1
|
||||
) IS NOT NULL,
|
||||
) IS NOT NULL,
|
||||
-- 如果子查询有值,就用它来算超期天数
|
||||
DATEDIFF(
|
||||
NOW(),
|
||||
@@ -115,6 +119,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
LEFT JOIN sys_user su2 ON su2.user_id = sot.worker_id
|
||||
LEFT JOIN sys_oa_project sop ON sop.project_id = sot.project_id
|
||||
LEFT JOIN sys_dept sd ON sd.dept_id = su2.dept_id
|
||||
LEFT JOIN oa_project_schedule_step stepAgg ON stepAgg.track_id = sot.track_id
|
||||
${ew.getCustomSqlSegment}
|
||||
</select>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user