|
@@ -230,8 +230,8 @@ public class ChannelMapServiceImpl implements ChannelMapService {
|
|
|
int total = 0;
|
|
|
List<WdInfo> wdInfos = wdInfoDao.selectList(queryWrapper2);
|
|
|
for (WdInfo wdInfo : wdInfos) {
|
|
|
- statistics.put(wdInfo.getAddrCode().substring(0,2),statistics.get(wdInfo.getAddrCode().substring(0,2))+wdInfo.getAudit());
|
|
|
- total+=+wdInfo.getAudit();
|
|
|
+ statistics.put(wdInfo.getAddrCode().substring(0,2),statistics.get(wdInfo.getAddrCode().substring(0,2)) + wdInfo.getAudit());
|
|
|
+ total += wdInfo.getAudit();
|
|
|
}
|
|
|
|
|
|
|
|
@@ -671,7 +671,7 @@ public class ChannelMapServiceImpl implements ChannelMapService {
|
|
|
}
|
|
|
|
|
|
//搜索字段
|
|
|
- if (channelMapAceeptVo.getSearchText() != null && !channelMapAceeptVo.getSearchText() .trim().equals("")) {
|
|
|
+ if (channelMapAceeptVo.getSearchText() != null && !channelMapAceeptVo.getSearchText().trim().equals("")) {
|
|
|
queryWrapper.and(originWdInfoQueryWrapper -> {
|
|
|
originWdInfoQueryWrapper.like("wd_name", channelMapAceeptVo.getSearchText() );
|
|
|
});
|
|
@@ -720,9 +720,7 @@ public class ChannelMapServiceImpl implements ChannelMapService {
|
|
|
}
|
|
|
});
|
|
|
List<AddrCategory> addrCategories1 = addrCategoryDao.selectList(queryWrapper1);
|
|
|
- List<String> collect = addrCategories1.stream().map(item -> {
|
|
|
- return item.getAddrCode();
|
|
|
- }).collect(Collectors.toList());
|
|
|
+ List<String> collect = addrCategories1.stream().map(AddrCategory::getAddrCode).collect(Collectors.toList());
|
|
|
|
|
|
return collect;
|
|
|
}
|