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

update 工作组导入导出增加到20人

Browse Source
This commit is contained in:
lijiarao
2024-08-07 17:44:48 +08:00
parent d7ca128328
commit 9a8347fe3a
4 changed files with 597 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java
+50
View File
@@ -915,6 +915,56 @@ public class PayWorkingGroupSubItemController extends JeroController<PayWorkingG
excel.setRemarksTen(remark);
excel.setContactsEmailTen(email);
excel.setContactsPhoneTen(phone);
case 10:
excel.setContactsName11(name);
excel.setRemarks11(remark);
excel.setContactsEmail11(email);
excel.setContactsPhone11(phone);
case 11:
excel.setContactsName12(name);
excel.setRemarks12(remark);
excel.setContactsEmail12(email);
excel.setContactsPhone12(phone);
case 12:
excel.setContactsName13(name);
excel.setRemarks13(remark);
excel.setContactsEmail13(email);
excel.setContactsPhone13(phone);
case 13:
excel.setContactsName14(name);
excel.setRemarks14(remark);
excel.setContactsEmail14(email);
excel.setContactsPhone14(phone);
case 14:
excel.setContactsName15(name);
excel.setRemarks15(remark);
excel.setContactsEmail15(email);
excel.setContactsPhone15(phone);
case 15:
excel.setContactsName16(name);
excel.setRemarks16(remark);
excel.setContactsEmail16(email);
excel.setContactsPhone16(phone);
case 16:
excel.setContactsName17(name);
excel.setRemarks17(remark);
excel.setContactsEmail17(email);
excel.setContactsPhone17(phone);
case 17:
excel.setContactsName18(name);
excel.setRemarks18(remark);
excel.setContactsEmail18(email);
excel.setContactsPhone18(phone);
case 18:
excel.setContactsName19(name);
excel.setRemarks19(remark);
excel.setContactsEmail19(email);
excel.setContactsPhone19(phone);
case 19:
excel.setContactsName20(name);
excel.setRemarks20(remark);
excel.setContactsEmail20(email);
excel.setContactsPhone20(phone);
break;
default:break;
}
jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItem.java
+251
View File
@@ -537,6 +537,257 @@ public class PayWorkingGroupSubItem implements Serializable {
@TableField(exist = false)
private String remarksTen;
/**
* 企业联系人名称11
*/
@TableField(exist = false)
@Excel(name = "企业联系人11", width = 15)
private String contactsName11;
/**
* 企业联系人手机号11
*/
@TableField(exist = false)
@Excel(name = "企业联系人手机号11", width = 17)
private String contactsPhone11;
/**
* 企业联系人邮箱11
*/
@TableField(exist = false)
@Excel(name = "企业联系人邮箱11", width = 15)
private String contactsEmail11;
/**
* 联系人备注11
*/
@TableField(exist = false)
@Excel(name = "联系人备注11", width = 15)
@Size(max = 50,message = "联系人备注11长度不能大于50个字符")
private String remarks11;
/**
* 企业联系人名称12
*/
@TableField(exist = false)
@Excel(name = "企业联系人12", width = 15)
private String contactsName12;
/**
* 企业联系人手机号12
*/
@TableField(exist = false)
@Excel(name = "企业联系人手机号12", width = 17)
private String contactsPhone12;
/**
* 企业联系人邮箱12
*/
@TableField(exist = false)
@Excel(name = "企业联系人邮箱12", width = 15)
private String contactsEmail12;
/**
* 联系人备注12
*/
@TableField(exist = false)
@Excel(name = "联系人备注12", width = 15)
@Size(max = 50,message = "联系人备注12长度不能大于50个字符")
private String remarks12;
/**
* 企业联系人名称13
*/
@TableField(exist = false)
@Excel(name = "企业联系人13", width = 15)
private String contactsName13;
/**
* 企业联系人手机号13
*/
@TableField(exist = false)
@Excel(name = "企业联系人手机号13", width = 17)
private String contactsPhone13;
/**
* 企业联系人邮箱13
*/
@TableField(exist = false)
@Excel(name = "企业联系人邮箱13", width = 15)
private String contactsEmail13;
/**
* 联系人备注13
*/
@TableField(exist = false)
@Excel(name = "联系人备注13", width = 15)
@Size(max = 50,message = "联系人备注13长度不能大于50个字符")
private String remarks13;
/**
* 企业联系人名称14
*/
@TableField(exist = false)
@Excel(name = "企业联系人14", width = 15)
private String contactsName14;
/**
* 企业联系人手机号14
*/
@TableField(exist = false)
@Excel(name = "企业联系人手机号14", width = 17)
private String contactsPhone14;
/**
* 企业联系人邮箱14
*/
@TableField(exist = false)
@Excel(name = "企业联系人邮箱14", width = 15)
private String contactsEmail14;
/**
* 联系人备注14
*/
@TableField(exist = false)
@Excel(name = "联系人备注14", width = 15)
@Size(max = 50,message = "联系人备注14长度不能大于50个字符")
private String remarks14;
/**
* 企业联系人名称15
*/
@TableField(exist = false)
@Excel(name = "企业联系人15", width = 15)
private String contactsName15;
/**
* 企业联系人手机号15
*/
@TableField(exist = false)
@Excel(name = "企业联系人手机号15", width = 17)
private String contactsPhone15;
/**
* 企业联系人邮箱15
*/
@TableField(exist = false)
@Excel(name = "企业联系人邮箱15", width = 15)
private String contactsEmail15;
/**
* 联系人备注15
*/
@TableField(exist = false)
@Excel(name = "联系人备注15", width = 15)
@Size(max = 50,message = "联系人备注15长度不能大于50个字符")
private String remarks15;
/**
* 企业联系人名称16
*/
@TableField(exist = false)
@Excel(name = "企业联系人16", width = 15)
private String contactsName16;
/**
* 企业联系人手机号16
*/
@TableField(exist = false)
@Excel(name = "企业联系人手机号16", width = 17)
private String contactsPhone16;
/**
* 企业联系人邮箱16
*/
@TableField(exist = false)
@Excel(name = "企业联系人邮箱16", width = 15)
private String contactsEmail16;
/**
* 联系人备注16
*/
@TableField(exist = false)
@Excel(name = "联系人备注16", width = 15)
@Size(max = 50,message = "联系人备注16长度不能大于50个字符")
private String remarks16;
/**
* 企业联系人名称17
*/
@TableField(exist = false)
@Excel(name = "企业联系人17", width = 15)
private String contactsName17;
/**
* 企业联系人手机号17
*/
@TableField(exist = false)
@Excel(name = "企业联系人手机号17", width = 17)
private String contactsPhone17;
/**
* 企业联系人邮箱17
*/
@TableField(exist = false)
@Excel(name = "企业联系人邮箱17", width = 15)
private String contactsEmail17;
/**
* 联系人备注17
*/
@TableField(exist = false)
@Excel(name = "联系人备注17", width = 15)
@Size(max = 50,message = "联系人备注17长度不能大于50个字符")
private String remarks17;
/**
* 企业联系人名称18
*/
@TableField(exist = false)
@Excel(name = "企业联系人18", width = 15)
private String contactsName18;
/**
* 企业联系人手机号18
*/
@TableField(exist = false)
@Excel(name = "企业联系人手机号18", width = 17)
private String contactsPhone18;
/**
* 企业联系人邮箱18
*/
@TableField(exist = false)
@Excel(name = "企业联系人邮箱18", width = 15)
private String contactsEmail18;
/**
* 联系人备注18
*/
@TableField(exist = false)
@Excel(name = "联系人备注18", width = 15)
@Size(max = 50,message = "联系人备注18长度不能大于50个字符")
private String remarks18;
/**
* 企业联系人名称19
*/
@TableField(exist = false)
@Excel(name = "企业联系人19", width = 15)
private String contactsName19;
/**
* 企业联系人手机号19
*/
@TableField(exist = false)
@Excel(name = "企业联系人手机号19", width = 17)
private String contactsPhone19;
/**
* 企业联系人邮箱19
*/
@TableField(exist = false)
@Excel(name = "企业联系人邮箱19", width = 15)
private String contactsEmail19;
/**
* 联系人备注19
*/
@TableField(exist = false)
@Excel(name = "联系人备注19", width = 15)
@Size(max = 50,message = "联系人备注19长度不能大于50个字符")
private String remarks19;
/**
* 企业联系人名称20
*/
@TableField(exist = false)
@Excel(name = "企业联系人20", width = 15)
private String contactsName20;
/**
* 企业联系人手机号20
*/
@TableField(exist = false)
@Excel(name = "企业联系人手机号20", width = 17)
private String contactsPhone20;
/**
* 企业联系人邮箱20
*/
@TableField(exist = false)
@Excel(name = "企业联系人邮箱20", width = 15)
private String contactsEmail20;
/**
* 联系人备注20
*/
@TableField(exist = false)
@Excel(name = "联系人备注20", width = 15)
@Size(max = 50,message = "联系人备注20长度不能大于50个字符")
private String remarks20;
@ApiModelProperty(value = "确认收入（（1：全额（对勾），0：0（X），2：>0 && <总金额（半满标志）））")
private Integer affirmIncome;
jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java
+95
View File
@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.common.common.ProjectCommon;
import com.jero.common.constant.CommonConstant;
import com.jero.common.dto.PaySendContactsMessageDTO;
import com.jero.common.dto.SendMessageDTO;
import com.jero.common.enums.CompanyMessageEnums;
@@ -30,6 +31,8 @@ import com.jero.contract.entity.PayIncomeContract;
import com.jero.contract.entity.PayIncomeContractAssociated;
import com.jero.contract.service.IPayIncomeContractAssociatedService;
import com.jero.contract.service.IPayIncomeContractService;
import com.jero.drafting.entity.PayDraftingGroupSubItem;
import com.jero.drafting.entity.PayDraftingGroupSubItemContacts;
import com.jero.mail.service.IPayMailBillService;
import com.jero.meeting.entity.PayMeetingRemindRecord;
import com.jero.meeting.service.IPayMeetingRemindRecordService;
@@ -773,6 +776,56 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
if (!CollectionUtils.isEmpty(listContactsName10)) {
listContactsName.addAll(listContactsName10);
}
// 获取excel中联系人11名称
List<String> listContactsName11 = list.stream().map(PayWorkingGroupSubItem::getContactsName11).collect(Collectors.toList());
if(!CollectionUtils.isEmpty(listContactsName11)){
listContactsName.addAll(listContactsName11);
}
// 获取excel中联系人12名称
List<String> listContactsName12 = list.stream().map(PayWorkingGroupSubItem::getContactsName12).collect(Collectors.toList());
if(!CollectionUtils.isEmpty(listContactsName12)){
listContactsName.addAll(listContactsName12);
}
// 获取excel中联系人13名称
List<String> listContactsName13 = list.stream().map(PayWorkingGroupSubItem::getContactsName13).collect(Collectors.toList());
if(!CollectionUtils.isEmpty(listContactsName13)){
listContactsName.addAll(listContactsName13);
}
// 获取excel中联系人14名称
List<String> listContactsName14 = list.stream().map(PayWorkingGroupSubItem::getContactsName14).collect(Collectors.toList());
if(!CollectionUtils.isEmpty(listContactsName14)){
listContactsName.addAll(listContactsName14);
}
// 获取excel中联系人15名称
List<String> listContactsName15 = list.stream().map(PayWorkingGroupSubItem::getContactsName15).collect(Collectors.toList());
if(!CollectionUtils.isEmpty(listContactsName15)){
listContactsName.addAll(listContactsName15);
}
// 获取excel中联系人16名称
List<String> listContactsName16 = list.stream().map(PayWorkingGroupSubItem::getContactsName16).collect(Collectors.toList());
if(!CollectionUtils.isEmpty(listContactsName16)){
listContactsName.addAll(listContactsName16);
}
// 获取excel中联系人17名称
List<String> listContactsName17 = list.stream().map(PayWorkingGroupSubItem::getContactsName17).collect(Collectors.toList());
if(!CollectionUtils.isEmpty(listContactsName17)){
listContactsName.addAll(listContactsName17);
}
// 获取excel中联系人18名称
List<String> listContactsName18 = list.stream().map(PayWorkingGroupSubItem::getContactsName18).collect(Collectors.toList());
if(!CollectionUtils.isEmpty(listContactsName18)){
listContactsName.addAll(listContactsName18);
}
// 获取excel中联系人19名称
List<String> listContactsName19 = list.stream().map(PayWorkingGroupSubItem::getContactsName19).collect(Collectors.toList());
if(!CollectionUtils.isEmpty(listContactsName19)){
listContactsName.addAll(listContactsName19);
}
// 获取excel中联系人20名称
List<String> listContactsName20 = list.stream().map(PayWorkingGroupSubItem::getContactsName20).collect(Collectors.toList());
if(!CollectionUtils.isEmpty(listContactsName20)){
listContactsName.addAll(listContactsName20);
}
// 获取excel中邮寄联系人名称
List<String> listContactsNameMail = list.stream().map(PayWorkingGroupSubItem::getMailContactsTemporaryName).collect(Collectors.toList());
if (!CollectionUtils.isEmpty(listContactsNameMail)) {
@@ -905,6 +958,8 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
p.setInAccount(PayProjectCommon.IN_ACCOUNT0);
p.setMakeInvoice(PayProjectCommon.MAKE_INVOICE0);
p.setMail(PayProjectCommon.MAIL0);
p.setCheckPaymentStatus(CommonConstant.NO);
p.setConfirmVoucher(CommonConstant.NO);
// 校验字段值
StringBuilder s = ValidUtil.validateExcel(p, (count + 3));
if (!StringUtils.isBlank(s)) {
@@ -1027,6 +1082,46 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
PayWorkingGroupSubItemContacts payWorkingGroupSubItemContacts = setContactsId(msg, p.getContactsNameTen(), 10, count, listCompany, listContactsInfo, map);
list.add(payWorkingGroupSubItemContacts);
}
if(!StringUtils.isBlank(p.getContactsName11())){
PayWorkingGroupSubItemContacts payWorkingGroupSubItemContacts = setContactsId(msg,p.getContactsName11(),11,count,listCompany,listContactsInfo,map);
list.add(payWorkingGroupSubItemContacts);
}
if(!StringUtils.isBlank(p.getContactsName12())){
PayWorkingGroupSubItemContacts payWorkingGroupSubItemContacts = setContactsId(msg,p.getContactsName12(),12,count,listCompany,listContactsInfo,map);
list.add(payWorkingGroupSubItemContacts);
}
if(!StringUtils.isBlank(p.getContactsName13())){
PayWorkingGroupSubItemContacts payWorkingGroupSubItemContacts = setContactsId(msg,p.getContactsName13(),13,count,listCompany,listContactsInfo,map);
list.add(payWorkingGroupSubItemContacts);
}
if(!StringUtils.isBlank(p.getContactsName14())){
PayWorkingGroupSubItemContacts payWorkingGroupSubItemContacts = setContactsId(msg,p.getContactsName14(),14,count,listCompany,listContactsInfo,map);
list.add(payWorkingGroupSubItemContacts);
}
if(!StringUtils.isBlank(p.getContactsName15())){
PayWorkingGroupSubItemContacts payWorkingGroupSubItemContacts = setContactsId(msg,p.getContactsName15(),15,count,listCompany,listContactsInfo,map);
list.add(payWorkingGroupSubItemContacts);
}
if(!StringUtils.isBlank(p.getContactsName16())){
PayWorkingGroupSubItemContacts payWorkingGroupSubItemContacts = setContactsId(msg,p.getContactsName16(),16,count,listCompany,listContactsInfo,map);
list.add(payWorkingGroupSubItemContacts);
}
if(!StringUtils.isBlank(p.getContactsName17())){
PayWorkingGroupSubItemContacts payWorkingGroupSubItemContacts = setContactsId(msg,p.getContactsName17(),17,count,listCompany,listContactsInfo,map);
list.add(payWorkingGroupSubItemContacts);
}
if(!StringUtils.isBlank(p.getContactsName18())){
PayWorkingGroupSubItemContacts payWorkingGroupSubItemContacts = setContactsId(msg,p.getContactsName18(),18,count,listCompany,listContactsInfo,map);
list.add(payWorkingGroupSubItemContacts);
}
if(!StringUtils.isBlank(p.getContactsName19())){
PayWorkingGroupSubItemContacts payWorkingGroupSubItemContacts = setContactsId(msg,p.getContactsName19(),19,count,listCompany,listContactsInfo,map);
list.add(payWorkingGroupSubItemContacts);
}
if(!StringUtils.isBlank(p.getContactsName20())){
PayWorkingGroupSubItemContacts payWorkingGroupSubItemContacts = setContactsId(msg,p.getContactsName20(),20,count,listCompany,listContactsInfo,map);
list.add(payWorkingGroupSubItemContacts);
}
return list;
}
jero-boot-incoming-payment/src/main/java/com/jero/project/vo/excel/PayWorkingGroupSubItemExcel.java
+201
View File
@@ -325,6 +325,207 @@ public class PayWorkingGroupSubItemExcel implements Serializable {
@ApiModelProperty(value = "联系人10备注")
private String remarksTen;
/**
* 企业联系人名称11
*/
@Excel(name = "企业联系人11", width = 15)
private String contactsName11;
/**
* 企业联系人手机号11
*/
@Excel(name = "企业联系人手机号11", width = 17)
private String contactsPhone11;
/**
* 企业联系人邮箱11
*/
@Excel(name = "企业联系人邮箱11", width = 15)
private String contactsEmail11;
/**
* 联系人备注11
*/
@Excel(name = "联系人备注11", width = 15)
private String remarks11;
/**
* 企业联系人名称12
*/
@Excel(name = "企业联系人12", width = 15)
private String contactsName12;
/**
* 企业联系人手机号12
*/
@Excel(name = "企业联系人手机号12", width = 17)
private String contactsPhone12;
/**
* 企业联系人邮箱12
*/
@Excel(name = "企业联系人邮箱12", width = 15)
private String contactsEmail12;
/**
* 联系人备注12
*/
@Excel(name = "联系人备注12", width = 15)
private String remarks12;
/**
* 企业联系人名称13
*/
@Excel(name = "企业联系人13", width = 15)
private String contactsName13;
/**
* 企业联系人手机号13
*/
@Excel(name = "企业联系人手机号13", width = 17)
private String contactsPhone13;
/**
* 企业联系人邮箱13
*/
@Excel(name = "企业联系人邮箱13", width = 15)
private String contactsEmail13;
/**
* 联系人备注13
*/
@Excel(name = "联系人备注13", width = 15)
private String remarks13;
/**
* 企业联系人名称14
*/
@Excel(name = "企业联系人14", width = 15)
private String contactsName14;
/**
* 企业联系人手机号14
*/
@Excel(name = "企业联系人手机号14", width = 17)
private String contactsPhone14;
/**
* 企业联系人邮箱14
*/
@Excel(name = "企业联系人邮箱14", width = 15)
private String contactsEmail14;
/**
* 联系人备注14
*/
@Excel(name = "联系人备注14", width = 15)
private String remarks14;
/**
* 企业联系人名称15
*/
@Excel(name = "企业联系人15", width = 15)
private String contactsName15;
/**
* 企业联系人手机号15
*/
@Excel(name = "企业联系人手机号15", width = 17)
private String contactsPhone15;
/**
* 企业联系人邮箱15
*/
@Excel(name = "企业联系人邮箱15", width = 15)
private String contactsEmail15;
/**
* 联系人备注15
*/
@Excel(name = "联系人备注15", width = 15)
private String remarks15;
/**
* 企业联系人名称16
*/
@Excel(name = "企业联系人16", width = 15)
private String contactsName16;
/**
* 企业联系人手机号16
*/
@Excel(name = "企业联系人手机号16", width = 17)
private String contactsPhone16;
/**
* 企业联系人邮箱16
*/
@Excel(name = "企业联系人邮箱16", width = 15)
private String contactsEmail16;
/**
* 联系人备注16
*/
@Excel(name = "联系人备注16", width = 15)
private String remarks16;
/**
* 企业联系人名称17
*/
@Excel(name = "企业联系人17", width = 15)
private String contactsName17;
/**
* 企业联系人手机号17
*/
@Excel(name = "企业联系人手机号17", width = 17)
private String contactsPhone17;
/**
* 企业联系人邮箱17
*/
@Excel(name = "企业联系人邮箱17", width = 15)
private String contactsEmail17;
/**
* 联系人备注17
*/
@Excel(name = "联系人备注17", width = 15)
private String remarks17;
/**
* 企业联系人名称18
*/
@Excel(name = "企业联系人18", width = 15)
private String contactsName18;
/**
* 企业联系人手机号18
*/
@Excel(name = "企业联系人手机号18", width = 17)
private String contactsPhone18;
/**
* 企业联系人邮箱18
*/
@Excel(name = "企业联系人邮箱18", width = 15)
private String contactsEmail18;
/**
* 联系人备注18
*/
@Excel(name = "联系人备注18", width = 15)
private String remarks18;
/**
* 企业联系人名称19
*/
@Excel(name = "企业联系人19", width = 15)
private String contactsName19;
/**
* 企业联系人手机号19
*/
@Excel(name = "企业联系人手机号19", width = 17)
private String contactsPhone19;
/**
* 企业联系人邮箱19
*/
@Excel(name = "企业联系人邮箱19", width = 15)
private String contactsEmail19;
/**
* 联系人备注19
*/
@Excel(name = "联系人备注19", width = 15)
private String remarks19;
/**
* 企业联系人名称20
*/
@Excel(name = "企业联系人20", width = 15)
private String contactsName20;
/**
* 企业联系人手机号20
*/
@Excel(name = "企业联系人手机号20", width = 17)
private String contactsPhone20;
/**
* 企业联系人邮箱20
*/
@Excel(name = "企业联系人邮箱20", width = 15)
private String contactsEmail20;
/**
* 联系人备注20
*/
@Excel(name = "联系人备注20", width = 15)
private String remarks20;
@Excel(name = "标签名称", width = 15)
@ApiModelProperty(value = "标签")
private String label;