Commit e3d58e5b authored by wujipeng's avatar wujipeng
Browse files

优化

parent 598bbf51
......@@ -26,5 +26,7 @@ public class CaseVO extends CasesEntity {
private boolean userFlag;
private String idCard;
private List<ExcelDataVO> excelDataList;
}
......@@ -223,7 +223,7 @@ public class AnalysisServiceImpl implements AnalysisService {
}
}
//保存账户
groupedMap.forEach((paymentAccount, paymentBankName) -> userAccountList.add(UserAccountEntity.builder().userName(folderName).account(paymentBankName).caseId(caseId).code(paymentAccount).build()));
groupedMap.forEach((paymentAccount, paymentBankName) -> userAccountList.add(UserAccountEntity.builder().userName(trimChineseNameFromFilename(folderName)).account(paymentBankName).caseId(caseId).code(paymentAccount).build()));
if (!userAccountList.isEmpty()) {
userAccountService.saveUserBatch(userAccountList);
}
......
......@@ -78,9 +78,11 @@ public class CaseServiceImpl extends ServiceImpl<CaseMapper, CasesEntity> implem
if (CollUtil.isNotEmpty(excelDataEntityListNew)) {
userFlag = excelDataEntityListNew.get(0).getUserFlag();
}
UserEntity user = userService.getByUserName(entry.getKey(), caseDTO.getId());
caseVOList.add(CaseVO.builder().excelDataList(excelDataEntityListNew)
.payUserName(entry.getKey())
.userFlag(userFlag)
.idCard(user.getIdCard())
.build());
}
return caseVOList;
......
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