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/BadBatt_monImpl.java | 59 ++++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 48 insertions(+), 11 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dao/impl/BadBatt_monImpl.java b/gx_tieta/src/com/fgkj/dao/impl/BadBatt_monImpl.java
index 5e32997..37a388e 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/BadBatt_monImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/BadBatt_monImpl.java
@@ -155,7 +155,7 @@
" where db_user.tb_user_battgroup_baojigroup_battgroup.BattGroupId=db_battinf.tb_battinf.BattGroupId " +
" and db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id=db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id " +
" and db_user.tb_user_inf.uid=db_user.tb_user_battgroup_baojigroup_usr.uid " +
- " and db_user.tb_user_inf.uid=? ) " ;
+ " and db_user.tb_user_inf.uid=? and db_battinf.tb_battinf.Station_install=1 ) " ;
//System.out.println(sql);
List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{uinf.getUId()}, new CallBack() {
@@ -296,16 +296,16 @@
String numberSql=" SELECT FOUND_ROWS() number";
String sql="";
String baseSql=" SELECT SQL_CALC_FOUND_ROWS distinct web_site.tb_badbatt_mon.battgroupid,web_site.tb_badbatt_mon.mon_num,web_site.tb_badbatt_mon.real_cap,web_site.tb_badbatt_mon.stdcap,web_site.tb_badbatt_mon.note " +
- ",db_battinf.tb_battinf.stationname1,db_battinf.tb_battinf.stationname,db_battinf.tb_battinf.battproducer,db_battinf.tb_battinf.battinusedate" +
+ ",db_battinf.tb_battinf.stationname1,db_battinf.tb_battinf.stationname,db_battinf.tb_battinf.stationname2,db_battinf.tb_battinf.stationname5,db_battinf.tb_battinf.battproducer,db_battinf.tb_battinf.battinusedate" +
",db_battinf.tb_battinf.monvolstd,db_battinf.tb_battinf.battgroupname " +
"FROM web_site.tb_badbatt_mon,db_battinf.tb_battinf " +
"where web_site.tb_badbatt_mon.battgroupid=db_battinf.tb_battinf.BattGroupId " +
"and test_starttime>=? and test_starttime<=? " +
- "and db_battinf.tb_battinf.stationname1 like ? and db_battinf.tb_battinf.stationname like ? and db_battinf.tb_battinf.stationname2 like ? ";
+ "and db_battinf.tb_battinf.stationname1 like ? and db_battinf.tb_battinf.stationname like ? and db_battinf.tb_battinf.stationname2 like ? and db_battinf.tb_battinf.stationname5 like ? ";
//閫夊彇钃勭數姹犵粍鏉′欢
- String idSqlT=" and db_battinf.tb_battinf.battgroupid!=? ";
- String idSqlF=" and db_battinf.tb_battinf.battgroupid=? ";
+ String idSqlT=" and db_battinf.tb_battinf.battgroupid!=? and db_battinf.tb_battinf.Station_install=1 ";
+ String idSqlF=" and db_battinf.tb_battinf.battgroupid=? and db_battinf.tb_battinf.Station_install=1 ";
if(binf.getBattGroupId()==0){
baseSql+=idSqlT;
}else{
@@ -325,7 +325,7 @@
sql=baseSql+endSql+limitSql;
//System.out.println(sql);
List<Batt_Maint_Dealarm> list=DAOHelper.executeQueryLimit(sql, conn, new Object[]{
- binf.getBattProductDate(),binf.getBattProductDate1(),"%"+binf.getStationName1()+"%","%"+binf.getStationName()+"%","%"+binf.getStationName2()+"%",
+ binf.getBattProductDate(),binf.getBattProductDate1(),"%"+binf.getStationName1()+"%","%"+binf.getStationName()+"%","%"+binf.getStationName2()+"%","%"+binf.getStationName5()+"%",
binf.getBattGroupId(),uinf.getUId(),
(page.getPageCurr()-1)*page.getPageSize(),page.getPageSize()}, new CallBack() {
@@ -336,7 +336,10 @@
Batt_Maint_Dealarm bmd = new Batt_Maint_Dealarm();
BattInf binf=new BattInf();
binf.setStationName1(rs.getString("stationName1"));
+ binf.setStationName2(rs.getString("stationName2"));
+ binf.setStationName5(rs.getString("stationName5"));
binf.setStationName(rs.getString("stationName"));
+
binf.setBattProducer(rs.getString("battProducer"));
if(rs.getString("battInUseDate")!=null)
binf.setBattInUseDate(rs.getDate("battInUseDate"));
@@ -374,8 +377,38 @@
}
return list;
}
-
-
+
+ //鏌ヨ瀛樺湪钀藉悗鍗曚綋寰楁満鎴夸釜鏁�
+ public int searchBadBattInStation(Object obj) {
+ User_inf uinf=(User_inf) obj;
+ String sql=" select count(distinct db_battinf.tb_battinf.stationid) as nums from db_battinf.tb_battinf where station_install=1 " +
+ " and db_battinf.tb_battinf.battgroupid in (select distinct tb_badbatt_mon.BattGroupId from web_site.tb_badbatt_mon) " +
+ " 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=? ) ";
+ //System.out.println(sql);
+ List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{uinf.getUId()}, new CallBack() {
+
+ public List getResults(ResultSet rs) {
+ List list=new ArrayList();
+ try {
+ while(rs.next()){
+ list.add(rs.getInt("nums"));
+ }
+ } catch (SQLException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ return list;
+ }
+ });
+ int nums=0;//鏈�鍚庣殑缁撴灉
+ if(list!=null&&list.size()>0){
+ nums=(Integer) list.get(list.size()-1);
+ }
+ return nums;
+ }
public static void main(String[] args) throws ParseException {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
Date date1 = sdf.parse("2000-01-01");
@@ -394,6 +427,8 @@
binf.setBattInUseDate1(ActionUtil.getSimpDate(date2));
binf.setStationName1("");
binf.setStationName("");
+ binf.setStationName2("");
+ binf.setStationName5("");
binf.setBattGroupId(0);
binf.setBattProducer("");
Page page=new Page();
@@ -405,10 +440,12 @@
bmd.setBinf(binf);
bmd.setPage(page);
bmd.setUinf(uinf);
- List<Batt_Maint_Dealarm> list=bimpl.serchByInfo(bmd);
+ /*List<Batt_Maint_Dealarm> list=bimpl.serchByInfo(bmd);
for (Batt_Maint_Dealarm b : list) {
- System.out.println(b.getBdmon());
- }
+ System.out.println(b);
+ }*/
+ int nums=bimpl.searchBadBattInStation(uinf);
+ System.out.println(nums);
}
--
Gitblit v1.9.1