From 4342203d21dfac86644c6ffc0c5b872e9e79ab68 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.27>
Date: 星期二, 06 十一月 2018 17:19:01 +0800
Subject: [PATCH] 问题反馈修改

---
 gx_tieta/src/com/fgkj/dao/impl/Deverror_recordImpl.java |   44 ++++++++++++++++++++++++++++++++++++++------
 1 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/gx_tieta/src/com/fgkj/dao/impl/Deverror_recordImpl.java b/gx_tieta/src/com/fgkj/dao/impl/Deverror_recordImpl.java
index 27ebc9d..47cc36b 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/Deverror_recordImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/Deverror_recordImpl.java
@@ -26,14 +26,15 @@
    //鐢ㄦ埛鎵嬪姩娣诲姞闂
 	public boolean add(Object obj) {
 		Deverror_record dev_record=(Deverror_record) obj;
-		String sql=" insert into db_battinf.tb_deverror_record(stationId,record_time,error_descript,error_dispose,uid,picture_num ";
-		String endsql=") values(?,?,?,?,?,?";
+		String sql=" insert into db_battinf.tb_deverror_record(stationId,record_time,error_descript,error_dispose,uid,uname,picture_num ";
+		String endsql=") values(?,?,?,?,?,?,?";
 		List list=new ArrayList();
 		list.add(dev_record.getStationId());
 		list.add(dev_record.getRecord_time());
 		list.add(dev_record.getError_descript());
 		list.add(dev_record.getError_dispose());
 		list.add(dev_record.getUid());
+		list.add(dev_record.getUname());
 		list.add(dev_record.getPicture_num());
 		if(dev_record.getPicture_num()>=1){
 			sql+=",picture_one";
@@ -62,9 +63,34 @@
     //鐢ㄦ埛澶勭悊鐨勭粨鏋�
 	public boolean update(Object obj) {
 		Deverror_record dev_record=(Deverror_record) obj;
-		System.out.println(dev_record);
-		String sql=" update db_battinf.tb_deverror_record set error_dispose=?,error_en=? where num=? ";
-		boolean bl=DAOHelper.executeUpdate(DBUtil.getConn(), sql, new Object[]{dev_record.getError_dispose(),dev_record.getError_en(),dev_record.getNum()});
+		List list=new ArrayList();
+		//System.out.println(dev_record);
+		String sql=" update db_battinf.tb_deverror_record set error_dispose=?,error_en=?,solve_uid=?,solve_uname=?,record_time=? "; 
+		String endSql=" where num=? ";
+	    list.add(dev_record.getError_dispose());
+		list.add(dev_record.getError_en());
+		list.add(dev_record.getSolve_uid());
+		list.add(dev_record.getSolve_uname());
+		list.add(dev_record.getSolve_record_time());
+		if (dev_record.getSolve_picture_num()>=1) {
+			sql+=",solve_picture_one=? ";
+			list.add(dev_record.getSolve_picture_one());
+		}
+		if (dev_record.getSolve_picture_num()>=2) {
+			sql+=",solve_picture_two=? ";
+			list.add(dev_record.getSolve_picture_two());
+		}
+		if (dev_record.getSolve_picture_num()>=3) {
+			sql+=",solve_picture_three=? ";
+			list.add(dev_record.getSolve_picture_three());
+		}
+		if (dev_record.getSolve_picture_num()>=4) {
+			sql+=",solve_picture_four=? ";
+			list.add(dev_record.getSolve_picture_four());
+		}
+		sql+=endSql;
+		list.add(dev_record.getNum());
+		boolean bl=DAOHelper.executeUpdatePicture(DBUtil.getConn(), sql,list);
 		return bl;
 	}
 
@@ -83,7 +109,7 @@
 		Page p=binf.getPage();
 		Connection conn=DBUtil.getConn();
 		String numberSql=" SELECT FOUND_ROWS() number";
-		String sql=" select SQL_CALC_FOUND_ROWS distinct tb_deverror_record.num,tb_deverror_record.stationid,record_time,error_descript,error_en,error_dispose,picture_num " +
+		String sql=" select SQL_CALC_FOUND_ROWS distinct tb_deverror_record.num,tb_deverror_record.stationid,record_time,error_descript,error_en,error_dispose,picture_num,solve_uid,solve_picture_num,uid,uname,solve_uname,solve_record_time  " +
 				"  ,db_battinf.tb_battinf.stationname,stationname1,stationname2,stationname3,stationname5 " +
 				"  from db_battinf.tb_deverror_record,db_battinf.tb_battinf " +
 				" where tb_deverror_record.stationid=tb_battinf.stationid " +
@@ -118,6 +144,12 @@
 						dev_record.setError_en(rs.getInt("error_en"));
 						dev_record.setError_dispose(rs.getString("error_dispose"));
 						dev_record.setPicture_num(rs.getInt("picture_num"));
+						dev_record.setUid(rs.getInt("uid"));
+						dev_record.setUname(rs.getString("uname"));
+						dev_record.setSolve_uid(rs.getInt("solve_uid"));
+						dev_record.setSolve_uname(rs.getString("solve_uname"));
+						dev_record.setSolve_picture_num(rs.getInt("solve_picture_num"));
+						dev_record.setSolve_record_time(rs.getTimestamp("solve_record_time"));
 						Page page=new Page();
 						dev_record.setPage(page);
 						list.add(dev_record);

--
Gitblit v1.9.1