|
|
@@ -1994,12 +1994,12 @@ public class BatchDealServiceImpl implements BatchDealService {
|
|
|
if(("MakeIMEI!Query").equals(caller)){
|
|
|
String ids = CollectionUtil.pluckSqlString(store, "mil_id");
|
|
|
int cn1,cn2,cn3 = 0;
|
|
|
- cn1 = baseDao.getCount("select count(1) cn from make left join makeimeilist on ma_code = mil_makecode where mil_id in("+ids+") and nvl(mil_sncode,' ') <> ' ' ");
|
|
|
- cn2 = baseDao.getCount("select count(1) cn from make left join makeimeilist on ma_code = mil_makecode where mil_id in("+ids+") and nvl(mil_sncode,' ') = ' ' ");
|
|
|
- cn3 = baseDao.getCount("select count(1) cn from makeimeilist where mil_id in("+ids+") and nvl(mil_sncode,' ') = ' '");
|
|
|
+ cn1 = baseDao.getCount("select count(1) cn from make left join makeimeilist on ma_code = mil_makecode where mil_id in("+ids+") and nvl(mil_status,0) <> 0 ");
|
|
|
+ cn2 = baseDao.getCount("select count(1) cn from make left join makeimeilist on ma_code = mil_makecode where mil_id in("+ids+") and nvl(mil_status,0) = 0 ");
|
|
|
+ cn3 = baseDao.getCount("select count(1) cn from makeimeilist where mil_id in("+ids+") and nvl(mil_status,0) = 0");
|
|
|
List<String> sqls = new ArrayList<String>();
|
|
|
for(Map<Object,Object> map:store){
|
|
|
- sqls.add("delete from makeimeilist where mil_id="+map.get("mil_id") +" and nvl(mil_sncode,' ') = ' '");
|
|
|
+ sqls.add("delete from makeimeilist where mil_id="+map.get("mil_id") +" and nvl(mil_status,0) = 0");
|
|
|
}
|
|
|
|
|
|
sqls.add("INSERT INTO MessageLog(ml_date,ml_man,ml_content,ml_result,ml_search) VALUES(sysdate,'"
|
|
|
@@ -2085,10 +2085,10 @@ public class BatchDealServiceImpl implements BatchDealService {
|
|
|
}
|
|
|
}else if(("MakeIMEI!Query").equals(caller)){
|
|
|
//被使用过的IMEI
|
|
|
- int cn1= baseDao.getCount("select count(1) cn from makeimeilist where "+data+" and nvl(mil_sncode,' ') <> ' '");
|
|
|
+ int cn1= baseDao.getCount("select count(1) cn from makeimeilist where "+data+" and nvl(mil_status,0) <> 0");
|
|
|
//未被使用的IMEI
|
|
|
- int cn2= baseDao.getCount("select count(1) cn from makeimeilist where "+data+" and nvl(mil_sncode,' ') = ' '");
|
|
|
- sqls.add("delete from makeimeilist where "+data+" and nvl(mil_sncode,' ') = ' '");
|
|
|
+ int cn2= baseDao.getCount("select count(1) cn from makeimeilist where "+data+" and nvl(mil_status,0) = 0");
|
|
|
+ sqls.add("delete from makeimeilist where "+data+" and nvl(mil_status,0) = 0");
|
|
|
sqls.add("INSERT INTO MessageLog(ml_date,ml_man,ml_content,ml_result,ml_search) VALUES(sysdate,'"
|
|
|
+ SystemSession.getUser().getEm_name() + "','批量删除IMEI','删除"+cn2+"条成功','Make!Base')");
|
|
|
baseDao.execute(sqls);
|
|
|
@@ -2107,12 +2107,12 @@ public class BatchDealServiceImpl implements BatchDealService {
|
|
|
if(("MakeIMEI!Query").equals(caller)){
|
|
|
String ids = CollectionUtil.pluckSqlString(store, "mil_id");
|
|
|
int cn1,cn2,cn3 = 0;
|
|
|
- cn1 = baseDao.getCount("select count(1) cn from make left join makeimeilist on ma_code = mil_makecode where mil_id in("+ids+") and nvl(mil_sncode,' ') <> ' ' ");
|
|
|
- cn2 = baseDao.getCount("select count(1) cn from make left join makeimeilist on ma_code = mil_makecode where mil_id in("+ids+") and nvl(mil_sncode,' ') = ' ' ");
|
|
|
+ cn1 = baseDao.getCount("select count(1) cn from make left join makeimeilist on ma_code = mil_makecode where mil_id in("+ids+") and nvl(mil_status,0) <> 0 ");
|
|
|
+ cn2 = baseDao.getCount("select count(1) cn from make left join makeimeilist on ma_code = mil_makecode where mil_id in("+ids+") and nvl(mil_status,0) = 0 ");
|
|
|
cn3 = baseDao.getCount("select count(1) cn from makeimeilist where mil_id in("+ids+") and nvl(mil_sncode,' ') = ' '");
|
|
|
List<String> sqls = new ArrayList<String>();
|
|
|
for(Map<Object,Object> map:store){
|
|
|
- sqls.add("delete from makeimeilist where mil_id="+map.get("mil_id") +" and nvl(mil_sncode,' ') = ' '");
|
|
|
+ sqls.add("delete from makeimeilist where mil_id="+map.get("mil_id") +" and nvl(mil_status,0) = 0");
|
|
|
}
|
|
|
|
|
|
sqls.add("INSERT INTO MessageLog(ml_date,ml_man,ml_content,ml_result,ml_search) VALUES(sysdate,'"
|
