81041
2018-12-26 e3e09bc29f2ddc1600e27a8d0ec12981215e68b2
gx_tieta/src/com/fgkj/dao/impl/Battinf_applyImpl.java
@@ -94,7 +94,7 @@
            int uid=((User_inf)ActionUtil.getUser()).getUId();
             bapply.setApply_uid(uid);
            BattInf binf=bapply.getBinf();
            String sql = "insert into db_battinf.tb_battinf_apply(" +
            String sql = "replace into db_battinf.tb_battinf_apply(" +
                  "apply_uid,apply_date,StationId,StationName,StationName1,StationName2,StationName3,StationName4,StationName5,StationIp,FBSDeviceId,FbsDeviceIp,FbsDeviceIp_YM,FbsDeviceIp_WG,"
                  + "FBSDeviceName,GroupIndexInFBSDevice,battgroupId,BattGroupNum,BattGroupName,FloatVolLevel,OfflineVolLevel,BattFloatCurrent" +
                  ",MonCount,MonCapStd,monVolStd,monResStd,MonSerStd,MonVolLowToAvg,BattProducer,BattModel,BattProductDate,BattInUseDate,Load_curr,install_user,DisCurrMax,station_phone" +
@@ -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) {