From 7b7e6fcb9f54efa98487222a54fb2c681ae79b78 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq,com>
Date: 星期一, 21 九月 2020 13:38:56 +0800
Subject: [PATCH] 修改

---
 ElectricalSystem_MonitorServer_4KW/src/com/electrical/FourKW/Electrical_Task_SQL.java |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ElectricalSystem_MonitorServer_4KW/src/com/electrical/FourKW/Electrical_Task_SQL.java b/ElectricalSystem_MonitorServer_4KW/src/com/electrical/FourKW/Electrical_Task_SQL.java
index a660587..747f226 100644
--- a/ElectricalSystem_MonitorServer_4KW/src/com/electrical/FourKW/Electrical_Task_SQL.java
+++ b/ElectricalSystem_MonitorServer_4KW/src/com/electrical/FourKW/Electrical_Task_SQL.java
@@ -721,12 +721,12 @@
 			for (Electric_alarm ealarm : list) {
 				String sql_str_sel = " select * from " + Sql_Mysql.Tb_Electric_alarm + " where electric_id = " + ealarm.getElectric_id()+" and alarm_id="+ealarm.getAlarm_id();
 				String sql_str_ins = " INSERT INTO " + Sql_Mysql.Tb_Electric_alarm + "(electric_id,alarm_id,alarm_starttime,alarm_endtime,alarm_confirm,alarm_confirmtime) "
-									+" VALUES("+ealarm.electric_id+","+ealarm.alarm_id+",'"+ealarm.alarm_starttime+"','"+ealarm.getAlarm_endtime()+"',"+ealarm.alarm_confirm+",'"+ealarm.alarm_confirmtime+"');";
+									+" VALUES("+ealarm.electric_id+","+ealarm.alarm_id+",'"+Com.getDateTimeFormat(ealarm.alarm_starttime, Com.DTF_YMDhms)+"','"+Com.getDateTimeFormat(ealarm.getAlarm_endtime(), Com.DTF_YMDhms)+"',"+ealarm.alarm_confirm+",'"+Com.getDateTimeFormat(ealarm.alarm_confirmtime, Com.DTF_YMDhms)+"');";
 				String sql_str_update= " update " + Sql_Mysql.Tb_Electric_alarm + 
-						               " set alarm_starttime="+ealarm.alarm_starttime+
-						               ",alarm_endtime="+ealarm.getAlarm_endtime()+
-						               ",alarm_confirm="+ealarm.alarm_confirm+
-						               ",alarm_confirmtime"+ealarm.getAlarm_confirmtime()+
+						               " set alarm_starttime='"+Com.getDateTimeFormat(ealarm.alarm_starttime, Com.DTF_YMDhms)+
+						               "',alarm_endtime='"+Com.getDateTimeFormat(ealarm.getAlarm_endtime(), Com.DTF_YMDhms)+
+						               "',alarm_confirm="+ealarm.alarm_confirm+
+						               //",alarm_confirmtime"+ealarm.getAlarm_confirmtime()+
 						               "  where electric_id="+ealarm.electric_id+
 						               "  and alarm_id="+ealarm.alarm_id;
 	

--
Gitblit v1.9.1