From 987088e7ee6318fbdfdeeaaf41c79a5dc8ef05c2 Mon Sep 17 00:00:00 2001
From: swb <jpy123456>
Date: Wed, 11 Sep 2024 13:32:17 +0800
Subject: [PATCH] fix:job尘负荷排名补充提交
---
screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 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 77f3892..703639c 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
@@ -211,9 +211,13 @@
public Map<String, Object> selectUnitView(Map<String, Object> map) {
QueryWrapper<Allocation> wrapper = new QueryWrapper<>();
//������������������
+
List<Integer> list = this.unitResult();
if (!ObjectUtils.isEmpty(map.get("unitId"))){
- wrapper.in("unit_id",map.get("unitId").toString());
+ String unitId = map.get("unitId").toString();
+// unitId.split(",");
+ List<String> list1 = Arrays.asList(unitId.split(","));
+ wrapper.in("unit_id",list1);
}else {
if (!ObjectUtils.isEmpty(list)){
Integer integer = list.get(0);
@@ -373,7 +377,11 @@
//������������������
List<Integer> list = this.unitResult();
if (!ObjectUtils.isEmpty(map.get("unitId"))){
- wrapper.in("unit_id",map.get("unitId").toString());
+ String unitId = map.get("unitId").toString();
+// unitId.split(",");
+ List<String> list1 = Arrays.asList(unitId.split(","));
+ wrapper.in("unit_id",list1);
+// wrapper.in("unit_id",map.get("unitId").toString());
}else {
if (!ObjectUtils.isEmpty(list)){
Integer integer = list.get(0);
@@ -392,7 +400,7 @@
String endTime=null;
if (!ObjectUtils.isEmpty(map.get("startTime")) || !ObjectUtils.isEmpty(map.get("endTime"))){
startTime = map.get("startTime").toString();
- endTime = map.get("endTime").toString();
+ endTime = DateUtils.getDateOfDay(map.get("endTime").toString(), 1, DateUtils.yyyy_MM_dd_EN);
}
if (Integer.parseInt(number1.toString())>0){
--
Gitblit v1.8.0