From 2ab4d484c09bf29d5f63dafb0fec3eda23bc4b4e Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Mon, 25 Dec 2023 14:17:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into cjl
---
screen-api/src/main/java/com/moral/api/service/impl/DataDisplayServiceImpl.java | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/DataDisplayServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/DataDisplayServiceImpl.java
index 9499b84..e560813 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/DataDisplayServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/DataDisplayServiceImpl.java
@@ -447,12 +447,9 @@
list1.add("������������������");
if (form.equals("hour")){ //������
- log.info(""+startTime);
- String[] split = startTime.split("-");
- String s = "_" + split[0] + split[1];
- log.info(s+"");
+// String[] split = startTime.split("-");
+// String s = "_" + split[0] + split[1];
String dateString = DateUtils.stringToDateString(startTime, DateUtils.yyyy_MM_dd_HH_EN, DateUtils.yyyyMM_EN);
- log.info(""+dateString);
map.put("organizationIds",list);
map.put("tableName","_"+dateString);
--
Gitblit v1.8.0