From b5bc0b851586c8ac4c74602a173fa5c141ef1353 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Wed, 13 Jan 2021 23:42:11 +0800
Subject: [PATCH] 客户列表接口修改
---
src/main/java/org/springblade/modules/equipment/controller/EquipmentController.java | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/equipment/controller/EquipmentController.java b/src/main/java/org/springblade/modules/equipment/controller/EquipmentController.java
index dfd0eb7..8a0438e 100644
--- a/src/main/java/org/springblade/modules/equipment/controller/EquipmentController.java
+++ b/src/main/java/org/springblade/modules/equipment/controller/EquipmentController.java
@@ -108,7 +108,24 @@
List<EquipmentVO> datas = new ArrayList<>();
- if (pid == null) {
+ if (pid == null || pid.equals("")) {
+ for (int j = 0; j < pages.size(); j++) {
+ String expireTime = pages.get(j).getExpireTime();
+ //1.获取当前时间
+ Date dd = new Date();
+ 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) {
+ pages.get(j).setType(1);
+ } else {
+ pages.get(j).setType(0);
+ }
+ }
datas = pages;
} else {
List<Map<String, Object>> treedatas = catalogService.selectCatalogEqNUmber(pid);
@@ -117,7 +134,6 @@
//将得到的设备与查询所得设备进行匹配
for (int i = 0; i < childList.size(); i++) {
for (int j = 0; j < pages.size(); j++) {
-
String expireTime = pages.get(j).getExpireTime();
//1.获取当前时间
Date dd = new Date();
@@ -130,6 +146,8 @@
int day = (int) ((st - en) / 86400000);
if (day <= 30) {
pages.get(j).setType(1);
+ } else {
+ pages.get(j).setType(0);
}
if (childList.get(i).get("eqid") != null) {
--
Gitblit v1.9.3