From 20c644e44d92fa02b873fb6189eee71615bc12d2 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 13 Oct 2023 14:28:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa
---
screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java | 59 ++++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 36 insertions(+), 23 deletions(-)
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 5949515..1b2f9ac 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
@@ -260,7 +260,7 @@
Object number1 = map.get("number");
String startTime=null;
String endTime=null;
- if (!ObjectUtils.isEmpty(map.get("startTime")) || !ObjectUtils.isEmpty(map.get("startTime"))){
+ if (!ObjectUtils.isEmpty(map.get("startTime")) || !ObjectUtils.isEmpty(map.get("endTime"))){
startTime = map.get("startTime").toString();
endTime = map.get("endTime").toString();
@@ -394,35 +394,48 @@
public List<Map<String, Object>> unitExel(Map<String, Object> map) {
QueryWrapper<Allocation> wrapper = new QueryWrapper<>();
//������������������
- Map<String, Object> userInfo = (Map<String, Object>) TokenUtils.getUserInfo();
- Object unitId = userInfo.get("unitId");
- Map<String, Object> orgInfo = (Map<String, Object>) userInfo.get("organization");
- Integer orgId = (Integer) orgInfo.get("id");
-
- if (ObjectUtils.isEmpty(unitId)){
- return null;
- }
- if (orgId!=24){
- ResponsibilityUnit responsibilityUnit1 = responsibilityUnitMapper.selectById(Integer.parseInt(unitId.toString()));
- Integer areaCode = responsibilityUnit1.getAreaCode();
- List<ResponsibilityUnit> responsibilityUnits = responsibilityUnitService.selectUnit(areaCode);
- if (ObjectUtils.isEmpty(responsibilityUnits)){
- List<ResponsibilityUnit> responsibilityUnits1 = responsibilityUnitService.selectAreaUnit(areaCode);
- Map<Integer, List<ResponsibilityUnit>> collect = responsibilityUnits1.stream().collect(Collectors.groupingBy(o -> o.getUnitId()));
- List<Integer> collect1 = collect.keySet().stream().collect(Collectors.toList());
- wrapper.in("unit_id",collect1);
- }else {
- Map<Integer, List<ResponsibilityUnit>> collect = responsibilityUnits.stream().collect(Collectors.groupingBy(o -> o.getUnitId()));
- List<Integer> collect1 = collect.keySet().stream().collect(Collectors.toList());
- wrapper.in("unit_id",collect1);
+ List<Integer> list = this.unitResult();
+ if (!ObjectUtils.isEmpty(map.get("unitId"))){
+ wrapper.in("unit_id",map.get("unitId").toString());
+ }else {
+ if (!ObjectUtils.isEmpty(list)){
+ Integer integer = list.get(0);
+ if (integer==0){
+ return null;
+ }else {
+ wrapper.in("unit_id",list);
+ }
}
}
+// Map<String, Object> userInfo = (Map<String, Object>) TokenUtils.getUserInfo();
+// Object unitId = userInfo.get("unitId");
+// Map<String, Object> orgInfo = (Map<String, Object>) userInfo.get("organization");
+// Integer orgId = (Integer) orgInfo.get("id");
+//
+// if (ObjectUtils.isEmpty(unitId)){
+// return null;
+// }
+// if (orgId!=24){
+// ResponsibilityUnit responsibilityUnit1 = responsibilityUnitMapper.selectById(Integer.parseInt(unitId.toString()));
+// Integer areaCode = responsibilityUnit1.getAreaCode();
+// List<ResponsibilityUnit> responsibilityUnits = responsibilityUnitService.selectUnit(areaCode);
+// if (ObjectUtils.isEmpty(responsibilityUnits)){
+// List<ResponsibilityUnit> responsibilityUnits1 = responsibilityUnitService.selectAreaUnit(areaCode);
+// Map<Integer, List<ResponsibilityUnit>> collect = responsibilityUnits1.stream().collect(Collectors.groupingBy(o -> o.getUnitId()));
+// List<Integer> collect1 = collect.keySet().stream().collect(Collectors.toList());
+// wrapper.in("unit_id",collect1);
+// }else {
+// Map<Integer, List<ResponsibilityUnit>> collect = responsibilityUnits.stream().collect(Collectors.groupingBy(o -> o.getUnitId()));
+// List<Integer> collect1 = collect.keySet().stream().collect(Collectors.toList());
+// wrapper.in("unit_id",collect1);
+// }
+// }
ArrayList<Map<String, Object>> rsMap = new ArrayList<>();
Object number1 = map.get("number");
String startTime=null;
String endTime=null;
- if (!ObjectUtils.isEmpty(map.get("startTime")) || !ObjectUtils.isEmpty(map.get("startTime"))){
+ if (!ObjectUtils.isEmpty(map.get("startTime")) || !ObjectUtils.isEmpty(map.get("endTime"))){
startTime = map.get("startTime").toString();
endTime = map.get("endTime").toString();
--
Gitblit v1.8.0