Commit 9234190f by 王志超

fix bug: 催办

parent 1892f990
Pipeline #88202 passed with stages
in 1 minute 49 seconds
...@@ -2222,7 +2222,7 @@ public class ChangeFlowBiz { ...@@ -2222,7 +2222,7 @@ public class ChangeFlowBiz {
|| ChangeFlowEnum.CHANGE_SUB_FLOW_SUBMIT.getNodeId().equals(subFlowNode) || ChangeFlowEnum.CHANGE_SUB_FLOW_SUBMIT.getNodeId().equals(subFlowNode)
|| ChangeFlowEnum.CHANGE_SUB_FLOW_EXE.getNodeId().equals(subFlowNode)) { || ChangeFlowEnum.CHANGE_SUB_FLOW_EXE.getNodeId().equals(subFlowNode)) {
Long subFlowUpdateTime = subFlow.getUpdateTime(); Long subFlowUpdateTime = subFlow.getUpdateTime();
if (subFlowUpdateTime != null && isOverdueByWorkdays(subFlowUpdateTime, currentTime, 2)) { if (isOverdueByWorkdays(subFlowUpdateTime, currentTime, appConfig.getOverdueWorkdays())) {
isOverdue = true; isOverdue = true;
break; break;
} }
...@@ -2235,7 +2235,7 @@ public class ChangeFlowBiz { ...@@ -2235,7 +2235,7 @@ public class ChangeFlowBiz {
String subFlowNode = subFlow.getSubFlowNode(); String subFlowNode = subFlow.getSubFlowNode();
if (ChangeFlowEnum.CHANGE_SUB_FLOW_CONFIRM.getNodeId().equals(subFlowNode)) { if (ChangeFlowEnum.CHANGE_SUB_FLOW_CONFIRM.getNodeId().equals(subFlowNode)) {
Long subFlowUpdateTime = subFlow.getUpdateTime(); Long subFlowUpdateTime = subFlow.getUpdateTime();
if (subFlowUpdateTime != null && isOverdueByWorkdays(subFlowUpdateTime, currentTime, 2)) { if (isOverdueByWorkdays(subFlowUpdateTime, currentTime, appConfig.getOverdueWorkdays())) {
isOverdue = true; isOverdue = true;
break; break;
} }
...@@ -2372,10 +2372,10 @@ public class ChangeFlowBiz { ...@@ -2372,10 +2372,10 @@ public class ChangeFlowBiz {
return false; return false;
} }
// 判断行动项的 changeExecFinishTime 是否超过两个工作日 // 判断行动项的 changeExecFinishTime 是否超过配置的工作日数
for (ChangeExecRecord execRecord : subFlowExecRecords) { for (ChangeExecRecord execRecord : subFlowExecRecords) {
Long changeExecFinishTime = execRecord.getChangeExecFinishTime(); Long changeExecFinishTime = execRecord.getChangeExecFinishTime();
if (changeExecFinishTime != null && isOverdueByWorkdays(changeExecFinishTime, currentTime, 2)) { if (isOverdueByWorkdays(changeExecFinishTime, currentTime, appConfig.getOverdueWorkdays())) {
return true; // 只要有一个行动项超期,该行动工单就需要催办 return true; // 只要有一个行动项超期,该行动工单就需要催办
} }
} }
......
...@@ -123,4 +123,10 @@ public class AppConfig { ...@@ -123,4 +123,10 @@ public class AppConfig {
*/ */
@ValueMapping("${changeSubflowNeedApproveDepartments:[]}") @ValueMapping("${changeSubflowNeedApproveDepartments:[]}")
private List<String> needApproveDepartments; private List<String> needApproveDepartments;
/**
* 工单超期判断的工作日数(默认2天)
*/
@Value("${change.overdue.workdays:2}")
private Integer overdueWorkdays;
} }
\ No newline at end of file
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