fuliqi
2025-02-10 7ffa0f92413da168a73394b02e06b760778da05c
办理期限
3个文件已修改
19 ■■■■ 已修改文件
business/src/main/java/com/ycl/task/FlowableTask.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
business/src/main/resources/mapper/ProjectInfoMapper.xml 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
flowable/src/main/resources/mapper/ProcessCodingMapper.xml 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
business/src/main/java/com/ycl/task/FlowableTask.java
@@ -91,9 +91,13 @@
                String overtimeStatus = NORMAL;
                if (overtime != null && overtime !=0 && durationDay >= overtime) {
                    overtimeStatus = OVERTIME; // 如果超过办理期限
                } else if (overtime != null && overtime != 0 && durationDay >= (overtime - 12 * 60 * 60)) {
                }
                else if (overtime != null && overtime != 0 && durationDay >= (overtime - 12 * 60 * 60)) {
                    overtimeStatus = WILLOVERTIME; // 如果临期(固定超时前12小时为临期)
                }
//                else if (overtime != null && overtime != 0 && durationDay >= (overtime - 60)) {
//                    overtimeStatus = WILLOVERTIME; // 如果临期(固定超时前12小时为临期)
//                }
                List<String> processInsIds = map.get(status);
                processInsIds.add(task.getProcessInstanceId());
@@ -123,6 +127,8 @@
                hours = Integer.parseInt(timeArr[1]);
            }
            time = (days * 24L + hours) * 3600L;
//            //分-秒
//            time= (days * 60L) + hours;
        }
        return time;
    }
business/src/main/resources/mapper/ProjectInfoMapper.xml
@@ -163,9 +163,9 @@
                and TPI.project_owner_unit = #{query.projectOwnerUnit}
            </if>
            <if test="query.projectCategory == 6">
                <if test="query.role == 0">
                    and TPI.used_status != 2
                </if>
<!--                <if test="query.role == 0">-->
<!--                    and TPI.used_status != 2-->
<!--                </if>-->
                <if test="query.role == 1">
                    and TPI.used_status = 1 and TPI.competent_department like concat('%',#{query.competentDepartment},'%')
                </if>
flowable/src/main/resources/mapper/ProcessCodingMapper.xml
@@ -69,6 +69,11 @@
                    when id=#{item.id} then #{item.status}
                </foreach>
            </trim>
            <trim prefix="overtime_status =case" suffix="end,"><!-- 构造case语法 末尾加上end,如果需要更新多个字段复制这个trim -->
                <foreach collection="list" item="item">
                    when id=#{item.id} then #{item.overtimeStatus}
                </foreach>
            </trim>
        </trim>
        where id in
        <foreach collection="list" index="index" item="item" separator="," open="(" close=")">