From 6b9938b5faf4a1b66f1c8886adc402d42bd447c1 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Tue, 31 Jul 2018 11:43:03 +0800
Subject: [PATCH] 增加 null判断

---
 src/main/java/com/moral/controller/DemoConreoller.java |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/moral/controller/DemoConreoller.java b/src/main/java/com/moral/controller/DemoConreoller.java
index b4e04d9..5b2470a 100644
--- a/src/main/java/com/moral/controller/DemoConreoller.java
+++ b/src/main/java/com/moral/controller/DemoConreoller.java
@@ -27,6 +27,7 @@
 import com.moral.mapper.AlarmDailyMapper;
 import com.moral.mapper.DemoMapper;
 
+
 @RestController
 @RequestMapping("demo")
 public class DemoConreoller {
@@ -98,4 +99,18 @@
 		return thisMonth;
 	}
 
+	/**
+	 *
+	 * ������������: 
+	 *
+	 * @param: startTime ������������
+	 * @param: endTime ������������
+	 * @return:
+	 * @author: fengxiang
+	 * @date: 2018/7/30 11:27
+	 */
+    @GetMapping("get-dayaqis")
+	public List<Map<String, Object>> getDayAqis(Date startTime,Date endTime) {
+		return  demoMapper.selectByTimeZones(startTime,endTime);
+	}
 }

--
Gitblit v1.8.0