From 7958f1dddb8a7f4e70d232b07a7703955ecedae0 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期六, 26 八月 2023 12:45:33 +0800
Subject: [PATCH] 优化diamante
---
service-common/src/main/java/com/java110/common/smo/impl/GoodCollectionUserInnerServiceSMOImpl.java | 30 ++++++++++++++++--------------
1 files changed, 16 insertions(+), 14 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 dfe3dd8..77f0e19 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
@@ -2,12 +2,12 @@
import com.java110.core.base.smo.BaseServiceSMO;
import com.java110.dto.PageDto;
-import com.java110.dto.auditMessage.AuditMessageDto;
-import com.java110.dto.businessDatabus.CustomBusinessDatabusDto;
-import com.java110.dto.purchaseApply.PurchaseApplyDto;
+import com.java110.dto.audit.AuditMessageDto;
+import com.java110.dto.data.DatabusDataDto;
+import com.java110.dto.purchase.PurchaseApplyDto;
import com.java110.dto.user.UserDto;
-import com.java110.dto.workflow.WorkflowDto;
-import com.java110.entity.audit.AuditUser;
+import com.java110.dto.oaWorkflow.WorkflowDto;
+import com.java110.dto.audit.AuditUser;
import com.java110.intf.common.IGoodCollectionUserInnerServiceSMO;
import com.java110.intf.common.IWorkflowInnerServiceSMO;
import com.java110.intf.job.IDataBusInnerServiceSMO;
@@ -82,8 +82,9 @@
variables.put("nextAuditStaffId", purchaseApplyDto.getStaffId());
variables.put("userId", purchaseApplyDto.getCurrentUserId());
variables.put("startUserId", purchaseApplyDto.getCurrentUserId());
+ variables.put("nextUserId", purchaseApplyDto.getNextStaffId());
//寮�鍚祦绋�
- 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();
@@ -104,7 +105,7 @@
machineRecordPo.setPurchaseUserId(actRuTaskUserId);
machineRecordPo.setResOrderType(resOrderType);
//浼犻�乨atabus
- dataBusInnerServiceSMOImpl.customExchange(CustomBusinessDatabusDto.getInstance(
+ dataBusInnerServiceSMOImpl.databusData(DatabusDataDto.getInstance(
BusinessTypeConstant.BUSINESS_TYPE_DATABUS_PURCHASE_APPLY, BeanConvertUtil.beanCovertJson(machineRecordPo)));
}
}
@@ -113,19 +114,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 +162,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,7 +174,7 @@
*/
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;
@@ -239,7 +241,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 +263,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