From 5c1d58556e9cd4c7603b5e16dc1640f61623af0b Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 08 Nov 2023 11:47:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into dev
---
screen-api/src/main/java/com/moral/api/service/impl/HistorySecondUavServiceImpl.java | 23 ++++++++++-------------
screen-api/src/main/java/com/moral/api/service/OrganizationService.java | 8 +++++++-
screen-api/src/main/java/com/moral/api/service/UserService.java | 1 +
screen-api/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java | 5 +++++
screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java | 8 ++++----
screen-api/src/main/resources/word/尘负荷监测报告.docx | 0
6 files changed, 27 insertions(+), 18 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/OrganizationService.java b/screen-api/src/main/java/com/moral/api/service/OrganizationService.java
index c27d8ef..2c3972c 100644
--- a/screen-api/src/main/java/com/moral/api/service/OrganizationService.java
+++ b/screen-api/src/main/java/com/moral/api/service/OrganizationService.java
@@ -2,6 +2,7 @@
import com.moral.api.entity.Organization;
import com.baomidou.mybatisplus.extension.service.IService;
+import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -34,6 +35,11 @@
Organization getOrganizationById(Integer id);
-
+ /**
+ * ������������������������
+ * @param organizationId
+ * @return
+ */
+ List<Integer> orgIdList( Integer organizationId);
}
diff --git a/screen-api/src/main/java/com/moral/api/service/UserService.java b/screen-api/src/main/java/com/moral/api/service/UserService.java
index 37282b5..56ef3f0 100644
--- a/screen-api/src/main/java/com/moral/api/service/UserService.java
+++ b/screen-api/src/main/java/com/moral/api/service/UserService.java
@@ -54,6 +54,7 @@
boolean updateUserId(Integer userId);
+ // ���������������
void pushOneUser(Allocation appAllocationPushUserCond);
}
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java
index da34292..8faee43 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java
@@ -126,7 +126,7 @@
//������
String allocationNum = "JBD-" + dateString + String.format("%04d", i);
allocation.setAllocationNum(allocationNum);
- if(Objects.nonNull(allocationCond.getEscalationUnitId())&& escalationType(allocationCond.getEscalationUnitId())) {
+ if(Objects.nonNull(allocationCond.getEscalationUnitId())&& !allocationCond.getEscalationUnitId().equals(allocationCond.getUnitId()) && escalationType(allocationCond.getEscalationUnitId())) {
allocation.setEscalationType(AllocationEscalationTypeEnum.CHECK.getValue());
}
if(NEW_BUILT.equals(allocationCond.getState())) {
@@ -137,7 +137,7 @@
//������������
userService.pushOneUser(allocation);
redisTemplate.opsForValue().set(RedisConstants.JBD_DATA,i);
- if(NEW_BUILT.equals(allocationCond.getState())) {
+ if(NEW_BUILT.equals(allocationCond.getState())||AllocationApproveEnum.UNDER_RECTIFICATION.value.equals(allocationCond.getState())) {
//������������������
ApproveTable approveTable = new ApproveTable();
approveTable.setRelationId(allocation.getAllocationId());
@@ -794,10 +794,10 @@
//������������������
ApproveTable approveTable = new ApproveTable();
approveTable.setRelationId(allocation.getAllocationId());
- approveTable.setState(NEW_BUILT);
approveTable.setApproveModule(FileTableEnum.ALLOCATION_FOUNDATION.value);
+ /* approveTable.setState(NEW_BUILT);
approveTable.setStateName("������");
- approveTableService.saveResult(approveTable);
+ approveTableService.saveResult(approveTable);*/
approveTable.setState(AllocationApproveEnum.UNDER_RECTIFICATION.value);
approveTable.setStateName(AllocationApproveEnum.UNDER_RECTIFICATION.name);
approveTableService.saveResult(approveTable);
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/HistorySecondUavServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/HistorySecondUavServiceImpl.java
index db1785c..7287c00 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/HistorySecondUavServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/HistorySecondUavServiceImpl.java
@@ -27,6 +27,7 @@
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import java.util.function.Predicate;
+import java.util.stream.Collectors;
/**
* <p>
@@ -59,28 +60,27 @@
public List<Date> queryDate(Integer organizationId) {
//������������������
QueryWrapper<HistorySecondUav> queryWrapper = new QueryWrapper<>();
+ //List<Integer> childrenId = new ArrayList<>();
+ List<Integer> children = organizationService.orgIdList(organizationId);
//���������������id
- List<Organization> children = organizationService.getChildrenOrganizationsById(organizationId);
+ /*List<Organization> children = organizationService.getChildrenOrganizationsById(organizationId);
List<Integer> childrenId = new ArrayList<>();
for (Organization child : children) {
childrenId.add(child.getId());
}
- childrenId.add(organizationId);
- queryWrapper.in("organization_id", childrenId);
+ childrenId.add(organizationId);*/
+ queryWrapper.in("organization_id", children);
//���������������������������180���
Date endDate = new Date();
Date startDate = DateUtils.addDays(endDate, -180);
queryWrapper.between("batch", startDate, endDate);
//������������������
- queryWrapper.select("DISTINCT batch");
+ queryWrapper.select("DISTINCT DATE_FORMAT(batch,'%Y-%m-%d') batch ");
queryWrapper.orderByDesc("batch");
//������������
List<HistorySecondUav> historySecondUavs = historySecondUavMapper.selectList(queryWrapper);
//������������Date������
- List<Date> result = new ArrayList<>();
- for (HistorySecondUav historySecondUav : historySecondUavs) {
- result.add(historySecondUav.getBatch());
- }
+ List<Date> result = historySecondUavs.stream().map(HistorySecondUav::getBatch).collect(Collectors.toList());
return result;
}
@@ -94,12 +94,9 @@
Date endDate = form.getEndDate();
QueryWrapper<HistorySecondUav> wrapper = new QueryWrapper<>();
//���������������id
- List<Organization> children = organizationService.getChildrenOrganizationsById(organizationId);
+ List<Integer> children = organizationService.orgIdList(organizationId);
List<Integer> childrenId = new ArrayList<>();
- for (Organization child : children) {
- childrenId.add(child.getId());
- }
- childrenId.add(organizationId);
+ childrenId.addAll(children);
childrenId.addAll(integerList);
wrapper.in("organization_id", childrenId);
//������������batch������������������������������������������������
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java
index 98ad2cd..9b03888 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java
@@ -71,4 +71,9 @@
return;
}
}
+
+ @Override
+ public List<Integer> orgIdList(Integer organizationId) {
+ return this.baseMapper.orgIdList(organizationId);
+ }
}
diff --git "a/screen-api/src/main/resources/word/\345\260\230\350\264\237\350\215\267\347\233\221\346\265\213\346\212\245\345\221\212.docx" "b/screen-api/src/main/resources/word/\345\260\230\350\264\237\350\215\267\347\233\221\346\265\213\346\212\245\345\221\212.docx"
index 9a585cf..efbb72c 100644
--- "a/screen-api/src/main/resources/word/\345\260\230\350\264\237\350\215\267\347\233\221\346\265\213\346\212\245\345\221\212.docx"
+++ "b/screen-api/src/main/resources/word/\345\260\230\350\264\237\350\215\267\347\233\221\346\265\213\346\212\245\345\221\212.docx"
Binary files differ
--
Gitblit v1.8.0