Commit f471cb97 authored by wujipeng's avatar wujipeng
Browse files

人与人关系弹框分页-优化

parent c3d54feb
......@@ -241,16 +241,16 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, UserEntity> impleme
public EveryoneVO relationPage(UserDTO userDTO) {
EveryoneVO everyoneVO = new EveryoneVO();
//标题
everyoneVO.setTitle(userDTO.getUserName() + "," + userDTO.getOtherUserName());
everyoneVO.setTitle(userDTO.getUserName() + "," + userDTO.getOtherName());
//查询关系
List<UserRelationEntity> userRelation = userRelationService.bothSides(userDTO.getUserName(), userDTO.getOtherUserName());
List<UserRelationEntity> userRelation = userRelationService.bothSides(userDTO.getUserName(), userDTO.getOtherName());
//指认关系
if (!ObjectUtils.isEmpty(userRelation)) {
everyoneVO.setRelation(userRelation);
}
//查询账户
List<String> oneselfAccountList = userAccountService.queryUserAccountList(userDTO.getUserName());
List<ExcelDataVO> ExcelDataList = excelDataService.queryOtherAccountList(userDTO.getOtherUserName(), userDTO.getCaseId());
List<ExcelDataVO> ExcelDataList = excelDataService.queryOtherAccountList(userDTO.getOtherName(), userDTO.getCaseId());
Set<String> otherAccountSet = new HashSet<>();
for (ExcelDataVO excelDataVO : ExcelDataList) {
otherAccountSet.add(excelDataVO.getPayAccount());
......@@ -286,11 +286,11 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, UserEntity> impleme
outTotal += detail.getAmount();
}
}
totalDescription.add(userDTO.getUserName() + "向" + userDTO.getOtherUserName() + "转账" + outCount + "次,合计" + outTotal + "元;");
totalDescription.add(userDTO.getOtherUserName() + "向" + userDTO.getUserName() + "转账" + inCount + "次,合计" + inTotal + "元;");
totalDescription.add(userDTO.getUserName() + "向" + userDTO.getOtherName() + "转账" + outCount + "次,合计" + outTotal + "元;");
totalDescription.add(userDTO.getOtherName() + "向" + userDTO.getUserName() + "转账" + inCount + "次,合计" + inTotal + "元;");
} else {
totalDescription.add(userDTO.getUserName() + "向" + userDTO.getOtherUserName() + "转账0次,合计0元;");
totalDescription.add(userDTO.getOtherUserName() + "向" + userDTO.getUserName() + "转账0次,合计0元;");
totalDescription.add(userDTO.getUserName() + "向" + userDTO.getOtherName() + "转账0次,合计0元;");
totalDescription.add(userDTO.getOtherName() + "向" + userDTO.getUserName() + "转账0次,合计0元;");
}
everyoneVO.setTotalDescription(totalDescription);
return everyoneVO;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment