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

fix 83202 会员管理-导入--存在合同号却报不存在，另外增加位数限制

Browse Source
This commit is contained in:
lijiarao
2024-03-29 10:32:46 +08:00
parent a48bccfc84
commit bb771e7e29
1 changed files with 4 additions and 3 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
+4 -3
View File
@@ -213,8 +213,9 @@ public class ITbMemberProjectSubitemService extends ServiceImpl<TbMemberProjectS
errorMessage.addAll(errorList);
String companyName = subitemExcel.getCompanyId();
PayCompanyManagement companyManagement = null;
if (StringUtils.isNotBlank(companyName)){
PayCompanyManagement companyManagement = companyManagementService.getCompanyByName(companyName);
companyManagement = companyManagementService.getCompanyByName(companyName);
if (companyManagement == null){
errorMessage.add("第" + errorRowNum + "行：" + "会员单位不存在");
}else if(companyNameList.contains(companyName)){
@@ -284,14 +285,14 @@ public class ITbMemberProjectSubitemService extends ServiceImpl<TbMemberProjectS
int paymentMethodInt = Integer.parseInt(paymentTypeMap.get(paymentMethod));
subitem.setPaymentMethod(paymentMethodInt);
if (Objects.equals(paymentMethodInt, PayProjectCommon.CHARGE_WAY2)) {
if (companyManagement != null && Objects.equals(paymentMethodInt, PayProjectCommon.CHARGE_WAY2)) {
errorMessage.addAll(ValidUtil.validateReturnListWithNum(subitemExcel,errorRowNum, Contract.class));
String contractNum = subitemExcel.getContractNum();
subitem.setContractNum(contractNum);
// 合同编号验证
LambdaQueryWrapper<PayIncomeContract> queryPayIncomeContract = new LambdaQueryWrapper<>();
queryPayIncomeContract.eq(PayIncomeContract::getContractNum,contractNum);
queryPayIncomeContract.eq(PayIncomeContract::getSignedCompanyId,subitemExcel.getCompanyId());
queryPayIncomeContract.eq(PayIncomeContract::getSignedCompanyId,companyManagement.getId());
List<PayIncomeContract> listPayIncomeContract = payIncomeContractService.list(queryPayIncomeContract);
if(CollectionUtils.isEmpty(listPayIncomeContract)){
errorMessage.add("第" + errorRowNum + "行：" + "合同号不存在");