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/dto/Deverror_record.java | 130 +++++++++++++++++++++++++++++-------------
1 files changed, 89 insertions(+), 41 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dto/Deverror_record.java b/gx_tieta/src/com/fgkj/dto/Deverror_record.java
index e92166b..1f053b6 100644
--- a/gx_tieta/src/com/fgkj/dto/Deverror_record.java
+++ b/gx_tieta/src/com/fgkj/dto/Deverror_record.java
@@ -17,22 +17,28 @@
private String stationName5;
private Date record_time;
private String error_descript;//闂鎻忚堪
- private int uid;
+ private String error_dispose;//闂澶勭悊
+
private int error_en; //闂鏄惁瑙ｅ喅
private String note;
private Page page;
-
- private Blob picture_one_blob;
- private Blob picture_two_blob;
- private Blob picture_three_blob;
- private Blob picture_four_blob;
-
+ private int uid;
+ private String uname;
private File picture_one;
private File picture_two;
private File picture_three;
private File picture_four;
-
private int picture_num;
+
+ private int solve_uid;
+ private String solve_uname;
+ private File solve_picture_one;
+ private File solve_picture_two;
+ private File solve_picture_three;
+ private File solve_picture_four;
+ private int solve_picture_num;
+ private Date solve_record_time;
+
public int getNum() {
return num;
}
@@ -112,30 +118,7 @@
public void setPage(Page page) {
this.page = page;
}
- public Blob getPicture_one_blob() {
- return picture_one_blob;
- }
- public void setPicture_one_blob(Blob picture_one_blob) {
- this.picture_one_blob = picture_one_blob;
- }
- public Blob getPicture_two_blob() {
- return picture_two_blob;
- }
- public void setPicture_two_blob(Blob picture_two_blob) {
- this.picture_two_blob = picture_two_blob;
- }
- public Blob getPicture_three_blob() {
- return picture_three_blob;
- }
- public void setPicture_three_blob(Blob picture_three_blob) {
- this.picture_three_blob = picture_three_blob;
- }
- public Blob getPicture_four_blob() {
- return picture_four_blob;
- }
- public void setPicture_four_blob(Blob picture_four_blob) {
- this.picture_four_blob = picture_four_blob;
- }
+
public File getPicture_one() {
return picture_one;
}
@@ -166,6 +149,67 @@
public void setPicture_num(int picture_num) {
this.picture_num = picture_num;
}
+
+ public String getError_dispose() {
+ return error_dispose;
+ }
+ public void setError_dispose(String error_dispose) {
+ this.error_dispose = error_dispose;
+ }
+ public int getSolve_uid() {
+ return solve_uid;
+ }
+ public void setSolve_uid(int solve_uid) {
+ this.solve_uid = solve_uid;
+ }
+ public File getSolve_picture_one() {
+ return solve_picture_one;
+ }
+ public void setSolve_picture_one(File solve_picture_one) {
+ this.solve_picture_one = solve_picture_one;
+ }
+ public File getSolve_picture_two() {
+ return solve_picture_two;
+ }
+ public void setSolve_picture_two(File solve_picture_two) {
+ this.solve_picture_two = solve_picture_two;
+ }
+ public File getSolve_picture_three() {
+ return solve_picture_three;
+ }
+ public void setSolve_picture_three(File solve_picture_three) {
+ this.solve_picture_three = solve_picture_three;
+ }
+ public File getSolve_picture_four() {
+ return solve_picture_four;
+ }
+ public void setSolve_picture_four(File solve_picture_four) {
+ this.solve_picture_four = solve_picture_four;
+ }
+ public int getSolve_picture_num() {
+ return solve_picture_num;
+ }
+ public void setSolve_picture_num(int solve_picture_num) {
+ this.solve_picture_num = solve_picture_num;
+ }
+ public String getUname() {
+ return uname;
+ }
+ public void setUname(String uname) {
+ this.uname = uname;
+ }
+ public String getSolve_uname() {
+ return solve_uname;
+ }
+ public void setSolve_uname(String solve_uname) {
+ this.solve_uname = solve_uname;
+ }
+ public Date getSolve_record_time() {
+ return solve_record_time;
+ }
+ public void setSolve_record_time(Date solve_record_time) {
+ this.solve_record_time = solve_record_time;
+ }
@Override
public String toString() {
return "Deverror_record [num=" + num + ", stationId=" + stationId
@@ -173,15 +217,19 @@
+ stationName1 + ", stationName2=" + stationName2
+ ", stationName3=" + stationName3 + ", stationName5="
+ stationName5 + ", record_time=" + record_time
- + ", error_descript=" + error_descript + ", uid=" + uid
- + ", error_en=" + error_en + ", note=" + note + ", page="
- + page + ", picture_one_blob=" + picture_one_blob
- + ", picture_two_blob=" + picture_two_blob
- + ", picture_three_blob=" + picture_three_blob
- + ", picture_four_blob=" + picture_four_blob + ", picture_one="
- + picture_one + ", picture_two=" + picture_two
- + ", picture_three=" + picture_three + ", picture_four="
- + picture_four + ", picture_num=" + picture_num + "]";
+ + ", error_descript=" + error_descript + ", error_dispose="
+ + error_dispose + ", error_en=" + error_en + ", note=" + note
+ + ", page=" + page + ", uid=" + uid + ", uname=" + uname
+ + ", picture_one=" + picture_one + ", picture_two="
+ + picture_two + ", picture_three=" + picture_three
+ + ", picture_four=" + picture_four + ", picture_num="
+ + picture_num + ", solve_uid=" + solve_uid + ", solve_uname="
+ + solve_uname + ", solve_picture_one=" + solve_picture_one
+ + ", solve_picture_two=" + solve_picture_two
+ + ", solve_picture_three=" + solve_picture_three
+ + ", solve_picture_four=" + solve_picture_four
+ + ", solve_picture_num=" + solve_picture_num
+ + ", solve_record_time=" + solve_record_time + "]";
}
--
Gitblit v1.9.1