From 7baed9209086324dba79d14407579b52628616c8 Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期三, 25 十月 2023 11:36:01 +0800
Subject: [PATCH] 34~58PwrdevHistorydataGwController.java;30行
---
src/main/java/com/whyc/service/Fbs9100StateService.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/whyc/service/Fbs9100StateService.java b/src/main/java/com/whyc/service/Fbs9100StateService.java
index 3f3ff0b..934631d 100644
--- a/src/main/java/com/whyc/service/Fbs9100StateService.java
+++ b/src/main/java/com/whyc/service/Fbs9100StateService.java
@@ -248,7 +248,8 @@
Set<Integer> workStateSet = workStateMap.keySet();
boolean commError = false;
for (Fbs9100State state : fbs9100States) {
- if (time.compareTo(DateUtil.YYYY_MM_DD_HH_MM_SS.parse(state.getRecordDatetime())) > 0) {
+ //if (time.compareTo(DateUtil.YYYY_MM_DD_HH_MM_SS.parse(state.getRecordDatetime())) > 0) {
+ if (time.compareTo(ThreadLocalUtil.parse(state.getRecordDatetime(),1)) > 0) {
resultMap.put("閫氳鏁呴殰鏁伴噺", resultMap.get("閫氳鏁呴殰鏁伴噺") + 1);
commError = true;
break;
@@ -340,7 +341,8 @@
}
map.put("stateNumMap", stateNumMap);
map.put("stateMap", stateMap);
- map.put("nowTime", ActionUtil.sdf.format(new Date()));
+ //map.put("nowTime", ActionUtil.sdf.format(new Date()));
+ map.put("nowTime", ThreadLocalUtil.format(new Date(),1));
return new Response().setII(1, true, map, "浠婃棩鏀剧數绔欑偣缁熻");
} catch (Exception e) {
return new Response().set(1, false, "鍑虹幇寮傚父" + e.getMessage());
--
Gitblit v1.9.1