Administrator
2018-12-25 569493e4a9a18b9ced6797dd03a3fb9eaecd5ae2
Merge branch 'dev_lxw' of https://whyccjj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
3个文件已修改
3 ■■■■ 已修改文件
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$9.class 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl.class 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/src/com/fgkj/dao/impl/Battinf_applyImpl.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$9.class
Binary files differ
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl.class
Binary files differ
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) {