From eaf1d101d0773823c2cd27f739011f900d739afd Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期一, 16 一月 2023 00:21:04 +0800
Subject: [PATCH] 优化OA流程
---
service-api/src/main/java/com/java110/api/smo/undo/impl/UndoSMOImpl.java | 40 +++++++++++++++++++++++++++++++++++++++-
1 files changed, 39 insertions(+), 1 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/smo/undo/impl/UndoSMOImpl.java b/service-api/src/main/java/com/java110/api/smo/undo/impl/UndoSMOImpl.java
index f9b2731..b87dc95 100644
--- a/service-api/src/main/java/com/java110/api/smo/undo/impl/UndoSMOImpl.java
+++ b/service-api/src/main/java/com/java110/api/smo/undo/impl/UndoSMOImpl.java
@@ -5,7 +5,12 @@
import com.java110.api.smo.DefaultAbstractComponentSMO;
import com.java110.api.smo.undo.IUndoSMO;
import com.java110.core.context.IPageData;
+import com.java110.dto.oaWorkflow.OaWorkflowDto;
+import com.java110.dto.workflow.WorkflowDto;
+import com.java110.entity.audit.AuditUser;
import com.java110.entity.component.ComponentValidateResult;
+import com.java110.intf.common.IOaWorkflowUserInnerServiceSMO;
+import com.java110.intf.oa.IOaWorkflowInnerServiceSMO;
import com.java110.utils.exception.SMOException;
import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;
@@ -15,6 +20,8 @@
import org.springframework.stereotype.Service;
import org.springframework.web.client.RestTemplate;
+import java.util.ArrayList;
+import java.util.List;
import java.util.Map;
/**
@@ -25,6 +32,13 @@
@Autowired
private RestTemplate restTemplate;
+
+ @Autowired
+ private IOaWorkflowUserInnerServiceSMO oaWorkflowUserInnerServiceSMOImpl;
+
+
+ @Autowired
+ private IOaWorkflowInnerServiceSMO oaWorkflowInnerServiceSMOImpl;
@Override
public ResponseEntity<String> listUndos(IPageData pd) throws SMOException {
@@ -135,8 +149,32 @@
} else {
doing.put("allocation", "0");
}
+ getItemReleaseCount(result, doing);
return ResultVo.createResponseEntity(doing);
+ }
+
+ private void getItemReleaseCount(ComponentValidateResult result, JSONObject data) {
+ OaWorkflowDto oaWorkflowDto = new OaWorkflowDto();
+ oaWorkflowDto.setState(OaWorkflowDto.STATE_COMPLAINT);
+ oaWorkflowDto.setFlowType(OaWorkflowDto.FLOW_TYPE_ITEM_RELEASE);
+ List<OaWorkflowDto> oaWorkflowDtos = oaWorkflowInnerServiceSMOImpl.queryOaWorkflows(oaWorkflowDto);
+
+ if (oaWorkflowDtos == null || oaWorkflowDtos.size() < 1) {
+ data.put("itemReleaseCount", "0");
+ return ;
+ }
+ List<String> flowIds = new ArrayList<>();
+ for (OaWorkflowDto tmpOaWorkflowDto : oaWorkflowDtos) {
+ flowIds.add(WorkflowDto.DEFAULT_PROCESS + tmpOaWorkflowDto.getFlowId());
+ }
+
+ AuditUser auditUser = new AuditUser();
+ auditUser.setUserId(result.getUserId());
+ auditUser.setProcessDefinitionKeys(flowIds);
+
+ long itemReleaseCount = oaWorkflowUserInnerServiceSMOImpl.getDefinitionKeysUserTaskCount(auditUser);
+ data.put("itemReleaseCount", itemReleaseCount);
}
public RestTemplate getRestTemplate() {
@@ -146,4 +184,4 @@
public void setRestTemplate(RestTemplate restTemplate) {
this.restTemplate = restTemplate;
}
-}
+}
\ No newline at end of file
--
Gitblit v1.8.0