whyclj
2019-01-07 b3460365bca5a645e3e37d69dd606ae8bea8cbb0
Merge branch 'dev_lxw' of https://whyclj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
6个文件已修改
24 ■■■■ 已修改文件
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$6.class 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$7.class 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$8.class 补丁 | 查看 | 原始文档 | blame | 历史
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 24 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$6.class
Binary files differ
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$7.class
Binary files differ
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$8.class
Binary files differ
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
@@ -554,8 +554,20 @@
                 ",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=?  and apply_uid=? order by apply_date desc " +
                " limit ?,? ";
                " where apply_en=?  and check_en=0 ";//(未审批和已审批的数据不能被验收)
        //用户
        String userSqlF=" and  apply_uid=? " ;
        String userSqlT=" and  apply_uid!=? " ;
        if(bapply.getApply_uid()==1002) {
            bapply.setNum(0);
            sql+=userSqlT;
        }else {
            sql+=userSqlF;
        }
        String endSql=" order by apply_date desc limit ?,?";
        sql+=endSql;
        //System.out.println(sql);
        List<Battinf_apply> list=DAOHelper.executeQueryLimit(sql, conn, new Object[]{bapply.getApply_en(),bapply.getNum(),(page.getPageCurr()-1)*page.getPageSize(),page.getPageSize()}, new CallBack() {
            
            public List getResults(ResultSet rs) {
@@ -768,10 +780,10 @@
        Battinf_applyImpl bimpl=new Battinf_applyImpl();
        Battinf_apply bapply=new Battinf_apply();
        bapply.setApply_date(ActionUtil.getSimpDate(date2));
        bapply.setApply_uid(1004);
        bapply.setApply_uid(1002);
        bapply.setApply_en(1);
        bapply.setCheck_en(1);
        bapply.setNum(1002);;
        BattInf binf=new BattInf();
        binf.setStationName("广西省-百色-GX百色乐业县立新小区WF-BTS设备");
        binf.setStationName1("湖北省");
@@ -814,8 +826,10 @@
        page.setPageSize(20);
        binf.setPage(page);
        bapply.setBinf(binf);
        List list=bimpl.serchByCondition(bapply);
        List list=bimpl.serchByInfo(bapply);
        System.out.println(list.size());
        /*List list=bimpl.serchByCondition(bapply);
        System.out.println(list.size());*/
        /*List list=new ArrayList();
        list.add(bapply);
        boolean bl=bimpl.add(list);