DeXun/fad_oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(oa): 修正项目计划结束时间判断逻辑

Browse Source 
- 修改XML中计划结束时间字段判断条件
- 更新Java服务类中计划结束时间处理逻辑
- 引入Timestamp类型以支持时间转换
- 确保original_end_time与plan_end比较准确性
This commit is contained in:
Joshi
2025-12-11 17:30:03 +08:00
parent 1330ef6826
commit 70d380ac65
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-oa/src/main/resources/mapper/oa/OaProjectScheduleMapper.xml
View File

@@ -57,7 +57,7 @@
WHERE opss.schedule_id = ops.schedule_id AND opss.del_flag = '0'
AND (
opss.use_flag = 0
OR (opss.original_end_time IS NOT NULL AND opss.end_time IS NOT NULL AND opss.end_time > opss.original_end_time)
OR (opss.original_end_time IS NOT NULL AND opss.plan_end IS NOT NULL AND opss.plan_end > opss.original_end_time)
OR (opss.status = 0 AND opss.original_end_time IS NOT NULL AND CURDATE() > DATE(opss.original_end_time))
)
) AS delayCount