From 8b7258c9427882bb1798f1502eaa35184c6e374e Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 09 Aug 2024 14:29:18 +0800
Subject: [PATCH] 短信指定楼栋发送
---
src/main/java/org/springblade/flow/business/service/impl/FlowBusinessServiceImpl.java | 51 ++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 46 insertions(+), 5 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 d61a1bb..fbd407d 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
@@ -247,16 +247,57 @@
flow.setProcessIsFinished(FlowEngineConstant.STATUS_UNFINISHED);
}
}
+// IPropertyCapitalApplyService bean = SpringUtils.getBean(IPropertyCapitalApplyService.class);
+// PropertyCapitalApplyEntity capitalApplyEntity = bean.getOne(Wrappers.<PropertyCapitalApplyEntity>lambdaQuery().eq(PropertyCapitalApplyEntity::getProcessInstanceId, historicTaskInstance.getProcessInstanceId()));
+// if (capitalApplyEntity != null) {
+// flow.setName(capitalApplyEntity.getName());
+// flow.setDistrictId(capitalApplyEntity.getDistrictId());
+// flow.setLinkman(capitalApplyEntity.getLinkman());
+// flow.setLinkPhone(capitalApplyEntity.getLinkPhone());
+// }
+
IPropertyCapitalApplyService bean = SpringUtils.getBean(IPropertyCapitalApplyService.class);
PropertyCapitalApplyEntity capitalApplyEntity = bean.getOne(Wrappers.<PropertyCapitalApplyEntity>lambdaQuery().eq(PropertyCapitalApplyEntity::getProcessInstanceId, historicTaskInstance.getProcessInstanceId()));
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());
}
+
flow.setStatus(FlowEngineConstant.STATUS_FINISH);
- flowList.add(flow);
+// flowList.add(flow);
+ Boolean districtNameFlag = true;
+ Boolean nameFlag = true;
+ Boolean dateFlag = true;
+ 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);
+ }
});
// 计算总数
long count = doneQuery.count();
@@ -347,9 +388,9 @@
flow.setProcessDefinitionVersion(processDefinition.getVersion());
flow.setProcessInstanceId(task.getProcessInstanceId());
flow.setStatus(status);
- Boolean districtNameFlag = false;
- Boolean nameFlag = false;
- Boolean dateFlag = false;
+ Boolean districtNameFlag = true;
+ Boolean nameFlag = true;
+ Boolean dateFlag = true;
Boolean isFilter = false;
if (StringUtils.isNotBlank(bladeFlow.getDistrictName())) {
@@ -367,7 +408,7 @@
&& flow.getCreateTime().before(bladeFlow.getEndTimes());
}
if (isFilter ) {
- if(districtNameFlag || nameFlag || dateFlag){
+ if(districtNameFlag && nameFlag && dateFlag){
flowList.add(flow);
}
} else {
--
Gitblit v1.9.3