From e051f5c497e691bcd97c81dffa97f7946fd197b1 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期二, 06 十一月 2018 16:32:24 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/actions/Deverror_recordAction.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/actions/Deverror_recordAction.java b/gx_tieta/src/com/fgkj/actions/Deverror_recordAction.java
index d4aaaf0..ffc7b38 100644
--- a/gx_tieta/src/com/fgkj/actions/Deverror_recordAction.java
+++ b/gx_tieta/src/com/fgkj/actions/Deverror_recordAction.java
@@ -23,10 +23,10 @@
private List<File> file;
//鐢ㄦ埛鎵嬪姩娣诲姞闂
public String add(){
- Deverror_record dev_record=getGson("yyyy-MM-dd").fromJson(json, Deverror_record.class);
+ Deverror_record dev_record=getGson("yyyy-MM-dd HH:mm:ss").fromJson(json, Deverror_record.class);
User_inf uinf=(User_inf) getUser();
dev_record.setUid(uinf.getUId());
- if(file.size()>0&&file!=null){
+ if(file!=null&&file.size()>0){
for (int i=0;i<file.size();i++) {
switch (i) {
case 0:
@@ -46,11 +46,19 @@
}
}
}
- dev_record.setPicture_num(file.size());
+ //dev_record.setPicture_num(file.size());
+ //System.out.println(dev_record);
ServiceModel model=service.add(dev_record);
result=tojson(model);
return SUCCESS;
}
+ //鐢ㄦ埛澶勭悊鐨勭粨鏋�
+ public String update(){
+ Deverror_record dev_record=getGson("yyyy-MM-dd HH:mm:ss").fromJson(json, Deverror_record.class);
+ ServiceModel model=service.update(dev_record);
+ result=tojson(model);
+ return SUCCESS;
+ }
//鏍规嵁stationid鏌ヨ璁惧鐨勯棶棰樿褰�
public String serchByCondition(){
BattInf binf=getGson().fromJson(json, BattInf.class);
--
Gitblit v1.9.1