From ac9f8bfd179c58b63b555664b3f81bc07e5756ee Mon Sep 17 00:00:00 2001 From: duhui Date: Mon, 13 Feb 2023 17:58:07 +0800 Subject: [PATCH] =?UTF-8?q?datetime-local=E7=B1=BB=E5=9E=8B=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E8=BE=93=E5=87=BA00=E7=A7=92=EF=BC=8C=E6=95=85?= =?UTF-8?q?=E5=BC=83=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jmfy/controller/OrderInfoController.java | 11 +++-------- .../com/jmfy/controller/SupportController.java | 2 +- .../model/config/SRechargeCommodityConfig.java | 2 +- src/main/java/com/jmfy/utils/FileCacheUtils.java | 3 ++- src/main/java/com/jmfy/utils/JsonUtil.java | 3 ++- src/main/resources/templates/ARBActivitys.html | 6 +++--- src/main/resources/templates/findOrder.html | 4 ++-- .../resources/templates/updateARBActivity.html | 14 ++++++-------- 8 files changed, 20 insertions(+), 25 deletions(-) diff --git a/src/main/java/com/jmfy/controller/OrderInfoController.java b/src/main/java/com/jmfy/controller/OrderInfoController.java index cb21bf5..6539901 100644 --- a/src/main/java/com/jmfy/controller/OrderInfoController.java +++ b/src/main/java/com/jmfy/controller/OrderInfoController.java @@ -5,10 +5,10 @@ import com.alibaba.fastjson.JSONObject; import com.jmfy.WebSecurityConfig; import com.jmfy.dao.*; import com.jmfy.model.*; +import com.jmfy.model.config.SRechargeCommodityConfig; import com.jmfy.model.vo.OrderExcelVo; import com.jmfy.redisProperties.RedisUserKey; import com.jmfy.utils.*; -import config.SRechargeCommodityConfig; import org.apache.poi.hssf.usermodel.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -174,18 +174,13 @@ public class OrderInfoController { /** * 查询订单 - * @param startTime - * @param endTime - * @param userId - * @param packId - * @param serverId * @return * @throws Exception */ private List findOrders(HashMap parameterMap) throws Exception { // 参数 - long startTime = DateUtil.timeToStamp2(parameterMap.get("startTime").replace("T"," ")); - long endTime = DateUtil.timeToStamp2(parameterMap.get("endTime").replace("T"," ")); + long startTime = DateUtil.timeToStamp2(parameterMap.get("startTime")); + long endTime = DateUtil.timeToStamp2(parameterMap.get("endTime")); String serverId = parameterMap.get("serverId"); String userId = parameterMap.get("userId"); String packId = parameterMap.get("packId"); diff --git a/src/main/java/com/jmfy/controller/SupportController.java b/src/main/java/com/jmfy/controller/SupportController.java index aa78f81..8eb4771 100644 --- a/src/main/java/com/jmfy/controller/SupportController.java +++ b/src/main/java/com/jmfy/controller/SupportController.java @@ -3,10 +3,10 @@ package com.jmfy.controller; import com.jmfy.WebSecurityConfig; import com.jmfy.dao.*; import com.jmfy.model.*; +import com.jmfy.model.config.SRechargeCommodityConfig; import com.jmfy.model.vo.PowersEnum; import com.jmfy.redisProperties.RedisUserKey; import com.jmfy.utils.*; -import config.SRechargeCommodityConfig; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.RequestBody; diff --git a/src/main/java/com/jmfy/model/config/SRechargeCommodityConfig.java b/src/main/java/com/jmfy/model/config/SRechargeCommodityConfig.java index 7618140..a1b63db 100644 --- a/src/main/java/com/jmfy/model/config/SRechargeCommodityConfig.java +++ b/src/main/java/com/jmfy/model/config/SRechargeCommodityConfig.java @@ -1,4 +1,4 @@ -package config; +package com.jmfy.model.config; import com.jmfy.utils.FileCacheUtils; import com.jmfy.utils.JsonUtil; diff --git a/src/main/java/com/jmfy/utils/FileCacheUtils.java b/src/main/java/com/jmfy/utils/FileCacheUtils.java index 2cecbe2..118b3be 100644 --- a/src/main/java/com/jmfy/utils/FileCacheUtils.java +++ b/src/main/java/com/jmfy/utils/FileCacheUtils.java @@ -1,10 +1,11 @@ package com.jmfy.utils; import config.SItemConfig; -import config.SRechargeCommodityConfig; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.jmfy.model.config.SRechargeCommodityConfig; + import java.io.*; import java.lang.reflect.Field; import java.util.*; diff --git a/src/main/java/com/jmfy/utils/JsonUtil.java b/src/main/java/com/jmfy/utils/JsonUtil.java index da37c3d..9ac754b 100644 --- a/src/main/java/com/jmfy/utils/JsonUtil.java +++ b/src/main/java/com/jmfy/utils/JsonUtil.java @@ -1,7 +1,8 @@ package com.jmfy.utils; import com.google.gson.Gson; -import config.SRechargeCommodityConfig; +import com.jmfy.model.config.SRechargeCommodityConfig; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/resources/templates/ARBActivitys.html b/src/main/resources/templates/ARBActivitys.html index 07fd075..57de419 100644 --- a/src/main/resources/templates/ARBActivitys.html +++ b/src/main/resources/templates/ARBActivitys.html @@ -66,12 +66,12 @@ - + diff --git a/src/main/resources/templates/findOrder.html b/src/main/resources/templates/findOrder.html index d32a690..6cd5595 100644 --- a/src/main/resources/templates/findOrder.html +++ b/src/main/resources/templates/findOrder.html @@ -48,7 +48,7 @@ * 开始时间:
- +
@@ -56,7 +56,7 @@ * 结束时间:
- +
diff --git a/src/main/resources/templates/updateARBActivity.html b/src/main/resources/templates/updateARBActivity.html index 30f5a7f..e424d1a 100644 --- a/src/main/resources/templates/updateARBActivity.html +++ b/src/main/resources/templates/updateARBActivity.html @@ -78,8 +78,8 @@ 常驻 自定义
- - + +
@@ -256,8 +256,6 @@ if (activity == null){ getFormat(); document.getElementById("always").checked = true; - document.getElementById("startTime").value = format;//赋初始值 - document.getElementById("endTime").value = format;//赋初始值 }else { // 时间 var timeType = activity.timeType; @@ -266,8 +264,8 @@ }else { document.getElementById("custom").checked = true; $("#times").css("display","block"); - document.getElementById("startTime").value = activity.startTime.replace(" ","T");//赋初始值 - document.getElementById("endTime").value = activity.endTime.replace(" ","T");//赋初始值 + document.getElementById("startTime").value = activity.startTime;//赋初始值 + document.getElementById("endTime").value = activity.endTime;//赋初始值 } // 类型 typeInfos.update({ disabled: true }); @@ -310,8 +308,8 @@ let startTime = "2000-01-01 00:00:00", endTime = "3000-01-01 00:00:00"; let effectTime = $("input[name='effectTime']:checked").val(); if (effectTime === "custom") { - startTime = document.getElementById("startTime").value.replace("T"," "); - endTime = document.getElementById("endTime").value.replace("T"," "); + startTime = document.getElementById("startTime").value; + endTime = document.getElementById("endTime").value; } let DateStart = new Date(startTime);