From a6bcf9902e3301deeff27673ab6b92d3982d6bde Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 02 Mar 2021 23:12:02 +0800
Subject: [PATCH] 警情分发新增接口修改，体温数据实体类修改
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/controller/EquipmentController.java | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/controller/EquipmentController.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/controller/EquipmentController.java
index a38180e..a2927d6 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/controller/EquipmentController.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/controller/EquipmentController.java
@@ -157,14 +157,17 @@
SimpleDateFormat sim = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String end = sim.format(dd);
//把string类型转换为long类型的
- long st = sim.parse(expireTime).getTime();
- long en = sim.parse(end).getTime();
- //计算天数
- int day = (int) ((st - en) / 86400000);
- if (day <= 30) {
- page.getRecords().get(j).setType(1);
- } else {
- page.getRecords().get(j).setType(0);
+
+ if (expireTime != null){
+ long st = sim.parse(expireTime).getTime();
+ long en = sim.parse(end).getTime();
+ //计算天数
+ int day = (int) ((st - en) / 86400000);
+ if (day <= 30) {
+ page.getRecords().get(j).setType(1);
+ } else {
+ page.getRecords().get(j).setType(0);
+ }
}
}
}
--
Gitblit v1.9.3