Merge remote-tracking branch 'origin/work_group_update' into work_group_update
This commit is contained in:
zhangqinlin
+53
-61
@@ -33,7 +33,9 @@ import com.jero.project.common.PayProjectCommon;
|
||||
import com.jero.project.entity.PayCommonProject;
|
||||
import com.jero.project.entity.PayWorkingGroupDistributionRecord;
|
||||
import com.jero.project.entity.PayWorkingGroupSubItem;
|
||||
import com.jero.project.entity.PayWorkingGroupSubItemContacts;
|
||||
import com.jero.project.service.IPayWorkingGroupDistributionRecordService;
|
||||
import com.jero.project.service.IPayWorkingGroupSubItemContactsService;
|
||||
import com.jero.project.service.IPayWorkingGroupSubItemService;
|
||||
import com.jero.temporary.common.PayCompanyManagementTemporaryCommon;
|
||||
import com.jero.temporary.entity.PayCompanyManagementTemporary;
|
||||
@@ -82,6 +84,8 @@ public class ProjectDetailServiceImpl implements ProjectDetailService {
|
||||
private ISysUserService sysUserService;
|
||||
@Resource
|
||||
private IPayWorkingGroupSubItemService payWorkingGroupSubItemService;
|
||||
@Resource
|
||||
private IPayWorkingGroupSubItemContactsService payWorkingGroupSubItemContactsService;
|
||||
|
||||
@Override
|
||||
public ProjectDetailVO getProjectDetail(String projectId) {
|
||||
@@ -229,75 +233,63 @@ public class ProjectDetailServiceImpl implements ProjectDetailService {
|
||||
projectDetailVO.setBankAccountName(payCompanyManagementTemporary.getBankAccountName());
|
||||
projectDetailVO.setBankAccount(payCompanyManagementTemporary.getBankAccount());
|
||||
projectDetailVO.setOpeningBank(payCompanyManagementTemporary.getOpeningBank());
|
||||
PayContactsManagementTemporary payContactsManagementTemporary = payContactsManagementTemporaryService.getById(payCommonProject.getContactsTemporaryId());
|
||||
if(Objects.isNull(payContactsManagementTemporary)){
|
||||
throw new JeroBootException("联系人不存在！");
|
||||
}
|
||||
projectDetailVO.setName(payContactsManagementTemporary.getName());
|
||||
projectDetailVO.setGender(payContactsManagementTemporary.getGender());
|
||||
if(!Objects.isNull(payContactsManagementTemporary.getGender())){
|
||||
projectDetailVO.setGender_dictText(sysBaseAPI.translateDict("sex",String.valueOf(payContactsManagementTemporary.getGender())));
|
||||
}
|
||||
projectDetailVO.setPost(payContactsManagementTemporary.getPost());
|
||||
if(!StringUtils.isBlank(payContactsManagementTemporary.getPhone())){
|
||||
projectDetailVO.setPhone(PasswordUtil.decrypt(payContactsManagementTemporary.getPhone()));
|
||||
}
|
||||
if(!StringUtils.isBlank(payContactsManagementTemporary.getEmail())){
|
||||
projectDetailVO.setEmail(PasswordUtil.decrypt(payContactsManagementTemporary.getEmail()));
|
||||
}
|
||||
projectDetailVO.setPostalCodeContacts(payContactsManagementTemporary.getPostalCode());
|
||||
projectDetailVO.setContactAddress(payContactsManagementTemporary.getContactAddress());
|
||||
// 工作组 添加企业联系人2，联系人3
|
||||
|
||||
// 工作组 添加企业联系人
|
||||
if(Objects.equals(String.valueOf(payCommonProject.getProjectType()), ProjectCommon.PROJECT_TYPE2)){
|
||||
PayWorkingGroupSubItem payWorkingGroupSubItem = payWorkingGroupSubItemService.getById(projectId);
|
||||
if(Objects.isNull(payWorkingGroupSubItem)){
|
||||
throw new JeroBootException("项目不存在！");
|
||||
}
|
||||
projectDetailVO.setRemarksOne(payWorkingGroupSubItem.getRemarksOne());
|
||||
|
||||
if(!StringUtils.isEmpty(payWorkingGroupSubItem.getContactsIdTwo())){
|
||||
projectDetailVO.setRemarksTwo(payWorkingGroupSubItem.getRemarksTwo());
|
||||
PayContactsManagementTemporary payContactsManagementTemporary2 = payContactsManagementTemporaryService.getById(payWorkingGroupSubItem.getContactsTemporaryIdTwo());
|
||||
if(Objects.isNull(payContactsManagementTemporary2)){
|
||||
throw new JeroBootException("联系人2不存在！");
|
||||
LambdaQueryWrapper<PayWorkingGroupSubItemContacts> queryPayWorkingGroupSubItemContacts = new LambdaQueryWrapper<>();
|
||||
queryPayWorkingGroupSubItemContacts.in(PayWorkingGroupSubItemContacts::getWorkingGroupSubId,projectId);
|
||||
queryPayWorkingGroupSubItemContacts.orderByAsc(PayWorkingGroupSubItemContacts::getOrderNum);
|
||||
List<PayWorkingGroupSubItemContacts> listPayWorkingGroupSubItemContacts = payWorkingGroupSubItemContactsService.list(queryPayWorkingGroupSubItemContacts);
|
||||
if(!CollectionUtils.isEmpty(listPayWorkingGroupSubItemContacts)){
|
||||
List<String> listIds = listPayWorkingGroupSubItemContacts.stream().map(PayWorkingGroupSubItemContacts::getContactsTemporaryId).collect(Collectors.toList());
|
||||
List<PayContactsManagementTemporary> payContactsManagementTemporaryList = payContactsManagementTemporaryService.listByIds(listIds);
|
||||
if(!CollectionUtils.isEmpty(payContactsManagementTemporaryList)){
|
||||
listPayWorkingGroupSubItemContacts.forEach(p->{
|
||||
List<PayContactsManagementTemporary> listNew = payContactsManagementTemporaryList.stream().filter(o->Objects.equals(o.getId(),p.getContactsTemporaryId())).collect(Collectors.toList());
|
||||
if(CollectionUtils.isEmpty(listNew)){
|
||||
return;
|
||||
}
|
||||
PayContactsManagementTemporary payContactsManagementTemporary = listNew.get(0);
|
||||
p.setGender(payContactsManagementTemporary.getGender());
|
||||
if(!Objects.isNull(payContactsManagementTemporary.getGender())){
|
||||
p.setGender_dictText(sysBaseAPI.translateDict("sex",String.valueOf(payContactsManagementTemporary.getGender())));
|
||||
}
|
||||
p.setPost(payContactsManagementTemporary.getPost());
|
||||
if(!StringUtils.isBlank(payContactsManagementTemporary.getPhone())){
|
||||
p.setPhone(PasswordUtil.decrypt(payContactsManagementTemporary.getPhone()));
|
||||
}
|
||||
if(!StringUtils.isBlank(payContactsManagementTemporary.getEmail())){
|
||||
p.setEmail(PasswordUtil.decrypt(payContactsManagementTemporary.getEmail()));
|
||||
}
|
||||
p.setPostalCodeContacts(payContactsManagementTemporary.getPostalCode());
|
||||
p.setContactAddress(payContactsManagementTemporary.getContactAddress());
|
||||
});
|
||||
projectDetailVO.setPayWorkingGroupSubItemContactsList(listPayWorkingGroupSubItemContacts);
|
||||
}
|
||||
projectDetailVO.setNameTwo(payContactsManagementTemporary2.getName());
|
||||
projectDetailVO.setGenderTwo(payContactsManagementTemporary2.getGender());
|
||||
if(!Objects.isNull(payContactsManagementTemporary2.getGender())){
|
||||
projectDetailVO.setGenderTwo_dictText(sysBaseAPI.translateDict("sex",String.valueOf(payContactsManagementTemporary.getGender())));
|
||||
}
|
||||
projectDetailVO.setPostTwo(payContactsManagementTemporary2.getPost());
|
||||
if(!StringUtils.isBlank(payContactsManagementTemporary2.getPhone())){
|
||||
projectDetailVO.setPhoneTwo(PasswordUtil.decrypt(payContactsManagementTemporary2.getPhone()));
|
||||
}
|
||||
if(!StringUtils.isBlank(payContactsManagementTemporary2.getEmail())){
|
||||
projectDetailVO.setEmailTwo(PasswordUtil.decrypt(payContactsManagementTemporary2.getEmail()));
|
||||
}
|
||||
projectDetailVO.setPostalCodeContactsTwo(payContactsManagementTemporary2.getPostalCode());
|
||||
projectDetailVO.setContactAddressTwo(payContactsManagementTemporary2.getContactAddress());
|
||||
}
|
||||
|
||||
if(!StringUtils.isEmpty(payWorkingGroupSubItem.getContactsIdThree())){
|
||||
projectDetailVO.setRemarksThree(payWorkingGroupSubItem.getRemarksThree());
|
||||
PayContactsManagementTemporary payContactsManagementTemporary3 = payContactsManagementTemporaryService.getById(payWorkingGroupSubItem.getContactsTemporaryIdThree());
|
||||
if(Objects.isNull(payContactsManagementTemporary3)){
|
||||
throw new JeroBootException("联系人3不存在！");
|
||||
}
|
||||
projectDetailVO.setNameThree(payContactsManagementTemporary3.getName());
|
||||
projectDetailVO.setGenderThree(payContactsManagementTemporary3.getGender());
|
||||
if(!Objects.isNull(payContactsManagementTemporary3.getGender())){
|
||||
projectDetailVO.setGenderThree_dictText(sysBaseAPI.translateDict("sex",String.valueOf(payContactsManagementTemporary3.getGender())));
|
||||
}
|
||||
projectDetailVO.setPostThree(payContactsManagementTemporary3.getPost());
|
||||
if(!StringUtils.isBlank(payContactsManagementTemporary3.getPhone())){
|
||||
projectDetailVO.setPhoneThree(PasswordUtil.decrypt(payContactsManagementTemporary3.getPhone()));
|
||||
}
|
||||
if(!StringUtils.isBlank(payContactsManagementTemporary3.getEmail())){
|
||||
projectDetailVO.setEmailThree(PasswordUtil.decrypt(payContactsManagementTemporary3.getEmail()));
|
||||
}
|
||||
projectDetailVO.setPostalCodeContactsThree(payContactsManagementTemporary3.getPostalCode());
|
||||
projectDetailVO.setContactAddressThree(payContactsManagementTemporary3.getContactAddress());
|
||||
}else {
|
||||
PayContactsManagementTemporary payContactsManagementTemporary = payContactsManagementTemporaryService.getById(payCommonProject.getContactsTemporaryId());
|
||||
if(Objects.isNull(payContactsManagementTemporary)){
|
||||
throw new JeroBootException("联系人不存在！");
|
||||
}
|
||||
projectDetailVO.setName(payContactsManagementTemporary.getName());
|
||||
projectDetailVO.setGender(payContactsManagementTemporary.getGender());
|
||||
if(!Objects.isNull(payContactsManagementTemporary.getGender())){
|
||||
projectDetailVO.setGender_dictText(sysBaseAPI.translateDict("sex",String.valueOf(payContactsManagementTemporary.getGender())));
|
||||
}
|
||||
projectDetailVO.setPost(payContactsManagementTemporary.getPost());
|
||||
if(!StringUtils.isBlank(payContactsManagementTemporary.getPhone())){
|
||||
projectDetailVO.setPhone(PasswordUtil.decrypt(payContactsManagementTemporary.getPhone()));
|
||||
}
|
||||
if(!StringUtils.isBlank(payContactsManagementTemporary.getEmail())){
|
||||
projectDetailVO.setEmail(PasswordUtil.decrypt(payContactsManagementTemporary.getEmail()));
|
||||
}
|
||||
projectDetailVO.setPostalCodeContacts(payContactsManagementTemporary.getPostalCode());
|
||||
projectDetailVO.setContactAddress(payContactsManagementTemporary.getContactAddress());
|
||||
}
|
||||
}
|
||||
// 到账信息
|
||||
|
||||
@@ -1,15 +1,11 @@
|
||||
package com.jero.common.vo;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.jero.mail.entity.PayMailBill;
|
||||
import com.jero.payment.entity.PayPaymentRecord;
|
||||
import com.jero.project.entity.PayWorkingGroupSubItemContacts;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import org.jeecgframework.poi.excel.annotation.Excel;
|
||||
|
||||
import javax.validation.constraints.NotEmpty;
|
||||
import javax.validation.constraints.Pattern;
|
||||
import javax.validation.constraints.Size;
|
||||
import java.io.Serializable;
|
||||
import java.math.BigDecimal;
|
||||
import java.util.List;
|
||||
@@ -266,4 +262,10 @@ public class ProjectDetailVO implements Serializable {
|
||||
@ApiModelProperty(value = "开票邮寄记录")
|
||||
private List<PayMailBillVO> mailBill;
|
||||
|
||||
/**
|
||||
* 工作组企业联系人列表
|
||||
*/
|
||||
@ApiModelProperty(value = "工作组企业联系人列表")
|
||||
private List<PayWorkingGroupSubItemContacts> payWorkingGroupSubItemContactsList;
|
||||
|
||||
}
|
||||
|
||||
+44
@@ -1,6 +1,7 @@
|
||||
package com.jero.project.entity;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
@@ -77,4 +78,47 @@ public class PayWorkingGroupSubItemContacts implements Serializable {
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
@ApiModelProperty(value = "更新时间")
|
||||
private Date updateTime;
|
||||
|
||||
/**
|
||||
* 企业联系人性别3
|
||||
*/
|
||||
@ApiModelProperty(value = "企业联系人性别")
|
||||
@TableField(exist = false)
|
||||
private String gender;
|
||||
/**
|
||||
* 企业联系人性别3
|
||||
*/
|
||||
@ApiModelProperty(value = "企业联系人性别")
|
||||
@TableField(exist = false)
|
||||
private String gender_dictText;
|
||||
/**
|
||||
* 企业联系人职务3
|
||||
*/
|
||||
@ApiModelProperty(value = "企业联系人职务")
|
||||
@TableField(exist = false)
|
||||
private String post;
|
||||
/**
|
||||
* 企业联系人电话3
|
||||
*/
|
||||
@ApiModelProperty(value = "企业联系人电话")
|
||||
@TableField(exist = false)
|
||||
private String phone;
|
||||
/**
|
||||
* 企业联系人邮箱3
|
||||
*/
|
||||
@ApiModelProperty(value = "企业联系人邮箱")
|
||||
@TableField(exist = false)
|
||||
private String email;
|
||||
/**
|
||||
* 企业联系人邮编3
|
||||
*/
|
||||
@ApiModelProperty(value = "企业联系人邮编")
|
||||
@TableField(exist = false)
|
||||
private String postalCodeContacts;
|
||||
/**
|
||||
* 企业联系人地址
|
||||
*/
|
||||
@ApiModelProperty(value = "企业联系人地址")
|
||||
@TableField(exist = false)
|
||||
private String contactAddress;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user