From 9dc69563217ae69a187533b638fe7e3ca797dacb Mon Sep 17 00:00:00 2001
From: nnnjjj123 <494715143@qq.com>
Date: Fri, 15 Jan 2021 16:27:10 +0800
Subject: [PATCH] 1.接警调整 2.警单排序
---
src/main/java/org/springblade/modules/alarm/controller/AlarmController.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/alarm/controller/AlarmController.java b/src/main/java/org/springblade/modules/alarm/controller/AlarmController.java
index b531808..e4e0555 100644
--- a/src/main/java/org/springblade/modules/alarm/controller/AlarmController.java
+++ b/src/main/java/org/springblade/modules/alarm/controller/AlarmController.java
@@ -312,6 +312,8 @@
String time = df.format(new Date());// new Date()为获取当前系统时间
String pastDate = getPastDate(7);
List<AlarmVO> alarmVOS = alarmService.selectListSe(pastDate, time);
+ for (int i=0;i<alarmVOS.size();i++){
+ }
return R.data(alarmVOS);
}
@@ -320,11 +322,11 @@
* 修改警情类型
*/
@PostMapping("/updateJtype")
- public R updateJtype(String id,String czTime,String bz,HttpServletResponse response) {
+ public R updateJtype(String id,String czTime,String bz,String jjTime,HttpServletResponse response) {
response.setHeader("Access-Control-Allow-Origin", "*");
response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
response.setHeader("Access-Control-Allow-Credentials","true");
- alarmService.updateJtype(id,czTime,bz);
+ alarmService.updateJtype(id,czTime,bz,jjTime);
return R.success("修改成功");
}
--
Gitblit v1.9.3