From 534515eeac9a28c5ab9dbcd666ec2d652146354e Mon Sep 17 00:00:00 2001
From: cjl <909710561@qq.com>
Date: Mon, 01 Apr 2024 15:02:44 +0800
Subject: [PATCH] fix：补充提交
---
screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java | 7 ++++---
1 files changed, 4 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 ec92c53..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();
--
Gitblit v1.8.0