LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 83171 会员管理-导入时--以下字段没有增加必填校验

Browse Source
This commit is contained in:
lijiarao
2024-03-29 10:18:52 +08:00
parent c3cdc2c5a5
commit a48bccfc84
2 changed files with 44 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/member/service/ITbMemberProjectSubitemService.java
+43 -35
View File
@@ -213,46 +213,50 @@ public class ITbMemberProjectSubitemService extends ServiceImpl<TbMemberProjectS
errorMessage.addAll(errorList); errorMessage.addAll(errorList);
String companyName = subitemExcel.getCompanyId(); String companyName = subitemExcel.getCompanyId();
PayCompanyManagement companyManagement = companyManagementService.getCompanyByName(companyName); if (StringUtils.isNotBlank(companyName)){
if (companyManagement == null){ PayCompanyManagement companyManagement = companyManagementService.getCompanyByName(companyName);
errorMessage.add("第" + errorRowNum + "行：" + "会员单位不存在"); if (companyManagement == null){
}else if(companyNameList.contains(companyName)){ errorMessage.add("第" + errorRowNum + "行：" + "会员单位不存在");
errorMessage.add("第" + errorRowNum + "行：" + "会员单位重复"); }else if(companyNameList.contains(companyName)){
} else { errorMessage.add("第" + errorRowNum + "行：" + "会员单位重复");
companyNameList.add(companyManagement.getCompanyName()); } else {
subitem.setCompanyName(companyManagement.getCompanyName()); companyNameList.add(companyManagement.getCompanyName());
subitem.setCompanyId(companyManagement.getId()); subitem.setCompanyName(companyManagement.getCompanyName());
} subitem.setCompanyId(companyManagement.getId());
if (companyManagement != null){
String companyId = companyManagement.getId();
LambdaQueryWrapper<TbMemberProjectSubitem> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(TbMemberProjectSubitem::getProjectId, projectId);
wrapper.eq(TbMemberProjectSubitem::getCompanyId, companyId);
int count = this.count(wrapper);
if (count > 0) {
errorMessage.add("第" + errorRowNum + "行：" + "会员单位已经存在");
} }
if (companyManagement != null){
String companyId = companyManagement.getId();
LambdaQueryWrapper<TbMemberProjectSubitem> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(TbMemberProjectSubitem::getProjectId, projectId);
wrapper.eq(TbMemberProjectSubitem::getCompanyId, companyId);
int count = this.count(wrapper);
if (count > 0) {
errorMessage.add("第" + errorRowNum + "行：" + "会员单位已经存在");
}
String liaisonManId = subitemExcel.getLiaisonManId(); String liaisonManId = subitemExcel.getLiaisonManId();
PayContactsManagement liaisonMan = payContactsManagementService.checkByCompanyIdAndName(liaisonManId, companyId); PayContactsManagement liaisonMan = payContactsManagementService.checkByCompanyIdAndName(liaisonManId, companyId);
if (liaisonMan == null){ if (liaisonMan == null){
errorMessage.add("第" + errorRowNum + "行：" + "企业联系人不存在"); errorMessage.add("第" + errorRowNum + "行：" + "企业联系人不存在");
}else { }else {
subitem.setLiaisonManId(liaisonMan.getId()); subitem.setLiaisonManId(liaisonMan.getId());
} }
String postContactId = subitemExcel.getPostContactId(); String postContactId = subitemExcel.getPostContactId();
PayContactsManagement postContact = payContactsManagementService.checkByCompanyIdAndName(postContactId, companyId); PayContactsManagement postContact = payContactsManagementService.checkByCompanyIdAndName(postContactId, companyId);
if (postContact == null){ if (postContact == null){
errorMessage.add("第" + errorRowNum + "行：" + "邮寄联系人不存在"); errorMessage.add("第" + errorRowNum + "行：" + "邮寄联系人不存在");
}else { }else {
subitem.setPostContactId(postContact.getId()); subitem.setPostContactId(postContact.getId());
}
} }
} }
//会员性质 //会员性质
String memberNature = subitemExcel.getMemberNature(); String memberNature = subitemExcel.getMemberNature();
if (!memberNatureMap.containsKey(memberNature)){ if (StringUtils.isBlank(memberNature)){
}else if (!memberNatureMap.containsKey(memberNature)){
errorMessage.add("第" + errorRowNum + "行：" + "会员性质不存在"); errorMessage.add("第" + errorRowNum + "行：" + "会员性质不存在");
}else { }else {
int memberNatureInt = Integer.parseInt(memberNatureMap.get(memberNature)); int memberNatureInt = Integer.parseInt(memberNatureMap.get(memberNature));
@@ -272,7 +276,9 @@ public class ITbMemberProjectSubitemService extends ServiceImpl<TbMemberProjectS
} }
String paymentMethod = subitemExcel.getPaymentMethod(); String paymentMethod = subitemExcel.getPaymentMethod();
if (!paymentTypeMap.containsKey(paymentMethod)){ if (StringUtils.isBlank(paymentMethod)){
}else if (!paymentTypeMap.containsKey(paymentMethod)){
errorMessage.add("第" + errorRowNum + "行：" + "来款方式不存在"); errorMessage.add("第" + errorRowNum + "行：" + "来款方式不存在");
}else { }else {
int paymentMethodInt = Integer.parseInt(paymentTypeMap.get(paymentMethod)); int paymentMethodInt = Integer.parseInt(paymentTypeMap.get(paymentMethod));
@@ -288,7 +294,7 @@ public class ITbMemberProjectSubitemService extends ServiceImpl<TbMemberProjectS
queryPayIncomeContract.eq(PayIncomeContract::getSignedCompanyId,subitemExcel.getCompanyId()); queryPayIncomeContract.eq(PayIncomeContract::getSignedCompanyId,subitemExcel.getCompanyId());
List<PayIncomeContract> listPayIncomeContract = payIncomeContractService.list(queryPayIncomeContract); List<PayIncomeContract> listPayIncomeContract = payIncomeContractService.list(queryPayIncomeContract);
if(CollectionUtils.isEmpty(listPayIncomeContract)){ if(CollectionUtils.isEmpty(listPayIncomeContract)){
errorMessage.add("第" + errorRowNum + "行:合同号不存在"); errorMessage.add("第" + errorRowNum + "行：" + "合同号不存在");
} }
} }
if (Objects.equals(paymentMethodInt, PayProjectCommon.CHARGE_WAY3)) { if (Objects.equals(paymentMethodInt, PayProjectCommon.CHARGE_WAY3)) {
@@ -298,7 +304,9 @@ public class ITbMemberProjectSubitemService extends ServiceImpl<TbMemberProjectS
} }
} }
String invoiceRequirements = subitemExcel.getInvoiceRequirements(); String invoiceRequirements = subitemExcel.getInvoiceRequirements();
if (!invoiceTypeMap.containsKey(invoiceRequirements)){ if (StringUtils.isBlank(invoiceRequirements)){
}else if (!invoiceTypeMap.containsKey(invoiceRequirements)){
errorMessage.add("第" + errorRowNum + "行：" + "需要发票不存在"); errorMessage.add("第" + errorRowNum + "行：" + "需要发票不存在");
}else { }else {
int invoiceRequirementsInt = Integer.parseInt(invoiceTypeMap.get(invoiceRequirements)); int invoiceRequirementsInt = Integer.parseInt(invoiceTypeMap.get(invoiceRequirements));
jero-boot-incoming-payment/src/main/java/com/jero/member/vo/TbMemberProjectSubitemExcelImport.java
+1
View File
@@ -76,6 +76,7 @@ public class TbMemberProjectSubitemExcelImport {
/**缴费方式*/ /**缴费方式*/
@Excel(name = "来款方式", width = 15) @Excel(name = "来款方式", width = 15)
@NotBlank(message = "来款方式不能为空")
@Dict(dicCode = "payment_type") @Dict(dicCode = "payment_type")
private String paymentMethod; private String paymentMethod;