From 4d6a0cdf54a36b88634629700e5ce7d4bf8d90e9 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Wed, 03 Feb 2021 10:27:10 +0800
Subject: [PATCH] 客户管理接口改动

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.xml          |    8 ++++++--
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/controller/EquipmentController.java |   19 +++++++++++--------
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/vo/EquipmentVO.java                 |    2 ++
 3 files changed, 19 insertions(+), 10 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);
+					}
 				}
 			}
 		}
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.xml b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.xml
index ac657fa..456f00d 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.xml
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.xml
@@ -70,8 +70,12 @@
             and (deviceName like concat('%',#{equipment.deviceName},'%') or deviceNumber like
             concat('%',#{equipment.deviceName},'%'))
         </if>
-        <if test="equipment.addvcd!=null">
-            and addvcd=#{equipment.addvcd}
+
+        <if test="equipment.beginTime!=null and equipment.beginTime!=''">
+            and expireTime&gt;=#{equipment.beginTime}
+        </if>
+        <if test="equipment.endTime!=null and equipment.endTime!=''">
+            and expireTime&lt;=#{equipment.endTime}
         </if>
 
         <if test="equipment.district!=null">
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/vo/EquipmentVO.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/vo/EquipmentVO.java
index 20bf20a..7d2a81f 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/vo/EquipmentVO.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/vo/EquipmentVO.java
@@ -35,5 +35,7 @@
 	int type;
 	String pay;
 	String expireTime;
+	private  String beginTime;
+	private  String endTime;
 
 }

--
Gitblit v1.9.3