feat(oa): 实现项目进度延期申请与审批功能
- 新增申请延期接口,自动填充申请人与申请时间 - 新增审批延期接口,自动填充审批人与审批时间 - 完善延期记录查询逻辑,支持多字段筛选 - 补充延期记录列表展示字段,关联步骤信息 - 优化延期申请逻辑,自动补全原计划结束时间 - 更新Mapper XML,完善延期记录联合查询SQL - VO类新增步骤相关字段,用于前端展示 - Controller层增加申请与审批接口路由 - Service层实现申请与审批核心业务逻辑 - BO类新增申请与审批方法签名定义
This commit is contained in:
@@ -24,7 +24,33 @@
|
||||
<result property="delFlag" column="del_flag"/>
|
||||
<result property="remark" column="remark"/>
|
||||
</resultMap>
|
||||
<select id="selectVoPagePlus" resultType="com.ruoyi.oa.domain.vo.OaProjectScheduleDelayVo"></select>
|
||||
<select id="selectVoPagePlus" resultType="com.ruoyi.oa.domain.vo.OaProjectScheduleDelayVo">
|
||||
SELECT opsd.delay_id AS delayId,
|
||||
opsd.track_id AS trackId,
|
||||
opsd.apply_user_name AS applyUserName,
|
||||
opsd.apply_time AS applyTime,
|
||||
opsd.apply_reason AS applyReason,
|
||||
opsd.original_end_time AS originalEndTime,
|
||||
opsd.expect_end_time AS expectEndTime,
|
||||
opsd.approve_user_name AS approveUserName,
|
||||
opsd.approve_time AS approveTime,
|
||||
opsd.approve_result AS approveResult,
|
||||
opsd.approve_remark AS approveRemark,
|
||||
opsd.delay_status AS delayStatus,
|
||||
opsd.remark AS remark,
|
||||
opss.step_name AS stepName,
|
||||
opss.node_header AS nodeHeader,
|
||||
opss.status AS stepStatus,
|
||||
opss.schedule_id AS scheduleId,
|
||||
opss.tab_node AS tabNode,
|
||||
opss.first_level_node AS firstLevelNode,
|
||||
opss.second_level_node AS secondLevelNode,
|
||||
opss.start_time AS startTime,
|
||||
opss.specification AS specification
|
||||
FROM oa_project_schedule_delay opsd
|
||||
LEFT JOIN oa_project_schedule_step opss ON opss.track_id = opsd.track_id
|
||||
${ew.customSqlSegment}
|
||||
</select>
|
||||
|
||||
|
||||
</mapper>
|
||||
|
||||
Reference in New Issue
Block a user