From bdcb64f0293f27e2dfb3de12a60f6e8412cb962b Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 26 五月 2022 01:45:22 +0800
Subject: [PATCH] 退费修改为 从证书地址中获取
---
service-common/src/main/java/com/java110/common/smo/impl/ContractApplyUserInnerServiceSMOImpl.java | 17 ++++++-----------
1 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/service-common/src/main/java/com/java110/common/smo/impl/ContractApplyUserInnerServiceSMOImpl.java b/service-common/src/main/java/com/java110/common/smo/impl/ContractApplyUserInnerServiceSMOImpl.java
index a4b5301..58a988f 100644
--- a/service-common/src/main/java/com/java110/common/smo/impl/ContractApplyUserInnerServiceSMOImpl.java
+++ b/service-common/src/main/java/com/java110/common/smo/impl/ContractApplyUserInnerServiceSMOImpl.java
@@ -140,23 +140,18 @@
if (FlowUtil.isCondition(outgoingFlow.getConditionExpression(), vars)) {
isReturn = true;
}
+
if (!isReturn) {
String assignee = ((UserTask) targetFlowElement).getAssignee();
- if (!StringUtil.isEmpty(assignee) && assignee.indexOf("${") < 0) {
- taskBusinessKeyMap.put(business_key+"_hasAudit", task.getId());
- }
- if ("${startUserId}".equals(assignee)) {
- taskBusinessKeyMap.put(business_key+"_hasAudit", task.getId());
- }
- if ("${nextUserId}".equals(assignee)) {
- taskBusinessKeyMap.put(business_key+"_hasAudit", task.getId());
+ if (!StringUtil.isEmpty(assignee)) {
+ taskBusinessKeyMap.put(business_key + "_hasAudit", "1");
}
}
}
//濡傛灉涓嬩竴涓负 缁撴潫鑺傜偣
if (targetFlowElement instanceof EndEvent) {
//true 鑾峰彇杈撳嚭鑺傜偣鍚嶇О
- taskBusinessKeyMap.put(business_key+"_hasEnd", task.getId());
+ taskBusinessKeyMap.put(business_key + "_hasEnd", "1");
}
}
@@ -174,8 +169,8 @@
for (ContractDto tmpContractDto : tmpContractDtos) {
tmpContractDto.setTaskId(taskBusinessKeyMap.get(tmpContractDto.getContractId()));
- tmpContractDto.setHasAudit(taskBusinessKeyMap.get(tmpContractDto.getContractId()+"_hasAudit"));
- tmpContractDto.setHasEnd(taskBusinessKeyMap.get(tmpContractDto.getContractId()+"_hasEnd"));
+ tmpContractDto.setHasAudit(taskBusinessKeyMap.get(tmpContractDto.getContractId() + "_hasAudit"));
+ tmpContractDto.setHasEnd(taskBusinessKeyMap.get(tmpContractDto.getContractId() + "_hasEnd"));
}
return tmpContractDtos;
}
--
Gitblit v1.8.0