Merge remote-tracking branch 'origin/master'

xiangpei

2025-02-22 839919c37a00a55bc57b21bcf519a113fcbd37ba

 business/src/main/java/com/ycl/task/FlowableTask.java

@@ -44,6 +44,7 @@
    private ProcessLogService processLogService;
    @Autowired
    private ProcessLogMapper processLogMapper;

    /**
     * 赋码任务
     * 两个逻辑 改项目码、改节点颜色
@@ -120,8 +121,7 @@
                String overtimeStatus = NORMAL;
                if (overtime != null && overtime !=0 && durationTime >= overtime) {
                    overtimeStatus = OVERTIME; // 如果超过办理期限
                }
                else if (overtime != null && overtime != 0 && durationTime >= (overtime - 12 * 60 * 60)) {
                } else if (overtime != null && overtime != 0 && durationTime >= (overtime - 12 * 60 * 60)) {
                    overtimeStatus = WILLOVERTIME; // 如果临期(固定超时前12小时为临期)
                }
//                else if (overtime != null && overtime != 0 && durationDay >= (overtime - 60)) {
@@ -130,6 +130,7 @@
                map.get(status).add(task.getProcessInstanceId());
                processCoding.setStatus(status);
                processCoding.setOvertimeStatus(overtimeStatus);
                processCoding.setStartTaskTime(task.getCreateTime());
                list.add(processCoding);
            } catch (Exception e) {
                log.error(e.getMessage(),"赋码时间格式有误");