From 093b73aadb022895a02dbbcd64b87613e19b547b Mon Sep 17 00:00:00 2001
From: 1098226878@qq.com <1098226878@qq.com>
Date: 星期一, 10 一月 2022 18:05:21 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-common/src/main/java/com/java110/common/smo/impl/GoodCollectionUserInnerServiceSMOImpl.java | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/service-common/src/main/java/com/java110/common/smo/impl/GoodCollectionUserInnerServiceSMOImpl.java b/service-common/src/main/java/com/java110/common/smo/impl/GoodCollectionUserInnerServiceSMOImpl.java
index ecd9480..76ee3e1 100755
--- a/service-common/src/main/java/com/java110/common/smo/impl/GoodCollectionUserInnerServiceSMOImpl.java
+++ b/service-common/src/main/java/com/java110/common/smo/impl/GoodCollectionUserInnerServiceSMOImpl.java
@@ -83,7 +83,7 @@
variables.put("userId", purchaseApplyDto.getCurrentUserId());
variables.put("startUserId", purchaseApplyDto.getCurrentUserId());
//寮�鍚祦绋�
- ProcessInstance processInstance = runtimeService.startProcessInstanceByKey(getWorkflowDto(purchaseApplyDto.getStoreId()), purchaseApplyDto.getApplyOrderId(), variables);
+ ProcessInstance processInstance = runtimeService.startProcessInstanceByKey(getWorkflowDto(purchaseApplyDto.getStoreId(),purchaseApplyDto.getCommunityId()), purchaseApplyDto.getApplyOrderId(), variables);
//灏嗗緱鍒扮殑瀹炰緥娴佺▼id鍊艰祴缁欎箣鍓嶈缃殑鍙橀噺
String processInstanceId = processInstance.getId();
String processDefinitionId = processInstance.getProcessDefinitionId();
@@ -113,19 +113,20 @@
}
- private String getWorkflowDto(String storeId) {
+ private String getWorkflowDto(String storeId,String communityId) {
//寮�鍚祦绋�
//WorkflowDto.DEFAULT_PROCESS + workflowDto.getFlowId()
WorkflowDto workflowDto = new WorkflowDto();
workflowDto.setFlowType(WorkflowDto.FLOW_TYPE_COLLECTION);
workflowDto.setStoreId(storeId);
+ 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())) {
- throw new IllegalArgumentException("娴佺▼杩樻湭閮ㄧ讲");
+ throw new IllegalArgumentException("鐗╁搧棰嗙敤娴佺▼杩樻湭閮ㄧ讲");
}
return WorkflowDto.DEFAULT_PROCESS + tmpWorkflowDto.getFlowId();
}
@@ -160,7 +161,7 @@
*/
public long getUserTaskCount(@RequestBody AuditUser user) {
TaskService taskService = processEngine.getTaskService();
- TaskQuery query = taskService.createTaskQuery().processDefinitionKey(getWorkflowDto(user.getStoreId()));
+ TaskQuery query = taskService.createTaskQuery().processDefinitionKey(getWorkflowDto(user.getStoreId(),user.getCommunityId()));
query.taskAssignee(user.getUserId());
return query.count();
}
@@ -172,12 +173,12 @@
*/
public List<PurchaseApplyDto> getUserTasks(@RequestBody AuditUser user) {
TaskService taskService = processEngine.getTaskService();
- TaskQuery query = taskService.createTaskQuery().processDefinitionKey(getWorkflowDto(user.getStoreId()));
+ TaskQuery query = taskService.createTaskQuery().processDefinitionKey(getWorkflowDto(user.getStoreId(),user.getCommunityId()));
query.taskAssignee(user.getUserId());
query.orderByTaskCreateTime().desc();
List<Task> list = null;
if (user.getPage() >= 1) {
- user.setPage(user.getPage() - 1);
+ user.setPage((user.getPage() - 1) * user.getRow());
}
if (user.getPage() != PageDto.DEFAULT_PAGE) {
list = query.listPage(user.getPage(), user.getRow());
@@ -239,7 +240,7 @@
// .taskAssignee(user.getUserId());
HistoricTaskInstanceQuery historicTaskInstanceQuery = historyService.createHistoricTaskInstanceQuery()
- .processDefinitionKey(getWorkflowDto(user.getStoreId()))
+ .processDefinitionKey(getWorkflowDto(user.getStoreId(),user.getCommunityId()))
.taskAssignee(user.getUserId())
.finished();
if (!StringUtil.isEmpty(user.getAuditLink()) && "START".equals(user.getAuditLink())) {
@@ -261,7 +262,7 @@
HistoryService historyService = processEngine.getHistoryService();
HistoricTaskInstanceQuery historicTaskInstanceQuery = historyService.createHistoricTaskInstanceQuery()
- .processDefinitionKey(getWorkflowDto(user.getStoreId()))
+ .processDefinitionKey(getWorkflowDto(user.getStoreId(),user.getCommunityId()))
.taskAssignee(user.getUserId())
.finished();
// if (!StringUtil.isEmpty(user.getAuditLink()) && "START".equals(user.getAuditLink())) {
--
Gitblit v1.8.0