From 0edab78d73d975663da8ce2596a0a00c1b6a6db1 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期一, 12 十一月 2018 08:51:53 +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 | 24 ++++++++++++++++++++++++
1 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/actions/Deverror_recordAction.java b/gx_tieta/src/com/fgkj/actions/Deverror_recordAction.java
index ffc7b38..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) {
@@ -55,6 +56,29 @@
//鐢ㄦ埛澶勭悊鐨勭粨鏋�
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;
--
Gitblit v1.9.1