From 7ffa0f92413da168a73394b02e06b760778da05c Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 10 二月 2025 10:08:49 +0800
Subject: [PATCH] 办理期限
---
business/src/main/resources/mapper/ProjectInfoMapper.xml | 6 +++---
business/src/main/java/com/ycl/task/FlowableTask.java | 8 +++++++-
flowable/src/main/resources/mapper/ProcessCodingMapper.xml | 5 +++++
3 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/business/src/main/java/com/ycl/task/FlowableTask.java b/business/src/main/java/com/ycl/task/FlowableTask.java
index 9112494..ecc8ed0 100644
--- a/business/src/main/java/com/ycl/task/FlowableTask.java
+++ b/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;
}
diff --git a/business/src/main/resources/mapper/ProjectInfoMapper.xml b/business/src/main/resources/mapper/ProjectInfoMapper.xml
index 9c04cba..365761b 100644
--- a/business/src/main/resources/mapper/ProjectInfoMapper.xml
+++ b/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>
diff --git a/flowable/src/main/resources/mapper/ProcessCodingMapper.xml b/flowable/src/main/resources/mapper/ProcessCodingMapper.xml
index 658c980..ad0c884 100644
--- a/flowable/src/main/resources/mapper/ProcessCodingMapper.xml
+++ b/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,"><!-- 鏋勯�燾ase璇硶 鏈熬鍔犱笂end锛屽鏋滈渶瑕佹洿鏂板涓瓧娈靛鍒惰繖涓猼rim -->
+ <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=")">
--
Gitblit v1.8.0