From 569493e4a9a18b9ced6797dd03a3fb9eaecd5ae2 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@USER-20180117QL>
Date: 星期二, 25 十二月 2018 17:58:22 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyccjj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl.class | 0
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$9.class | 0
gx_tieta/src/com/fgkj/dao/impl/Battinf_applyImpl.java | 3 ++-
3 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$9.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$9.class
index 1b1bdc5..bd3028a 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$9.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$9.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl.class
index c32b259..968d6d9 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl.class
Binary files differ
diff --git a/gx_tieta/src/com/fgkj/dao/impl/Battinf_applyImpl.java b/gx_tieta/src/com/fgkj/dao/impl/Battinf_applyImpl.java
index bc32ce1..e45ca37 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/Battinf_applyImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/Battinf_applyImpl.java
@@ -717,7 +717,7 @@
}
//鐢宠琛ㄤ腑宸插鎵归�氳繃鐨勮澶囪繛鎺ユ暟
public List devCommNum() {
- String sql=" select distinct db_battinf.tb_battinf_apply.FbsDeviceId,dev_commcount " +
+ String sql=" select distinct db_battinf.tb_battinf_apply.FbsDeviceId,dev_commcount,dev_errcommcount " +
" from db_battinf.tb_battinf_apply,db_ram_db.tb_fbs9100_state " +
" where apply_en=1 and db_battinf.tb_battinf_apply.FbsDeviceId=db_ram_db.tb_fbs9100_state.dev_id "
+ " order by apply_date desc" ;
@@ -731,6 +731,7 @@
Fbs9100_state fbs=new Fbs9100_state();
fbs.setDev_id(rs.getInt("FbsDeviceId"));
fbs.setDev_commcount(rs.getInt("dev_commcount"));
+ fbs.setDev_errcommcount(rs.getInt("dev_errcommcount"));
list.add(fbs);
}
} catch (SQLException e) {
--
Gitblit v1.9.1