From f97d74f9f851ef70048fab599d7bc54d7932afc7 Mon Sep 17 00:00:00 2001
From: Administrator <1144154118@qq.com>
Date: 星期三, 23 八月 2023 17:29:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/app/patrolplan/service/impl/ArdAppPatrolpointRecordServiceImpl.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/app/patrolplan/service/impl/ArdAppPatrolpointRecordServiceImpl.java b/ard-work/src/main/java/com/ruoyi/app/patrolplan/service/impl/ArdAppPatrolpointRecordServiceImpl.java
index 5e97915..5ca3909 100644
--- a/ard-work/src/main/java/com/ruoyi/app/patrolplan/service/impl/ArdAppPatrolpointRecordServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/app/patrolplan/service/impl/ArdAppPatrolpointRecordServiceImpl.java
@@ -795,12 +795,12 @@
// 鍑忓皯 10 绉�
LocalDateTime now = LocalDateTime.now(); // 鑾峰彇褰撳墠鏃ユ湡鏃堕棿
LocalDateTime earlier = now.minusSeconds(10); // 鍑忓皯30绉�
- System.out.println("褰撳墠鏃ユ湡鏃堕棿锛�" + now);
- System.out.println("鍑忓皯10绉掑悗鐨勬棩鏈熸椂闂达細" + earlier);
RecordSonParam recordSonParam = new RecordSonParam();
recordSonParam.setUserId(userId);
- recordSonParam.setTime(fmt.format(now));
- recordSonParam.setBeforeTime(fmt.format(earlier));
+ String n = fmt.format(now);
+ recordSonParam.setTime(n);
+ String e = fmt.format(earlier);
+ recordSonParam.setBeforeTime(e);
//鏍规嵁濮撳悕ID涓烘墽琛屼汉鑾峰彇鎵�鏈夊搴旂殑璁″垝鍚嶇О
List<ArdAppPatrolplan> list = patrolplanMapper.planUser(recordSonParam);
JSONArray jsonArray = new JSONArray();
--
Gitblit v1.9.3