From 478dd6c27759ea6c6eb0379b57128dac17b9144c Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 02 一月 2024 14:15:52 +0800
Subject: [PATCH] 优化物业手机端首页统计
---
service-api/src/main/java/com/java110/api/smo/undo/impl/UndoSMOImpl.java | 41 ++++++++++++++++++++++++++++++++++++++---
1 files changed, 38 insertions(+), 3 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 f130d66..5b6ea15 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
@@ -10,10 +10,14 @@
import com.java110.dto.oaWorkflow.WorkflowDto;
import com.java110.dto.audit.AuditUser;
import com.java110.dto.system.ComponentValidateResult;
+import com.java110.dto.workCopy.WorkCopyDto;
+import com.java110.dto.workTask.WorkTaskDto;
import com.java110.intf.common.IOaWorkflowActivitiInnerServiceSMO;
import com.java110.intf.community.IInspectionTaskInnerServiceSMO;
import com.java110.intf.community.IMaintainanceTaskV1InnerServiceSMO;
import com.java110.intf.oa.IOaWorkflowInnerServiceSMO;
+import com.java110.intf.oa.IWorkCopyV1InnerServiceSMO;
+import com.java110.intf.oa.IWorkTaskV1InnerServiceSMO;
import com.java110.utils.exception.SMOException;
import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;
@@ -48,6 +52,12 @@
@Autowired
private IMaintainanceTaskV1InnerServiceSMO maintainanceTaskV1InnerServiceSMOImpl;
+
+ @Autowired
+ private IWorkTaskV1InnerServiceSMO workTaskV1InnerServiceSMOImpl;
+
+ @Autowired
+ private IWorkCopyV1InnerServiceSMO workCopyV1InnerServiceSMOImpl;
@Override
public ResponseEntity<String> listUndos(IPageData pd) throws SMOException {
@@ -173,7 +183,31 @@
//todo 寰呬繚鍏�
getMaintainanceTaskCount(result, doing);
+ //todo 寰� 鍔炵悊宸ヤ綔鍗�
+ getUndoWorkCount(result,doing);
+
+ //todo 寰� 鍔炵悊鎶勯�佸伐浣滃崟
+ getUndoWorkCopyCount(result,doing);
+
return ResultVo.createResponseEntity(doing);
+ }
+
+ private void getUndoWorkCopyCount(ComponentValidateResult result, JSONObject doing) {
+ WorkCopyDto workCopyDto = new WorkCopyDto();
+ workCopyDto.setStaffId(result.getUserId());
+ workCopyDto.setStoreId(result.getStoreId());
+ workCopyDto.setState(WorkCopyDto.STATE_DOING);
+ int count = workCopyV1InnerServiceSMOImpl.queryWorkCopysCount(workCopyDto);
+ doing.put("workUndoCopyCount", count);
+ }
+
+ private void getUndoWorkCount(ComponentValidateResult result, JSONObject doing) {
+ WorkTaskDto workTaskDto = new WorkTaskDto();
+ workTaskDto.setStaffId(result.getUserId());
+ workTaskDto.setStoreId(result.getStoreId());
+ workTaskDto.setState(WorkTaskDto.STATE_WAIT);
+ int count = workTaskV1InnerServiceSMOImpl.queryWorkTasksCount(workTaskDto);
+ doing.put("workUndDoCount", count);
}
/**
@@ -216,7 +250,7 @@
if (oaWorkflowDtos == null || oaWorkflowDtos.size() < 1) {
data.put("ownerSettledApplyCount", "0");
- return;
+ return ;
}
List<String> flowIds = new ArrayList<>();
for (OaWorkflowDto tmpOaWorkflowDto : oaWorkflowDtos) {
@@ -231,6 +265,7 @@
data.put("ownerSettledApplyCount", itemReleaseCount);
}
+
private void getVisitCount(ComponentValidateResult result, JSONObject data) {
OaWorkflowDto oaWorkflowDto = new OaWorkflowDto();
oaWorkflowDto.setState(OaWorkflowDto.STATE_COMPLAINT);
@@ -239,7 +274,7 @@
if (oaWorkflowDtos == null || oaWorkflowDtos.size() < 1) {
data.put("visitUndoCount", "0");
- return;
+ return ;
}
List<String> flowIds = new ArrayList<>();
for (OaWorkflowDto tmpOaWorkflowDto : oaWorkflowDtos) {
@@ -262,7 +297,7 @@
if (oaWorkflowDtos == null || oaWorkflowDtos.size() < 1) {
data.put("itemReleaseCount", "0");
- return;
+ return ;
}
List<String> flowIds = new ArrayList<>();
for (OaWorkflowDto tmpOaWorkflowDto : oaWorkflowDtos) {
--
Gitblit v1.8.0