|
|
@@ -61,7 +61,7 @@ public class DistributeSMD {
|
|
61
|
61
|
}
|
|
62
|
62
|
});
|
|
63
|
63
|
|
|
64
|
|
- List<Map<String,Object>> simlist=RCPService.getSimpService().getMapList("select iccid,scgrpid from sim where imsi like '46001%' or imsi like '46006%' or imsi like '46009%' or scgrpid=14 order by id");
|
|
|
64
|
+ List<Map<String,Object>> simlist=RCPService.getSimpService().getMapList("select iccid,scgrpid from sim s inner join simgroup g on s.scgrpid=g.id where ispid='46001'");
|
|
65
|
65
|
Map<String, String> iccidmap = new LinkedHashMap<>();
|
|
66
|
66
|
Map<String, String> iccidCuMap = new HashMap<String, String>();
|
|
67
|
67
|
simlist.stream().forEach(item->{
|
|
|
@@ -145,7 +145,7 @@ public class DistributeSMD {
|
|
145
|
145
|
}
|
|
146
|
146
|
|
|
147
|
147
|
|
|
148
|
|
- String sql = "SELECT min(iccid) iccid,sn,rmode FROM `smd` where `rmode` in (5,6,7,8,1) group by sn,rmode having count(*)>1";
|
|
|
148
|
+ String sql = "SELECT min(iccid) iccid,sn,rmode FROM `smd` where `rmode` in (5,6,7,8,23,47,51,1) group by sn,rmode having count(*)>1";
|
|
149
|
149
|
List<Map<String, Object>> smdList2=RCPService.getBaseService().getMapList(sql);
|
|
150
|
150
|
if (smdList2!=null) {
|
|
151
|
151
|
for (Map<String, Object> map : smdList2) {
|