From 6e8c95d31d85b53857e4e3ce12ea303eb0ea42eb Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 19 八月 2021 00:47:48 +0800
Subject: [PATCH] 优化代码
---
service-common/src/main/java/com/java110/common/smo/impl/AllocationStorehouseUserInnerServiceSMOImpl.java | 69 ++++++++++++++++++++++++++++++++--
1 files changed, 64 insertions(+), 5 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 91a5729..47fe8b6 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
@@ -3,12 +3,19 @@
import com.java110.core.base.smo.BaseServiceSMO;
import com.java110.dto.PageDto;
import com.java110.dto.allocationStorehouseApply.AllocationStorehouseApplyDto;
+import com.java110.dto.businessDatabus.CustomBusinessDatabusDto;
+import com.java110.dto.purchaseApply.PurchaseApplyDto;
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.job.IDataBusInnerServiceSMO;
import com.java110.intf.store.IAllocationStorehouseApplyInnerServiceSMO;
+import com.java110.intf.store.IPurchaseApplyInnerServiceSMO;
+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;
@@ -47,6 +54,12 @@
@Autowired
private IWorkflowInnerServiceSMO workflowInnerServiceSMOImpl;
+ @Autowired
+ private IPurchaseApplyInnerServiceSMO purchaseApplyInnerServiceSMOImpl;
+
+ @Autowired
+ private IDataBusInnerServiceSMO dataBusInnerServiceSMOImpl;
+
/**
* 鍚姩娴佺▼
*
@@ -63,11 +76,27 @@
//灏嗗緱鍒扮殑瀹炰緥娴佺▼id鍊艰祴缁欎箣鍓嶈缃殑鍙橀噺
String processInstanceId = processInstance.getId();
// System.out.println("娴佺▼寮�鍚垚鍔�.......瀹炰緥娴佺▼id:" + processInstanceId);
-
+ 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;
-
}
/**
@@ -95,7 +124,7 @@
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());
@@ -258,6 +287,15 @@
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(allocationStorehouseApplyDto.getTaskId()).singleResult();
String processInstanceId = task.getProcessInstanceId();
@@ -269,11 +307,32 @@
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