From dd895ca1b57fe68906edc0cfeddc7bc23f331124 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Wed, 20 Apr 2022 14:54:17 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=BB=84=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PayWorkingGroupSubItemController.java | 122 +++++--- .../entity/PayWorkingGroupSubItem.java | 146 +++++++-- .../PayWorkingGroupSubItemServiceImpl.java | 211 ++++++++----- .../vo/excel/PayWorkingGroupSubItemExcel.java | 293 +++++++++++++----- 4 files changed, 575 insertions(+), 197 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java index 01ce0d0c..57d64f11 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java @@ -37,6 +37,7 @@ import com.jero.pack.service.IPayPackCompanyService; import com.jero.project.common.PayProjectCommon; import com.jero.project.entity.PayWorkingGroup; import com.jero.project.entity.PayWorkingGroupSubItem; +import com.jero.project.entity.PayWorkingGroupSubItemContacts; import com.jero.project.service.IPayWorkingGroupService; import com.jero.project.service.IPayWorkingGroupSubItemService; import com.jero.project.vo.SetChargeInput; @@ -511,7 +512,6 @@ public class PayWorkingGroupSubItemController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(payWorkingGroupSubItem, request.getParameterMap()); - // todo 联系人关联表 // Step.2 获取导出数据 List pageList = payWorkingGroupSubItemService.list(queryWrapper); List exportList; @@ -528,40 +528,91 @@ public class PayWorkingGroupSubItemController extends JeroController listPayWorkingGroupSubItemContacts = workingGroupSubItem.getPayWorkingGroupSubItemContactsList(); + if(!CollectionUtils.isEmpty(listPayWorkingGroupSubItemContacts)){ + listPayWorkingGroupSubItemContacts.sort(Comparator.comparing(PayWorkingGroupSubItemContacts::getOrderNum)); + List listIds = listPayWorkingGroupSubItemContacts.stream().map(PayWorkingGroupSubItemContacts::getContactsTemporaryId).collect(Collectors.toList()); + List listPayContactsManagementTemporary = payContactsManagementTemporaryService.listByIds(listIds); + for (int i = 0; i < listPayWorkingGroupSubItemContacts.size(); i++) { + PayWorkingGroupSubItemContacts payWorkingGroupSubItemContacts = listPayWorkingGroupSubItemContacts.get(i); + List temporary = listPayContactsManagementTemporary.stream().filter(s->Objects.equals(s.getId(),payWorkingGroupSubItemContacts.getContactsTemporaryId())).collect(Collectors.toList()); + String email = ""; + String phone = ""; + String name = payWorkingGroupSubItemContacts.getContactsTemporaryName(); + String remark = payWorkingGroupSubItemContacts.getRemarks(); + if(!CollectionUtils.isEmpty(temporary)){ + email = temporary.get(0).getEmail(); + if (StringUtils.isNotBlank(email)){ + email = PasswordUtil.decrypt(email); + } + phone = temporary.get(0).getPhone(); + if (StringUtils.isNotBlank(phone)){ + phone = PasswordUtil.decrypt(phone); + } + } + switch (i){ + case 0: + excel.setContactsNameOne(name); + excel.setRemarksOne(remark); + excel.setContactsEmailOne(email); + excel.setContactsPhoneOne(phone); + break; + case 1: + excel.setContactsNameTwo(name); + excel.setRemarksTwo(remark); + excel.setContactsEmailTwo(email); + excel.setContactsPhoneTwo(phone); + break; + case 2: + excel.setContactsNameThree(name); + excel.setRemarksThree(remark); + excel.setContactsEmailThree(email); + excel.setContactsPhoneThree(phone); + break; + case 3: + excel.setContactsNameFour(name); + excel.setRemarksFour(remark); + excel.setContactsEmailFour(email); + excel.setContactsPhoneFour(phone); + break; + case 4: + excel.setContactsNameFive(name); + excel.setRemarksFive(remark); + excel.setContactsEmailFive(email); + excel.setContactsPhoneFive(phone); + break; + case 5: + excel.setContactsNameSix(name); + excel.setRemarksSix(remark); + excel.setContactsEmailSix(email); + excel.setContactsPhoneSix(phone); + break; + case 6: + excel.setContactsNameSeven(name); + excel.setRemarksSeven(remark); + excel.setContactsEmailSeven(email); + excel.setContactsPhoneSeven(phone); + break; + case 7: + excel.setContactsNameEight(name); + excel.setRemarksEight(remark); + excel.setContactsEmailEight(email); + excel.setContactsPhoneEight(phone); + break; + case 8: + excel.setContactsNameNine(name); + excel.setRemarksNine(remark); + excel.setContactsEmailNine(email); + excel.setContactsPhoneNine(phone); + break; + case 9: + excel.setContactsNameTen(name); + excel.setRemarksTen(remark); + excel.setContactsEmailTen(email); + excel.setContactsPhoneTen(phone); + break; + default:break; + } } } excelList.add(excel); @@ -598,7 +649,6 @@ public class PayWorkingGroupSubItemController extends JeroController payWorkingGroupSubItemContactsList; + + /**企业联系人1名称*/ + @Excel(name = "企业联系人1", width = 15) + @ApiModelProperty(value = "企业联系人1") + @TableField(exist = false) + private String contactsNameOne; + /**联系人1备注*/ + @Excel(name = "联系人1备注", width = 15) + @ApiModelProperty(value = "联系人1备注") + @Size(max = 50,message = "联系人1备注长度不能大于50个字符") + @TableField(exist = false) + private String remarksOne; + /**企业联系人2名称*/ + @Excel(name = "企业联系人2", width = 15) + @ApiModelProperty(value = "企业联系人2") + @TableField(exist = false) + private String contactsNameTwo; + /**联系人2备注*/ + @Excel(name = "联系人2备注", width = 15) + @ApiModelProperty(value = "联系人2备注") + @Size(max = 50,message = "联系人2备注长度不能大于50个字符") + @TableField(exist = false) + private String remarksTwo; + /**企业联系人3名称*/ + @Excel(name = "企业联系人3", width = 15) + @ApiModelProperty(value = "企业联系人3") + @TableField(exist = false) + private String contactsNameThree; + /**联系人3备注*/ + @Excel(name = "联系人3备注", width = 15) + @ApiModelProperty(value = "联系人3备注") + @Size(max = 50,message = "联系人3备注长度不能大于50个字符") + @TableField(exist = false) + private String remarksThree; + /**企业联系人4名称*/ + @Excel(name = "企业联系人4", width = 15) + @ApiModelProperty(value = "企业联系人4") + @TableField(exist = false) + private String contactsNameFour; + /**联系人4备注*/ + @Excel(name = "联系人4备注", width = 15) + @ApiModelProperty(value = "联系人4备注") + @Size(max = 50,message = "联系人4备注长度不能大于50个字符") + @TableField(exist = false) + private String remarksFour; + /**企业联系人5名称*/ + @Excel(name = "企业联系人5", width = 15) + @ApiModelProperty(value = "企业联系人5") + @TableField(exist = false) + private String contactsNameFive; + /**联系人5备注*/ + @Excel(name = "联系人5备注", width = 15) + @ApiModelProperty(value = "联系人5备注") + @Size(max = 50,message = "联系人5备注长度不能大于50个字符") + @TableField(exist = false) + private String remarksFive; + /**企业联系人6名称*/ + @Excel(name = "企业联系人6", width = 15) + @ApiModelProperty(value = "企业联系人6") + @TableField(exist = false) + private String contactsNameSix; + /**联系人6备注*/ + @Excel(name = "联系人6备注", width = 15) + @ApiModelProperty(value = "联系人6备注") + @Size(max = 50,message = "联系人6备注长度不能大于50个字符") + @TableField(exist = false) + private String remarksSix; + /**企业联系人7名称*/ + @Excel(name = "企业联系人7", width = 15) + @ApiModelProperty(value = "企业联系人7") + @TableField(exist = false) + private String contactsNameSeven; + /**联系人7备注*/ + @Excel(name = "联系人7备注", width = 15) + @ApiModelProperty(value = "联系人7备注") + @Size(max = 50,message = "联系人7备注长度不能大于50个字符") + @TableField(exist = false) + private String remarksSeven; + /**企业联系人8名称*/ + @Excel(name = "企业联系人8", width = 15) + @ApiModelProperty(value = "企业联系人8") + @TableField(exist = false) + private String contactsNameEight; + /**联系人8备注*/ + @Excel(name = "联系人8备注", width = 15) + @ApiModelProperty(value = "联系人8备注") + @Size(max = 50,message = "联系人8备注长度不能大于50个字符") + @TableField(exist = false) + private String remarksEight; + /**企业联系人9名称*/ + @Excel(name = "企业联系人9", width = 15) + @ApiModelProperty(value = "企业联系人9") + @TableField(exist = false) + private String contactsNameNine; + /**联系人9备注*/ + @Excel(name = "联系人9备注", width = 15) + @ApiModelProperty(value = "联系人9备注") + @Size(max = 50,message = "联系人9备注长度不能大于50个字符") + @TableField(exist = false) + private String remarksNine; + /**企业联系人10名称*/ + @Excel(name = "企业联系人10", width = 15) + @ApiModelProperty(value = "企业联系人10") + @TableField(exist = false) + private String contactsNameTen; + /**联系人10备注*/ + @Excel(name = "联系人10备注", width = 15) + @ApiModelProperty(value = "联系人10备注") + @Size(max = 50,message = "联系人10备注长度不能大于50个字符") + @TableField(exist = false) + private String remarksTen; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java index 57fa1274..5a0726e4 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java @@ -507,20 +507,55 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl listContactsName = new ArrayList<>(); - // 获取excel中联系人一名称 - List listContactsNameOne = list.stream().map(PayWorkingGroupSubItem::getContactsTemporaryNameOne).collect(Collectors.toList()); - if(!CollectionUtils.isEmpty(listContactsNameOne)){ - listContactsName.addAll(listContactsNameOne); + // 获取excel中联系人1名称 + List listContactsName1 = list.stream().map(PayWorkingGroupSubItem::getContactsNameOne).collect(Collectors.toList()); + if(!CollectionUtils.isEmpty(listContactsName1)){ + listContactsName.addAll(listContactsName1); } - // 获取excel中联系人二名称 - List listContactsNameTwo = list.stream().map(PayWorkingGroupSubItem::getContactsTemporaryNameTwo).collect(Collectors.toList()); - if(!CollectionUtils.isEmpty(listContactsNameTwo)){ - listContactsName.addAll(listContactsNameTwo); + // 获取excel中联系人2名称 + List listContactsName2 = list.stream().map(PayWorkingGroupSubItem::getContactsNameTwo).collect(Collectors.toList()); + if(!CollectionUtils.isEmpty(listContactsName2)){ + listContactsName.addAll(listContactsName2); } - // 获取excel中联系人三名称 - List listContactsNameThree = list.stream().map(PayWorkingGroupSubItem::getContactsTemporaryNameThree).collect(Collectors.toList()); - if(!CollectionUtils.isEmpty(listContactsNameThree)){ - listContactsName.addAll(listContactsNameThree); + // 获取excel中联系人3名称 + List listContactsName3 = list.stream().map(PayWorkingGroupSubItem::getContactsNameThree).collect(Collectors.toList()); + if(!CollectionUtils.isEmpty(listContactsName3)){ + listContactsName.addAll(listContactsName3); + } + // 获取excel中联系人4名称 + List listContactsName4 = list.stream().map(PayWorkingGroupSubItem::getContactsNameFour).collect(Collectors.toList()); + if(!CollectionUtils.isEmpty(listContactsName4)){ + listContactsName.addAll(listContactsName4); + } + // 获取excel中联系人5名称 + List listContactsName5 = list.stream().map(PayWorkingGroupSubItem::getContactsNameFive).collect(Collectors.toList()); + if(!CollectionUtils.isEmpty(listContactsName5)){ + listContactsName.addAll(listContactsName5); + } + // 获取excel中联系人6名称 + List listContactsName6 = list.stream().map(PayWorkingGroupSubItem::getContactsNameSix).collect(Collectors.toList()); + if(!CollectionUtils.isEmpty(listContactsName6)){ + listContactsName.addAll(listContactsName6); + } + // 获取excel中联系人7名称 + List listContactsName7 = list.stream().map(PayWorkingGroupSubItem::getContactsNameSeven).collect(Collectors.toList()); + if(!CollectionUtils.isEmpty(listContactsName7)){ + listContactsName.addAll(listContactsName7); + } + // 获取excel中联系人8名称 + List listContactsName8 = list.stream().map(PayWorkingGroupSubItem::getContactsNameEight).collect(Collectors.toList()); + if(!CollectionUtils.isEmpty(listContactsName8)){ + listContactsName.addAll(listContactsName8); + } + // 获取excel中联系人9名称 + List listContactsName9 = list.stream().map(PayWorkingGroupSubItem::getContactsNameNine).collect(Collectors.toList()); + if(!CollectionUtils.isEmpty(listContactsName9)){ + listContactsName.addAll(listContactsName9); + } + // 获取excel中联系人10名称 + List listContactsName10 = list.stream().map(PayWorkingGroupSubItem::getContactsNameTen).collect(Collectors.toList()); + if(!CollectionUtils.isEmpty(listContactsName10)){ + listContactsName.addAll(listContactsName10); } // 获取excel中邮寄联系人名称 List listContactsNameMail = list.stream().map(PayWorkingGroupSubItem::getMailContactsTemporaryName).collect(Collectors.toList()); @@ -568,67 +603,9 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl"); } } - if(!StringUtils.isBlank(p.getContactsTemporaryNameOne()) && !StringUtils.isBlank(p.getContactsTemporaryNameTwo()) - && Objects.equals(p.getContactsTemporaryNameOne(),p.getContactsTemporaryNameTwo())){ - msg.append("第").append(count + 3).append("行:企业联系人1与企业联系人2重复，请修改。
"); - } - if(!StringUtils.isBlank(p.getContactsTemporaryNameOne()) && !StringUtils.isBlank(p.getContactsTemporaryNameThree()) - && Objects.equals(p.getContactsTemporaryNameOne(),p.getContactsTemporaryNameThree())){ - msg.append("第").append(count + 3).append("行:企业联系人1与企业联系人3重复，请修改。
"); - } - if(!StringUtils.isBlank(p.getContactsTemporaryNameTwo()) && !StringUtils.isBlank(p.getContactsTemporaryNameThree()) - && Objects.equals(p.getContactsTemporaryNameTwo(),p.getContactsTemporaryNameThree())){ - msg.append("第").append(count + 3).append("行:企业联系人2与企业联系人3重复，请修改。
"); - } - - // 校验联系人一 - if (StringUtils.isBlank(p.getContactsTemporaryNameOne())) { - msg.append("第").append(count + 3).append("行:企业联系人1不能为空，请修改。
"); - } else { - if (!CollectionUtils.isEmpty(listCompany)) { - // 通过联系人获取联系人id - List finalListCompany = listCompany; - List listContacts = listContactsInfo.stream().filter(item -> - Objects.equals(item.getName(), p.getContactsTemporaryNameOne()) - && Objects.equals(item.getCompanyId(), finalListCompany.get(0).getId())).collect(Collectors.toList()); - if (CollectionUtils.isEmpty(listContacts)) { - msg.append("第").append(count + 3).append("行:该企业下不存在企业联系人1，请修改。
"); - } else { - p.setContactsIdOne(listContacts.get(0).getId()); - } - } - } - - // 校验联系人二 - if (!StringUtils.isBlank(p.getContactsTemporaryNameTwo()) && !CollectionUtils.isEmpty(listCompany)) { - if (!CollectionUtils.isEmpty(listCompany)) { - // 通过联系人获取联系人id - List finalListCompany = listCompany; - List listContacts = listContactsInfo.stream().filter(item -> - Objects.equals(item.getName(), p.getContactsTemporaryNameTwo()) - && Objects.equals(item.getCompanyId(), finalListCompany.get(0).getId())).collect(Collectors.toList()); - if (CollectionUtils.isEmpty(listContacts)) { - msg.append("第").append(count + 3).append("行:该企业下不存在企业联系人2，请修改。
"); - } else { - p.setContactsIdTwo(listContacts.get(0).getId()); - } - } - } - // 校验联系人三 - if (!StringUtils.isBlank(p.getContactsTemporaryNameThree()) && !CollectionUtils.isEmpty(listCompany)) { - if (!CollectionUtils.isEmpty(listCompany)) { - // 通过联系人获取联系人id - List finalListCompany = listCompany; - List listContacts = listContactsInfo.stream().filter(item -> - Objects.equals(item.getName(), p.getContactsTemporaryNameThree()) - && Objects.equals(item.getCompanyId(), finalListCompany.get(0).getId())).collect(Collectors.toList()); - if (CollectionUtils.isEmpty(listContacts)) { - msg.append("第").append(count + 3).append("行:该企业下不存在企业联系人3，请修改。
"); - } else { - p.setContactsIdThree(listContacts.get(0).getId()); - } - } - } + // 校验重复 + List listPayWorkingGroupSubItemContacts = checkRepeat(p,msg,count,listCompany,listContactsInfo); + p.setPayWorkingGroupSubItemContactsList(listPayWorkingGroupSubItemContacts); // 校验邮寄联系人 if (StringUtils.isBlank(p.getMailContactsTemporaryName())) { msg.append("第").append(count + 3).append("行:邮寄联系人不能为空，请修改。
"); @@ -707,6 +684,14 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl{ + List listPayWorkingGroupSubItemContacts = p.getPayWorkingGroupSubItemContactsList(); + if(!CollectionUtils.isEmpty(listPayWorkingGroupSubItemContacts)){ + listPayWorkingGroupSubItemContacts.forEach(s->{ + s.setWorkingGroupId(p.getWorkingGroupId()); + s.setWorkingGroupSubId(p.getId()); + }); + payWorkingGroupSubItemContactsService.saveBatch(listPayWorkingGroupSubItemContacts); + } PayIncomeContract payIncomeContract = p.getPayIncomeContract(); if(Objects.isNull(payIncomeContract)){ return; @@ -746,6 +731,86 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl checkRepeat(PayWorkingGroupSubItem p,StringBuilder msg,int count,List listCompany,List listContactsInfo){ + List list = new ArrayList<>(); + HashMap map = new HashMap<>(); + if(!StringUtils.isBlank(p.getContactsNameOne())){ + PayWorkingGroupSubItemContacts payWorkingGroupSubItemContacts = setContactsId(msg,p.getContactsNameOne(),1,count,listCompany,listContactsInfo,map); + list.add(payWorkingGroupSubItemContacts); + }else{ + msg.append("第").append(count + 3).append("行:企业联系人1不能为空，请修改。
"); + } + + if(!StringUtils.isBlank(p.getContactsNameTwo())){ + PayWorkingGroupSubItemContacts payWorkingGroupSubItemContacts = setContactsId(msg,p.getContactsNameTwo(),2,count,listCompany,listContactsInfo,map); + list.add(payWorkingGroupSubItemContacts); + } + if(!StringUtils.isBlank(p.getContactsNameThree())){ + PayWorkingGroupSubItemContacts payWorkingGroupSubItemContacts = setContactsId(msg,p.getContactsNameThree(),3,count,listCompany,listContactsInfo,map); + list.add(payWorkingGroupSubItemContacts); + } + if(!StringUtils.isBlank(p.getContactsNameFour())){ + PayWorkingGroupSubItemContacts payWorkingGroupSubItemContacts = setContactsId(msg,p.getContactsNameFour(),4,count,listCompany,listContactsInfo,map); + list.add(payWorkingGroupSubItemContacts); + } + if(!StringUtils.isBlank(p.getContactsNameFive())){ + PayWorkingGroupSubItemContacts payWorkingGroupSubItemContacts = setContactsId(msg,p.getContactsNameFive(),5,count,listCompany,listContactsInfo,map); + list.add(payWorkingGroupSubItemContacts); + } + if(!StringUtils.isBlank(p.getContactsNameSix())){ + PayWorkingGroupSubItemContacts payWorkingGroupSubItemContacts = setContactsId(msg,p.getContactsNameSix(),6,count,listCompany,listContactsInfo,map); + list.add(payWorkingGroupSubItemContacts); + } + if(!StringUtils.isBlank(p.getContactsNameSeven())){ + PayWorkingGroupSubItemContacts payWorkingGroupSubItemContacts = setContactsId(msg,p.getContactsNameSeven(),7,count,listCompany,listContactsInfo,map); + list.add(payWorkingGroupSubItemContacts); + } + if(!StringUtils.isBlank(p.getContactsNameEight())){ + PayWorkingGroupSubItemContacts payWorkingGroupSubItemContacts = setContactsId(msg,p.getContactsNameEight(),8,count,listCompany,listContactsInfo,map); + list.add(payWorkingGroupSubItemContacts); + } + if(!StringUtils.isBlank(p.getContactsNameNine())){ + PayWorkingGroupSubItemContacts payWorkingGroupSubItemContacts = setContactsId(msg,p.getContactsNameNine(),9,count,listCompany,listContactsInfo,map); + list.add(payWorkingGroupSubItemContacts); + } + if(!StringUtils.isBlank(p.getContactsNameTen())){ + PayWorkingGroupSubItemContacts payWorkingGroupSubItemContacts = setContactsId(msg,p.getContactsNameTen(),10,count,listCompany,listContactsInfo,map); + list.add(payWorkingGroupSubItemContacts); + } + return list; + } + + private PayWorkingGroupSubItemContacts setContactsId(StringBuilder msg,String name,int num,int count,List listCompany,List listContactsInfo,HashMap map){ + PayWorkingGroupSubItemContacts payWorkingGroupSubItemContacts = new PayWorkingGroupSubItemContacts(); + if(map.containsKey(name)){ + int c = map.get(name); + msg.append("第").append(count + 3).append("行:企业联系人").append(c).append("与企业联系人3重复，请修改。
"); + }else{ + map.put(name,3); + } + if (!CollectionUtils.isEmpty(listCompany)) { + // 通过联系人获取联系人id + List listContacts = listContactsInfo.stream().filter(item -> + Objects.equals(item.getName(), name) + && Objects.equals(item.getCompanyId(), listCompany.get(0).getId())).collect(Collectors.toList()); + if (CollectionUtils.isEmpty(listContacts)) { + msg.append("第").append(count + 3).append("行:该企业下不存在企业联系人").append(num).append("，请修改。
"); + } else { + payWorkingGroupSubItemContacts.setContactsId(listContacts.get(0).getId()); + } + } + return payWorkingGroupSubItemContacts; + } @Override diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/vo/excel/PayWorkingGroupSubItemExcel.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/vo/excel/PayWorkingGroupSubItemExcel.java index 326ba6bb..4bd92799 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/vo/excel/PayWorkingGroupSubItemExcel.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/vo/excel/PayWorkingGroupSubItemExcel.java @@ -5,7 +5,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.jeecgframework.poi.excel.annotation.Excel; -import javax.validation.constraints.DecimalMax; import java.io.Serializable; import java.math.BigDecimal; @@ -26,75 +25,6 @@ public class PayWorkingGroupSubItemExcel implements Serializable { @ApiModelProperty(value = "临时成员单位") private String chargeCompanyTemporaryName; - /** - * 临时企业联系人1名称 - */ - @Excel(name = "企业联系人1", width = 15) - @ApiModelProperty(value = "临时企业联系人1名称") - private String contactsTemporaryNameOne; - - /** - * 企业联系人1手机号 - */ - @Excel(name = "企业联系人1手机号", width = 17) - private String contactsPhoneOne; - - /** - * 企业联系人1邮箱 - */ - @Excel(name = "企业联系人1邮箱", width = 15) - private String contactsEmailOne; - - /** - * 联系人1备注 - */ - @Excel(name = "联系人1备注", width = 15) - @ApiModelProperty(value = "联系人1备注") - private String remarksOne; - /** - * 临时企业联系人2名称 - */ - @Excel(name = "企业联系人2", width = 15) - @ApiModelProperty(value = "临时企业联系人2名称") - private String contactsTemporaryNameTwo; - /** - * 企业联系人2手机号 - */ - @Excel(name = "企业联系人2手机号", width = 17) - private String contactsPhoneTwo; - /** - * 企业联系人2邮箱 - */ - @Excel(name = "企业联系人2邮箱", width = 15) - private String contactsEmailTwo; - /** - * 联系人2备注 - */ - @Excel(name = "联系人2备注", width = 15) - @ApiModelProperty(value = "联系人2备注") - private String remarksTwo; - /** - * 临时企业联系人3名称 - */ - @Excel(name = "企业联系人3", width = 15) - @ApiModelProperty(value = "临时企业联系人3名称") - private String contactsTemporaryNameThree; - /** - * 企业联系人3手机号 - */ - @Excel(name = "企业联系人3手机号", width = 17) - private String contactsPhoneThree; - /** - * 企业联系人3邮箱 - */ - @Excel(name = "企业联系人3邮箱", width = 15) - private String contactsEmailThree; - /** - * 联系人3备注 - */ - @Excel(name = "联系人3备注", width = 15) - @ApiModelProperty(value = "联系人3备注") - private String remarksThree; /** * 临时邮寄联系人名称 */ @@ -138,4 +68,227 @@ public class PayWorkingGroupSubItemExcel implements Serializable { @Excel(name = "备注", width = 15) @ApiModelProperty(value = "备注") private String remarks; + /** + * 企业联系人1名称 + */ + @Excel(name = "企业联系人1", width = 15) + @ApiModelProperty(value = "企业联系人1名称") + private String contactsNameOne; + + /** + * 企业联系人1手机号 + */ + @Excel(name = "企业联系人1手机号", width = 15) + private String contactsPhoneOne; + + /** + * 企业联系人1邮箱 + */ + @Excel(name = "企业联系人1邮箱", width = 15) + private String contactsEmailOne; + + /** + * 联系人1备注 + */ + @Excel(name = "联系人1备注", width = 15) + @ApiModelProperty(value = "联系人1备注") + private String remarksOne; + /** + * 企业联系人2名称 + */ + @Excel(name = "企业联系人2", width = 15) + @ApiModelProperty(value = "企业联系人2名称") + private String contactsNameTwo; + /** + * 企业联系人2手机号 + */ + @Excel(name = "企业联系人2手机号", width = 15) + private String contactsPhoneTwo; + /** + * 企业联系人2邮箱 + */ + @Excel(name = "企业联系人2邮箱", width = 15) + private String contactsEmailTwo; + /** + * 联系人2备注 + */ + @Excel(name = "联系人2备注", width = 15) + @ApiModelProperty(value = "联系人2备注") + private String remarksTwo; + /** + * 企业联系人3名称 + */ + @Excel(name = "企业联系人3", width = 15) + @ApiModelProperty(value = "企业联系人3名称") + private String contactsNameThree; + /** + * 企业联系人3手机号 + */ + @Excel(name = "企业联系人3手机号", width = 15) + private String contactsPhoneThree; + /** + * 企业联系人3邮箱 + */ + @Excel(name = "企业联系人3邮箱", width = 15) + private String contactsEmailThree; + /** + * 联系人3备注 + */ + @Excel(name = "联系人3备注", width = 15) + @ApiModelProperty(value = "联系人3备注") + private String remarksThree; + /** + * 企业联系人4名称 + */ + @Excel(name = "企业联系人4", width = 15) + @ApiModelProperty(value = "企业联系人4名称") + private String contactsNameFour; + /** + * 企业联系人4手机号 + */ + @Excel(name = "企业联系人4手机号", width = 15) + private String contactsPhoneFour; + /** + * 企业联系人4邮箱 + */ + @Excel(name = "企业联系人4邮箱", width = 15) + private String contactsEmailFour; + /** + * 联系人4备注 + */ + @Excel(name = "联系人4备注", width = 15) + @ApiModelProperty(value = "联系人4备注") + private String remarksFour; + /** + * 企业联系人5名称 + */ + @Excel(name = "企业联系人5", width = 15) + @ApiModelProperty(value = "企业联系人5名称") + private String contactsNameFive; + /** + * 企业联系人5手机号 + */ + @Excel(name = "企业联系人5手机号", width = 15) + private String contactsPhoneFive; + /** + * 企业联系人5邮箱 + */ + @Excel(name = "企业联系人5邮箱", width = 15) + private String contactsEmailFive; + /** + * 联系人5备注 + */ + @Excel(name = "联系人5备注", width = 15) + @ApiModelProperty(value = "联系人5备注") + private String remarksFive; + /** + * 企业联系人6名称 + */ + @Excel(name = "企业联系人6", width = 15) + @ApiModelProperty(value = "企业联系人6名称") + private String contactsNameSix; + /** + * 企业联系人6手机号 + */ + @Excel(name = "企业联系人6手机号", width = 15) + private String contactsPhoneSix; + /** + * 企业联系人6邮箱 + */ + @Excel(name = "企业联系人6邮箱", width = 15) + private String contactsEmailSix; + /** + * 联系人6备注 + */ + @Excel(name = "联系人6备注", width = 15) + @ApiModelProperty(value = "联系人6备注") + private String remarksSix; + /** + * 企业联系人7名称 + */ + @Excel(name = "企业联系人7", width = 15) + @ApiModelProperty(value = "企业联系人7名称") + private String contactsNameSeven; + /** + * 企业联系人7手机号 + */ + @Excel(name = "企业联系人7手机号", width = 15) + private String contactsPhoneSeven; + /** + * 企业联系人7邮箱 + */ + @Excel(name = "企业联系人7邮箱", width = 15) + private String contactsEmailSeven; + /** + * 联系人7备注 + */ + @Excel(name = "联系人7备注", width = 15) + @ApiModelProperty(value = "联系人7备注") + private String remarksSeven; + /** + * 企业联系人8名称 + */ + @Excel(name = "企业联系人8", width = 15) + @ApiModelProperty(value = "企业联系人8名称") + private String contactsNameEight; + /** + * 企业联系人8手机号 + */ + @Excel(name = "企业联系人8手机号", width = 15) + private String contactsPhoneEight; + /** + * 企业联系人8邮箱 + */ + @Excel(name = "企业联系人8邮箱", width = 15) + private String contactsEmailEight; + /** + * 联系人8备注 + */ + @Excel(name = "联系人8备注", width = 15) + @ApiModelProperty(value = "联系人8备注") + private String remarksEight; + /** + * 企业联系人9名称 + */ + @Excel(name = "企业联系人9", width = 15) + @ApiModelProperty(value = "企业联系人9名称") + private String contactsNameNine; + /** + * 企业联系人9手机号 + */ + @Excel(name = "企业联系人9手机号", width = 15) + private String contactsPhoneNine; + /** + * 企业联系人9邮箱 + */ + @Excel(name = "企业联系人9邮箱", width = 15) + private String contactsEmailNine; + /** + * 联系人9备注 + */ + @Excel(name = "联系人9备注", width = 15) + @ApiModelProperty(value = "联系人9备注") + private String remarksNine; + /** + * 企业联系人10名称 + */ + @Excel(name = "企业联系人10", width = 15) + @ApiModelProperty(value = "企业联系人10名称") + private String contactsNameTen; + /** + * 企业联系人10手机号 + */ + @Excel(name = "企业联系人10手机号", width = 15) + private String contactsPhoneTen; + /** + * 企业联系人10邮箱 + */ + @Excel(name = "企业联系人10邮箱", width = 15) + private String contactsEmailTen; + /** + * 联系人10备注 + */ + @Excel(name = "联系人10备注", width = 15) + @ApiModelProperty(value = "联系人10备注") + private String remarksTen; }