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/AllocationStorehouseUserInnerServiceSMOImpl.java | 245 +++++++++++++++++++++++++++++++++++--------------
1 files changed, 175 insertions(+), 70 deletions(-)
diff --git a/service-common/src/main/java/com/java110/common/smo/impl/AllocationStorehouseUserInnerServiceSMOImpl.java b/service-common/src/main/java/com/java110/common/smo/impl/AllocationStorehouseUserInnerServiceSMOImpl.java
index 2bc83ec..a1a380e 100644
--- a/service-common/src/main/java/com/java110/common/smo/impl/AllocationStorehouseUserInnerServiceSMOImpl.java
+++ b/service-common/src/main/java/com/java110/common/smo/impl/AllocationStorehouseUserInnerServiceSMOImpl.java
@@ -1,16 +1,23 @@
package com.java110.common.smo.impl;
-
import com.java110.core.base.smo.BaseServiceSMO;
import com.java110.dto.PageDto;
-import com.java110.dto.allocationStorehouse.AllocationStorehouseDto;
+import com.java110.dto.allocationStorehouseApply.AllocationStorehouseApplyDto;
+import com.java110.dto.businessDatabus.CustomBusinessDatabusDto;
+import com.java110.dto.purchaseApply.PurchaseApplyDto;
+import com.java110.dto.storehouse.StorehouseDto;
import com.java110.dto.workflow.WorkflowDto;
import com.java110.entity.audit.AuditUser;
import com.java110.intf.common.IAllocationStorehouseUserInnerServiceSMO;
import com.java110.intf.common.IWorkflowInnerServiceSMO;
-import com.java110.intf.store.IAllocationStorehouseInnerServiceSMO;
-import com.java110.intf.store.IContractInnerServiceSMO;
+import com.java110.intf.job.IDataBusInnerServiceSMO;
+import com.java110.intf.store.IAllocationStorehouseApplyInnerServiceSMO;
+import com.java110.intf.store.IPurchaseApplyInnerServiceSMO;
+import com.java110.intf.store.IStorehouseInnerServiceSMO;
+import com.java110.po.machine.MachineRecordPo;
+import com.java110.utils.constant.BusinessTypeConstant;
import com.java110.utils.util.Assert;
+import com.java110.utils.util.BeanConvertUtil;
import com.java110.utils.util.StringUtil;
import org.activiti.engine.HistoryService;
import org.activiti.engine.ProcessEngine;
@@ -33,6 +40,8 @@
import java.util.List;
import java.util.Map;
+import static com.java110.dto.storehouse.StorehouseDto.SH_TYPE_GROUP;
+
//@Service("resourceEntryStoreSMOImpl")
@RestController
public class AllocationStorehouseUserInnerServiceSMOImpl extends BaseServiceSMO implements IAllocationStorehouseUserInnerServiceSMO {
@@ -44,13 +53,19 @@
private RuntimeService runtimeService;
@Autowired
- private TaskService taskService;
-
- @Autowired
- private IAllocationStorehouseInnerServiceSMO allocationStorehouseInnerServiceSMOImpl;
+ private IAllocationStorehouseApplyInnerServiceSMO allocationStorehouseApplyInnerServiceSMOImpl;
@Autowired
private IWorkflowInnerServiceSMO workflowInnerServiceSMOImpl;
+
+ @Autowired
+ private IPurchaseApplyInnerServiceSMO purchaseApplyInnerServiceSMOImpl;
+
+ @Autowired
+ private IDataBusInnerServiceSMO dataBusInnerServiceSMOImpl;
+
+ @Autowired
+ private IStorehouseInnerServiceSMO iStorehouseInnerServiceSMO;
/**
@@ -58,22 +73,53 @@
*
* @return
*/
- public AllocationStorehouseDto startProcess(@RequestBody AllocationStorehouseDto allocationStorehouseDto) {
+ public AllocationStorehouseApplyDto startProcess(@RequestBody AllocationStorehouseApplyDto allocationStorehouseApplyDto) {
//灏嗕俊鎭姞鍏ap,浠ヤ究浼犲叆娴佺▼涓�
Map<String, Object> variables = new HashMap<String, Object>();
- variables.put("allocationStorehouseDto", allocationStorehouseDto);
- variables.put("userId", allocationStorehouseDto.getCurrentUserId());
- variables.put("startUserId", allocationStorehouseDto.getCurrentUserId());
+ variables.put("allocationStorehouseApplyDto", allocationStorehouseApplyDto);
+ variables.put("userId", allocationStorehouseApplyDto.getCurrentUserId());
+ variables.put("startUserId", allocationStorehouseApplyDto.getCurrentUserId());
+ variables.put("nextUserId", allocationStorehouseApplyDto.getNextUserId());
+ //鏌ヨ璋冩嫧婧愪粨搴撴槸闆嗗洟浠撳簱杩樻槸灏忓尯浠撳簱锛屽皬鍖轰粨搴撹蛋琚皟鎷ㄦ祦绋嬪鎵�
+ StorehouseDto storehouseDto = new StorehouseDto();
+ storehouseDto.setShId(allocationStorehouseApplyDto.getShId());
+ List<StorehouseDto> storehouseDtoList = iStorehouseInnerServiceSMO.queryStorehouses(storehouseDto);
+ StorehouseDto storehouseDto1 = new StorehouseDto();
+ String communityId = null;
+ if (storehouseDtoList != null && storehouseDtoList.size() > 0) {
+ storehouseDto1 = storehouseDtoList.get(0);
+ }
+ if (SH_TYPE_GROUP.equals(storehouseDto1.getShType())) {//闆嗗洟浠撳簱
+ communityId = "9999";
+ } else {//灏忓尯浠撳簱
+ communityId = storehouseDto1.getShObjId();
+ }
//寮�鍚祦绋�
- ProcessInstance processInstance = runtimeService.startProcessInstanceByKey(getWorkflowDto(allocationStorehouseDto.getStoreId()), allocationStorehouseDto.getAsId(), variables);
+ ProcessInstance processInstance = runtimeService.startProcessInstanceByKey(getWorkflowDto(allocationStorehouseApplyDto.getStoreId(), communityId), allocationStorehouseApplyDto.getApplyId(), variables);
//灏嗗緱鍒扮殑瀹炰緥娴佺▼id鍊艰祴缁欎箣鍓嶈缃殑鍙橀噺
String processInstanceId = processInstance.getId();
// System.out.println("娴佺▼寮�鍚垚鍔�.......瀹炰緥娴佺▼id:" + processInstanceId);
-
- allocationStorehouseDto.setProcessInstanceId(processInstanceId);
-
- return allocationStorehouseDto;
-
+ String processDefinitionId = processInstance.getProcessDefinitionId();
+ String businessKey = processInstance.getBusinessKey();
+ //鑾峰彇涓嬬骇澶勭悊浜篿d
+ PurchaseApplyDto purchaseDto = new PurchaseApplyDto();
+ purchaseDto.setActRuTaskId(processInstanceId);
+ purchaseDto.setProcDefId(processDefinitionId);
+ purchaseDto.setBusinessKey(businessKey);
+ List<PurchaseApplyDto> actRuTaskUserIds = purchaseApplyInnerServiceSMOImpl.getActRuTaskUserId(purchaseDto);
+ allocationStorehouseApplyDto.setProcessInstanceId(processInstanceId);
+ if (actRuTaskUserIds != null && actRuTaskUserIds.size() > 0) {
+ for (PurchaseApplyDto purchaseApply : actRuTaskUserIds) {
+ String actRuTaskUserId = purchaseApply.getTaskUserId();
+ MachineRecordPo machineRecordPo = new MachineRecordPo();
+ machineRecordPo.setApplyOrderId(businessKey);
+ machineRecordPo.setPurchaseUserId(actRuTaskUserId);
+ //浼犻�乨atabus
+ dataBusInnerServiceSMOImpl.customExchange(CustomBusinessDatabusDto.getInstance(
+ BusinessTypeConstant.BUSINESS_TYPE_DATABUS_ALLOCATION_STOREHOUSE_APPLY, BeanConvertUtil.beanCovertJson(machineRecordPo)));
+ }
+ }
+ return allocationStorehouseApplyDto;
}
/**
@@ -84,7 +130,9 @@
*/
public long getUserTaskCount(@RequestBody AuditUser user) {
TaskService taskService = processEngine.getTaskService();
- TaskQuery query = taskService.createTaskQuery().processDefinitionKey(getWorkflowDto(user.getStoreId()));
+ List<String> workflowlist = getWorkflowDto1(user.getStoreId());
+ TaskQuery query = taskService.createTaskQuery().processDefinitionKeyIn(workflowlist);
+// TaskQuery query = taskService.createTaskQuery().processDefinitionKey(getWorkflowDto(user.getStoreId(), user.getCommunityId()));
query.taskAssignee(user.getUserId());
return query.count();
}
@@ -94,14 +142,14 @@
*
* @param user 鐢ㄦ埛淇℃伅
*/
- public List<AllocationStorehouseDto> getUserTasks(@RequestBody AuditUser user) {
+ public List<AllocationStorehouseApplyDto> getUserTasks(@RequestBody AuditUser user) {
TaskService taskService = processEngine.getTaskService();
- TaskQuery query = taskService.createTaskQuery().processDefinitionKey(getWorkflowDto(user.getStoreId()));
+ TaskQuery query = taskService.createTaskQuery().processDefinitionKeyIn(getWorkflowDto1(user.getStoreId()));
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());
@@ -109,7 +157,7 @@
list = query.list();
}
- List<String> asIds = new ArrayList<>();
+ List<String> appIyIds = new ArrayList<>();
Map<String, String> taskBusinessKeyMap = new HashMap<>();
for (Task task : list) {
String processInstanceId = task.getProcessInstanceId();
@@ -117,72 +165,99 @@
ProcessInstance pi = runtimeService.createProcessInstanceQuery().processInstanceId(processInstanceId).singleResult();
//4.浣跨敤娴佺▼瀹炰緥瀵硅薄鑾峰彇BusinessKey
String business_key = pi.getBusinessKey();
- asIds.add(business_key);
+ appIyIds.add(business_key);
taskBusinessKeyMap.put(business_key, task.getId());
}
- if (asIds == null || asIds.size() == 0) {
+ if (appIyIds == null || appIyIds.size() == 0) {
return new ArrayList<>();
}
//鏌ヨ 鎶曡瘔淇℃伅
- AllocationStorehouseDto allocationStorehouseDto = new AllocationStorehouseDto();
- allocationStorehouseDto.setStoreId(user.getStoreId());
- allocationStorehouseDto.setAsIds(asIds.toArray(new String[asIds.size()]));
- List<AllocationStorehouseDto> tmpAllocationStorehouseDtos = allocationStorehouseInnerServiceSMOImpl.queryAllocationStorehouses(allocationStorehouseDto);
-
- for (AllocationStorehouseDto tmpAllocationStorehouseDto : tmpAllocationStorehouseDtos) {
- tmpAllocationStorehouseDto.setTaskId(taskBusinessKeyMap.get(tmpAllocationStorehouseDto.getAsId()));
+ AllocationStorehouseApplyDto allocationStorehouseApplyDto = new AllocationStorehouseApplyDto();
+ allocationStorehouseApplyDto.setStoreId(user.getStoreId());
+ allocationStorehouseApplyDto.setApplyIds(appIyIds.toArray(new String[appIyIds.size()]));
+ List<AllocationStorehouseApplyDto> tmpAllocationStorehouseApplyDtos = allocationStorehouseApplyInnerServiceSMOImpl.queryAllocationStorehouseApplys(allocationStorehouseApplyDto);
+ for (AllocationStorehouseApplyDto tmpAllocationStorehouseApplyDto : tmpAllocationStorehouseApplyDtos) {
+ tmpAllocationStorehouseApplyDto.setTaskId(taskBusinessKeyMap.get(tmpAllocationStorehouseApplyDto.getApplyId()));
}
- return tmpAllocationStorehouseDtos;
+ return tmpAllocationStorehouseApplyDtos;
}
- public boolean agreeCompleteTask(@RequestBody AllocationStorehouseDto allocationStorehouseDto) {
+ public boolean agreeCompleteTask(@RequestBody AllocationStorehouseApplyDto allocationStorehouseApplyDto) {
TaskService taskService = processEngine.getTaskService();
Map<String, Object> variables = new HashMap<String, Object>();
- variables.put("auditCode", allocationStorehouseDto.getAuditCode());
- taskService.complete(allocationStorehouseDto.getTaskId(), variables);
+ variables.put("auditCode", allocationStorehouseApplyDto.getAuditCode());
+ taskService.complete(allocationStorehouseApplyDto.getTaskId(), variables);
return true;
}
- public boolean refuteCompleteTask(@RequestBody AllocationStorehouseDto allocationStorehouseDto) {
+ public boolean refuteCompleteTask(@RequestBody AllocationStorehouseApplyDto allocationStorehouseApplyDto) {
TaskService taskService = processEngine.getTaskService();
Map<String, Object> variables = new HashMap<String, Object>();
- variables.put("auditCode", allocationStorehouseDto.getAuditCode());
- taskService.complete(allocationStorehouseDto.getTaskId(), variables);
+ variables.put("auditCode", allocationStorehouseApplyDto.getAuditCode());
+ taskService.complete(allocationStorehouseApplyDto.getTaskId(), variables);
return true;
}
/**
* 瀹℃牳 褰撳墠浠诲姟
*
- * @param allocationStorehouseDto 璧勬簮璁㈠崟
+ * @param allocationStorehouseApplyDto 璧勬簮璁㈠崟
* @return
*/
- public boolean complete(@RequestBody AllocationStorehouseDto allocationStorehouseDto) {
+ public boolean complete(@RequestBody AllocationStorehouseApplyDto allocationStorehouseApplyDto) {
TaskService taskService = processEngine.getTaskService();
- taskService.complete(allocationStorehouseDto.getTaskId());
+ taskService.complete(allocationStorehouseApplyDto.getTaskId());
return true;
}
-
- 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_CONTRACT_APPLY);
+ if (!StringUtil.isEmpty(communityId) && "9999".equals(communityId)) {
+ workflowDto.setFlowType(WorkflowDto.FLOW_TYPE_ALLOCATION_STOREHOUSE);
+ } else {
+ workflowDto.setFlowType(WorkflowDto.FLOW_TYPE_ALLOCATION_STOREHOUSE_GO);
+ }
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();
+ }
+
+ private List<String> getWorkflowDto1(String storeId) {
+
+ //寮�鍚祦绋�
+ //WorkflowDto.DEFAULT_PROCESS + workflowDto.getFlowId()
+ WorkflowDto workflowDto = new WorkflowDto();
+ String[] flowTypes = new String[]{WorkflowDto.FLOW_TYPE_ALLOCATION_STOREHOUSE, WorkflowDto.FLOW_TYPE_ALLOCATION_STOREHOUSE_GO};
+ workflowDto.setFlowTypes(flowTypes);
+ workflowDto.setStoreId(storeId);
+ List<WorkflowDto> workflowDtos = workflowInnerServiceSMOImpl.queryWorkflows(workflowDto);
+ if (workflowDtos != null && workflowDtos.size() == 0) {
+ throw new IllegalArgumentException("鏈壘鍒� 璋冩嫧娴佺▼锛岃鍦ㄧ墿涓氳处鍙风郴缁熺鐞嗕笅娴佺▼绠＄悊涓厤缃祦绋�!");
+ }
+ List<String> flowIdList = new ArrayList<String>();
+ for (WorkflowDto workflowDto1 : workflowDtos) {
+ if (StringUtil.isEmpty(workflowDto1.getProcessDefinitionKey()) && WorkflowDto.FLOW_TYPE_ALLOCATION_STOREHOUSE.equals(workflowDto1.getFlowType())) {
+ throw new IllegalArgumentException("灏忓尯缂栫爜=" + workflowDto1.getCommunityId() + "鐨勭墿鍝佽皟鎷ㄦ祦绋嬭繕鏈儴缃�");
+ }
+ if (StringUtil.isEmpty(workflowDto1.getProcessDefinitionKey()) && WorkflowDto.FLOW_TYPE_ALLOCATION_STOREHOUSE_GO.equals(workflowDto1.getFlowType())) {
+ throw new IllegalArgumentException("灏忓尯缂栫爜=" + workflowDto1.getCommunityId() + "鐨勭墿鍝佽璋冩嫧杩樻湭閮ㄧ讲");
+ }
+ flowIdList.add(WorkflowDto.DEFAULT_PROCESS + workflowDto1.getFlowId());
+ }
+ return flowIdList;
}
/**
@@ -198,7 +273,7 @@
// .taskAssignee(user.getUserId());
HistoricTaskInstanceQuery historicTaskInstanceQuery = historyService.createHistoricTaskInstanceQuery()
- .processDefinitionKey(getWorkflowDto(user.getStoreId()))
+ .processDefinitionKeyIn(getWorkflowDto1(user.getStoreId()))
.taskAssignee(user.getUserId())
.finished();
if (!StringUtil.isEmpty(user.getAuditLink()) && "START".equals(user.getAuditLink())) {
@@ -216,11 +291,11 @@
*
* @param user 鐢ㄦ埛淇℃伅
*/
- public List<AllocationStorehouseDto> getUserHistoryTasks(@RequestBody AuditUser user) {
+ public List<AllocationStorehouseApplyDto> getUserHistoryTasks(@RequestBody AuditUser user) {
HistoryService historyService = processEngine.getHistoryService();
HistoricTaskInstanceQuery historicTaskInstanceQuery = historyService.createHistoricTaskInstanceQuery()
- .processDefinitionKey(getWorkflowDto(user.getStoreId()))
+ .processDefinitionKeyIn(getWorkflowDto1(user.getStoreId()))
.taskAssignee(user.getUserId())
.finished();
// if (!StringUtil.isEmpty(user.getAuditLink()) && "START".equals(user.getAuditLink())) {
@@ -238,7 +313,7 @@
list = query.list();
}
- List<String> asIds = new ArrayList<>();
+ List<String> appIyIds = new ArrayList<>();
Map<String, String> taskBusinessKeyMap = new HashMap<>();
for (HistoricTaskInstance task : list) {
@@ -247,40 +322,70 @@
HistoricProcessInstance pi = historyService.createHistoricProcessInstanceQuery().processInstanceId(processInstanceId).singleResult();
//4.浣跨敤娴佺▼瀹炰緥瀵硅薄鑾峰彇BusinessKey
String business_key = pi.getBusinessKey();
- asIds.add(business_key);
+ appIyIds.add(business_key);
taskBusinessKeyMap.put(business_key, task.getId());
}
//鏌ヨ 鎶曡瘔淇℃伅
- AllocationStorehouseDto allocationStorehouseDto = new AllocationStorehouseDto();
- allocationStorehouseDto.setStoreId(user.getStoreId());
- allocationStorehouseDto.setAsIds(asIds.toArray(new String[asIds.size()]));
- List<AllocationStorehouseDto> tmpAllocationStorehouseDtos = allocationStorehouseInnerServiceSMOImpl.queryAllocationStorehouses(allocationStorehouseDto);
+ AllocationStorehouseApplyDto allocationStorehouseApplyDto = new AllocationStorehouseApplyDto();
+ allocationStorehouseApplyDto.setStoreId(user.getStoreId());
+ allocationStorehouseApplyDto.setApplyIds(appIyIds.toArray(new String[appIyIds.size()]));
+ List<AllocationStorehouseApplyDto> tmpAllocationStorehouseApplyDtos = allocationStorehouseApplyInnerServiceSMOImpl.queryAllocationStorehouseApplys(allocationStorehouseApplyDto);
- for (AllocationStorehouseDto tmpAllocationStorehouseDto : tmpAllocationStorehouseDtos) {
- tmpAllocationStorehouseDto.setTaskId(taskBusinessKeyMap.get(tmpAllocationStorehouseDto.getAsId()));
+ for (AllocationStorehouseApplyDto tmpAllocationStorehouseApplyDto : tmpAllocationStorehouseApplyDtos) {
+ tmpAllocationStorehouseApplyDto.setTaskId(taskBusinessKeyMap.get(tmpAllocationStorehouseApplyDto.getApplyId()));
}
- return tmpAllocationStorehouseDtos;
+ return tmpAllocationStorehouseApplyDtos;
}
- public boolean completeTask(@RequestBody AllocationStorehouseDto allocationStorehouseDto) {
+ public boolean completeTask(@RequestBody AllocationStorehouseApplyDto allocationStorehouseApplyDto) {
+ //鑾峰彇鐘舵�佹爣璇�
+ String noticeState = allocationStorehouseApplyDto.getNoticeState();
+ //鑾峰彇瀹℃壒鐘舵��
+ String auditCode = allocationStorehouseApplyDto.getAuditCode();
+ //鑾峰彇鎷掔粷鐞嗙敱
+ String auditMessage = "";
+ if (!StringUtil.isEmpty(auditCode) && auditCode.equals("1200")) {
+ auditMessage = allocationStorehouseApplyDto.getAuditMessage();
+ }
TaskService taskService = processEngine.getTaskService();
- Task task = taskService.createTaskQuery().taskId(allocationStorehouseDto.getTaskId()).singleResult();
+ Task task = taskService.createTaskQuery().taskId(allocationStorehouseApplyDto.getTaskId()).singleResult();
String processInstanceId = task.getProcessInstanceId();
- Authentication.setAuthenticatedUserId(allocationStorehouseDto.getCurrentUserId());
- taskService.addComment(allocationStorehouseDto.getTaskId(), processInstanceId, allocationStorehouseDto.getAuditMessage());
+ Authentication.setAuthenticatedUserId(allocationStorehouseApplyDto.getCurrentUserId());
+ taskService.addComment(allocationStorehouseApplyDto.getTaskId(), processInstanceId, allocationStorehouseApplyDto.getAuditMessage());
Map<String, Object> variables = new HashMap<String, Object>();
- variables.put("auditCode", allocationStorehouseDto.getAuditCode());
- variables.put("currentUserId", allocationStorehouseDto.getCurrentUserId());
- variables.put("flag", "1200".equals(allocationStorehouseDto.getAuditCode()) ? "false" : "true");
- variables.put("startUserId", allocationStorehouseDto.getStartUserId());
- taskService.complete(allocationStorehouseDto.getTaskId(), variables);
-
+ variables.put("auditCode", allocationStorehouseApplyDto.getAuditCode());
+ variables.put("currentUserId", allocationStorehouseApplyDto.getCurrentUserId());
+ variables.put("flag", "1200".equals(allocationStorehouseApplyDto.getAuditCode()) ? "false" : "true");
+ variables.put("startUserId", allocationStorehouseApplyDto.getStartUserId());
+ taskService.complete(allocationStorehouseApplyDto.getTaskId(), variables);
ProcessInstance pi = runtimeService.createProcessInstanceQuery().processInstanceId(processInstanceId).singleResult();
if (pi == null) {
return true;
}
+ String rootProcessInstanceId = pi.getId();
+ String processDefinitionId = pi.getProcessDefinitionId();
+ String businessKey = pi.getBusinessKey();
+ //鑾峰彇涓嬬骇澶勭悊浜篿d
+ PurchaseApplyDto purchaseDto = new PurchaseApplyDto();
+ purchaseDto.setActRuTaskId(rootProcessInstanceId);
+ purchaseDto.setProcDefId(processDefinitionId);
+ purchaseDto.setBusinessKey(businessKey);
+ List<PurchaseApplyDto> actRuTaskUserIds = purchaseApplyInnerServiceSMOImpl.getActRuTaskUserId(purchaseDto);
+ if (actRuTaskUserIds != null && actRuTaskUserIds.size() > 0) {
+ for (PurchaseApplyDto purchaseApply : actRuTaskUserIds) {
+ String actRuTaskUserId = purchaseApply.getTaskUserId();
+ MachineRecordPo machineRecordPo = new MachineRecordPo();
+ machineRecordPo.setApplyOrderId(businessKey);
+ machineRecordPo.setPurchaseUserId(actRuTaskUserId);
+ machineRecordPo.setNoticeState(noticeState);
+ machineRecordPo.setAuditMessage(auditMessage);
+ //浼犻�乨atabus
+ dataBusInnerServiceSMOImpl.customExchange(CustomBusinessDatabusDto.getInstance(
+ BusinessTypeConstant.BUSINESS_TYPE_DATABUS_ALLOCATION_STOREHOUSE_APPLY, BeanConvertUtil.beanCovertJson(machineRecordPo)));
+ }
+ }
return false;
}
--
Gitblit v1.8.0