修改

81041

2018-12-19 4213452111f688906056a003393e86be1a886729

 gx_tieta/src/com/fgkj/dao/impl/Battinf_applyImpl.java

@@ -214,16 +214,18 @@
   }

   //查询出所有需要确认的申请

   public List serchByCondition(Object obj) {

      Page page=(Page) obj;

      Battinf_apply bapply=(Battinf_apply) obj;

      BattInf binf=bapply.getBinf();

      Page page=binf.getPage();

      Connection conn=DBUtil.getConn();

      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 " +

            " from db_battinf.tb_battinf_apply " +

            " where apply_en=0  order by apply_date desc" +

            " where apply_en=?  order by apply_date desc" +

            " limit ?,? ";

      List<Battinf_apply> list=DAOHelper.executeQueryLimit(sql, conn, new Object[]{(page.getPageCurr()-1)*page.getPageSize(),page.getPageSize()}, new CallBack() {

      List<Battinf_apply> list=DAOHelper.executeQueryLimit(sql, conn, new Object[]{bapply.getApply_en(),(page.getPageCurr()-1)*page.getPageSize(),page.getPageSize()}, new CallBack() {

         

         public List getResults(ResultSet rs) {

            List list=new ArrayList();

@@ -391,7 +393,7 @@
      Page page=b.getPage();

      Connection conn=DBUtil.getConn();

      String numberSql=" SELECT FOUND_ROWS() number";

      String sql=" select SQL_CALC_FOUND_ROWS distinct num,apply_uid,confrim_uid,apply_date,apply_en,apply_note,StationId,StationName,StationName1,StationName2,StationName3,StationName4,StationName5,StationIp,FbsDeviceId,FbsDeviceIp_YM,FbsDeviceIp_WG,FbsDeviceIp"+

      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 " +

            " from db_battinf.tb_battinf_apply " +

@@ -410,6 +412,9 @@
                  apply.setConfrim_uid(rs.getInt("confrim_uid"));

                  apply.setConfirm_name((new User_infImpl()).changeUidToUname(apply.getConfrim_uid()));

                  apply.setApply_en(rs.getInt("apply_en"));

                  apply.setCheck_uid(rs.getInt("check_uid"));

                  apply.setCheck_en(rs.getInt("check_en"));

                  apply.setCheck_uname((new User_infImpl()).changeUidToUname(apply.getCheck_en()));

                  apply.setApply_date(rs.getTimestamp("apply_date"));

                  apply.setApply_note(rs.getString("apply_note"));