Commit bfe79013 authored by zhuxiang's avatar zhuxiang
Browse files

Merge remote-tracking branch 'origin/dev' into dev

parents 4d9358e6 0ee46ee5
......@@ -173,21 +173,25 @@ public class AnalysisServiceImpl implements AnalysisService {
userService.saveUserBatch(userList);
}
//保存账户
String userName = trimChineseNameFromFilename(folderName);
groupedMap.forEach((paymentAccount, paymentBankName) -> userAccountList.add(UserAccountEntity.builder().userName(userName).account(paymentBankName).caseId(caseId).code(paymentAccount).build()));
groupedMap.forEach((paymentAccount, paymentBankName) -> userAccountList.add(UserAccountEntity.builder().userName(folderName).account(paymentBankName).caseId(caseId).code(paymentAccount).build()));
userAccountService.saveUserBatch(userAccountList);
//保存用户
if (StringUtils.isNotEmpty(folderName)) {
Map<String, String> idCardInfo = IdCardUtils.parseIdCardInfo(folderName);
if (!ObjectUtils.isEmpty(idCardInfo)) {
userService.save(UserEntity.builder()
.userName(userName + idCardInfo.get("idCard"))
.userName(folderName)
.age(Integer.parseInt(idCardInfo.get("age")))
.idCard(idCardInfo.get("idCard"))
.sex(idCardInfo.get("sex"))
.idType("身份证")
.type("1")
.caseId(caseId).build());
}else {
userService.save(UserEntity.builder()
.userName(folderName)
.type("1")
.caseId(caseId).build());
}
}
if (errorCount == 0) {
......@@ -282,13 +286,14 @@ public class AnalysisServiceImpl implements AnalysisService {
trySetValue(() -> excelDataEntity.setExternalChannel(getCellValueAsString(row.getCell(tableHeaderList.get(14).getIndex()))));
trySetValue(() -> excelDataEntity.setPayAccount(getCellValueAsString(row.getCell(tableHeaderList.get(15).getIndex()))));
trySetValue(() -> excelDataEntity.setRemark(getCellValueAsString(row.getCell(tableHeaderList.get(16).getIndex()))));
if (StringUtils.isNotEmpty(folderName)) {
Map<String, String> idCardInfo = IdCardUtils.parseIdCardInfo(folderName);
if (!ObjectUtils.isEmpty(idCardInfo)) {
//切割文件名前面是中文的人名,使用正则表达式
trySetValue(() -> excelDataEntity.setPayUserName(trimChineseNameFromFilename(folderName) + idCardInfo.get("idCard")));
}
}
// if (StringUtils.isNotEmpty(folderName)) {
// Map<String, String> idCardInfo = IdCardUtils.parseIdCardInfo(folderName);
// if (!ObjectUtils.isEmpty(idCardInfo)) {
// //切割文件名前面是中文的人名,使用正则表达式
// trySetValue(() -> excelDataEntity.setPayUserName(trimChineseNameFromFilename(folderName) + idCardInfo.get("idCard")));
// }
// }
trySetValue(() -> excelDataEntity.setPayUserName(folderName));
excelDataEntity.setFileId(fileId);
excelDataEntity.setUseFlag(true);
excelDataEntity.setCaseId(caseId);
......
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