From ea9ca0ef5707dfa9e3e404049372a121ce03fb2d Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 05 八月 2021 22:54:57 +0800
Subject: [PATCH] 优化日志记录bug
---
service-common/src/main/java/com/java110/common/smo/impl/GoodCollectionUserInnerServiceSMOImpl.java | 51 ++++++++++++++++++++++++++++++++++-----------------
1 files changed, 34 insertions(+), 17 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 3a15936..ecd9480 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
@@ -1,20 +1,23 @@
package com.java110.common.smo.impl;
-
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.user.UserDto;
import com.java110.dto.workflow.WorkflowDto;
import com.java110.entity.audit.AuditUser;
-import com.java110.intf.common.IAuditUserInnerServiceSMO;
import com.java110.intf.common.IGoodCollectionUserInnerServiceSMO;
import com.java110.intf.common.IWorkflowInnerServiceSMO;
+import com.java110.intf.job.IDataBusInnerServiceSMO;
import com.java110.intf.store.IComplaintInnerServiceSMO;
import com.java110.intf.store.IPurchaseApplyInnerServiceSMO;
import com.java110.intf.user.IUserInnerServiceSMO;
+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.*;
import org.activiti.engine.history.HistoricProcessInstance;
@@ -35,7 +38,9 @@
import java.util.List;
import java.util.Map;
-
+/**
+ * 鐗╁搧棰嗙敤宸ヤ綔娴�
+ */
@RestController
public class GoodCollectionUserInnerServiceSMOImpl extends BaseServiceSMO implements IGoodCollectionUserInnerServiceSMO {
@@ -49,13 +54,6 @@
private TaskService taskService;
@Autowired
- private HistoryService historyService;
-
- @Autowired
- private RepositoryService repositoryService;
-
-
- @Autowired
private IUserInnerServiceSMO userInnerServiceSMOImpl;
@Autowired
@@ -65,11 +63,10 @@
private IPurchaseApplyInnerServiceSMO purchaseApplyInnerServiceSMOImpl;
@Autowired
- private IAuditUserInnerServiceSMO auditUserInnerServiceSMOImpl;
-
- @Autowired
private IWorkflowInnerServiceSMO workflowInnerServiceSMOImpl;
+ @Autowired
+ private IDataBusInnerServiceSMO dataBusInnerServiceSMOImpl;
/**
* 鍚姩娴佺▼
@@ -77,6 +74,8 @@
* @return
*/
public PurchaseApplyDto startProcess(@RequestBody PurchaseApplyDto purchaseApplyDto) {
+ //鑾峰彇鍑哄叆搴撶被鍨�
+ String resOrderType = purchaseApplyDto.getResOrderType();
//灏嗕俊鎭姞鍏ap,浠ヤ究浼犲叆娴佺▼涓�
Map<String, Object> variables = new HashMap<String, Object>();
variables.put("purchaseApplyDto", purchaseApplyDto);
@@ -85,11 +84,30 @@
variables.put("startUserId", purchaseApplyDto.getCurrentUserId());
//寮�鍚祦绋�
ProcessInstance processInstance = runtimeService.startProcessInstanceByKey(getWorkflowDto(purchaseApplyDto.getStoreId()), purchaseApplyDto.getApplyOrderId(), variables);
-// //灏嗗緱鍒扮殑瀹炰緥娴佺▼id鍊艰祴缁欎箣鍓嶈缃殑鍙橀噺
+ //灏嗗緱鍒扮殑瀹炰緥娴佺▼id鍊艰祴缁欎箣鍓嶈缃殑鍙橀噺
String processInstanceId = processInstance.getId();
-// // System.out.println("娴佺▼寮�鍚垚鍔�.......瀹炰緥娴佺▼id:" + processInstanceId);
-//
+ String processDefinitionId = processInstance.getProcessDefinitionId();
+ String businessKey = processInstance.getBusinessKey();
+ //鑾峰彇涓嬬骇澶勭悊浜篿d
+ PurchaseApplyDto purchaseApply = new PurchaseApplyDto();
+ purchaseApply.setBusinessKey(businessKey);
+ purchaseApply.setActRuTaskId(processInstanceId);
+ purchaseApply.setProcDefId(processDefinitionId);
+ List<PurchaseApplyDto> actRuTaskUserIds = purchaseApplyInnerServiceSMOImpl.getActRuTaskUserId(purchaseApply);
+ // System.out.println("娴佺▼寮�鍚垚鍔�.......瀹炰緥娴佺▼id:" + processInstanceId);
purchaseApplyDto.setProcessInstanceId(processInstanceId);
+ if (actRuTaskUserIds != null && actRuTaskUserIds.size() > 0) {
+ for (PurchaseApplyDto purchase : actRuTaskUserIds) {
+ String actRuTaskUserId = purchase.getTaskUserId();
+ MachineRecordPo machineRecordPo = new MachineRecordPo();
+ machineRecordPo.setApplyOrderId(businessKey);
+ machineRecordPo.setPurchaseUserId(actRuTaskUserId);
+ machineRecordPo.setResOrderType(resOrderType);
+ //浼犻�乨atabus
+ dataBusInnerServiceSMOImpl.customExchange(CustomBusinessDatabusDto.getInstance(
+ BusinessTypeConstant.BUSINESS_TYPE_DATABUS_PURCHASE_APPLY, BeanConvertUtil.beanCovertJson(machineRecordPo)));
+ }
+ }
//autoFinishFirstTask(purchaseApplyDto);
return purchaseApplyDto;
}
@@ -299,7 +317,6 @@
variables.put("flag", "1200".equals(purchaseApplyDto.getAuditCode()) ? "false" : "true");
variables.put("startUserId", purchaseApplyDto.getStartUserId());
taskService.complete(purchaseApplyDto.getTaskId(), variables);
-
ProcessInstance pi = runtimeService.createProcessInstanceQuery().processInstanceId(processInstanceId).singleResult();
if (pi == null) {
return true;
--
Gitblit v1.8.0