Commit 1005372a authored by 鲁鸿波's avatar 鲁鸿波

所有作业3天未完成的,需要重新发起申请。

危险作业到交底环节后按固定时间判断是否超时,超时自动取消
parent 0c020d16
......@@ -11,10 +11,6 @@ public interface THazardWorkPlanExpiredLogService extends SuperService<THazardW
*/
public void refreshSwitch();
/**
* 危险作业三天内未完成自动过期
*/
public void refreshSwitch1();
/**
* 根据计划id查询过期日志
......
......@@ -132,42 +132,6 @@ public class THazardWorkPlanExpiredLogServiceImpl extends SuperServiceImpl<THaza
log.info("结束---refreshSwitch-----查询所有危险作业已安全许可申请审批通过后未完成的作业");
}
/**
* 每小时检查所有未完成作业
*/
@Override
public void refreshSwitch1() {
if (!isSchedulerEnabled()) {
log.debug("refreshSwitch1: 调度被禁用(字典值非 {})", DICT_ENABLE_VALUE);
return;
}
log.info("开始---refreshSwitch1-------查询所有危险作业未完成的作业");
List<THazardWorkPlan> plans;
try {
plans = hazardWorkPlanDao.selectNotCompleteList();
} catch (Exception e) {
log.error("查询 selectNotCompleteList 失败", e);
return;
}
if (plans == null || plans.isEmpty()) {
log.info("refreshSwitch1: 无需处理的计划");
return;
}
for (THazardWorkPlan plan : plans) {
try {
checkThreeDaysExpiredRelaxed(plan);
} catch (Exception e) {
log.error("宽松检查处理异常,planId={}, code={}", plan == null ? null : plan.getId(),
plan == null ? null : plan.getCode(), e);
}
}
log.info("结束---refreshSwitch1-------查询所有危险作业未完成的作业");
}
......@@ -272,22 +236,6 @@ public class THazardWorkPlanExpiredLogServiceImpl extends SuperServiceImpl<THaza
}
}
/**
* 检查3天过期逻辑
*/
private void checkThreeDaysExpiredRelaxed(THazardWorkPlan plan) {
if (plan == null) {
return;
}
double hoursSinceCreation = calculateHoursBetween(plan.getCreateDate());
if (hoursSinceCreation > 72) {
handleThreeDaysExpired(plan, hoursSinceCreation);
} else {
log.debug("检查通过 - planId={}, hoursSinceCreation={}", plan.getId(), hoursSinceCreation);
}
}
private void handleThreeDaysExpired(THazardWorkPlan plan, double actualHours) {
log.warn("3天过期 - planId={}, code={}, hoursSinceCreation={}",
plan.getId(), plan.getCode(), actualHours);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment