From 99285fcc7d30e62f1e84e1c96d29d0ffcd9ccdbc Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.30>
Date: 星期三, 14 十一月 2018 17:33:27 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/actions/Deverror_recordAction.java | 33 ++++++++++++++++++++++++++++++++-
1 files changed, 32 insertions(+), 1 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/actions/Deverror_recordAction.java b/gx_tieta/src/com/fgkj/actions/Deverror_recordAction.java
index 5f923d6..8f5373e 100644
--- a/gx_tieta/src/com/fgkj/actions/Deverror_recordAction.java
+++ b/gx_tieta/src/com/fgkj/actions/Deverror_recordAction.java
@@ -26,6 +26,7 @@
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());
+ dev_record.setUname(uinf.getUName());
if(file!=null&&file.size()>0){
for (int i=0;i<file.size();i++) {
switch (i) {
@@ -46,12 +47,42 @@
}
}
}
- 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);
+ User_inf uinf=(User_inf) getUser();
+ dev_record.setSolve_uid(uinf.getUId());
+ dev_record.setSolve_uname(uinf.getUName());
+ if(file!=null&&file.size()>0){
+ for (int i=0;i<file.size();i++) {
+ switch (i) {
+ case 0:
+ dev_record.setSolve_picture_one(file.get(i));
+ break;
+ case 1:
+ dev_record.setSolve_picture_two(file.get(i));
+ break;
+ case 2:
+ dev_record.setSolve_picture_three(file.get(i));
+ break;
+ case 3:
+ dev_record.setSolve_picture_four(file.get(i));
+ break;
+ default:
+ break;
+ }
+ }
+ }
+ 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