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

添加起草组分发资料维护

Browse Source
This commit is contained in:
梁琦涛
2024-01-08 16:03:21 +08:00
parent 6b1e77be08
commit 201ba42b9c
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupSubItemContactsServiceImpl.java
+4 -1
View File
@@ -12,6 +12,7 @@ import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.stream.Collectors;
/**
@@ -40,7 +41,9 @@ public class PayDraftingGroupSubItemContactsServiceImpl extends ServiceImpl<PayD
for (PayDraftingGroupSubItemContacts subItemContacts : listPayDraftingGroupSubItemContacts) {
String contactsTemporaryId = subItemContacts.getContactsTemporaryId();
PayContactsManagementTemporary payContactsManagementTemporary = collectMap.get(contactsTemporaryId);
subItemContacts.setCompanyName(payContactsManagementTemporary.getCompanyName());
if(!Objects.isNull(payContactsManagementTemporary)) {
subItemContacts.setCompanyName(payContactsManagementTemporary.getCompanyName());
}
}
return listPayDraftingGroupSubItemContacts;
}
jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupDistributionRecordController.java
-1
View File
@@ -256,7 +256,6 @@ public class PayWorkingGroupDistributionRecordController extends JeroController<
listData.add(payContactsManagement);
});
}
}else if(Objects.equals(projectType,PayProjectCommon.PROJECT_TYPE_FILE4)){
List<PayDraftingGroupSubItemContacts> list = payDraftingGroupSubItemContactsService.getContactsInfo(projectId);
if(!CollectionUtils.isEmpty(list)){
jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemContactsServiceImpl.java
+5 -2
View File
@@ -1,6 +1,5 @@
package com.jero.project.service.impl;
import cn.hutool.core.collection.CollectionUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.project.entity.PayWorkingGroupSubItemContacts;
@@ -13,6 +12,7 @@ import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.stream.Collectors;
@@ -40,7 +40,10 @@ public class PayWorkingGroupSubItemContactsServiceImpl extends ServiceImpl<PayWo
for (PayWorkingGroupSubItemContacts subItemContacts : listPayWorkingGroupSubItemContacts) {
String contactsTemporaryId = subItemContacts.getContactsTemporaryId();
PayContactsManagementTemporary payContactsManagementTemporary = collectMap.get(contactsTemporaryId);
subItemContacts.setCompanyName(payContactsManagementTemporary.getCompanyName());
if(!Objects.isNull(payContactsManagementTemporary)){
subItemContacts.setCompanyName(payContactsManagementTemporary.getCompanyName());
}
}
return listPayWorkingGroupSubItemContacts;
}