From bc251e599ba9c3babd5b10b924107c1db427eca1 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 11 Mar 2021 16:48:35 +0800
Subject: [PATCH] 解决警情分发的接口报错问题

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/jingdan/controller/JingdanController.java |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/jingdan/controller/JingdanController.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/jingdan/controller/JingdanController.java
index ba58c48..7ee8626 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/jingdan/controller/JingdanController.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/jingdan/controller/JingdanController.java
@@ -121,7 +121,17 @@
 	@ApiOperation(value = "新增或修改", notes = "传入jingdan")
 	public R submit(@Valid @RequestBody Jingdan jingdan) {
 		//return R.status(jingdanService.saveOrUpdate(jingdan));
-		return R.status(jingdanService.save(jingdan));
+
+		if (jingdan.getCzTime() != null && jingdan.getCzTime().equals("")){
+			jingdan.setCzTime(null);
+		}
+		if (jingdan.getGalarmTime() != null && jingdan.getGalarmTime().equals("")){
+			jingdan.setGalarmTime(null);
+		}
+		if (jingdan.getHandleTime() != null && jingdan.getHandleTime().equals("")){
+			jingdan.setHandleTime(null);
+		}
+		return R.status(jingdanService.saveOrUpdate(jingdan));
 	}
 
 
@@ -214,7 +224,7 @@
 		response.setHeader("Access-Control-Allow-Origin", "*");
 		response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
 		response.setHeader("Access-Control-Allow-Credentials","true");
-		jingdanService.insert(galarmPeople,phoneNumber,place,content,galarmTime,waringType,deviceNumber,type,handleP,handleTime,handName,level,coordinate,jd,wd,addvcd,rName,czTime,bz);
+		jingdanService.inserts(galarmPeople,phoneNumber,place,content,galarmTime,waringType,deviceNumber,type,handleP,handleTime,handName,level,coordinate,jd,wd,addvcd,rName,czTime,bz);
 		return R.success("成功");
 	}
 

--
Gitblit v1.9.3