From 5f73148bd85016ac62586e030c2a4cccccfacf47 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.33>
Date: 星期四, 11 十月 2018 10:19:56 +0800
Subject: [PATCH] 电池配组记录添加
---
gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
index bf5dd09..d55984c 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
@@ -3699,8 +3699,8 @@
" from db_battinf.tb_battinf " +
" left outer join (select * from db_battinf.tb_battinf_rebuild where tb_battinf_rebuild.rebuild_clear_type=1 ) as battinf_re " +
" on BattGroupId=battinf_re.new_battgroupid or BattGroupId=battinf_re.old_battgroupid " +
- " where stationname1 like ? and stationname2 like ? and stationname3 like ? and battgroupname like ? ";
- List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{"%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%","%"+binf.getStationName3()+"%","%"+binf.getStationName4()+"%"}, new CallBack() {
+ " where stationname1 like ? and stationname2 like ? and stationname3 like ? and battgroupname like ? and battgroupid=? ";
+ List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{"%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%","%"+binf.getStationName3()+"%","%"+binf.getBattGroupName()+"%",binf.getBattGroupId()}, new CallBack() {
public List getResults(ResultSet rs) {
List<BattInf> list=new ArrayList();
@@ -3765,10 +3765,12 @@
BattInfImpl biml = new BattInfImpl();
BattInf binf = new BattInf();
- binf.setBattGroupId(1000967);
+ binf.setBattGroupId(1000001);
binf.setStationName("");
binf.setStationName1("");
binf.setStationName2("");
+ binf.setStationName3("姝︽眽婧愭殺瀹為獙瀹�1");
+ binf.setBattGroupName("");
binf.setBattProducer("1");
User_inf uinf=new User_inf();
uinf.setUId(1002);
@@ -3794,7 +3796,8 @@
//List<BattInf> list = biml.serchByConditionNew(bmd);
//List<BattInf> list=biml.serchByTestType(bmd);
//List<BattInf> list=biml.serchGroupAssess(bmd);
- List<BattInf> list=biml.serchMakeGroup(binf);
+ //List<BattInf> list=biml.serchMakeGroup(binf);
+ List<BattInf> list=biml.serchGroupByInfor(binf);
for (BattInf b : list) {
System.out.println(b);
}
--
Gitblit v1.9.1