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

update 工作组-资料分发 回显企业名称

Browse Source
This commit is contained in:
lijiarao
2023-05-19 13:59:43 +08:00
parent f309f4cf9b
commit 780091f723
4 changed files with 43 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/project/controller/PayWorkingGroupDistributionRecordController.java
+5 -3
View File
@@ -207,14 +207,16 @@ public class PayWorkingGroupDistributionRecordController extends JeroController<
}
List<PayContactsManagement> listData = new ArrayList<>();
if(projectType == PayProjectCommon.PROJECT_TYPE_FILE1){
LambdaQueryWrapper<PayWorkingGroupSubItemContacts> queryPayWorkingGroupSubItemContacts = new LambdaQueryWrapper<>();
queryPayWorkingGroupSubItemContacts.eq(PayWorkingGroupSubItemContacts::getWorkingGroupId,projectId);
List<PayWorkingGroupSubItemContacts> list = payWorkingGroupSubItemContactsService.list(queryPayWorkingGroupSubItemContacts);
//LambdaQueryWrapper<PayWorkingGroupSubItemContacts> queryPayWorkingGroupSubItemContacts = new LambdaQueryWrapper<>();
//queryPayWorkingGroupSubItemContacts.eq(PayWorkingGroupSubItemContacts::getWorkingGroupId,projectId);
//List<PayWorkingGroupSubItemContacts> list = payWorkingGroupSubItemContactsService.list(queryPayWorkingGroupSubItemContacts);
List<PayWorkingGroupSubItemContacts> list = payWorkingGroupSubItemContactsService.getContactsInfo(projectId);
if(!CollectionUtils.isEmpty(list)){
list.forEach(p->{
PayContactsManagement payContactsManagement = new PayContactsManagement();
payContactsManagement.setId(p.getContactsTemporaryId());
payContactsManagement.setName(p.getContactsTemporaryName());
payContactsManagement.setCompanyName(p.getCompanyName());
listData.add(payContactsManagement);
});
}
jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItemContacts.java
+7
View File
@@ -121,4 +121,11 @@ public class PayWorkingGroupSubItemContacts implements Serializable {
@ApiModelProperty(value = "企业联系人地址")
@TableField(exist = false)
private String contactAddress;
/**
* 企业名称
*/
@TableField(exist = false)
@ApiModelProperty(value = "企业名称")
private String companyName;
}
jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupSubItemContactsService.java
+3
View File
@@ -3,6 +3,8 @@ package com.jero.project.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.jero.project.entity.PayWorkingGroupSubItemContacts;
import java.util.List;
/**
* @Description: pay_working_group_subitem_contacts
* @Author: jeecg-boot
@@ -11,4 +13,5 @@ import com.jero.project.entity.PayWorkingGroupSubItemContacts;
*/
public interface IPayWorkingGroupSubItemContactsService extends IService<PayWorkingGroupSubItemContacts> {
List<PayWorkingGroupSubItemContacts> getContactsInfo(String projectId);
}
jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemContactsServiceImpl.java
+28
View File
@@ -1,11 +1,20 @@
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;
import com.jero.project.mapper.PayWorkingGroupSubItemContactsMapper;
import com.jero.project.service.IPayWorkingGroupSubItemContactsService;
import com.jero.temporary.entity.PayContactsManagementTemporary;
import com.jero.temporary.service.IPayContactsManagementTemporaryService;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
* @Description: pay_working_group_subitem_contacts
@@ -15,5 +24,24 @@ import org.springframework.stereotype.Service;
*/
@Service
public class PayWorkingGroupSubItemContactsServiceImpl extends ServiceImpl<PayWorkingGroupSubItemContactsMapper, PayWorkingGroupSubItemContacts> implements IPayWorkingGroupSubItemContactsService {
@Resource
private IPayContactsManagementTemporaryService payContactsManagementTemporaryService;
@Override
public List<PayWorkingGroupSubItemContacts> getContactsInfo(String projectId){
//1.获取成员信息
LambdaQueryWrapper<PayWorkingGroupSubItemContacts> queryPayWorkingGroupSubItemContacts = new LambdaQueryWrapper<>();
queryPayWorkingGroupSubItemContacts.eq(PayWorkingGroupSubItemContacts::getWorkingGroupId,projectId);
List<PayWorkingGroupSubItemContacts> listPayWorkingGroupSubItemContacts = this.list(queryPayWorkingGroupSubItemContacts);
//2.根据成员id获取用户信息
List<String> temporaryIds = listPayWorkingGroupSubItemContacts.stream().map(PayWorkingGroupSubItemContacts::getContactsTemporaryId).collect(Collectors.toList());
List<PayContactsManagementTemporary> contactsManagementTemporaryList = payContactsManagementTemporaryService.listByIds(temporaryIds);
Map<String, PayContactsManagementTemporary> collectMap = contactsManagementTemporaryList.stream().collect(Collectors.toMap(PayContactsManagementTemporary::getId, PayContactsManagementTemporary -> PayContactsManagementTemporary));
for (PayWorkingGroupSubItemContacts subItemContacts : listPayWorkingGroupSubItemContacts) {
String contactsTemporaryId = subItemContacts.getContactsTemporaryId();
PayContactsManagementTemporary payContactsManagementTemporary = collectMap.get(contactsTemporaryId);
subItemContacts.setCompanyName(payContactsManagementTemporary.getCompanyName());
}
return listPayWorkingGroupSubItemContacts;
}
}