From cb6efdef55c77da2bcc8dbd99a74e7e49c5ec067 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Tue, 05 Mar 2024 18:06:34 +0800
Subject: [PATCH] 邮件收件+bug修复+流程优化
---
src/main/java/org/springblade/flow/business/service/impl/FlowBusinessServiceImpl.java | 40 ++++++++++++++++++++++++++++++++++++++--
1 files changed, 38 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/flow/business/service/impl/FlowBusinessServiceImpl.java b/src/main/java/org/springblade/flow/business/service/impl/FlowBusinessServiceImpl.java
index d8d1bdd..d61a1bb 100644
--- a/src/main/java/org/springblade/flow/business/service/impl/FlowBusinessServiceImpl.java
+++ b/src/main/java/org/springblade/flow/business/service/impl/FlowBusinessServiceImpl.java
@@ -16,9 +16,12 @@
*/
package org.springblade.flow.business.service.impl;
+import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.time.DateUtils;
import org.flowable.engine.HistoryService;
import org.flowable.engine.TaskService;
import org.flowable.engine.history.HistoricProcessInstance;
@@ -39,6 +42,8 @@
import org.springblade.flow.engine.constant.FlowEngineConstant;
import org.springblade.flow.engine.entity.FlowProcess;
import org.springblade.flow.engine.utils.FlowCache;
+import org.springblade.modules.district.entity.DistrictEntity;
+import org.springblade.modules.district.service.IDistrictService;
import org.springblade.modules.property.entity.PropertyCapitalApplyEntity;
import org.springblade.modules.property.service.IPropertyCapitalApplyService;
import org.springframework.stereotype.Service;
@@ -46,6 +51,7 @@
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
/**
* 流程业务实现类
@@ -104,7 +110,7 @@
buildFlowTaskList(bladeFlow, flowList, todoQuery, FlowEngineConstant.STATUS_TODO);
// 计算总数
- long count = todoQuery.count();
+ long count = flowList.size();
// 设置页数
page.setSize(count);
// 设置总数
@@ -323,6 +329,11 @@
if (capitalApplyEntity != null) {
flow.setName(capitalApplyEntity.getName());
flow.setDistrictId(capitalApplyEntity.getDistrictId());
+ IDistrictService bean1 = SpringUtils.getBean(IDistrictService.class);
+ DistrictEntity one = bean1.getOne(Wrappers.<DistrictEntity>lambdaQuery().eq(DistrictEntity::getId, capitalApplyEntity.getDistrictId()));
+ if (one != null) {
+ flow.setDistrictName(one.getName());
+ }
flow.setLinkman(capitalApplyEntity.getLinkman());
flow.setLinkPhone(capitalApplyEntity.getLinkPhone());
}
@@ -336,7 +347,32 @@
flow.setProcessDefinitionVersion(processDefinition.getVersion());
flow.setProcessInstanceId(task.getProcessInstanceId());
flow.setStatus(status);
- flowList.add(flow);
+ Boolean districtNameFlag = false;
+ Boolean nameFlag = false;
+ Boolean dateFlag = false;
+ Boolean isFilter = false;
+
+ if (StringUtils.isNotBlank(bladeFlow.getDistrictName())) {
+ isFilter = true;
+ // 小区、项目名称、申请时间
+ districtNameFlag = flow.getDistrictName().contains(bladeFlow.getDistrictName());
+ } else if (StringUtils.isNotBlank(bladeFlow.getName())) {
+ isFilter = true;
+ // 小区、项目名称、申请时间
+ nameFlag = flow.getName().contains(bladeFlow.getName());
+ } else if (bladeFlow.getStartTimes() != null && bladeFlow.getEndTimes() != null) {
+ isFilter = true;
+ // 小区、项目名称、申请时间
+ dateFlag = flow.getCreateTime().after(bladeFlow.getStartTimes())
+ && flow.getCreateTime().before(bladeFlow.getEndTimes());
+ }
+ if (isFilter ) {
+ if(districtNameFlag || nameFlag || dateFlag){
+ flowList.add(flow);
+ }
+ } else {
+ flowList.add(flow);
+ }
});
}
--
Gitblit v1.9.3