From 7f953d9aa0e7d4fcbe3c366c7f9f0b3f847f12bd Mon Sep 17 00:00:00 2001
From: hdw <hdw@192.168.137.1>
Date: 星期六, 19 一月 2019 09:16:08 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/dto/Deverror_record.java | 142 ++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 133 insertions(+), 9 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dto/Deverror_record.java b/gx_tieta/src/com/fgkj/dto/Deverror_record.java
index b43f6d9..d8dfb1a 100644
--- a/gx_tieta/src/com/fgkj/dto/Deverror_record.java
+++ b/gx_tieta/src/com/fgkj/dto/Deverror_record.java
@@ -1,7 +1,10 @@
package com.fgkj.dto;
+import java.io.File;
import java.io.Serializable;
import java.util.Date;
+
+import com.mysql.jdbc.Blob;
public class Deverror_record implements Serializable{
@@ -14,10 +17,28 @@
private String stationName5;
private Date record_time;
private String error_descript;//闂鎻忚堪
- private int uid;
+ private String error_dispose;//闂澶勭悊
+ private int error_state;//闂绫诲瀷
private int error_en; //闂鏄惁瑙ｅ喅
private String note;
private Page page;
+ 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;
}
@@ -97,17 +118,120 @@
public void setPage(Page page) {
this.page = page;
}
+
+ public File getPicture_one() {
+ return picture_one;
+ }
+ public void setPicture_one(File picture_one) {
+ this.picture_one = picture_one;
+ }
+ public File getPicture_two() {
+ return picture_two;
+ }
+ public void setPicture_two(File picture_two) {
+ this.picture_two = picture_two;
+ }
+ public File getPicture_three() {
+ return picture_three;
+ }
+ public void setPicture_three(File picture_three) {
+ this.picture_three = picture_three;
+ }
+ public File getPicture_four() {
+ return picture_four;
+ }
+ public void setPicture_four(File picture_four) {
+ this.picture_four = picture_four;
+ }
+ public int getPicture_num() {
+ return picture_num;
+ }
+ 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;
+ }
+ public int getError_state() {
+ return error_state;
+ }
+ public void setError_state(int error_state) {
+ this.error_state = error_state;
+ }
@Override
public String toString() {
- return "Deverror_record [num=" + num + ", stationId=" + stationId
- + ", stationName=" + stationName + ", stationName1="
- + 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 + "]";
+ return "Deverror_record [num=" + num + ", stationId=" + stationId + ", stationName=" + stationName
+ + ", stationName1=" + stationName1 + ", stationName2=" + stationName2 + ", stationName3=" + stationName3
+ + ", stationName5=" + stationName5 + ", record_time=" + record_time + ", error_descript="
+ + error_descript + ", error_dispose=" + error_dispose + ", error_state=" + error_state + ", 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