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/dao/impl/BattInf_RebuildImpl.java |   44 ++++++++++++++++++++++++++++++++++----------
 1 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/gx_tieta/src/com/fgkj/dao/impl/BattInf_RebuildImpl.java b/gx_tieta/src/com/fgkj/dao/impl/BattInf_RebuildImpl.java
index c2c9dc1..060996f 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/BattInf_RebuildImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/BattInf_RebuildImpl.java
@@ -1,6 +1,8 @@
 package com.fgkj.dao.impl;
 
 import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
 import java.util.List;
 
 import com.fgkj.dao.BaseDAO;
@@ -8,6 +10,7 @@
 import com.fgkj.dao.DAOHelper;
 import com.fgkj.db.DBUtil;
 import com.fgkj.dto.BattInf_Rebuild;
+import com.mysql.fabric.xmlrpc.base.Array;
 
 public class BattInf_RebuildImpl implements BaseDAO,CallBack{
 
@@ -15,19 +18,21 @@
 		// TODO Auto-generated method stub
 		return null;
 	}
-
+    //娣诲姞
 	public boolean add(Object obj) {
 		BattInf_Rebuild br=(BattInf_Rebuild) obj;
-		String sql="insert into db_battinf.tb_battinf_rebuild(old_stationname,old_battgroupname,old_battproducer,old_stationid,old_battgroupid,old_monum,new_stationname,new_battgroupname,new_battproducer,new_stationid,new_battgroupid,new_monum,rebuild_time,rebuild_uid,rebuild_address,rebuild_clear_type) " +
-				   "values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
+		String sql="insert into db_battinf.tb_battinf_rebuild(old_stationname,old_battgroupname,old_battproducer,old_stationid,old_battgroupid,old_monum,new_stationname,new_battgroupname,new_battproducer,new_stationid,new_battgroupid,new_monum,rebuild_time,rebuild_uid,rebuild_clear_type) " +
+				   "values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
 		boolean bl=DAOHelper.executeUpdate(DBUtil.getConn(), sql, new Object[]{br.getOld_stationname(),br.getOld_battgroupname(),br.getOld_battproducer(),br.getOld_stationid(),br.getOld_battgroupid(),br.getOld_monum(),
-			       br.getNew_stationname(),br.getNew_battgroupname(),br.getNew_battproducer(),br.getNew_stationid(),br.getNew_battgroupid(),br.getNew_monum(),br.getRebuild_time(),br.getRebuild_uid(),br.getRebuild_address(),br.getRebuild_clear_type()});
+			       br.getNew_stationname(),br.getNew_battgroupname(),br.getNew_battproducer(),br.getNew_stationid(),br.getNew_battgroupid(),br.getNew_monum(),br.getRebuild_time(),br.getRebuild_uid(),br.getRebuild_clear_type()});
 		return bl;
 	}
-
+    //灏嗗悓鐢垫睜缁勫悓鍗曚綋鐨勮褰曞彉涓哄巻鍙�(rebuild_clear_type=0)
 	public boolean update(Object obj) {
-		// TODO Auto-generated method stub
-		return false;
+		BattInf_Rebuild br=(BattInf_Rebuild) obj;
+		String sql="update db_battinf.tb_battinf_rebuild set rebuild_clear_type=0 where  new_battgroupid=? and new_monum=? ";
+		Boolean bl=DAOHelper.executeUpdate(DBUtil.getConn(), sql, new Object[]{br.getNew_battgroupid(),br.getNew_monum()});
+		return bl;
 	}
 
 	public boolean del(Object obj) {
@@ -39,10 +44,29 @@
 		// TODO Auto-generated method stub
 		return null;
 	}
-
+    //鏌ヨnew_battgroupid,new_monum鏄惁鏈夎閰嶇粍鐨勮褰�
 	public List serchByCondition(Object obj) {
-		// TODO Auto-generated method stub
-		return null;
+		BattInf_Rebuild br=(BattInf_Rebuild) obj;
+		String sql="select * from db_battinf.tb_battinf_rebuild  where  new_battgroupid=? and new_monum=? and rebuild_clear_type=1 limit 1";
+		List list=DAOHelper.executeQuery(sql, DBUtil.getConn(),new Object[]{br.getNew_battgroupid(),br.getNew_monum()}, new CallBack() {
+			
+			public List getResults(ResultSet rs) {
+				List list=new ArrayList();
+				try {
+					while(rs.next()){
+						BattInf_Rebuild br=new BattInf_Rebuild();
+						br.setNew_battgroupid(rs.getInt("new_battgroupid"));
+						br.setNew_monum(rs.getInt("new_monum"));
+						list.add(br);
+					}
+				} catch (SQLException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
+				return list;
+			}
+		});
+		return list;
 	}
 
 	public List serchByInfo(Object obj) {

--
Gitblit v1.9.1