From 45199ae5da5ca4bcfae8d61fb97f1780e1305dcf Mon Sep 17 00:00:00 2001
From: cjl <909710561@qq.com>
Date: Tue, 02 Apr 2024 09:39:18 +0800
Subject: [PATCH] fix：臭氧预测功能开发
---
screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java | 8 +++++---
1 files changed, 5 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 c7c3ebf..f588770 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
@@ -231,15 +231,16 @@
ArrayList<Map<String, Object>> escalationTypeList = new ArrayList<>();
ArrayList<AllocationUnitViewDto> allocationUnitViewDtos = new ArrayList<>();
- Object number1 = map.get("number");
+ String number1 = map.get("number").toString();
String startTime=null;
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 = map.get("endTime").toString();
+ endTime = DateUtils.getDateOfDay(map.get("endTime").toString(), 1, DateUtils.yyyy_MM_dd_EN);
}
- if (!ObjectUtils.isEmpty(number1)){
+ if (!number1.equals("0")){
String s = "-"+number1;
//������������������
endTime = DateUtils.getCurDateTime();
@@ -1003,6 +1004,7 @@
AllocationExt allocationExt = oneAllocation(i);
AllocationExcelExt allocationExcelExt = BeanConverts.convert(allocationExt,AllocationExcelExt.class);
allocationExcelExt.setFileBaseList(fileTableService.list(i,FileTableEnum.ALLOCATION_FOUNDATION.value,FileType.PICTURE.getValue()));
+ allocationExcelExt.setFileChangeList(fileTableService.list(i,FileTableEnum.ALLOCATION_RECTIFICATION.value,FileType.PICTURE.getValue()));
list.add(allocationExcelExt);
}
return list;
--
Gitblit v1.8.0