From a6205cbf1a93ea8f77a771de2dbd68c8f1e52ebe Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期五, 02 八月 2024 13:25:46 +0800
Subject: [PATCH] 电磁锁新增临时电子围栏查询修改提交
---
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankWallTemporaryServiceImpl.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankWallTemporaryServiceImpl.java b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankWallTemporaryServiceImpl.java
index b673448..ad8b921 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankWallTemporaryServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankWallTemporaryServiceImpl.java
@@ -1,5 +1,6 @@
package com.ruoyi.sy.service.impl;
+import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -225,7 +226,12 @@
try{
ardTankWallTemporary.setCancelTime(processArray[1]);
}catch (Exception e){
- ardTankWallTemporary.setCancelTime("");
+ try{
+ Long cancelDate = this.sdf.parse(processArray[0]).getTime() + Long.parseLong(ardTankWallTemporary.getInterval()) * 60 * 1000;
+ ardTankWallTemporary.setCancelTime(this.sdf.format(cancelDate));
+ } catch (ParseException ex) {
+ ex.printStackTrace();
+ }
}
switch(ardTankWallTemporary.getProcessMark()){
case "1" : ardTankWallTemporary.setProcessInfo("鐢熸晥");break;
--
Gitblit v1.9.3