From d22bbb827940050d4df2bf3fb16dae79eba91d4e Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期二, 12 十一月 2024 18:45:15 +0800 Subject: [PATCH] 批量审核bug,离线时间点回显 --- ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java | 22 ++++++++++++---------- 1 files changed, 12 insertions(+), 10 deletions(-) diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java index b2acaff..9ea32fa 100644 --- a/ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java +++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java @@ -108,17 +108,19 @@ item.setOnlineStr("鏈煡"); } List<Date> offLineTime = item.getOffLineTime(); - //鍚庣画鍙互鏀规垚閰嶇疆鐨勭绾挎鏁�(鎻愬彇鍓峮娆★紝n涓洪厤缃殑绂荤嚎娆℃暟) - SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - if(CollectionUtils.isNotEmpty(offLineTime) && offLineTime.size()>1){ - offLineTime = offLineTime.subList(0,1); + if(!CollectionUtils.isEmpty(offLineTime)) { + //鍚庣画鍙互鏀规垚閰嶇疆鐨勭绾挎鏁�(鎻愬彇鍓峮娆★紝n涓洪厤缃殑绂荤嚎娆℃暟) + SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + if (offLineTime.size() > 1) { + offLineTime = offLineTime.subList(0, 2); + } + List<String> dateStr = new ArrayList<>(); + for (Date date : offLineTime) { + String formatDate = format.format(date); + dateStr.add(formatDate); + } + item.setOffLineTimeStr(dateStr); } - List<String> dateStr = new ArrayList<>(); - for (Date date : offLineTime) { - String formatDate = format.format(date); - dateStr.add(formatDate); - } - item.setOffLineTimeStr(dateStr); }); params.setDeptTag(-1); params.setDeviceType(1); -- Gitblit v1.8.0