Commit e3d58e5b authored by wujipeng's avatar wujipeng
Browse files

优化

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