81041
2018-12-25 f9dc37de61954ea173d0f79aa801402df9b4bc9a
gx_tieta/src/com/fgkj/dao/impl/Battinf_applyImpl.java
@@ -282,7 +282,8 @@
      String numberSql=" SELECT FOUND_ROWS() number";
      String sql=" select SQL_CALC_FOUND_ROWS distinct num,apply_uid,confrim_uid,check_uid,check_en,apply_date,apply_en,apply_note,StationId,StationName,StationName1,StationName2,StationName3,StationName4,StationName5,StationIp,FbsDeviceId,FbsDeviceIp_YM,FbsDeviceIp_WG,FbsDeviceIp"+
              ",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 " +
             ",MonCount,MonCapStd,monVolStd,monResStd,MonSerStd,MonVolLowToAvg,BattProducer,BattModel,BattProductDate,BattInUseDate,Load_curr,install_user,DisCurrMax,station_phone "
             + ",longitude,latitude,address " +
            " from db_battinf.tb_battinf_apply " +
            " where apply_en=?  order by apply_date desc" +
            " limit ?,? ";
@@ -304,6 +305,9 @@
                  apply.setCheck_uname((new User_infImpl()).changeUidToUname(apply.getCheck_uid()));
                  apply.setApply_date(rs.getTimestamp("apply_date"));
                  apply.setApply_note(rs.getString("apply_note"));
                  apply.setLongitude(rs.getDouble("longitude"));
                  apply.setLatitude(rs.getDouble("latitude"));
                  apply.setAddress(rs.getString("address"));
                  
                  BattInf binf=new BattInf();
                  binf.setStationId(rs.getString("stationId"));