From e22fd0bac62d20d94e58409ea15049c67f6ff1eb Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.26>
Date: 星期四, 13 十二月 2018 10:33:35 +0800
Subject: [PATCH] 修改

---
 gx_tieta/src/com/fgkj/dao/impl/Deverror_recordImpl.java |   69 +++++++++++++++++++++++++++-------
 1 files changed, 55 insertions(+), 14 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 a797c10..b9031f6 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/Deverror_recordImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/Deverror_recordImpl.java
@@ -26,41 +26,73 @@
    //鐢ㄦ埛鎵嬪姩娣诲姞闂
 	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,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";
 			endsql+=",? ";
+			list.add(dev_record.getPicture_one());
 		}
 		if(dev_record.getPicture_num()>=2){
 			sql+=",picture_two";
 			endsql+=",? ";
+			list.add(dev_record.getPicture_two());
 		}if(dev_record.getPicture_num()>=3){
 			sql+=",picture_three";
 			endsql+=",? ";
+			list.add(dev_record.getPicture_three());
 		}if(dev_record.getPicture_num()>=4){
 			sql+=",picture_four";
 			endsql+=",? ";
+			list.add(dev_record.getPicture_four());
 		}
-		list.add(dev_record.getPicture_one());
-		list.add(dev_record.getPicture_two());
-		list.add(dev_record.getPicture_three());
-		list.add(dev_record.getPicture_four());
 		endsql+=")";
 		sql+=endsql;
+		//System.err.println(sql);
 		boolean bl=DAOHelper.executeUpdatePicture(DBUtil.getConn(), sql, list);
 		return bl;
 	}
-
+    //鐢ㄦ埛澶勭悊鐨勭粨鏋�
 	public boolean update(Object obj) {
-		// TODO Auto-generated method stub
-		return false;
+		Deverror_record dev_record=(Deverror_record) obj;
+		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=?,solve_picture_num=?,solve_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_picture_num());
+		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;
 	}
 
 	public boolean del(Object obj) {
@@ -78,12 +110,11 @@
 		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,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 " +
-				" and tb_deverror_record.stationid like ? and stationname1 like ? and stationname2 like ? and stationname5 like ?  " +
-				" and tb_deverror_record.uid=? and error_en=0 " ;
+				" and tb_deverror_record.stationid like ? and stationname1 like ? and stationname2 like ? and stationname5 like ?  " ;
 		//鐢ㄦ埛绠$悊
 		String userSql=" and db_battinf.tb_battinf.StationId in(" +
 				" select distinct db_user.tb_user_battgroup_baojigroup_battgroup.StationId from db_user.tb_user_battgroup_baojigroup_battgroup,db_user.tb_user_battgroup_baojigroup_usr where db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id=db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id  and db_user.tb_user_battgroup_baojigroup_usr.uId=? "+
@@ -94,7 +125,7 @@
 		sql+=orderSql;
 		String limitSql=" limit ?,? ";
 		sql+=limitSql;
-		List<Deverror_record> list=DAOHelper.executeQueryLimit(sql, conn, new Object[]{"%"+binf.getStationId()+"%","%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%","%"+binf.getStationName5()+"%",binf.getNum()
+		List<Deverror_record> list=DAOHelper.executeQueryLimit(sql, conn, new Object[]{"%"+binf.getStationId()+"%","%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%","%"+binf.getStationName5()+"%"
 				,binf.getNum(),(p.getPageCurr()-1)*p.getPageSize(),p.getPageSize()}, new CallBack() {
 			
 			public List getResults(ResultSet rs) {
@@ -112,7 +143,14 @@
 						dev_record.setRecord_time(rs.getTimestamp("record_time"));
 						dev_record.setError_descript(rs.getString("error_descript"));
 						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);
@@ -127,7 +165,7 @@
 		//鍘绘帀limit鏉′欢鍚庣殑鎬绘暟
 		int number=LimitNumberFactory.GetLimtitNumber(conn, numberSql);
 		if(list!=null&&list.size()>0){
-			list.get(list.size()-1).getPage().setPageSize(number);
+			list.get(list.size()-1).getPage().setPageAll(number);
 		}
 		return list;
 	}
@@ -170,6 +208,9 @@
 		 p.setPageSize(10);
 		 binf.setPage(p);
 		 List list=dimpl.serchByCondition(binf);
+		 for (Object object : list) {
+			System.out.println(object);
+		}
 		 System.out.println(list.size());
 	}
 

--
Gitblit v1.9.1