From fdd79c10325b5e3241931788f354b0163b8f0cfe Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 01 四月 2021 01:03:24 +0800
Subject: [PATCH] 加入合同审批功能
---
service-common/src/main/java/com/java110/common/smo/impl/ComplaintUserInnerServiceSMOImpl.java | 27 +++++++++++++++++----------
1 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/service-common/src/main/java/com/java110/common/smo/impl/ComplaintUserInnerServiceSMOImpl.java b/service-common/src/main/java/com/java110/common/smo/impl/ComplaintUserInnerServiceSMOImpl.java
index 8702977..70b9c77 100644
--- a/service-common/src/main/java/com/java110/common/smo/impl/ComplaintUserInnerServiceSMOImpl.java
+++ b/service-common/src/main/java/com/java110/common/smo/impl/ComplaintUserInnerServiceSMOImpl.java
@@ -2,10 +2,10 @@
import com.java110.core.base.smo.BaseServiceSMO;
-import com.java110.core.smo.common.IComplaintUserInnerServiceSMO;
-import com.java110.core.smo.common.IWorkflowInnerServiceSMO;
-import com.java110.core.smo.store.IComplaintInnerServiceSMO;
-import com.java110.core.smo.user.IUserInnerServiceSMO;
+import com.java110.intf.common.IComplaintUserInnerServiceSMO;
+import com.java110.intf.common.IWorkflowInnerServiceSMO;
+import com.java110.intf.store.IComplaintInnerServiceSMO;
+import com.java110.intf.user.IUserInnerServiceSMO;
import com.java110.dto.PageDto;
import com.java110.dto.auditMessage.AuditMessageDto;
import com.java110.dto.complaint.ComplaintDto;
@@ -89,7 +89,7 @@
workflowDto.setCommunityId(communityId);
List<WorkflowDto> workflowDtos = workflowInnerServiceSMOImpl.queryWorkflows(workflowDto);
- Assert.listOnlyOne(workflowDtos, "鏈壘鍒� 鎶曡瘔寤鸿娴佺▼鎴栨壘鍒板鏉�");
+ Assert.listOnlyOne(workflowDtos, "鏈壘鍒� 鎶曡瘔寤鸿娴佺▼鎴栨壘鍒板鏉★紝璇峰湪鐗╀笟璐﹀彿绯荤粺绠＄悊涓嬫祦绋嬬鐞嗕腑閰嶇疆娴佺▼");
WorkflowDto tmpWorkflowDto = workflowDtos.get(0);
if (StringUtil.isEmpty(tmpWorkflowDto.getProcessDefinitionKey())) {
@@ -194,7 +194,8 @@
HistoricTaskInstanceQuery historicTaskInstanceQuery = historyService.createHistoricTaskInstanceQuery()
.processDefinitionKey(getWorkflowDto(user.getCommunityId()))
- .taskAssignee(user.getUserId());
+ .taskAssignee(user.getUserId())
+ .finished();
if (!StringUtil.isEmpty(user.getAuditLink()) && "START".equals(user.getAuditLink())) {
historicTaskInstanceQuery.taskName("complaint");
} else if (!StringUtil.isEmpty(user.getAuditLink()) && "AUDIT".equals(user.getAuditLink())) {
@@ -202,6 +203,7 @@
}
Query query = historicTaskInstanceQuery;
+
return query.count();
}
@@ -215,7 +217,8 @@
HistoricTaskInstanceQuery historicTaskInstanceQuery = historyService.createHistoricTaskInstanceQuery()
.processDefinitionKey(getWorkflowDto(user.getCommunityId()))
- .taskAssignee(user.getUserId());
+ .taskAssignee(user.getUserId())
+ .finished();
if (!StringUtil.isEmpty(user.getAuditLink()) && "START".equals(user.getAuditLink())) {
historicTaskInstanceQuery.taskName("complaint");
} else if (!StringUtil.isEmpty(user.getAuditLink()) && "AUDIT".equals(user.getAuditLink())) {
@@ -315,8 +318,10 @@
String userIds = "";
String userNames = "";
String userTels = "";
+ String taskIds = "";
for (Task task : tasks) {
String userId = task.getAssignee();
+ taskIds += (task.getId() + "/");
List<UserDto> users = userInnerServiceSMOImpl.getUserInfo(new String[]{userId});
if (users == null || users.size() == 0) {
continue;
@@ -325,12 +330,14 @@
userNames += (users.get(0).getName() + "/");
userTels += (users.get(0).getTel() + "/");
}
- userIds = userIds.endsWith("/") ? userIds.substring(0, userIds.length() - 2) : userIds;
- userNames = userNames.endsWith("/") ? userNames.substring(0, userNames.length() - 2) : userNames;
- userTels = userTels.endsWith("/") ? userTels.substring(0, userTels.length() - 2) : userTels;
+ userIds = userIds.endsWith("/") ? userIds.substring(0, userIds.length() - 1) : userIds;
+ userNames = userNames.endsWith("/") ? userNames.substring(0, userNames.length() - 1) : userNames;
+ userTels = userTels.endsWith("/") ? userTels.substring(0, userTels.length() - 1) : userTels;
+ taskIds = taskIds.endsWith("/") ? taskIds.substring(0, taskIds.length() - 1) : taskIds;
complaintDto.setCurrentUserId(userIds);
complaintDto.setCurrentUserName(userNames);
complaintDto.setCurrentUserTel(userTels);
+ complaintDto.setTaskId(taskIds);
return complaintDto;
}
--
Gitblit v1.8.0