|
@@ -308,6 +308,26 @@ public class RepalRemindHistoryServiceImpl extends ServiceImpl<RepalRemindHistor
|
|
|
result.setUnreadTotalCount(result.getUnreadTotalCount()+tmp.getUnreadTotalCount());
|
|
|
}
|
|
|
}
|
|
|
+ }else if(Dict.COUNT_QUERY_ENUM.账本.getCode().equals(dto.getQueryType())){
|
|
|
+ if(ObjectUtil.isNull(dto.getRepalBookId())){
|
|
|
+ throw new CommonException(CodeMsg.VALIDATE_PARAMETER);
|
|
|
+ }
|
|
|
+ //客户维度多账款
|
|
|
+ List<RepalBill> repalBills = repalBillService.list(Wrappers.lambdaQuery(RepalBill.class).eq(RepalBill::getRepalBookId,dto.getRepalBookId()).eq(RepalBill::getDeleted, Dict.DeletedStatusEnunm.否.getCode()));
|
|
|
+ for(RepalBill repalBill:repalBills){
|
|
|
+ RepalRemindReadInfo repalRemindReadInfo = repalRemindReadInfoService.getReadInfoByUserId(userBean.getUserId(), dto.getRepalBillId(), repalBill.getRepalBookId());
|
|
|
+ RepalRemindCountVO tmp = repalRemindHistoryMapper.remindCount(repalBill.getId(),localDateTime,repalRemindReadInfo.getRiskRemindId(),repalRemindReadInfo.getRankRemindId(),repalRemindReadInfo.getOverdueRemindId(),repalRemindReadInfo.getFinanceRemindId());
|
|
|
+ result.setFinanceCount(result.getFinanceCount()+tmp.getFinanceCount());
|
|
|
+ result.setRankCount(result.getRankCount()+tmp.getRankCount());
|
|
|
+ result.setOverdueCount(result.getOverdueCount()+tmp.getOverdueCount());
|
|
|
+ result.setRiskCount(result.getRiskCount()+tmp.getRiskCount());
|
|
|
+ result.setUnreadRiskCount(result.getUnreadRiskCount()+tmp.getUnreadRiskCount());
|
|
|
+ result.setUnreadRankCount(result.getUnreadRankCount()+tmp.getUnreadRankCount());
|
|
|
+ result.setUnreadFinanceCount(result.getUnreadFinanceCount()+tmp.getUnreadFinanceCount());
|
|
|
+ result.setUnreadOverdueCount(result.getUnreadOverdueCount()+tmp.getUnreadOverdueCount());
|
|
|
+ result.setTotalCount(result.getTotalCount()+tmp.getTotalCount());
|
|
|
+ result.setUnreadTotalCount(result.getUnreadTotalCount()+tmp.getUnreadTotalCount());
|
|
|
+ }
|
|
|
}
|
|
|
return result;
|
|
|
}
|
|
@@ -466,6 +486,51 @@ public class RepalRemindHistoryServiceImpl extends ServiceImpl<RepalRemindHistor
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+ }else if(Dict.COUNT_QUERY_ENUM.账本.getCode().equals(dto.getQueryType())){
|
|
|
+ if(ObjectUtil.isNull(dto.getRepalBookId())){
|
|
|
+ throw new CommonException(CodeMsg.VALIDATE_PARAMETER);
|
|
|
+ }
|
|
|
+ //客户维度多账款
|
|
|
+ List<RepalBill> repalBills = repalBillService.list(Wrappers.lambdaQuery(RepalBill.class).eq(RepalBill::getRepalBookId,dto.getRepalBookId()).eq(RepalBill::getDeleted, Dict.DeletedStatusEnunm.否.getCode()));
|
|
|
+ if(CollUtil.isEmpty(repalBills)){
|
|
|
+ return new VOPage<>();
|
|
|
+ }
|
|
|
+ qw.in(RepalRemindHistory::getRepalBillId,repalBills.stream().map(RepalBill::getId).collect(Collectors.toList()));
|
|
|
+ Map<String,RepalCustomer> repalCustomerMap = repalCustomerService.list(Wrappers.lambdaQuery(RepalCustomer.class).in(RepalCustomer::getCustId,repalBills.stream().map(RepalBill::getCustomerId).collect(Collectors.toList()))).stream().collect(Collectors.toMap(RepalCustomer::getCustName, Function.identity()));
|
|
|
+ IPage<RepalRemindHistory> pageAccountRemindHistory = page(new Page<>(pageNum, pageSize), qw);
|
|
|
+ if(CollUtil.isNotEmpty(pageAccountRemindHistory.getRecords())){
|
|
|
+ result = new VOPage<>(pageNum, pageSize, pageAccountRemindHistory.getTotal(), pageAccountRemindHistory.getRecords().stream()
|
|
|
+ .map(RepalRemindHistoryConvert::EntityToVO).collect(Collectors.toList()));
|
|
|
+ Map<Long,RepalRemindReadInfo> readInfoMap = new HashMap<>();
|
|
|
+ for(RepalRemindHistoryVO vo:result.getDataList()){
|
|
|
+ if(repalCustomerMap.containsKey(vo.getCompanyName())){
|
|
|
+ vo.setCompanyId(repalCustomerMap.get(vo.getCompanyName()).getCompanyId());
|
|
|
+ }
|
|
|
+ vo.setReadStatus(Dict.ReadStatusEnum.已读.getCode());
|
|
|
+ RepalRemindReadInfo repalRemindReadInfo;
|
|
|
+ if(readInfoMap.containsKey(vo.getRepalBillId())){
|
|
|
+ repalRemindReadInfo = readInfoMap.get(vo.getRepalBillId());
|
|
|
+ }else {
|
|
|
+ repalRemindReadInfo = repalRemindReadInfoService.getReadInfoByUserId(userBean.getUserId(), vo.getRepalBillId(), vo.getRepalBookId());
|
|
|
+ readInfoMap.put(vo.getRepalBillId(),repalRemindReadInfo);
|
|
|
+ }
|
|
|
+ if(RemindEnum.逾期提醒.getCode().equals(vo.getRemindType()) && vo.getId() > repalRemindReadInfo.getOverdueRemindId()){
|
|
|
+ vo.setReadStatus(Dict.ReadStatusEnum.未读.getCode());
|
|
|
+ }else if(RemindEnum.财产线索.getCode().equals(vo.getRemindType()) && vo.getId() > repalRemindReadInfo.getFinanceRemindId()){
|
|
|
+ vo.setReadStatus(Dict.ReadStatusEnum.未读.getCode());
|
|
|
+ }else if(RemindEnum.风险预警.getCode().equals(vo.getRemindType()) && vo.getId() > repalRemindReadInfo.getRiskRemindId()){
|
|
|
+ vo.setReadStatus(Dict.ReadStatusEnum.未读.getCode());
|
|
|
+ }else if(RemindEnum.账款评级.getCode().equals(vo.getRemindType()) && vo.getId() > repalRemindReadInfo.getRankRemindId()){
|
|
|
+ vo.setReadStatus(Dict.ReadStatusEnum.未读.getCode());
|
|
|
+ }
|
|
|
+ }
|
|
|
+ //查询详细分类时更新已读id
|
|
|
+ if(StrUtil.isNotBlank(dto.getRemindType()) && CollUtil.isNotEmpty(readInfoMap)){
|
|
|
+ for(RepalRemindReadInfo repalRemindReadInfo:readInfoMap.values()){
|
|
|
+ repalRemindReadInfoService.updateReadInfoByUserId(userBean.getUserId(), dto.getRemindType(),repalRemindReadInfo.getRepalBillId(), repalRemindReadInfo.getRepalBookId());
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
if (CollUtil.isNotEmpty(result.getDataList())) {
|
|
|
result.getDataList().forEach(e -> {
|