From 35fefed0792c40cb99b8d15fa5811bbb5992bff9 Mon Sep 17 00:00:00 2001 From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139> Date: 星期一, 21 一月 2019 10:42:24 +0800 Subject: [PATCH] 修改 --- gx_tieta/src/com/fgkj/dao/impl/Battinf_applyImpl.java | 31 +++++++++++++++++++++++++------ 1 files changed, 25 insertions(+), 6 deletions(-) diff --git a/gx_tieta/src/com/fgkj/dao/impl/Battinf_applyImpl.java b/gx_tieta/src/com/fgkj/dao/impl/Battinf_applyImpl.java index ad7b2aa..82f8c89 100644 --- a/gx_tieta/src/com/fgkj/dao/impl/Battinf_applyImpl.java +++ b/gx_tieta/src/com/fgkj/dao/impl/Battinf_applyImpl.java @@ -296,7 +296,12 @@ if(bapply.getApply_en()==0) { sql+=" apply_en=? and check_en!=? "; }else { - sql+=" apply_en=? and check_en=? "; + if(bapply.getCheck_en()==1) { + sql+=" apply_en=? and check_en=? "; + }else { + sql+=" apply_en=? and check_en!=? and check_en!=1 "; + } + } sql+=" order by apply_date desc limit ?,?"; List<Battinf_apply> list=DAOHelper.executeQueryLimit(sql, conn, new Object[]{bapply.getApply_en(),bapply.getCheck_en(),(page.getPageCurr()-1)*page.getPageSize(),page.getPageSize()}, new CallBack() { @@ -549,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) { @@ -763,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鐧捐壊涔愪笟鍘跨珛鏂板皬鍖篧F-BTS璁惧"); binf.setStationName1("婀栧寳鐪�"); @@ -809,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); -- Gitblit v1.9.1