| @@ -1349,27 +1349,27 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc | |||||
| } | } | ||||
| List<Long> userIds = wxCUserBasicInfoMapper.findVoIdsList1(tenantInfo,basicInfo); | List<Long> userIds = wxCUserBasicInfoMapper.findVoIdsList1(tenantInfo,basicInfo); | ||||
| if (null != userIds && userIds.size() > 0 ) { | if (null != userIds && userIds.size() > 0 ) { | ||||
| // WxCreditHistory chaddq = new WxCreditHistory(); | |||||
| // chaddq.setUserIdList(userIds); | |||||
| // chaddq.setTenantId(tenantInfo.getFinalTenantId()); | |||||
| // chaddq.setStartTime(basicInfo.getCreditStartTime()); | |||||
| // chaddq.setEndTime(basicInfo.getCreditEndTime()); | |||||
| // List<WxCreditHistory> chadds = creditHistoryMapper.findAddList(chaddq); | |||||
| // Map<Long, Integer> chaddMap = new HashMap<>(); | |||||
| // if(null != chadds){ | |||||
| // chaddMap = chadds.stream().collect(Collectors.toMap(WxCreditHistory::getCUserId, WxCreditHistory::getCreditNum)); | |||||
| // } | |||||
| // | |||||
| // WxCreditHistory chlesq = new WxCreditHistory(); | |||||
| // chlesq.setUserIdList(userIds); | |||||
| // chlesq.setTenantId(tenantInfo.getFinalTenantId()); | |||||
| // chlesq.setStartTime(basicInfo.getCreditStartTime()); | |||||
| // chlesq.setEndTime(basicInfo.getCreditEndTime()); | |||||
| // List<WxCreditHistory> chless = creditHistoryMapper.findLesList(chlesq); | |||||
| // Map<Long, Integer> chlesMap = new HashMap<>(); | |||||
| // if(null != chless){ | |||||
| // chlesMap = chless.stream().collect(Collectors.toMap(WxCreditHistory::getCUserId, WxCreditHistory::getCreditNum)); | |||||
| // } | |||||
| WxCreditHistory chaddq = new WxCreditHistory(); | |||||
| chaddq.setUserIdList(userIds); | |||||
| chaddq.setTenantId(tenantInfo.getFinalTenantId()); | |||||
| chaddq.setStartTime(basicInfo.getCreditStartTime()); | |||||
| chaddq.setEndTime(basicInfo.getCreditEndTime()); | |||||
| List<WxCreditHistory> chadds = creditHistoryMapper.findAddList(chaddq); | |||||
| Map<Long, Integer> chaddMap = new HashMap<>(); | |||||
| if(null != chadds){ | |||||
| chaddMap = chadds.stream().collect(Collectors.toMap(WxCreditHistory::getCUserId, WxCreditHistory::getCreditNum)); | |||||
| } | |||||
| WxCreditHistory chlesq = new WxCreditHistory(); | |||||
| chlesq.setUserIdList(userIds); | |||||
| chlesq.setTenantId(tenantInfo.getFinalTenantId()); | |||||
| chlesq.setStartTime(basicInfo.getCreditStartTime()); | |||||
| chlesq.setEndTime(basicInfo.getCreditEndTime()); | |||||
| List<WxCreditHistory> chless = creditHistoryMapper.findLesList(chlesq); | |||||
| Map<Long, Integer> chlesMap = new HashMap<>(); | |||||
| if(null != chless){ | |||||
| chlesMap = chless.stream().collect(Collectors.toMap(WxCreditHistory::getCUserId, WxCreditHistory::getCreditNum)); | |||||
| } | |||||
| // WxCUserTags tq = new WxCUserTags(); | // WxCUserTags tq = new WxCUserTags(); | ||||
| // tq.setUserIdList(userIds); | // tq.setUserIdList(userIds); | ||||
| @@ -1386,13 +1386,13 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc | |||||
| List<WxTags> tagList = wxTagsMapper.findListAll(); | List<WxTags> tagList = wxTagsMapper.findListAll(); | ||||
| // Map<Long, Integer> finalChaddMap = chaddMap; | |||||
| // Map<Long, Integer> finalChlesMap = chlesMap; | |||||
| Map<Long, Integer> finalChaddMap = chaddMap; | |||||
| Map<Long, Integer> finalChlesMap = chlesMap; | |||||
| // Map<Long, String> finalUserTagsMap = userTagsMap; | // Map<Long, String> finalUserTagsMap = userTagsMap; | ||||
| Map<Long, String> finalTagMap = tagList.stream().collect(Collectors.toMap(WxTags::getId, WxTags::getName));; | Map<Long, String> finalTagMap = tagList.stream().collect(Collectors.toMap(WxTags::getId, WxTags::getName));; | ||||
| list.stream().forEach(u->{ | list.stream().forEach(u->{ | ||||
| // u.setAddCredit(finalChaddMap.get(u.getId())); | |||||
| // u.setLesCredit(finalChlesMap.get(u.getId())); | |||||
| u.setAddCredit(finalChaddMap.get(u.getId())); | |||||
| u.setLesCredit(finalChlesMap.get(u.getId())); | |||||
| if(StringUtils.isNotBlank(u.getTags())){ | if(StringUtils.isNotBlank(u.getTags())){ | ||||
| List<Long> ids = JSONObject.parseArray(u.getTags(), Long.class); | List<Long> ids = JSONObject.parseArray(u.getTags(), Long.class); | ||||
| if (null != ids) { | if (null != ids) { | ||||