修改bug#40695

This commit is contained in:
梁琦涛
2021-10-14 17:50:05 +08:00
parent 1c4e36e956
commit 57b9793601
@@ -298,11 +298,11 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
try {
Boolean t = ExcelImportCheckUtil.check(file.getInputStream(), PayWorkingGroupSubItem.class, params);
if(!t){
throw new JeroBootException("文件格式有误,请下载模板后上传 ");
throw new JeroBootException("文件格式有误,请下载模板后上传!");
}
} catch (Exception e) {
e.printStackTrace();
throw new JeroBootException("文件格式有误,请下载模板后上传 ");
throw new JeroBootException("文件格式有误,请下载模板后上传!");
}
try {
List<PayWorkingGroupSubItem> list = ExcelImportUtil.importExcel(file.getInputStream(), PayWorkingGroupSubItem.class, params);
@@ -315,9 +315,9 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
LambdaQueryWrapper<PayCompanyManagement> companyWrapper = new LambdaQueryWrapper<>();
companyWrapper.in(PayCompanyManagement::getCompanyName,listCompanyName);
List<PayCompanyManagement> listCompanyInfo = payCompanyManagementService.list(companyWrapper);
if(CollectionUtils.isEmpty(listCompanyInfo)){
msg.append("excel中企业不存在 ");
}
// if(CollectionUtils.isEmpty(listCompanyInfo)){
// msg.append("excel中企业不存在 ");
// }
List<String> listContactsName = new ArrayList<>();
// 获取excel中联系人一名称
List<String> listContactsNameOne = list.stream().map(PayWorkingGroupSubItem::getContactsTemporaryNameOne).collect(Collectors.toList());
@@ -343,9 +343,9 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
LambdaQueryWrapper<PayContactsManagement> contactsWrapper = new LambdaQueryWrapper<>();
contactsWrapper.in(PayContactsManagement::getName,listContactsName);
List<PayContactsManagement> listContactsInfo = payContactsManagementService.list(contactsWrapper);
if(CollectionUtils.isEmpty(listContactsInfo)){
msg.append("excel中联系人不存在 ");
}
// if(CollectionUtils.isEmpty(listContactsInfo)){
// msg.append("excel中联系人不存在 ");
// }
// 获取工作组信息
PayWorkingGroup payWorkingGroup = payWorkingGroupService.getById(workGroupId);
if(Objects.isNull(payWorkingGroup)){