Merge branch '24年二季度其他'
This commit is contained in:
lijiarao
+25
-1
@@ -225,4 +225,28 @@ alter table tb_member_project_subitem
|
||||
add post_contact_temporary_id varchar(150) null comment '邮寄联系人临时id' after post_contact_id;
|
||||
# 标协会员项目增加临时id
|
||||
alter table pay_pack_company
|
||||
add mail_contact_temporary_id varchar(150) null comment '邮寄联系人临时id' after mail_contacts_id;
|
||||
add mail_contact_temporary_id varchar(150) null comment '邮寄联系人临时id' after mail_contacts_id;
|
||||
|
||||
-- 20240807 工作组成员单位 审核凭证修改成查看凭证
|
||||
UPDATE sys_permission SET parent_id='1431167539278086146', name='查看凭证' WHERE id='1808440661174550530';
|
||||
-- 20240807 会议 查看凭证 按钮
|
||||
INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1821076019175383042', '1443460205023940610', '查看凭证', NULL, NULL, NULL, NULL, 2, 'otherMeetingSituation:lookVoucher', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-08-07 14:48:52', NULL, NULL, 0, 0, '1', 0, 1);
|
||||
INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1821076182862290946', '1443461591480487938', '查看凭证', NULL, NULL, NULL, NULL, 2, 'committeeMeetingSituation:lookVoucher', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-08-07 14:49:31', NULL, NULL, 0, 0, '1', 0, 1);
|
||||
INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1821076336449314817', '1433322232030777345', '查看凭证', NULL, NULL, NULL, NULL, 2, 'internalMeetingSituation:lookVoucher', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-08-07 14:50:07', NULL, NULL, 0, 0, '1', 0, 1);
|
||||
INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1821076500849254402', '1470954992463327234', '查看凭证', NULL, NULL, NULL, NULL, 2, 'councilMeetingSituation:lookVoucher', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-08-07 14:50:46', NULL, NULL, 0, 0, '1', 0, 1);
|
||||
INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1821077226275102721', '1443470901166039042', '查看凭证', NULL, NULL, NULL, NULL, 2, 'standardsMeetingSituation:lookVoucher', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-08-07 14:53:39', NULL, NULL, 0, 0, '1', 0, 1);
|
||||
INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1821829573108494337', '1443462660843458561', '查看凭证', NULL, NULL, NULL, NULL, 2, 'workGroupMeetingSituation:lookVoucher', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-08-09 16:43:13', NULL, NULL, 0, 0, '1', 0, 1);
|
||||
|
||||
-- 20240807 会议酒店推荐调整菜单层级 增加菜单。会议汇总 修改成 会议信息统计
|
||||
DELETE FROM sys_permission where id = '1812785413516914690';
|
||||
UPDATE sys_permission SET menu_type = 0 , parent_id = NULL, sort_no = 4.2, icon = 'fund',hidden = 0 WHERE id = '1808757213186904065';
|
||||
UPDATE sys_permission SET `name`= '会议信息统计', menu_type = 1 , parent_id = '1437320526513905666', icon = NULL, sort_no = 14.00 WHERE id = '1626061755230580738';
|
||||
-- 20240807 功能安全中心菜单中增加 汽车2字
|
||||
UPDATE sys_permission SET `name`= '汽车功能安全中心' WHERE id = '1802631077112610817';
|
||||
UPDATE sys_permission SET `name`= '汽车功能安全中心成员维护' WHERE id = '1802967227660554241';
|
||||
UPDATE sys_permission SET `name`= '汽车功能安全中心参会情况' WHERE id = '1802969401866113025';
|
||||
UPDATE sys_permission SET `name`= '汽车功能安全中心会议维护' WHERE id = '1802970571397451777';
|
||||
UPDATE sys_permission SET `name`= '汽车功能安全中心会议' WHERE id = '1808094888670056450';
|
||||
|
||||
-- 处理标协会员未缴费历史数据
|
||||
update tb_member_project_subitem set member_status = 3 where member_status != 3 and payment_status = 'completed';
|
||||
|
||||
+3
@@ -311,4 +311,7 @@ public interface CommonConstant {
|
||||
public final static String THIRD_LOGIN_CODE = "third_login_code";
|
||||
|
||||
public final static String ZERO = "0.00";
|
||||
|
||||
Integer YES = 1;
|
||||
Integer NO = 0;
|
||||
}
|
||||
|
||||
+9
@@ -38,6 +38,7 @@
|
||||
c.tax_rate as tax_rate,
|
||||
c.tax as tax,
|
||||
c.no_tax_amount as no_tax_amount,
|
||||
c.confirm_amount as confirm_amount,
|
||||
c.affirm_income as affirm_income
|
||||
from pay_common_project c
|
||||
left join sys_user su on c.principal_id = su.id
|
||||
@@ -82,6 +83,7 @@
|
||||
c.tax_rate as tax_rate,
|
||||
c.tax as tax,
|
||||
c.no_tax_amount as no_tax_amount,
|
||||
c.confirm_amount as confirm_amount,
|
||||
affirm_income
|
||||
from pay_working_group g
|
||||
left join sys_user su on g.principal_id_a = su.id
|
||||
@@ -127,6 +129,7 @@
|
||||
c.tax_rate as tax_rate,
|
||||
c.tax as tax,
|
||||
c.no_tax_amount as no_tax_amount,
|
||||
c.confirm_amount as confirm_amount,
|
||||
affirm_income
|
||||
from pay_meeting meeting
|
||||
left join sys_user su on meeting.director_id = su.id
|
||||
@@ -172,6 +175,7 @@
|
||||
c.tax_rate as tax_rate,
|
||||
c.tax as tax,
|
||||
c.no_tax_amount as no_tax_amount,
|
||||
c.confirm_amount as confirm_amount,
|
||||
affirm_income
|
||||
from pay_member_project pmp
|
||||
left join sys_user su on pmp.director_id = su.id
|
||||
@@ -217,6 +221,7 @@
|
||||
c.tax_rate as tax_rate,
|
||||
c.tax as tax,
|
||||
c.no_tax_amount as no_tax_amount,
|
||||
c.confirm_amount as confirm_amount,
|
||||
affirm_income
|
||||
from tb_member_project tmember
|
||||
left join sys_user su on tmember.director_id = su.id
|
||||
@@ -264,6 +269,7 @@
|
||||
c.tax_rate as tax_rate,
|
||||
c.tax as tax,
|
||||
c.no_tax_amount as no_tax_amount,
|
||||
c.confirm_amount as confirm_amount,
|
||||
affirm_income
|
||||
from tb_member_project tmember
|
||||
left join sys_user su on tmember.director_id = su.id
|
||||
@@ -309,6 +315,7 @@
|
||||
'' as tax_rate,
|
||||
'' as tax,
|
||||
'' as no_tax_amount,
|
||||
'' as confirm_amount,
|
||||
''
|
||||
FROM
|
||||
pay_drafting_group g
|
||||
@@ -357,6 +364,7 @@
|
||||
c.tax_rate as tax_rate,
|
||||
c.tax as tax,
|
||||
c.no_tax_amount as no_tax_amount,
|
||||
c.confirm_amount as confirm_amount,
|
||||
c.income_affirm AS affirm_income
|
||||
from pay_pack_company c
|
||||
left join sys_user su on c.pack_principal_id = su.id
|
||||
@@ -402,6 +410,7 @@
|
||||
'' as tax_rate,
|
||||
'' as tax,
|
||||
'' as no_tax_amount,
|
||||
'' as confirm_amount,
|
||||
''
|
||||
FROM
|
||||
pay_functional_safety_center c
|
||||
|
||||
+8
-1
@@ -37,6 +37,7 @@ import com.jero.modules.system.entity.SysUser;
|
||||
import com.jero.modules.system.service.ISysUserService;
|
||||
import com.jero.payment.entity.PayPaymentRecord;
|
||||
import com.jero.payment.service.IPayPaymentRecordService;
|
||||
import com.jero.payment.service.impl.PayConfirmPaymentRecordService;
|
||||
import com.jero.project.common.PayProjectCommon;
|
||||
import com.jero.project.entity.PayCommonProject;
|
||||
import com.jero.project.entity.PayWorkingGroupDistributionRecord;
|
||||
@@ -103,6 +104,8 @@ public class ProjectDetailServiceImpl implements ProjectDetailService {
|
||||
private ITbMemberProjectSubitemService tbMemberProjectSubitemService;
|
||||
@Resource
|
||||
private SafetyCenterSubitemContactsService safetyCenterSubitemContactsService;
|
||||
@Resource
|
||||
private PayConfirmPaymentRecordService confirmPaymentRecordService;
|
||||
|
||||
@Override
|
||||
public ProjectDetailVO getProjectDetail(String projectId) {
|
||||
@@ -495,7 +498,7 @@ public class ProjectDetailServiceImpl implements ProjectDetailService {
|
||||
projectStatusVO.setMakeInvoice(ProjectCommon.MAKE_INVOICE0);
|
||||
}
|
||||
// 开票金额 > 0 && 开票金额 < 待确收金额 = 2
|
||||
if(invoice.compareTo(new BigDecimal("0.00")) > 0 && invoice.compareTo(payCommonProject.getReceivableAmount()) < 0){
|
||||
if(invoice.compareTo(new BigDecimal("0.00")) > 0 && invoice.compareTo(receivableAmount) < 0){
|
||||
projectStatusVO.setMakeInvoice(ProjectCommon.MAKE_INVOICE2);
|
||||
}
|
||||
}
|
||||
@@ -512,6 +515,10 @@ public class ProjectDetailServiceImpl implements ProjectDetailService {
|
||||
if(y > 0 && y <= c){
|
||||
projectStatusVO.setMail(ProjectCommon.MAIL2);
|
||||
}
|
||||
//确认收入
|
||||
BigDecimal confirmAmount = payCommonProject.getConfirmAmount();
|
||||
Integer affirmIncome = confirmPaymentRecordService.getAffirmIncome(receivableAmount, confirmAmount);
|
||||
projectStatusVO.setAffirmIncome(affirmIncome);
|
||||
return projectStatusVO;
|
||||
}
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
package com.jero.common.vo;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
@@ -18,4 +19,9 @@ public class ProjectStatusVO implements Serializable {
|
||||
* 邮寄（（1：全额（对勾），0：0（X），2：>0 && <总金额（半满标志）））
|
||||
*/
|
||||
private Integer mail;
|
||||
|
||||
/**
|
||||
* 确认收入（（1：全额（对勾），0：0（X），2：>0 && <总金额（半满标志）））
|
||||
*/
|
||||
private Integer affirmIncome;
|
||||
}
|
||||
|
||||
+58
-8
@@ -431,22 +431,21 @@ public class PayDraftingGroupSubItemController extends JeroController<PayDraftin
|
||||
// 拿到该名成员对应的联系人的id的list
|
||||
List<String> listIds = listPayDraftingGroupSubItemContacts.stream().map(PayDraftingGroupSubItemContacts::getContactsTemporaryId).collect(Collectors.toList());
|
||||
// 拿到所有联系人信息对应的详情信息
|
||||
List<PayContactsManagementTemporary> listPayContactsManagementTemporary = payContactsManagementTemporaryService.listByIds(listIds);
|
||||
for (int i = 0; i < listPayDraftingGroupSubItemContacts.size(); i++) {
|
||||
PayDraftingGroupSubItemContacts payDraftingGroupSubItemContacts = listPayDraftingGroupSubItemContacts.get(i);
|
||||
PayDraftingGroupSubItemContacts contacts = listPayDraftingGroupSubItemContacts.get(i);
|
||||
// 拿到该联系人的详情信息
|
||||
List<PayContactsManagementTemporary> temporary = listPayContactsManagementTemporary.stream().filter(s->Objects.equals(s.getId(),payDraftingGroupSubItemContacts.getContactsTemporaryId())).collect(Collectors.toList());
|
||||
PayContactsManagementTemporary temporary = payContactsManagementTemporaryService.getByAllTable(contacts.getContactsId(), contacts.getContactsTemporaryId());
|
||||
String email = "";
|
||||
String phone = "";
|
||||
String name = payDraftingGroupSubItemContacts.getContactsTemporaryName();
|
||||
String remark = payDraftingGroupSubItemContacts.getRemarks();
|
||||
if(!CollectionUtils.isEmpty(temporary)){
|
||||
email = temporary.get(0).getEmail();
|
||||
String name = contacts.getContactsTemporaryName();
|
||||
String remark = contacts.getRemarks();
|
||||
if(temporary != null){
|
||||
email = temporary.getEmail();
|
||||
// 解密
|
||||
if (StringUtils.isNotBlank(email)){
|
||||
email = PasswordUtil.decrypt(email);
|
||||
}
|
||||
phone = temporary.get(0).getPhone();
|
||||
phone = temporary.getPhone();
|
||||
if (StringUtils.isNotBlank(phone)){
|
||||
phone = PasswordUtil.decrypt(phone);
|
||||
}
|
||||
@@ -512,6 +511,57 @@ public class PayDraftingGroupSubItemController extends JeroController<PayDraftin
|
||||
excel.setContactsEmailTen(email);
|
||||
excel.setContactsPhoneTen(phone);
|
||||
break;
|
||||
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;
|
||||
}
|
||||
}
|
||||
|
||||
+251
@@ -410,6 +410,257 @@ public class PayDraftingGroupSubItem 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;
|
||||
|
||||
|
||||
/**已提醒*/
|
||||
@TableField(exist = false)
|
||||
|
||||
+101
@@ -579,6 +579,57 @@ public class PayDraftingGroupSubItemServiceImpl extends ServiceImpl<PayDraftingG
|
||||
if(!CollectionUtils.isEmpty(listContactsName10)){
|
||||
listContactsName.addAll(listContactsName10);
|
||||
}
|
||||
|
||||
// 获取excel中联系人11名称
|
||||
List<String> listContactsName11 = list.stream().map(PayDraftingGroupSubItem::getContactsName11).collect(Collectors.toList());
|
||||
if(!CollectionUtils.isEmpty(listContactsName11)){
|
||||
listContactsName.addAll(listContactsName11);
|
||||
}
|
||||
// 获取excel中联系人12名称
|
||||
List<String> listContactsName12 = list.stream().map(PayDraftingGroupSubItem::getContactsName12).collect(Collectors.toList());
|
||||
if(!CollectionUtils.isEmpty(listContactsName12)){
|
||||
listContactsName.addAll(listContactsName12);
|
||||
}
|
||||
// 获取excel中联系人13名称
|
||||
List<String> listContactsName13 = list.stream().map(PayDraftingGroupSubItem::getContactsName13).collect(Collectors.toList());
|
||||
if(!CollectionUtils.isEmpty(listContactsName13)){
|
||||
listContactsName.addAll(listContactsName13);
|
||||
}
|
||||
// 获取excel中联系人14名称
|
||||
List<String> listContactsName14 = list.stream().map(PayDraftingGroupSubItem::getContactsName14).collect(Collectors.toList());
|
||||
if(!CollectionUtils.isEmpty(listContactsName14)){
|
||||
listContactsName.addAll(listContactsName14);
|
||||
}
|
||||
// 获取excel中联系人15名称
|
||||
List<String> listContactsName15 = list.stream().map(PayDraftingGroupSubItem::getContactsName15).collect(Collectors.toList());
|
||||
if(!CollectionUtils.isEmpty(listContactsName15)){
|
||||
listContactsName.addAll(listContactsName15);
|
||||
}
|
||||
// 获取excel中联系人16名称
|
||||
List<String> listContactsName16 = list.stream().map(PayDraftingGroupSubItem::getContactsName16).collect(Collectors.toList());
|
||||
if(!CollectionUtils.isEmpty(listContactsName16)){
|
||||
listContactsName.addAll(listContactsName16);
|
||||
}
|
||||
// 获取excel中联系人17名称
|
||||
List<String> listContactsName17 = list.stream().map(PayDraftingGroupSubItem::getContactsName17).collect(Collectors.toList());
|
||||
if(!CollectionUtils.isEmpty(listContactsName17)){
|
||||
listContactsName.addAll(listContactsName17);
|
||||
}
|
||||
// 获取excel中联系人18名称
|
||||
List<String> listContactsName18 = list.stream().map(PayDraftingGroupSubItem::getContactsName18).collect(Collectors.toList());
|
||||
if(!CollectionUtils.isEmpty(listContactsName18)){
|
||||
listContactsName.addAll(listContactsName18);
|
||||
}
|
||||
// 获取excel中联系人19名称
|
||||
List<String> listContactsName19 = list.stream().map(PayDraftingGroupSubItem::getContactsName19).collect(Collectors.toList());
|
||||
if(!CollectionUtils.isEmpty(listContactsName19)){
|
||||
listContactsName.addAll(listContactsName19);
|
||||
}
|
||||
// 获取excel中联系人20名称
|
||||
List<String> listContactsName20 = list.stream().map(PayDraftingGroupSubItem::getContactsName20).collect(Collectors.toList());
|
||||
if(!CollectionUtils.isEmpty(listContactsName20)){
|
||||
listContactsName.addAll(listContactsName20);
|
||||
}
|
||||
// 获取excel联系人信息
|
||||
LambdaQueryWrapper<PayContactsManagement> contactsWrapper = new LambdaQueryWrapper<>();
|
||||
contactsWrapper.in(PayContactsManagement::getName,listContactsName);
|
||||
@@ -686,6 +737,16 @@ public class PayDraftingGroupSubItemServiceImpl extends ServiceImpl<PayDraftingG
|
||||
arrayList.add(p.getRemarksEight());
|
||||
arrayList.add(p.getRemarksNine());
|
||||
arrayList.add(p.getRemarksTen());
|
||||
arrayList.add(p.getRemarks11());
|
||||
arrayList.add(p.getRemarks12());
|
||||
arrayList.add(p.getRemarks13());
|
||||
arrayList.add(p.getRemarks14());
|
||||
arrayList.add(p.getRemarks15());
|
||||
arrayList.add(p.getRemarks16());
|
||||
arrayList.add(p.getRemarks17());
|
||||
arrayList.add(p.getRemarks18());
|
||||
arrayList.add(p.getRemarks19());
|
||||
arrayList.add(p.getRemarks20());
|
||||
return arrayList;
|
||||
}
|
||||
|
||||
@@ -744,6 +805,46 @@ public class PayDraftingGroupSubItemServiceImpl extends ServiceImpl<PayDraftingG
|
||||
PayDraftingGroupSubItemContacts payDraftingGroupSubItemContacts = setContactsId(msg,p.getContactsNameTen(),10,count,listCompany,listContactsInfo,map);
|
||||
list.add(payDraftingGroupSubItemContacts);
|
||||
}
|
||||
if(!StringUtils.isBlank(p.getContactsName11())){
|
||||
PayDraftingGroupSubItemContacts payDraftingGroupSubItemContacts = setContactsId(msg,p.getContactsName11(),11,count,listCompany,listContactsInfo,map);
|
||||
list.add(payDraftingGroupSubItemContacts);
|
||||
}
|
||||
if(!StringUtils.isBlank(p.getContactsName12())){
|
||||
PayDraftingGroupSubItemContacts payDraftingGroupSubItemContacts = setContactsId(msg,p.getContactsName12(),12,count,listCompany,listContactsInfo,map);
|
||||
list.add(payDraftingGroupSubItemContacts);
|
||||
}
|
||||
if(!StringUtils.isBlank(p.getContactsName13())){
|
||||
PayDraftingGroupSubItemContacts payDraftingGroupSubItemContacts = setContactsId(msg,p.getContactsName13(),13,count,listCompany,listContactsInfo,map);
|
||||
list.add(payDraftingGroupSubItemContacts);
|
||||
}
|
||||
if(!StringUtils.isBlank(p.getContactsName14())){
|
||||
PayDraftingGroupSubItemContacts payDraftingGroupSubItemContacts = setContactsId(msg,p.getContactsName14(),14,count,listCompany,listContactsInfo,map);
|
||||
list.add(payDraftingGroupSubItemContacts);
|
||||
}
|
||||
if(!StringUtils.isBlank(p.getContactsName15())){
|
||||
PayDraftingGroupSubItemContacts payDraftingGroupSubItemContacts = setContactsId(msg,p.getContactsName15(),15,count,listCompany,listContactsInfo,map);
|
||||
list.add(payDraftingGroupSubItemContacts);
|
||||
}
|
||||
if(!StringUtils.isBlank(p.getContactsName16())){
|
||||
PayDraftingGroupSubItemContacts payDraftingGroupSubItemContacts = setContactsId(msg,p.getContactsName16(),16,count,listCompany,listContactsInfo,map);
|
||||
list.add(payDraftingGroupSubItemContacts);
|
||||
}
|
||||
if(!StringUtils.isBlank(p.getContactsName17())){
|
||||
PayDraftingGroupSubItemContacts payDraftingGroupSubItemContacts = setContactsId(msg,p.getContactsName17(),17,count,listCompany,listContactsInfo,map);
|
||||
list.add(payDraftingGroupSubItemContacts);
|
||||
}
|
||||
if(!StringUtils.isBlank(p.getContactsName18())){
|
||||
PayDraftingGroupSubItemContacts payDraftingGroupSubItemContacts = setContactsId(msg,p.getContactsName18(),18,count,listCompany,listContactsInfo,map);
|
||||
list.add(payDraftingGroupSubItemContacts);
|
||||
}
|
||||
if(!StringUtils.isBlank(p.getContactsName19())){
|
||||
PayDraftingGroupSubItemContacts payDraftingGroupSubItemContacts = setContactsId(msg,p.getContactsName19(),19,count,listCompany,listContactsInfo,map);
|
||||
list.add(payDraftingGroupSubItemContacts);
|
||||
}
|
||||
if(!StringUtils.isBlank(p.getContactsName20())){
|
||||
PayDraftingGroupSubItemContacts payDraftingGroupSubItemContacts = setContactsId(msg,p.getContactsName20(),20,count,listCompany,listContactsInfo,map);
|
||||
list.add(payDraftingGroupSubItemContacts);
|
||||
}
|
||||
return list;
|
||||
}
|
||||
|
||||
|
||||
+202
@@ -250,4 +250,206 @@ public class PayDraftingGroupSubItemExcel implements Serializable {
|
||||
@Excel(name = "联系人10备注", width = 15)
|
||||
@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;
|
||||
|
||||
}
|
||||
|
||||
+43
-5
@@ -1,5 +1,12 @@
|
||||
package com.jero.functionalsafetycenter.controller;
|
||||
|
||||
import cn.hutool.core.bean.BeanUtil;
|
||||
import cn.hutool.core.bean.copier.CopyOptions;
|
||||
import cn.hutool.core.collection.CollStreamUtil;
|
||||
import cn.hutool.core.collection.CollectionUtil;
|
||||
import cn.hutool.core.collection.IterUtil;
|
||||
import cn.hutool.core.collection.ListUtil;
|
||||
import cn.hutool.core.util.ObjUtil;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
@@ -11,11 +18,16 @@ import com.jero.common.exception.JeroBootException;
|
||||
import com.jero.common.system.base.controller.JeroController;
|
||||
import com.jero.common.system.query.QueryGenerator;
|
||||
import com.jero.common.system.vo.LoginUser;
|
||||
import com.jero.common.util.PasswordUtil;
|
||||
import com.jero.common.util.oConvertUtils;
|
||||
import com.jero.company.entity.PayContactsManagement;
|
||||
import com.jero.company.service.IPayContactsManagementService;
|
||||
import com.jero.functionalsafetycenter.entity.SafetyCenter;
|
||||
import com.jero.functionalsafetycenter.entity.SafetyCenterSubitem;
|
||||
import com.jero.functionalsafetycenter.entity.SafetyCenterSubitemContacts;
|
||||
import com.jero.functionalsafetycenter.service.SafetyCenterService;
|
||||
import com.jero.functionalsafetycenter.service.SafetyCenterSubitemService;
|
||||
import com.jero.functionalsafetycenter.vo.SafetyCenterSubitemExcel;
|
||||
import com.jero.functionalsafetycenter.vo.SafetyCenterSubitemImport;
|
||||
import com.jero.project.entity.PayWorkingGroup;
|
||||
import com.jero.project.entity.PayWorkingGroupSubItem;
|
||||
@@ -25,6 +37,7 @@ import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.apache.shiro.SecurityUtils;
|
||||
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
||||
import org.jeecgframework.poi.excel.entity.params.ExcelExportEntity;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
@@ -32,9 +45,7 @@ import org.springframework.web.servlet.ModelAndView;
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
import java.util.*;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
@@ -55,6 +66,8 @@ public class SafetyCenterSubitemController extends JeroController<SafetyCenterSu
|
||||
|
||||
@Resource
|
||||
private SafetyCenterService safetyCenterService;
|
||||
@Resource
|
||||
private IPayContactsManagementService contactsManagementService;
|
||||
|
||||
/**
|
||||
* 分页列表查询
|
||||
@@ -214,7 +227,32 @@ public class SafetyCenterSubitemController extends JeroController<SafetyCenterSu
|
||||
if (exportList.isEmpty()) {
|
||||
throw new JeroBootException("没有数据");
|
||||
}
|
||||
return super.exportListXls(exportList, SafetyCenterSubitem.class, "功能安全中心成员");
|
||||
|
||||
List<SafetyCenterSubitemExcel> list = new ArrayList<>();
|
||||
|
||||
for (SafetyCenterSubitem subitem : exportList) {
|
||||
Map<String, Object> map = new HashMap<>();
|
||||
map.put("companyId",subitem.getCompanyId());
|
||||
map.put("remarks",subitem.getRemarks());
|
||||
List<SafetyCenterSubitemContacts> contactsList = subitem.getContactsList();
|
||||
List<String> contactsIdList = contactsList.stream().map(SafetyCenterSubitemContacts::getContactsId).collect(Collectors.toList());
|
||||
List<PayContactsManagement> contactsManagementList = contactsManagementService.listByIds(contactsIdList);
|
||||
Map<String, PayContactsManagement> stringPayContactsManagementMap = CollStreamUtil.toIdentityMap(contactsManagementList, PayContactsManagement::getId);
|
||||
int i = 1;
|
||||
for (SafetyCenterSubitemContacts contacts : contactsList) {
|
||||
String contactsId = contacts.getContactsId();
|
||||
PayContactsManagement contactsManagement = stringPayContactsManagementMap.get(contactsId);
|
||||
map.put("contactsName"+i, contactsManagement.getName());
|
||||
map.put("contactsPhone"+i, PasswordUtil.decrypt(contactsManagement.getPhone()));
|
||||
map.put("contactsEmail"+i, PasswordUtil.decrypt(contactsManagement.getEmail()));
|
||||
map.put("remarks"+i,contacts.getRemarks());
|
||||
i++;
|
||||
}
|
||||
CopyOptions copyOptions = new CopyOptions();
|
||||
SafetyCenterSubitemExcel safetyCenterSubitemExcel = BeanUtil.mapToBean(map, SafetyCenterSubitemExcel.class, false, copyOptions);
|
||||
list.add(safetyCenterSubitemExcel);
|
||||
}
|
||||
return super.exportListXls(list, SafetyCenterSubitemExcel.class, "功能安全中心成员");
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -226,7 +264,7 @@ public class SafetyCenterSubitemController extends JeroController<SafetyCenterSu
|
||||
@ApiOperation(value = "功能安全中心成员-模板下载")
|
||||
@GetMapping(value = "/downloadExcelModel")
|
||||
public ModelAndView downloadExcelModel() {
|
||||
return super.exportTemplate(SafetyCenterSubitem.class, "功能安全中心成员导入模板");
|
||||
return super.exportTemplate(SafetyCenterSubitemExcel.class, "功能安全中心成员导入模板");
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
+22
-14
@@ -1,11 +1,13 @@
|
||||
package com.jero.functionalsafetycenter.service;
|
||||
|
||||
import cn.hutool.core.bean.BeanUtil;
|
||||
import cn.hutool.core.collection.CollStreamUtil;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.jero.common.exception.JeroBootException;
|
||||
import com.jero.common.system.vo.LoginUser;
|
||||
import com.jero.common.util.PasswordUtil;
|
||||
import com.jero.company.entity.PayCompanyManagement;
|
||||
import com.jero.company.entity.PayContactsManagement;
|
||||
import com.jero.company.service.IPayCompanyManagementService;
|
||||
@@ -14,6 +16,7 @@ import com.jero.functionalsafetycenter.common.SafetyCenterCommon;
|
||||
import com.jero.functionalsafetycenter.entity.SafetyCenter;
|
||||
import com.jero.functionalsafetycenter.entity.SafetyCenterSubitemContacts;
|
||||
import com.jero.functionalsafetycenter.vo.SafetyCenterSubitemContactsImport;
|
||||
import com.jero.functionalsafetycenter.vo.SafetyCenterSubitemExcel;
|
||||
import com.jero.functionalsafetycenter.vo.SafetyCenterSubitemImport;
|
||||
import com.jero.project.entity.PayWorkingGroupSubItem;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
@@ -302,13 +305,24 @@ public class SafetyCenterSubitemService extends ServiceImpl<SafetyCenterSubitemM
|
||||
}
|
||||
List<String> errorMessage = new ArrayList<>();
|
||||
List<String> companyNameList = new ArrayList<>();
|
||||
int errorRowNum = 3;
|
||||
int errorRowNum2 = 3;
|
||||
int errorRowNum = 2;
|
||||
for (Object obj : excelData) {
|
||||
errorRowNum += 1;
|
||||
SafetyCenterSubitemImport subitemImport = (SafetyCenterSubitemImport) obj;
|
||||
String companyName = subitemImport.getCompanyName();
|
||||
List<SafetyCenterSubitemContactsImport> contactsList = subitemImport.getContactsList();
|
||||
Map<String, Object> map = BeanUtil.beanToMap(subitemImport);
|
||||
List<SafetyCenterSubitemContactsImport> contactsList = new ArrayList<>();
|
||||
for (int i = 1; i < 21; i++) {
|
||||
SafetyCenterSubitemContactsImport contactsImport = new SafetyCenterSubitemContactsImport();
|
||||
String s = (String) map.get("contactsName" + i);
|
||||
if (s == null){
|
||||
continue;
|
||||
}
|
||||
String s1 = (String) map.get("remarks"+i);
|
||||
contactsImport.setContacts(s);
|
||||
contactsImport.setRemarks(s1);
|
||||
contactsList.add(contactsImport);
|
||||
}
|
||||
|
||||
PayCompanyManagement company = null;
|
||||
if (StringUtils.isBlank(companyName)){
|
||||
@@ -318,12 +332,10 @@ public class SafetyCenterSubitemService extends ServiceImpl<SafetyCenterSubitemM
|
||||
company = payCompanyManagementService.getCompanyByName(companyName);
|
||||
if (company == null){
|
||||
errorMessage.add("第" + errorRowNum + "行：成员单位不存在");
|
||||
errorRowNum2 += contactsList.size();
|
||||
continue;
|
||||
}
|
||||
if (companyNameList.contains(companyName)) {
|
||||
errorMessage.add("第" + errorRowNum + "行：成员单位重复");
|
||||
errorRowNum2 += contactsList.size();
|
||||
continue;
|
||||
}else {
|
||||
companyNameList.add(companyName);
|
||||
@@ -351,31 +363,27 @@ public class SafetyCenterSubitemService extends ServiceImpl<SafetyCenterSubitemM
|
||||
SafetyCenterSubitem parentCenterSubitem = this.getOne(wrapper1);
|
||||
if (parentCenterSubitem == null) {
|
||||
errorMessage.add("第" + errorRowNum + "行：成员单位不是当前项目成员");
|
||||
errorRowNum2 += contactsList.size();
|
||||
continue;
|
||||
}
|
||||
String parentCenterSubitemId = parentCenterSubitem.getId();
|
||||
List<SafetyCenterSubitemContacts> parentContactList = contactsService.listBySubitemId(parentCenterSubitemId);
|
||||
parentContactIdList = parentContactList.stream().map(SafetyCenterSubitemContacts::getContactsId).distinct().collect(Collectors.toList());
|
||||
}
|
||||
errorRowNum += contactsList.size() -1;
|
||||
|
||||
List<String> distinctContactsList = new ArrayList<>();
|
||||
List<SafetyCenterSubitemContacts> subitemContactsList = new ArrayList<>();
|
||||
for (SafetyCenterSubitemContactsImport contactsImport : contactsList) {
|
||||
errorRowNum2 += 1;
|
||||
String contacts = contactsImport.getContacts();
|
||||
if (StringUtils.isBlank(contacts)){
|
||||
errorMessage.add("第" + errorRowNum2 + "行：企业联系人不能为空");
|
||||
errorMessage.add("第" + errorRowNum + "行：企业联系人不能为空");
|
||||
continue;
|
||||
}
|
||||
PayContactsManagement payContactsManagement = payContactsManagementService.checkByCompanyIdAndName(contacts, companyId);
|
||||
if (payContactsManagement == null){
|
||||
errorMessage.add("第" + errorRowNum2 + "行：企业联系人不存在");
|
||||
errorMessage.add("第" + errorRowNum + "行：企业联系人"+contacts+"不存在");
|
||||
continue;
|
||||
}
|
||||
if (distinctContactsList.contains(contacts)){
|
||||
errorMessage.add("第" + errorRowNum2 + "行：企业联系人重复");
|
||||
errorMessage.add("第" + errorRowNum + "行：企业联系人"+contacts+"重复");
|
||||
continue;
|
||||
}else {
|
||||
distinctContactsList.add(contacts);
|
||||
@@ -383,13 +391,13 @@ public class SafetyCenterSubitemService extends ServiceImpl<SafetyCenterSubitemM
|
||||
if (SafetyCenterCommon.PROJECT_TYPE_1 != projectType) {
|
||||
//判断联系人
|
||||
if (!parentContactIdList.contains(payContactsManagement.getId())){
|
||||
errorMessage.add("第" + errorRowNum2 + "行：企业联系人不是当前项目成员");
|
||||
errorMessage.add("第" + errorRowNum + "行：企业联系人"+contacts+"不是当前项目成员");
|
||||
continue;
|
||||
}
|
||||
}
|
||||
String remarks = contactsImport.getRemarks();
|
||||
if (remarks != null && remarks.length() > 50){
|
||||
errorMessage.add("第" + errorRowNum2 + "行：企业联系人备注最长为50字符");
|
||||
errorMessage.add("第" + errorRowNum + "行：企业联系人"+contacts+"备注最长为50字符");
|
||||
continue;
|
||||
}
|
||||
SafetyCenterSubitemContacts contacts1 = new SafetyCenterSubitemContacts();
|
||||
|
||||
+441
@@ -0,0 +1,441 @@
|
||||
package com.jero.functionalsafetycenter.vo;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.jero.common.aspect.annotation.Dict;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import org.jeecgframework.poi.excel.annotation.Excel;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.math.BigDecimal;
|
||||
|
||||
/**
|
||||
* @Description: pay_working_group_subitem
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2021-08-27
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Data
|
||||
public class SafetyCenterSubitemExcel implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 成员单位id
|
||||
*/
|
||||
@TableField(value = "company_id")
|
||||
@ApiModelProperty(value = "成员单位id")
|
||||
@Excel(name = "成员单位", width = 15, dictTable = "pay_company_management", dicText = "company_name", dicCode = "id", needMerge = true)
|
||||
@Dict(dictTable = "pay_company_management", dicText = "company_name", dicCode = "id")
|
||||
private String companyId;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@Excel(name = "备注", width = 15)
|
||||
@ApiModelProperty(value = "备注")
|
||||
private String remarks;
|
||||
/**
|
||||
* 企业联系人名称1
|
||||
*/
|
||||
@Excel(name = "企业联系人1", width = 15)
|
||||
private String contactsName1;
|
||||
/**
|
||||
* 企业联系人手机号1
|
||||
*/
|
||||
@Excel(name = "企业联系人手机号1", width = 17)
|
||||
private String contactsPhone1;
|
||||
/**
|
||||
* 企业联系人邮箱1
|
||||
*/
|
||||
@Excel(name = "企业联系人邮箱1", width = 15)
|
||||
private String contactsEmail1;
|
||||
/**
|
||||
* 联系人备注1
|
||||
*/
|
||||
@Excel(name = "联系人备注1", width = 15)
|
||||
private String remarks1;
|
||||
/**
|
||||
* 企业联系人名称2
|
||||
*/
|
||||
@Excel(name = "企业联系人2", width = 15)
|
||||
private String contactsName2;
|
||||
/**
|
||||
* 企业联系人手机号2
|
||||
*/
|
||||
@Excel(name = "企业联系人手机号2", width = 17)
|
||||
private String contactsPhone2;
|
||||
/**
|
||||
* 企业联系人邮箱2
|
||||
*/
|
||||
@Excel(name = "企业联系人邮箱2", width = 15)
|
||||
private String contactsEmail2;
|
||||
/**
|
||||
* 联系人备注2
|
||||
*/
|
||||
@Excel(name = "联系人备注2", width = 15)
|
||||
private String remarks2;
|
||||
/**
|
||||
* 企业联系人名称3
|
||||
*/
|
||||
@Excel(name = "企业联系人3", width = 15)
|
||||
private String contactsName3;
|
||||
/**
|
||||
* 企业联系人手机号3
|
||||
*/
|
||||
@Excel(name = "企业联系人手机号3", width = 17)
|
||||
private String contactsPhone3;
|
||||
/**
|
||||
* 企业联系人邮箱3
|
||||
*/
|
||||
@Excel(name = "企业联系人邮箱3", width = 15)
|
||||
private String contactsEmail3;
|
||||
/**
|
||||
* 联系人备注3
|
||||
*/
|
||||
@Excel(name = "联系人备注3", width = 15)
|
||||
private String remarks3;
|
||||
/**
|
||||
* 企业联系人名称4
|
||||
*/
|
||||
@Excel(name = "企业联系人4", width = 15)
|
||||
private String contactsName4;
|
||||
/**
|
||||
* 企业联系人手机号4
|
||||
*/
|
||||
@Excel(name = "企业联系人手机号4", width = 17)
|
||||
private String contactsPhone4;
|
||||
/**
|
||||
* 企业联系人邮箱4
|
||||
*/
|
||||
@Excel(name = "企业联系人邮箱4", width = 15)
|
||||
private String contactsEmail4;
|
||||
/**
|
||||
* 联系人备注4
|
||||
*/
|
||||
@Excel(name = "联系人备注4", width = 15)
|
||||
private String remarks4;
|
||||
/**
|
||||
* 企业联系人名称5
|
||||
*/
|
||||
@Excel(name = "企业联系人5", width = 15)
|
||||
private String contactsName5;
|
||||
/**
|
||||
* 企业联系人手机号5
|
||||
*/
|
||||
@Excel(name = "企业联系人手机号5", width = 17)
|
||||
private String contactsPhone5;
|
||||
/**
|
||||
* 企业联系人邮箱5
|
||||
*/
|
||||
@Excel(name = "企业联系人邮箱5", width = 15)
|
||||
private String contactsEmail5;
|
||||
/**
|
||||
* 联系人备注5
|
||||
*/
|
||||
@Excel(name = "联系人备注5", width = 15)
|
||||
private String remarks5;
|
||||
/**
|
||||
* 企业联系人名称6
|
||||
*/
|
||||
@Excel(name = "企业联系人6", width = 15)
|
||||
private String contactsName6;
|
||||
/**
|
||||
* 企业联系人手机号6
|
||||
*/
|
||||
@Excel(name = "企业联系人手机号6", width = 17)
|
||||
private String contactsPhone6;
|
||||
/**
|
||||
* 企业联系人邮箱6
|
||||
*/
|
||||
@Excel(name = "企业联系人邮箱6", width = 15)
|
||||
private String contactsEmail6;
|
||||
/**
|
||||
* 联系人备注6
|
||||
*/
|
||||
@Excel(name = "联系人备注6", width = 15)
|
||||
private String remarks6;
|
||||
/**
|
||||
* 企业联系人名称7
|
||||
*/
|
||||
@Excel(name = "企业联系人7", width = 15)
|
||||
private String contactsName7;
|
||||
/**
|
||||
* 企业联系人手机号7
|
||||
*/
|
||||
@Excel(name = "企业联系人手机号7", width = 17)
|
||||
private String contactsPhone7;
|
||||
/**
|
||||
* 企业联系人邮箱7
|
||||
*/
|
||||
@Excel(name = "企业联系人邮箱7", width = 15)
|
||||
private String contactsEmail7;
|
||||
/**
|
||||
* 联系人备注7
|
||||
*/
|
||||
@Excel(name = "联系人备注7", width = 15)
|
||||
private String remarks7;
|
||||
/**
|
||||
* 企业联系人名称8
|
||||
*/
|
||||
@Excel(name = "企业联系人8", width = 15)
|
||||
private String contactsName8;
|
||||
/**
|
||||
* 企业联系人手机号8
|
||||
*/
|
||||
@Excel(name = "企业联系人手机号8", width = 17)
|
||||
private String contactsPhone8;
|
||||
/**
|
||||
* 企业联系人邮箱8
|
||||
*/
|
||||
@Excel(name = "企业联系人邮箱8", width = 15)
|
||||
private String contactsEmail8;
|
||||
/**
|
||||
* 联系人备注8
|
||||
*/
|
||||
@Excel(name = "联系人备注8", width = 15)
|
||||
private String remarks8;
|
||||
/**
|
||||
* 企业联系人名称9
|
||||
*/
|
||||
@Excel(name = "企业联系人9", width = 15)
|
||||
private String contactsName9;
|
||||
/**
|
||||
* 企业联系人手机号9
|
||||
*/
|
||||
@Excel(name = "企业联系人手机号9", width = 17)
|
||||
private String contactsPhone9;
|
||||
/**
|
||||
* 企业联系人邮箱9
|
||||
*/
|
||||
@Excel(name = "企业联系人邮箱9", width = 15)
|
||||
private String contactsEmail9;
|
||||
/**
|
||||
* 联系人备注9
|
||||
*/
|
||||
@Excel(name = "联系人备注9", width = 15)
|
||||
private String remarks9;
|
||||
/**
|
||||
* 企业联系人名称10
|
||||
*/
|
||||
@Excel(name = "企业联系人10", width = 15)
|
||||
private String contactsName10;
|
||||
/**
|
||||
* 企业联系人手机号10
|
||||
*/
|
||||
@Excel(name = "企业联系人手机号10", width = 17)
|
||||
private String contactsPhone10;
|
||||
/**
|
||||
* 企业联系人邮箱10
|
||||
*/
|
||||
@Excel(name = "企业联系人邮箱10", width = 15)
|
||||
private String contactsEmail10;
|
||||
/**
|
||||
* 联系人备注10
|
||||
*/
|
||||
@Excel(name = "联系人备注10", width = 15)
|
||||
private String remarks10;
|
||||
|
||||
/**
|
||||
* 企业联系人名称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;
|
||||
|
||||
}
|
||||
+403
-1
@@ -35,8 +35,410 @@ public class SafetyCenterSubitemImport {
|
||||
* 企业联系人列表
|
||||
*/
|
||||
@ApiModelProperty(value = "企业联系人列表")
|
||||
@ExcelCollection(name = "企业联系人列表")
|
||||
private List<SafetyCenterSubitemContactsImport> contactsList;
|
||||
|
||||
/**
|
||||
* 企业联系人名称1
|
||||
*/
|
||||
@Excel(name = "企业联系人1", width = 15)
|
||||
private String contactsName1;
|
||||
/**
|
||||
* 企业联系人手机号1
|
||||
*/
|
||||
@Excel(name = "企业联系人手机号1", width = 17)
|
||||
private String contactsPhone1;
|
||||
/**
|
||||
* 企业联系人邮箱1
|
||||
*/
|
||||
@Excel(name = "企业联系人邮箱1", width = 15)
|
||||
private String contactsEmail1;
|
||||
/**
|
||||
* 联系人备注1
|
||||
*/
|
||||
@Excel(name = "联系人备注1", width = 15)
|
||||
private String remarks1;
|
||||
/**
|
||||
* 企业联系人名称2
|
||||
*/
|
||||
@Excel(name = "企业联系人2", width = 15)
|
||||
private String contactsName2;
|
||||
/**
|
||||
* 企业联系人手机号2
|
||||
*/
|
||||
@Excel(name = "企业联系人手机号2", width = 17)
|
||||
private String contactsPhone2;
|
||||
/**
|
||||
* 企业联系人邮箱2
|
||||
*/
|
||||
@Excel(name = "企业联系人邮箱2", width = 15)
|
||||
private String contactsEmail2;
|
||||
/**
|
||||
* 联系人备注2
|
||||
*/
|
||||
@Excel(name = "联系人备注2", width = 15)
|
||||
private String remarks2;
|
||||
/**
|
||||
* 企业联系人名称3
|
||||
*/
|
||||
@Excel(name = "企业联系人3", width = 15)
|
||||
private String contactsName3;
|
||||
/**
|
||||
* 企业联系人手机号3
|
||||
*/
|
||||
@Excel(name = "企业联系人手机号3", width = 17)
|
||||
private String contactsPhone3;
|
||||
/**
|
||||
* 企业联系人邮箱3
|
||||
*/
|
||||
@Excel(name = "企业联系人邮箱3", width = 15)
|
||||
private String contactsEmail3;
|
||||
/**
|
||||
* 联系人备注3
|
||||
*/
|
||||
@Excel(name = "联系人备注3", width = 15)
|
||||
private String remarks3;
|
||||
/**
|
||||
* 企业联系人名称4
|
||||
*/
|
||||
@Excel(name = "企业联系人4", width = 15)
|
||||
private String contactsName4;
|
||||
/**
|
||||
* 企业联系人手机号4
|
||||
*/
|
||||
@Excel(name = "企业联系人手机号4", width = 17)
|
||||
private String contactsPhone4;
|
||||
/**
|
||||
* 企业联系人邮箱4
|
||||
*/
|
||||
@Excel(name = "企业联系人邮箱4", width = 15)
|
||||
private String contactsEmail4;
|
||||
/**
|
||||
* 联系人备注4
|
||||
*/
|
||||
@Excel(name = "联系人备注4", width = 15)
|
||||
private String remarks4;
|
||||
/**
|
||||
* 企业联系人名称5
|
||||
*/
|
||||
@Excel(name = "企业联系人5", width = 15)
|
||||
private String contactsName5;
|
||||
/**
|
||||
* 企业联系人手机号5
|
||||
*/
|
||||
@Excel(name = "企业联系人手机号5", width = 17)
|
||||
private String contactsPhone5;
|
||||
/**
|
||||
* 企业联系人邮箱5
|
||||
*/
|
||||
@Excel(name = "企业联系人邮箱5", width = 15)
|
||||
private String contactsEmail5;
|
||||
/**
|
||||
* 联系人备注5
|
||||
*/
|
||||
@Excel(name = "联系人备注5", width = 15)
|
||||
private String remarks5;
|
||||
/**
|
||||
* 企业联系人名称6
|
||||
*/
|
||||
@Excel(name = "企业联系人6", width = 15)
|
||||
private String contactsName6;
|
||||
/**
|
||||
* 企业联系人手机号6
|
||||
*/
|
||||
@Excel(name = "企业联系人手机号6", width = 17)
|
||||
private String contactsPhone6;
|
||||
/**
|
||||
* 企业联系人邮箱6
|
||||
*/
|
||||
@Excel(name = "企业联系人邮箱6", width = 15)
|
||||
private String contactsEmail6;
|
||||
/**
|
||||
* 联系人备注6
|
||||
*/
|
||||
@Excel(name = "联系人备注6", width = 15)
|
||||
private String remarks6;
|
||||
/**
|
||||
* 企业联系人名称7
|
||||
*/
|
||||
@Excel(name = "企业联系人7", width = 15)
|
||||
private String contactsName7;
|
||||
/**
|
||||
* 企业联系人手机号7
|
||||
*/
|
||||
@Excel(name = "企业联系人手机号7", width = 17)
|
||||
private String contactsPhone7;
|
||||
/**
|
||||
* 企业联系人邮箱7
|
||||
*/
|
||||
@Excel(name = "企业联系人邮箱7", width = 15)
|
||||
private String contactsEmail7;
|
||||
/**
|
||||
* 联系人备注7
|
||||
*/
|
||||
@Excel(name = "联系人备注7", width = 15)
|
||||
private String remarks7;
|
||||
/**
|
||||
* 企业联系人名称8
|
||||
*/
|
||||
@Excel(name = "企业联系人8", width = 15)
|
||||
private String contactsName8;
|
||||
/**
|
||||
* 企业联系人手机号8
|
||||
*/
|
||||
@Excel(name = "企业联系人手机号8", width = 17)
|
||||
private String contactsPhone8;
|
||||
/**
|
||||
* 企业联系人邮箱8
|
||||
*/
|
||||
@Excel(name = "企业联系人邮箱8", width = 15)
|
||||
private String contactsEmail8;
|
||||
/**
|
||||
* 联系人备注8
|
||||
*/
|
||||
@Excel(name = "联系人备注8", width = 15)
|
||||
private String remarks8;
|
||||
/**
|
||||
* 企业联系人名称9
|
||||
*/
|
||||
@Excel(name = "企业联系人9", width = 15)
|
||||
private String contactsName9;
|
||||
/**
|
||||
* 企业联系人手机号9
|
||||
*/
|
||||
@Excel(name = "企业联系人手机号9", width = 17)
|
||||
private String contactsPhone9;
|
||||
/**
|
||||
* 企业联系人邮箱9
|
||||
*/
|
||||
@Excel(name = "企业联系人邮箱9", width = 15)
|
||||
private String contactsEmail9;
|
||||
/**
|
||||
* 联系人备注9
|
||||
*/
|
||||
@Excel(name = "联系人备注9", width = 15)
|
||||
private String remarks9;
|
||||
/**
|
||||
* 企业联系人名称10
|
||||
*/
|
||||
@Excel(name = "企业联系人10", width = 15)
|
||||
private String contactsName10;
|
||||
/**
|
||||
* 企业联系人手机号10
|
||||
*/
|
||||
@Excel(name = "企业联系人手机号10", width = 17)
|
||||
private String contactsPhone10;
|
||||
/**
|
||||
* 企业联系人邮箱10
|
||||
*/
|
||||
@Excel(name = "企业联系人邮箱10", width = 15)
|
||||
private String contactsEmail10;
|
||||
/**
|
||||
* 联系人备注10
|
||||
*/
|
||||
@Excel(name = "联系人备注10", width = 15)
|
||||
private String remarks10;
|
||||
|
||||
/**
|
||||
* 企业联系人名称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;
|
||||
|
||||
|
||||
|
||||
}
|
||||
+1
-1
@@ -72,7 +72,7 @@ public interface PayMailBillMapper extends BaseMapper<PayMailBill> {
|
||||
|
||||
PayContactsManagement print(@Param("id") String id);
|
||||
|
||||
Integer updateByProjectId(@Param("updated") PayMailBill payMailBill, @Param("projectId") String projectId);
|
||||
Integer updateByProjectId(@Param("updated") PayMailBill payMailBill, @Param("idList") List<String> idList);
|
||||
|
||||
Integer updateTax(@Param("id") String id);
|
||||
|
||||
|
||||
+12
-3
@@ -1,17 +1,26 @@
|
||||
package com.jero.mail.mapper;
|
||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||
import java.util.List;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.jero.mail.entity.PayMailBillProject;
|
||||
import io.lettuce.core.dynamic.annotation.Param;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* @Description: pay_mail_bill_project
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2021-08-31
|
||||
* @Date: 2021-08-31
|
||||
* @Version: V1.0
|
||||
*/
|
||||
public interface PayMailBillProjectMapper extends BaseMapper<PayMailBillProject> {
|
||||
default List<String> selectBillIdByProjectId(String projectId) {
|
||||
LambdaQueryWrapper<PayMailBillProject> myQuery = Wrappers.lambdaQuery(PayMailBillProject.class);
|
||||
myQuery.eq(PayMailBillProject::getProjectId, projectId);
|
||||
myQuery.select(PayMailBillProject::getBillId);
|
||||
return selectList(myQuery).stream().map(PayMailBillProject::getBillId).collect(Collectors.toList());
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
+4
-5
@@ -197,11 +197,10 @@
|
||||
</if>
|
||||
</set>
|
||||
<where>
|
||||
id in (
|
||||
select bill_id
|
||||
from pay_mail_bill_project
|
||||
where project_id = #{projectId}
|
||||
)
|
||||
id in
|
||||
<foreach item="item" index="index" collection="idList" open="(" separator="," close=")">
|
||||
#{item}
|
||||
</foreach>
|
||||
and post_status = 0
|
||||
</where>
|
||||
</update>
|
||||
|
||||
+5
-1
@@ -1,5 +1,6 @@
|
||||
package com.jero.mail.service.impl;
|
||||
|
||||
import cn.hutool.core.collection.CollectionUtil;
|
||||
import com.alibaba.fastjson.JSON;
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
@@ -604,7 +605,10 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
|
||||
mailBill.setPostalCode(payMailBill.getPostalCode());
|
||||
mailBill.setContactAddress(payMailBill.getContactAddress());
|
||||
}
|
||||
payMailBillMapper.updateByProjectId(mailBill,projectId);
|
||||
List<String> idList = payMailBillProjectMapper.selectBillIdByProjectId(projectId);
|
||||
if (CollectionUtil.isNotEmpty(idList)){
|
||||
payMailBillMapper.updateByProjectId(mailBill,idList);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
+7
-7
@@ -94,7 +94,7 @@ public class MeetingSubitemCommon {
|
||||
*/
|
||||
public static final Integer SIGNUP_STATUS_2 = 2;
|
||||
/**
|
||||
* 需要缴费-非成员已报名审核
|
||||
* 需要缴费-非成员已报名待审核
|
||||
*/
|
||||
public static final Integer REGISTER_PROCESS_1 = 1;
|
||||
/**
|
||||
@@ -102,7 +102,7 @@ public class MeetingSubitemCommon {
|
||||
*/
|
||||
public static final Integer REGISTER_PROCESS_2 = 2;
|
||||
/**
|
||||
* 需要缴费-付款方式为汇款现场缴费
|
||||
* 需要缴费-付款方式为汇款现场缴费 待上传凭证
|
||||
*/
|
||||
public static final Integer REGISTER_PROCESS_3 = 3;
|
||||
/**
|
||||
@@ -122,23 +122,23 @@ public class MeetingSubitemCommon {
|
||||
*/
|
||||
public static final Integer REGISTER_PROCESS_7 = 7;
|
||||
/**
|
||||
* 需要缴费-付款方式为汇款 的先签到 但是没有上传凭证 报名状态为已签到
|
||||
* 需要缴费-付款方式为汇款 的先签到 但是没有上传凭证 报名状态为已签到-待上传凭证
|
||||
*/
|
||||
public static final Integer REGISTER_PROCESS_8 = 8;
|
||||
/**
|
||||
* 需要缴费-付款方式为汇款 的先签到 但是没有上传凭证 报名状态为已签到
|
||||
* 需要缴费-付款方式为汇款 的先签到 但是没有上传凭证 报名状态为已签到-凭证待审核
|
||||
*/
|
||||
public static final Integer REGISTER_PROCESS_9 = 9;
|
||||
/**
|
||||
* 需要缴费-付款方式为汇款 的先签到 但是没有上传凭证 报名状态为已签到
|
||||
* 需要缴费-付款方式为汇款 的先签到 但是没有上传凭证 报名状态为已签到-凭证被拒绝
|
||||
*/
|
||||
public static final Integer REGISTER_PROCESS_10 = 10;
|
||||
/**
|
||||
* 需要缴费-付款方式为汇款 的先签到 但是没有上传凭证 报名状态为已签到
|
||||
* 需要缴费-付款方式为汇款 的先签到 但是没有上传凭证 报名状态为已签到-缴费成功
|
||||
*/
|
||||
public static final Integer REGISTER_PROCESS_11 = 11;
|
||||
/**
|
||||
* 不需要缴费-非成员已报名审核
|
||||
* 不需要缴费-非成员已报名待审核
|
||||
*/
|
||||
public static final Integer REGISTER_PROCESS_12 = 12;
|
||||
/**
|
||||
|
||||
+7
-5
@@ -29,6 +29,7 @@ import com.jero.data.service.IPayCaseCommitteeService;
|
||||
import com.jero.data.service.IPayCaseCommitteeSubitemService;
|
||||
import com.jero.data.service.IPayCaseCouncilSubitemService;
|
||||
import com.jero.meeting.common.MeetingCommon;
|
||||
import com.jero.meeting.common.MeetingSubitemCommon;
|
||||
import com.jero.meeting.entity.*;
|
||||
import com.jero.meeting.mapper.PayMeetingGuestsFileMapper;
|
||||
import com.jero.meeting.service.*;
|
||||
@@ -184,6 +185,7 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
|
||||
Integer checkResult = meetingSituation.getCheckResult();
|
||||
String paymentRecord = meetingSituation.getPaymentRecord();
|
||||
Integer checkIn = meetingSituation.getCheckIn();
|
||||
Integer registerProcess = meetingSituation.getRegisterProcess();
|
||||
//报名信息审核中：非成员单位需要审核的
|
||||
if (Objects.equals(registerCheckResult, 0)) {
|
||||
meeting.setSignUpStatus(1);
|
||||
@@ -196,9 +198,8 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
|
||||
} else if (Objects.equals(registerCheckResult, 2)) {
|
||||
meeting.setSignUpStatus(3);
|
||||
// 待上传凭证：来款方式为：汇款/线上缴费。需要上传审核凭证的
|
||||
} else if (Objects.equals(registerCheckResult, 1)
|
||||
&& StringUtils.isBlank(paymentRecord)
|
||||
&& !Objects.equals(checkResult, 1)) {
|
||||
} else if (registerProcess.equals(MeetingSubitemCommon.REGISTER_PROCESS_3)
|
||||
|| registerProcess.equals(MeetingSubitemCommon.REGISTER_PROCESS_8)) {
|
||||
meeting.setSignUpStatus(4);
|
||||
// 凭证被拒绝：来款方式为：汇款/线上缴费。上传审核凭证被拒绝的
|
||||
} else if (Objects.equals(checkResult, 2)) {
|
||||
@@ -206,8 +207,9 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
|
||||
//签到成功的
|
||||
} else if (Objects.equals(checkIn, 1)) {
|
||||
meeting.setSignUpStatus(7);
|
||||
// 报名成功：不需要审核直接报名成功的;审核凭证通过的
|
||||
} else if (Objects.equals(checkResult, 1)) {
|
||||
// 待签到 报名成功：不需要审核直接报名成功的;审核凭证通过的
|
||||
} else if (registerProcess.equals(MeetingSubitemCommon.REGISTER_PROCESS_6)
|
||||
||registerProcess.equals(MeetingSubitemCommon.REGISTER_PROCESS_14)) {
|
||||
meeting.setSignUpStatus(6);
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -353,7 +353,7 @@ public class PayMeetingSituation implements Serializable {
|
||||
@ApiModelProperty(value = "到账")
|
||||
private Integer inAccount;
|
||||
|
||||
/**开票*/
|
||||
/**开票（1：全额（对勾），0：0（X），2：>0 && <总金额（半满标志））*/
|
||||
//@Excel(name = "开票", width = 15)
|
||||
@ApiModelProperty(value = "开票")
|
||||
private Integer makeInvoice;
|
||||
|
||||
+44
-14
@@ -376,8 +376,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
|
||||
sendWasicMessage(payMeeting,payMeetingSituation1);
|
||||
|
||||
//报名后返回是否不需要审核
|
||||
return Objects.equals(payMeetingSituation1.getRegisterCheckResult(), MeetingSubitemCommon.SIGNUP_STATUS_1)
|
||||
&& Objects.equals(payMeetingSituation1.getCheckResult(), MeetingSubitemCommon.SIGNUP_STATUS_1);
|
||||
return Objects.equals(payMeetingSituation1.getRegisterCheckResult(), MeetingSubitemCommon.SIGNUP_STATUS_1);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -570,12 +569,13 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
|
||||
if (checkResult.equals(MeetingSubitemCommon.SIGNUP_STATUS_2)) {
|
||||
payMeetingSituation.setCheckRemark(checkRemark);
|
||||
|
||||
if (Objects.equals(registerProcess,3)||Objects.equals(registerProcess,8)){
|
||||
if (Objects.equals(registerProcess,MeetingSubitemCommon.REGISTER_PROCESS_3)
|
||||
||Objects.equals(registerProcess,MeetingSubitemCommon.REGISTER_PROCESS_8)){
|
||||
throw new JeroBootException("提前审核无法驳回");
|
||||
}
|
||||
if (Objects.equals(registerProcess,4)){
|
||||
if (Objects.equals(registerProcess,MeetingSubitemCommon.REGISTER_PROCESS_4)){
|
||||
payMeetingSituation.setRegisterProcess(MeetingSubitemCommon.REGISTER_PROCESS_5);
|
||||
}else if (Objects.equals(registerProcess,9)){
|
||||
}else if (Objects.equals(registerProcess,MeetingSubitemCommon.REGISTER_PROCESS_9)){
|
||||
payMeetingSituation.setRegisterProcess(MeetingSubitemCommon.REGISTER_PROCESS_10);
|
||||
}
|
||||
payMeetingSituation.setPaymentStatus(PaymentStatusEnum.REJECTED.getCode());
|
||||
@@ -587,9 +587,13 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
|
||||
//payMeetingSituation.setInAccount(PayProjectCommon.YES);
|
||||
//设置实收金额
|
||||
//payMeetingSituation.setPaidAmount(payMeetingSituation.getAmountReceivable());
|
||||
if (Objects.equals(registerProcess,3)||Objects.equals(registerProcess,4)||Objects.equals(registerProcess,5)){
|
||||
if (Objects.equals(registerProcess,MeetingSubitemCommon.REGISTER_PROCESS_3)
|
||||
||Objects.equals(registerProcess,MeetingSubitemCommon.REGISTER_PROCESS_4)
|
||||
||Objects.equals(registerProcess,MeetingSubitemCommon.REGISTER_PROCESS_5)){
|
||||
payMeetingSituation.setRegisterProcess(MeetingSubitemCommon.REGISTER_PROCESS_6);
|
||||
}else if (Objects.equals(registerProcess,8)||Objects.equals(registerProcess,9)||Objects.equals(registerProcess,10)){
|
||||
}else if (Objects.equals(registerProcess,MeetingSubitemCommon.REGISTER_PROCESS_8)
|
||||
||Objects.equals(registerProcess,MeetingSubitemCommon.REGISTER_PROCESS_9)
|
||||
||Objects.equals(registerProcess,MeetingSubitemCommon.REGISTER_PROCESS_10)){
|
||||
payMeetingSituation.setRegisterProcess(MeetingSubitemCommon.REGISTER_PROCESS_11);
|
||||
}
|
||||
payMeetingSituation.setPaymentStatus(PaymentStatusEnum.COMPLETED.getCode());
|
||||
@@ -853,11 +857,11 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
|
||||
meetingSituation.setCheckFile(signInVO.getFileId());
|
||||
meetingSituation.setCheckInTime(new Date());
|
||||
Integer registerProcess = meetingSituation.getRegisterProcess();
|
||||
if (Objects.equals(registerProcess,3)){
|
||||
if (Objects.equals(registerProcess,MeetingSubitemCommon.REGISTER_PROCESS_3)){
|
||||
meetingSituation.setRegisterProcess(MeetingSubitemCommon.REGISTER_PROCESS_7);
|
||||
}else if (Objects.equals(registerProcess,6)){
|
||||
}else if (Objects.equals(registerProcess,MeetingSubitemCommon.REGISTER_PROCESS_6)){
|
||||
meetingSituation.setRegisterProcess(MeetingSubitemCommon.REGISTER_PROCESS_7);
|
||||
}else if (Objects.equals(registerProcess,14)){
|
||||
}else if (Objects.equals(registerProcess,MeetingSubitemCommon.REGISTER_PROCESS_14)){
|
||||
meetingSituation.setRegisterProcess(MeetingSubitemCommon.REGISTER_PROCESS_15);
|
||||
}
|
||||
saveOrUpdate(meetingSituation);
|
||||
@@ -1330,8 +1334,14 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
|
||||
}
|
||||
}
|
||||
payMeetingSituation1.setPaymentRecord(paymentRecord);
|
||||
if (!Objects.equals(payMeetingSituation.getCheckResult(),MeetingSubitemCommon.SIGNUP_STATUS_1)
|
||||
&&!Objects.equals(payMeetingSituation.getCheckResult(),MeetingSubitemCommon.SIGNUP_STATUS_2)) {
|
||||
Integer checkResult = payMeetingSituation.getCheckResult();
|
||||
if (!Objects.equals(checkResult,MeetingSubitemCommon.SIGNUP_STATUS_1)
|
||||
&&!Objects.equals(checkResult,MeetingSubitemCommon.SIGNUP_STATUS_2)) {
|
||||
payMeetingSituation1.setCheckResult(MeetingSubitemCommon.SIGNUP_STATUS_0);
|
||||
}
|
||||
//参会人由打包编辑为来款时处理
|
||||
if (Objects.equals(checkResult,MeetingSubitemCommon.SIGNUP_STATUS_1)
|
||||
&& paymentRecord == null) {
|
||||
payMeetingSituation1.setCheckResult(MeetingSubitemCommon.SIGNUP_STATUS_0);
|
||||
}
|
||||
payMeetingSituation1.setOrderCode(orderCode);
|
||||
@@ -1425,6 +1435,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
|
||||
}
|
||||
}
|
||||
//展示的流程图
|
||||
String situationId = payMeetingSituation.getId();
|
||||
if (payMeetingSituation1.getIsZero()) {
|
||||
//如果报名信息审核通过就直接待签到
|
||||
if (payMeetingSituation1.getRegisterCheckResult().equals(MeetingSubitemCommon.SIGNUP_STATUS_1)) {
|
||||
@@ -1432,9 +1443,23 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
|
||||
}else {
|
||||
payMeetingSituation1.setRegisterProcess(MeetingSubitemCommon.REGISTER_PROCESS_12);
|
||||
}
|
||||
LambdaUpdateWrapper<PayMeetingSituation> updateWrapper = new LambdaUpdateWrapper<>();
|
||||
updateWrapper.eq(PayMeetingSituation::getId,situationId);
|
||||
updateWrapper.set(PayMeetingSituation::getPaymentStatus,null);
|
||||
this.update(updateWrapper);
|
||||
}else {
|
||||
//todo 这里的缴费状态需要处理下，审核后就不应该变了
|
||||
payMeetingSituation1.setPaymentStatus(PaymentStatusEnum.TO_BE_UPLOADED.getCode());
|
||||
if (situationId == null){
|
||||
payMeetingSituation1.setPaymentStatus(PaymentStatusEnum.TO_BE_UPLOADED.getCode());
|
||||
}else {
|
||||
LambdaQueryWrapper<PayMeetingSituation> wrapper = new LambdaQueryWrapper<>();
|
||||
wrapper.select(PayMeetingSituation::getPayMode);
|
||||
wrapper.eq(PayMeetingSituation::getId,situationId);
|
||||
PayMeetingSituation old = this.getOne(wrapper);
|
||||
Integer oldPayMode = old.getPayMode();
|
||||
if (MeetingSubitemCommon.PAY_MODE_3.equals(oldPayMode)){
|
||||
payMeetingSituation1.setPaymentStatus(PaymentStatusEnum.TO_BE_UPLOADED.getCode());
|
||||
}
|
||||
}
|
||||
if (Objects.equals(payMeetingSituation1.getRegisterCheckResult(),MeetingSubitemCommon.SIGNUP_STATUS_1)){
|
||||
payMeetingSituation1.setRegisterProcess(MeetingSubitemCommon.REGISTER_PROCESS_3);
|
||||
}else {
|
||||
@@ -1786,6 +1811,11 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
|
||||
OSSFile ossFile = ossFileService.getById(checkFile);
|
||||
meetingSituation.setCheckFile(ossFile.getUrl());
|
||||
}
|
||||
String paymentRecord = meetingSituation.getPaymentRecord();
|
||||
if (StringUtils.isNotBlank(paymentRecord)) {
|
||||
OSSFile ossFile = ossFileService.getById(paymentRecord);
|
||||
meetingSituation.setPaymentRecord(ossFile.getUrl());
|
||||
}
|
||||
switch (meetingType1) {
|
||||
case MeetingCommon.STANDARD_MEETING:
|
||||
//保存数据
|
||||
|
||||
+1
-1
@@ -286,7 +286,7 @@ public class MeetingSituationContractVO {
|
||||
@ApiModelProperty(value = "到账")
|
||||
private Integer inAccount;
|
||||
|
||||
/**开票*/
|
||||
/**开票（1：全额（对勾），0：0（X），2：>0 && <总金额（半满标志））*/
|
||||
@ApiModelProperty(value = "开票")
|
||||
private Integer makeInvoice;
|
||||
|
||||
|
||||
+10
@@ -1,6 +1,7 @@
|
||||
package com.jero.meeting.vo.excel;
|
||||
|
||||
import com.jero.common.aspect.annotation.Dict;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import org.jeecgframework.poi.excel.annotation.Excel;
|
||||
|
||||
@@ -72,6 +73,15 @@ public class CommitteeSituationExcel extends SituationBaseExcel {
|
||||
@Excel(name = "需要发票", width = 15,dicCode = "invoice_type")
|
||||
private Integer needInvoice;
|
||||
|
||||
/**缴费凭证*/
|
||||
@Excel(name = "缴费凭证", type = 2 ,width = 40 , height = 20)
|
||||
private String paymentRecord;
|
||||
|
||||
/**到账*/
|
||||
@ApiModelProperty(value = "到账")
|
||||
@Excel(name = "是否到账", width = 15, dicCode = "account_type")
|
||||
private Integer inAccount;
|
||||
|
||||
/**订单后4位编码*/
|
||||
@Excel(name = "订单后4位编码", width = 15)
|
||||
private String orderCode;
|
||||
|
||||
+10
@@ -1,6 +1,7 @@
|
||||
package com.jero.meeting.vo.excel;
|
||||
|
||||
import com.jero.common.aspect.annotation.Dict;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import org.jeecgframework.poi.excel.annotation.Excel;
|
||||
|
||||
@@ -72,6 +73,15 @@ public class CouncilSituationExcel extends SituationBaseExcel {
|
||||
@Excel(name = "需要发票", width = 15,dicCode = "invoice_type")
|
||||
private Integer needInvoice;
|
||||
|
||||
/**缴费凭证*/
|
||||
@Excel(name = "缴费凭证", type = 2 ,width = 40 , height = 20)
|
||||
private String paymentRecord;
|
||||
|
||||
/**到账*/
|
||||
@ApiModelProperty(value = "到账")
|
||||
@Excel(name = "是否到账", width = 15, dicCode = "account_type")
|
||||
private Integer inAccount;
|
||||
|
||||
/**订单后4位编码*/
|
||||
@Excel(name = "订单后4位编码", width = 15)
|
||||
private String orderCode;
|
||||
|
||||
+1
-24
@@ -1,6 +1,7 @@
|
||||
package com.jero.meeting.vo.excel;
|
||||
|
||||
import com.jero.common.aspect.annotation.Dict;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import org.jeecgframework.poi.excel.annotation.Excel;
|
||||
|
||||
@@ -48,28 +49,4 @@ public class DraftingGroupSituationExcel extends SituationBaseExcel {
|
||||
@Excel(name = "离开时间", width = 20, format = "yyyy-MM-dd")
|
||||
private java.util.Date departureTime;
|
||||
|
||||
/**邮寄联系人*/
|
||||
@Excel(name = "邮寄联系人", width = 15, dictTable = "pay_contacts_management", dicText = "name", dicCode = "id")
|
||||
private String postContactId;
|
||||
|
||||
/**邮寄联系人地址*/
|
||||
@Excel(name = "邮寄联系人地址", width = 15)
|
||||
private String postContactAddress;
|
||||
|
||||
/**邮编*/
|
||||
@Excel(name = "邮编", width = 15)
|
||||
private String postCode;
|
||||
|
||||
/**缴费方式*/
|
||||
@Excel(name = "缴费方式", width = 15,dicCode = "meeting_pay_type")
|
||||
private Integer payMode;
|
||||
|
||||
/**需要发票*/
|
||||
@Excel(name = "需要发票", width = 15,dicCode = "invoice_type")
|
||||
private Integer needInvoice;
|
||||
|
||||
/**订单后4位编码*/
|
||||
@Excel(name = "订单后4位编码", width = 15)
|
||||
private String orderCode;
|
||||
|
||||
}
|
||||
|
||||
+9
@@ -142,6 +142,15 @@ public class InternationalSituationExcel extends SituationBaseExcel {
|
||||
@Excel(name = "需要发票", width = 15,dicCode = "invoice_type")
|
||||
private Integer needInvoice;
|
||||
|
||||
/**缴费凭证*/
|
||||
@Excel(name = "缴费凭证", type = 2 ,width = 40 , height = 20)
|
||||
private String paymentRecord;
|
||||
|
||||
/**到账*/
|
||||
@ApiModelProperty(value = "到账")
|
||||
@Excel(name = "是否到账", width = 15, dicCode = "account_type")
|
||||
private Integer inAccount;
|
||||
|
||||
/**订单后4位编码*/
|
||||
@Excel(name = "订单后4位编码", width = 15)
|
||||
private String orderCode;
|
||||
|
||||
+2
-2
@@ -1,5 +1,6 @@
|
||||
package com.jero.meeting.vo.excel;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import org.jeecgframework.poi.excel.annotation.Excel;
|
||||
|
||||
@@ -10,9 +11,8 @@ import org.jeecgframework.poi.excel.annotation.Excel;
|
||||
@Data
|
||||
public class SituationBaseExcel {
|
||||
/**签到文件*/
|
||||
@Excel(name = "手动签到", type = 2 ,width = 40 , height = 20,imageType = 3)
|
||||
@Excel(name = "手动签到", type = 2 ,width = 40 , height = 20)
|
||||
private String checkFile;
|
||||
|
||||
/**发票项目*/
|
||||
@Excel(name = "发票项目", dicCode = "invoice_project", width = 15)
|
||||
private Integer invoiceProject;
|
||||
|
||||
+10
@@ -1,6 +1,7 @@
|
||||
package com.jero.meeting.vo.excel;
|
||||
|
||||
import com.jero.common.aspect.annotation.Dict;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import org.jeecgframework.poi.excel.annotation.Excel;
|
||||
|
||||
@@ -72,6 +73,15 @@ public class SituationExcel extends SituationBaseExcel{
|
||||
@Excel(name = "需要发票", width = 15,dicCode = "invoice_type")
|
||||
private Integer needInvoice;
|
||||
|
||||
/**缴费凭证*/
|
||||
@Excel(name = "缴费凭证", type = 2 ,width = 40 , height = 20)
|
||||
private String paymentRecord;
|
||||
|
||||
/**到账*/
|
||||
@ApiModelProperty(value = "到账")
|
||||
@Excel(name = "是否到账", width = 15, dicCode = "account_type")
|
||||
private Integer inAccount;
|
||||
|
||||
/**订单后4位编码*/
|
||||
@Excel(name = "订单后4位编码", width = 15)
|
||||
private String orderCode;
|
||||
|
||||
+9
@@ -88,6 +88,15 @@ public class StandardsSituationExcel extends SituationBaseExcel {
|
||||
@Excel(name = "需要发票", width = 15,dicCode = "invoice_type")
|
||||
private Integer needInvoice;
|
||||
|
||||
/**缴费凭证*/
|
||||
@Excel(name = "缴费凭证", type = 2 ,width = 40 , height = 20)
|
||||
private String paymentRecord;
|
||||
|
||||
/**到账*/
|
||||
@ApiModelProperty(value = "到账")
|
||||
@Excel(name = "是否到账", width = 15, dicCode = "account_type")
|
||||
private Integer inAccount;
|
||||
|
||||
/**订单后4位编码*/
|
||||
@Excel(name = "订单后4位编码", width = 15)
|
||||
private String orderCode;
|
||||
|
||||
+10
@@ -1,6 +1,7 @@
|
||||
package com.jero.meeting.vo.excel;
|
||||
|
||||
import com.jero.common.aspect.annotation.Dict;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import org.jeecgframework.poi.excel.annotation.Excel;
|
||||
@@ -73,6 +74,15 @@ public class WorkingGroupSituationExcel extends SituationBaseExcel {
|
||||
@Excel(name = "需要发票", width = 15,dicCode = "invoice_type")
|
||||
private Integer needInvoice;
|
||||
|
||||
/**缴费凭证*/
|
||||
@Excel(name = "缴费凭证", type = 2 ,width = 40 , height = 20)
|
||||
private String paymentRecord;
|
||||
|
||||
/**到账*/
|
||||
@ApiModelProperty(value = "到账")
|
||||
@Excel(name = "是否到账", width = 15, dicCode = "account_type")
|
||||
private Integer inAccount;
|
||||
|
||||
/**订单后4位编码*/
|
||||
@Excel(name = "订单后4位编码", width = 15)
|
||||
private String orderCode;
|
||||
|
||||
+10
@@ -10,6 +10,7 @@ import javax.servlet.http.HttpServletRequest;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.jero.common.api.vo.Result;
|
||||
import com.jero.common.constant.CommonConstant;
|
||||
import com.jero.common.exception.JeroBootException;
|
||||
import com.jero.common.system.api.ISysBaseAPI;
|
||||
import com.jero.common.system.query.QueryGenerator;
|
||||
@@ -27,6 +28,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.jero.member.vo.*;
|
||||
import com.jero.project.common.PayProjectCommon;
|
||||
import com.jero.temporary.entity.PayCompanyManagementTemporary;
|
||||
import com.jero.temporary.entity.PayContactsManagementTemporary;
|
||||
import com.jero.temporary.service.IPayCompanyManagementTemporaryService;
|
||||
@@ -325,6 +327,14 @@ public class TbMemberProjectSubitemController extends JeroController<TbMemberPro
|
||||
memberProjectSubitem.setPostalCode(payContactsManagement.getPostalCode());
|
||||
}
|
||||
}
|
||||
//是否借票
|
||||
Integer inAccount = memberProjectSubitem.getInAccount();
|
||||
Integer makeInvoice = memberProjectSubitem.getMakeInvoice();
|
||||
if (PayProjectCommon.IN_ACCOUNT0.equals(inAccount) && PayProjectCommon.MAKE_INVOICE1.equals(makeInvoice) ){
|
||||
memberProjectSubitem.setBorrowTicket(CommonConstant.YES);
|
||||
}else {
|
||||
memberProjectSubitem.setBorrowTicket(CommonConstant.NO);
|
||||
}
|
||||
}
|
||||
return super.exportListXls(exportList, TbMemberProjectSubitem.class, "标协会员项目成员表");
|
||||
}
|
||||
|
||||
+1
-4
@@ -251,11 +251,8 @@ public class PayMemberProjectSubitem implements Serializable {
|
||||
@ApiModelProperty(value = "到账")
|
||||
private Integer inAccount;
|
||||
|
||||
/**
|
||||
* 开票
|
||||
*/
|
||||
/**开票（1：全额（对勾），0：0（X），2：>0 && <总金额（半满标志））*/
|
||||
@ApiModelProperty(value = "开票")
|
||||
@Dict(dicCode = "yn")
|
||||
private Integer makeInvoice;
|
||||
|
||||
/**
|
||||
|
||||
+5
@@ -237,6 +237,11 @@ public class TbMemberProjectSubitem implements Serializable {
|
||||
@Excel(name = "是否开票", width = 15, dicCode = "make_invoice_type")
|
||||
private Integer makeInvoice;
|
||||
|
||||
/**是否借票*/
|
||||
@TableField(exist = false)
|
||||
@Excel(name = "是否借票", width = 15, dicCode = "yn")
|
||||
private Integer borrowTicket;
|
||||
|
||||
@ApiModelProperty(value = "确认收入（（1：全额（对勾），0：0（X），2：>0 && <总金额（半满标志）））")
|
||||
@Excel(name = "是否确收", width = 15, dicCode = "affirmi_ncome")
|
||||
private Integer affirmIncome;
|
||||
|
||||
+15
-1
@@ -27,6 +27,7 @@ import com.jero.member.mapper.PayMemberProjectMapper;
|
||||
import com.jero.member.mapper.PayMemberProjectSubitemMapper;
|
||||
import com.jero.pack.entity.PayPackCompanyProject;
|
||||
import com.jero.pack.service.IPayPackCompanyProjectService;
|
||||
import com.jero.payment.service.IPayPaymentCheckService;
|
||||
import com.jero.project.common.PayProjectCommon;
|
||||
import com.jero.project.entity.AnnualDataLocking;
|
||||
import com.jero.project.service.AnnualDataLockingService;
|
||||
@@ -82,6 +83,8 @@ public class IPayMemberProjectSubitemService extends ServiceImpl<PayMemberProjec
|
||||
private IPayMailBillService payMailBillService;
|
||||
@Resource
|
||||
private AnnualDataLockingService annualDataLockingService;
|
||||
@Resource
|
||||
private IPayPaymentCheckService payPaymentCheckService;
|
||||
/**
|
||||
* 保存
|
||||
*/
|
||||
@@ -113,6 +116,10 @@ public class IPayMemberProjectSubitemService extends ServiceImpl<PayMemberProjec
|
||||
payMemberProjectSubitem.setMakeInvoice(PayProjectCommon.MAKE_INVOICE0);
|
||||
//邮寄
|
||||
payMemberProjectSubitem.setMail(PayProjectCommon.MAIL0);
|
||||
BigDecimal amountReceivable = payMemberProjectSubitem.getAmountReceivable();
|
||||
if (amountReceivable != null && amountReceivable.compareTo(BigDecimal.ZERO) >0){
|
||||
payMemberProjectSubitem.setPaymentStatus(PayProjectCommon.PAYMENT_STATUS);
|
||||
}
|
||||
save(payMemberProjectSubitem);
|
||||
// 来款方式为合同，校验合同编号
|
||||
if(Objects.equals(payMemberProjectSubitem.getPaymentMethod(),PayProjectCommon.CHARGE_WAY2)){
|
||||
@@ -145,7 +152,7 @@ public class IPayMemberProjectSubitemService extends ServiceImpl<PayMemberProjec
|
||||
paySendContactsMessageDTO.setUserId(memberProject.getDirectorId());
|
||||
paySendContactsMessageDTO.setFlag(ProjectCommon.FLAG0);
|
||||
// 项目的待确收金额＞0 发送缴费通知
|
||||
if(payMemberProjectSubitem.getAmountReceivable().compareTo(new BigDecimal("0")) > 0){
|
||||
if(amountReceivable.compareTo(new BigDecimal("0")) > 0){
|
||||
paySendContactsMessageDTO.setFlag(ProjectCommon.FLAG0 + "," + ProjectCommon.FLAG1);
|
||||
}
|
||||
JSONObject json = new JSONObject();
|
||||
@@ -227,6 +234,9 @@ public class IPayMemberProjectSubitemService extends ServiceImpl<PayMemberProjec
|
||||
if(!Objects.isNull(projectStatusVO.getMail())){
|
||||
payMemberProjectSubitem.setMail(projectStatusVO.getMail());
|
||||
}
|
||||
if(!Objects.isNull(projectStatusVO.getAffirmIncome())){
|
||||
payMemberProjectSubitem.setAffirmIncome(projectStatusVO.getAffirmIncome());
|
||||
}
|
||||
}
|
||||
// 选择无
|
||||
if(Objects.equals(payMemberProjectSubitem.getPaymentMethod(), PayProjectCommon.CHARGE_WAY1)){
|
||||
@@ -243,6 +253,10 @@ public class IPayMemberProjectSubitemService extends ServiceImpl<PayMemberProjec
|
||||
if(Objects.equals(payMemberProjectSubitem.getPaymentMethod(),PayProjectCommon.CHARGE_WAY3)){
|
||||
payMemberProjectSubitem.setContractNo(null);
|
||||
}
|
||||
|
||||
String paymentStatus = payPaymentCheckService.getPaymentStatus(payMemberProjectSubitem.getAmountReceivable(), payMemberProjectSubitem.getPaidAmount(), payMemberProjectSubitem.getPaymentStatus(), false);
|
||||
payMemberProjectSubitem.setPaymentStatus(paymentStatus);
|
||||
|
||||
validMemberProjectSubitemEdit(payMemberProjectSubitem,payMemberProjectSubitem1,annualDataLocking);
|
||||
saveOrUpdate(payMemberProjectSubitem);
|
||||
// 如果有邮寄信息更新邮寄联系人信息
|
||||
|
||||
+25
@@ -13,12 +13,14 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.jero.common.common.ProjectCommon;
|
||||
import com.jero.common.enums.PaymentStatusEnum;
|
||||
import com.jero.common.exception.JeroBootException;
|
||||
import com.jero.common.service.ProjectDetailService;
|
||||
import com.jero.common.service.RolePermissionService;
|
||||
import com.jero.common.system.api.ISysBaseAPI;
|
||||
import com.jero.common.system.query.QueryGenerator;
|
||||
import com.jero.common.system.vo.DictModel;
|
||||
import com.jero.common.system.vo.LoginUser;
|
||||
import com.jero.common.util.ValidUtil;
|
||||
import com.jero.common.vo.ProjectStatusVO;
|
||||
import com.jero.company.entity.PayCompanyManagement;
|
||||
import com.jero.company.entity.PayContactsManagement;
|
||||
import com.jero.company.service.IPayCompanyManagementService;
|
||||
@@ -45,6 +47,7 @@ import com.jero.pack.entity.PayPackCompanyProject;
|
||||
import com.jero.pack.service.IPayPackCompanyProjectService;
|
||||
import com.jero.payment.entity.PayConfirmPaymentRecord;
|
||||
import com.jero.payment.entity.PayPaymentRecord;
|
||||
import com.jero.payment.service.IPayPaymentCheckService;
|
||||
import com.jero.payment.service.IPayPaymentRecordService;
|
||||
import com.jero.payment.service.impl.PayConfirmPaymentRecordService;
|
||||
import com.jero.project.common.PayProjectCommon;
|
||||
@@ -122,6 +125,10 @@ public class ITbMemberProjectSubitemService extends ServiceImpl<TbMemberProjectS
|
||||
private IPayCompanyManagementTemporaryService payCompanyManagementTemporaryService;
|
||||
@Resource
|
||||
private IPayContactsManagementTemporaryService payContactsManagementTemporaryService;
|
||||
@Autowired
|
||||
private ProjectDetailService projectDetailService;
|
||||
@Resource
|
||||
private IPayPaymentCheckService payPaymentCheckService;
|
||||
/**
|
||||
* 保存
|
||||
*/
|
||||
@@ -439,6 +446,24 @@ public class ITbMemberProjectSubitemService extends ServiceImpl<TbMemberProjectS
|
||||
throw new JeroBootException("会员单位不可变更");
|
||||
}
|
||||
setSubitemEdit(tbMemberProjectSubitem,subitemOld,annualDataLocking);
|
||||
// 变更待确收金额，重新校验状态
|
||||
ProjectStatusVO projectStatusVO = projectDetailService.getStatus(subitemId,tbMemberProjectSubitem.getAmountReceivable(),tbMemberProjectSubitem.getInvoiceRequirements());
|
||||
if(!Objects.isNull(projectStatusVO)){
|
||||
if(!Objects.isNull(projectStatusVO.getInAccount())){
|
||||
tbMemberProjectSubitem.setInAccount(projectStatusVO.getInAccount());
|
||||
}
|
||||
if(!Objects.isNull(projectStatusVO.getMakeInvoice())){
|
||||
tbMemberProjectSubitem.setMakeInvoice(projectStatusVO.getMakeInvoice());
|
||||
}
|
||||
if(!Objects.isNull(projectStatusVO.getMail())){
|
||||
tbMemberProjectSubitem.setMail(projectStatusVO.getMail());
|
||||
}
|
||||
if(!Objects.isNull(projectStatusVO.getAffirmIncome())){
|
||||
tbMemberProjectSubitem.setAffirmIncome(projectStatusVO.getAffirmIncome());
|
||||
}
|
||||
}
|
||||
String paymentStatus = payPaymentCheckService.getPaymentStatus(tbMemberProjectSubitem.getAmountReceivable(), subitemOld.getPaidAmount(), tbMemberProjectSubitem.getPaymentStatus(), false);
|
||||
tbMemberProjectSubitem.setPaymentStatus(paymentStatus);
|
||||
// 校验项目是否已关联合同
|
||||
PayIncomeContract payIncomeContract = payIncomeContractService.checkPayIncomeContractAssociated(subitemId);
|
||||
if (!Objects.isNull(payIncomeContract)) {
|
||||
|
||||
+14
-56
@@ -6,6 +6,8 @@ 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.exception.JeroBootException;
|
||||
import com.jero.common.service.ProjectDetailService;
|
||||
import com.jero.common.vo.ProjectStatusVO;
|
||||
import com.jero.mail.entity.PayMailBillProject;
|
||||
import com.jero.mail.service.IPayMailBillProjectService;
|
||||
import com.jero.mail.service.IPayMailBillService;
|
||||
@@ -58,7 +60,8 @@ public class PayPackCompanyServiceImpl extends ServiceImpl<PayPackCompanyMapper,
|
||||
private IPayMailBillService payMailBillService;
|
||||
@Resource
|
||||
private AnnualDataLockingService annualDataLockingService;
|
||||
|
||||
@Autowired
|
||||
private ProjectDetailService projectDetailService;
|
||||
@Override
|
||||
public IPage<PayPackCompany> queryPageList(Page<PayPackCompany> page, PayPackCompany payPackCompany) {
|
||||
return payPackCompanyMapper.queryPageList(page,payPackCompany);
|
||||
@@ -236,65 +239,20 @@ public class PayPackCompanyServiceImpl extends ServiceImpl<PayPackCompanyMapper,
|
||||
}
|
||||
BigDecimal receivableAmount = payPackCompany.getReceivableAmount();
|
||||
Integer needInvoice = payPackCompany.getNeedInvoice();
|
||||
if (Objects.isNull(payPackCompany.getReceivableAmount())) {
|
||||
payPackCompany.setReceivableAmount(new BigDecimal("0.00"));
|
||||
}
|
||||
if (Objects.isNull(payPackCompany.getPaidAmount())) {
|
||||
payPackCompany.setPaidAmount(new BigDecimal("0.00"));
|
||||
}
|
||||
// 待确收金额没有变更 && 验证来款方式没有变更
|
||||
if (receivableAmount.compareTo(payPackCompanyOld.getReceivableAmount()) == 0 &&
|
||||
needInvoice.equals(payPackCompanyOld.getNeedInvoice())) {
|
||||
return payPackCompany;
|
||||
}
|
||||
// 验证待确收金额不能小于实收金额
|
||||
if (receivableAmount.compareTo(payPackCompanyOld.getPaidAmount()) < 0) {
|
||||
throw new JeroBootException("待确收金额不能小于实收金额！");
|
||||
}
|
||||
LambdaQueryWrapper<PayMailBillProject> queryPayMailBillProject = new LambdaQueryWrapper<>();
|
||||
queryPayMailBillProject.eq(PayMailBillProject::getProjectId, payPackCompanyOld.getId());
|
||||
List<PayMailBillProject> listPayMailBillProject = payMailBillProjectService.list(queryPayMailBillProject);
|
||||
// 开票金额
|
||||
BigDecimal invoice = new BigDecimal("0.00");
|
||||
if (!CollectionUtils.isEmpty(listPayMailBillProject)) {
|
||||
BigDecimal b = listPayMailBillProject.stream().map(PayMailBillProject::getInvoiceAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
|
||||
invoice = invoice.add(b);
|
||||
if (receivableAmount.compareTo(invoice) < 0) {
|
||||
throw new JeroBootException("待确收金额不可小于实收金额，请先修改实际来款后再来修改！");
|
||||
// 变更待确收金额，重新校验状态
|
||||
ProjectStatusVO projectStatusVO = projectDetailService.getStatus(payPackCompany.getId(), receivableAmount,needInvoice);
|
||||
if(!Objects.isNull(projectStatusVO)){
|
||||
if(!Objects.isNull(projectStatusVO.getInAccount())){
|
||||
payPackCompany.setInAccount(projectStatusVO.getInAccount());
|
||||
}
|
||||
}
|
||||
// 到账
|
||||
// 待确收金额 = 实收金额 = 1
|
||||
if (receivableAmount.compareTo(payPackCompanyOld.getPaidAmount()) == 0) {
|
||||
payPackCompany.setInAccount(ProjectCommon.IN_ACCOUNT1);
|
||||
}
|
||||
// 0 = 实收金额 = 0
|
||||
if (payPackCompanyOld.getPaidAmount().compareTo(new BigDecimal("0.00")) == 0) {
|
||||
payPackCompany.setInAccount(ProjectCommon.IN_ACCOUNT0);
|
||||
}
|
||||
// 0 < 实收金额 && 实收金额 < 待确收金额 = 2
|
||||
if (payPackCompanyOld.getPaidAmount().compareTo(new BigDecimal("0.00")) > 0
|
||||
&& payPackCompanyOld.getPaidAmount().compareTo(receivableAmount) < 0) {
|
||||
payPackCompany.setInAccount(ProjectCommon.IN_ACCOUNT2);
|
||||
}
|
||||
// 开票
|
||||
// 不需要开票
|
||||
if (Objects.equals(payPackCompanyOld.getNeedInvoice(), ProjectCommon.NEED_INVOICE0)) {
|
||||
payPackCompany.setMakeInvoice(ProjectCommon.MAKE_INVOICE0);
|
||||
} else {
|
||||
// 开票金额 = 待确收金额 = 1
|
||||
if (invoice.compareTo(receivableAmount) == 0) {
|
||||
payPackCompany.setMakeInvoice(ProjectCommon.MAKE_INVOICE1);
|
||||
if(!Objects.isNull(projectStatusVO.getMakeInvoice())){
|
||||
payPackCompany.setMakeInvoice(projectStatusVO.getMakeInvoice());
|
||||
}
|
||||
// 开票金额 = 0 = 0
|
||||
if (invoice.compareTo(new BigDecimal("0.00")) == 0) {
|
||||
payPackCompany.setMakeInvoice(ProjectCommon.MAKE_INVOICE0);
|
||||
}
|
||||
// 开票金额 > 0 && 开票金额 < 待确收金额 = 2
|
||||
if (invoice.compareTo(new BigDecimal("0.00")) > 0 && invoice.compareTo(receivableAmount) < 0) {
|
||||
payPackCompany.setMakeInvoice(ProjectCommon.MAKE_INVOICE2);
|
||||
if(!Objects.isNull(projectStatusVO.getAffirmIncome())){
|
||||
payPackCompany.setIncomeAffirm(projectStatusVO.getAffirmIncome());
|
||||
}
|
||||
}
|
||||
|
||||
return payPackCompany;
|
||||
}
|
||||
}
|
||||
|
||||
+11
-1
@@ -8,8 +8,8 @@ import com.jero.member.entity.TbCertificatePayment;
|
||||
import com.jero.member.entity.TbMemberProjectSubitem;
|
||||
import com.jero.member.service.ITbCertificatePaymentService;
|
||||
import com.jero.member.service.ITbMemberProjectSubitemService;
|
||||
import com.jero.payment.entity.PayPaymentRecordSub;
|
||||
import com.jero.payment.entity.PayPaymentRecord;
|
||||
import com.jero.payment.entity.PayPaymentRecordSub;
|
||||
import com.jero.payment.service.IPayPaymentCheckService;
|
||||
import com.jero.payment.service.IPayPaymentRecordService;
|
||||
import io.swagger.annotations.Api;
|
||||
@@ -130,6 +130,16 @@ public class PayPaymentCheckController extends JeroController<PayPaymentRecordSu
|
||||
}
|
||||
}
|
||||
|
||||
@ApiOperation(value="获取最新一条缴费凭证", notes="获取最新一条缴费凭证")
|
||||
@GetMapping(value = "/getLastProof")
|
||||
public Result<?> getLastProof(String projectId) {
|
||||
PayPaymentRecordSub sub = payPaymentCheckService.getLastProof(projectId);
|
||||
if (sub == null) {
|
||||
return Result.OK("无数据");
|
||||
}
|
||||
return Result.OK(sub);
|
||||
}
|
||||
|
||||
|
||||
@ApiOperation(value="标协会员项目详情", notes="标协会员项目详情")
|
||||
@GetMapping(value = "/getTbMemberProject")
|
||||
|
||||
+33
-31
@@ -279,37 +279,39 @@
|
||||
<if test="payCommonProject.affirmIncome != null">
|
||||
AND tcp.affirm_income = #{payCommonProject.affirmIncome}
|
||||
</if>
|
||||
<!-- 打包项目-->
|
||||
UNION ALL
|
||||
select ppc.id,ppc.company_temporary_name AS charge_project,22 AS charge_use,ppc.pack_principal_id as principal_id,su.realname AS principal_name,ppc.company_id as charge_company_id,ppc.company_temporary_name as charge_company_temporary_name,ppc.receivable_amount,ppc.paid_amount,
|
||||
ppc.need_invoice,1 AS pack,ppc.in_account,ppc.make_invoice,NULL AS mail,ppc.create_time,8 AS projectType,ppc.invoice_amount,ppc.mail_contacts_id,'' AS register_check_result,ppc.pack_contact_temporary_name as contacts_temporary_name,NULL AS payment_status,ppc.company_temporary_id,ppc.confirm_amount,ppc.income_affirm AS affirm_income,0 AS admin_add_flag
|
||||
from pay_pack_company ppc
|
||||
left join sys_user su on ppc.pack_principal_id = su.id
|
||||
left join pay_company_management on ppc.company_id = pay_company_management.id
|
||||
where
|
||||
ppc.receivable_amount <![CDATA[<>]]> 0
|
||||
and ppc.receivable_amount is not null
|
||||
<if test="payCommonProject.chargeCompanyTemporaryName != null and payCommonProject.chargeCompanyTemporaryName != ''">
|
||||
AND pay_company_management.company_name like concat('%',#{payCommonProject.chargeCompanyTemporaryName},'%')
|
||||
</if>
|
||||
<if test="payCommonProject.principalId != null and payCommonProject.principalId != ''">
|
||||
AND ppc.pack_principal_id = #{payCommonProject.principalId}
|
||||
</if>
|
||||
<if test="payCommonProject.chargeProject != null and payCommonProject.chargeProject != ''">
|
||||
AND ppc.company_temporary_name like concat('%',concat(#{payCommonProject.chargeProject},'%'))
|
||||
</if>
|
||||
<!-- 来款未开票 -->
|
||||
<if test='paidInvoicStatus != null and paidInvoicStatus == "1"'>
|
||||
AND (ppc.paid_amount <![CDATA[>]]> ppc.invoice_amount or
|
||||
(ppc.paid_amount is not null and ppc.paid_amount !=0 and ppc.invoice_amount is null))
|
||||
</if>
|
||||
<!-- 开票未来款 -->
|
||||
<if test='paidInvoicStatus != null and paidInvoicStatus == "2"'>
|
||||
AND (ppc.paid_amount <![CDATA[<]]> ppc.invoice_amount or
|
||||
(ppc.paid_amount is null and ppc.invoice_amount is not null and ppc.invoice_amount !=0))
|
||||
</if>
|
||||
<if test="payCommonProject.affirmIncome != null">
|
||||
AND ppc.income_affirm = #{payCommonProject.affirmIncome}
|
||||
<if test="payCommonProject.paymentStatus == null">
|
||||
<!-- 打包项目-->
|
||||
UNION ALL
|
||||
select ppc.id,ppc.company_temporary_name AS charge_project,22 AS charge_use,ppc.pack_principal_id as principal_id,su.realname AS principal_name,ppc.company_id as charge_company_id,ppc.company_temporary_name as charge_company_temporary_name,ppc.receivable_amount,ppc.paid_amount,
|
||||
ppc.need_invoice,1 AS pack,ppc.in_account,ppc.make_invoice,NULL AS mail,ppc.create_time,8 AS projectType,ppc.invoice_amount,ppc.mail_contacts_id,'' AS register_check_result,ppc.pack_contact_temporary_name as contacts_temporary_name,NULL AS payment_status,ppc.company_temporary_id,ppc.confirm_amount,ppc.income_affirm AS affirm_income,0 AS admin_add_flag
|
||||
from pay_pack_company ppc
|
||||
left join sys_user su on ppc.pack_principal_id = su.id
|
||||
left join pay_company_management on ppc.company_id = pay_company_management.id
|
||||
where
|
||||
ppc.receivable_amount <![CDATA[<>]]> 0
|
||||
and ppc.receivable_amount is not null
|
||||
<if test="payCommonProject.chargeCompanyTemporaryName != null and payCommonProject.chargeCompanyTemporaryName != ''">
|
||||
AND pay_company_management.company_name like concat('%',#{payCommonProject.chargeCompanyTemporaryName},'%')
|
||||
</if>
|
||||
<if test="payCommonProject.principalId != null and payCommonProject.principalId != ''">
|
||||
AND ppc.pack_principal_id = #{payCommonProject.principalId}
|
||||
</if>
|
||||
<if test="payCommonProject.chargeProject != null and payCommonProject.chargeProject != ''">
|
||||
AND ppc.company_temporary_name like concat('%',concat(#{payCommonProject.chargeProject},'%'))
|
||||
</if>
|
||||
<!-- 来款未开票 -->
|
||||
<if test='paidInvoicStatus != null and paidInvoicStatus == "1"'>
|
||||
AND (ppc.paid_amount <![CDATA[>]]> ppc.invoice_amount or
|
||||
(ppc.paid_amount is not null and ppc.paid_amount !=0 and ppc.invoice_amount is null))
|
||||
</if>
|
||||
<!-- 开票未来款 -->
|
||||
<if test='paidInvoicStatus != null and paidInvoicStatus == "2"'>
|
||||
AND (ppc.paid_amount <![CDATA[<]]> ppc.invoice_amount or
|
||||
(ppc.paid_amount is null and ppc.invoice_amount is not null and ppc.invoice_amount !=0))
|
||||
</if>
|
||||
<if test="payCommonProject.affirmIncome != null">
|
||||
AND ppc.income_affirm = #{payCommonProject.affirmIncome}
|
||||
</if>
|
||||
</if>
|
||||
)p
|
||||
LEFT JOIN pay_payment_record ppr ON ppr.project_id = p.id
|
||||
|
||||
+7
@@ -55,4 +55,11 @@ public interface IPayPaymentCheckService extends IService<PayPaymentRecordSub> {
|
||||
* @return
|
||||
*/
|
||||
String getPaymentStatus(BigDecimal amountReceivable, BigDecimal paidAmount, String paymentStatus, boolean changeReceivableAmountFlag);
|
||||
|
||||
/**
|
||||
* 获取最新一条缴费凭证
|
||||
* @param projectId
|
||||
* @return
|
||||
*/
|
||||
PayPaymentRecordSub getLastProof(String projectId);
|
||||
}
|
||||
|
||||
+15
@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.jero.common.common.ProjectCommon;
|
||||
import com.jero.common.common.RoleCommon;
|
||||
import com.jero.common.constant.CommonConstant;
|
||||
import com.jero.common.dto.SendMessageDTO;
|
||||
import com.jero.common.enums.CompanyMessageEnums;
|
||||
import com.jero.common.enums.LastSignEnum;
|
||||
@@ -23,6 +24,7 @@ import com.jero.config.StaticConfig;
|
||||
import com.jero.contract.common.PayIncomeContractCommon;
|
||||
import com.jero.meeting.mapper.PayMeetingSituationMapper;
|
||||
import com.jero.member.entity.*;
|
||||
import com.jero.member.enums.MemberStatusEnum;
|
||||
import com.jero.member.mapper.PayMemberProjectSubitemMapper;
|
||||
import com.jero.member.mapper.TbCertificatePaymentMapper;
|
||||
import com.jero.member.mapper.TbMemberProjectSubitemMapper;
|
||||
@@ -237,6 +239,7 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
|
||||
PayWorkingGroup payWorkingGroup = payWorkingGroupService.getById(payWorking.getWorkingGroupId());
|
||||
|
||||
payWorking.setPaymentStatus(PaymentStatusEnum.TO_BE_REVIEWED.getCode());
|
||||
payWorking.setConfirmVoucher(CommonConstant.NO);
|
||||
payWorkingGroupSubItemMapper.updateById(payWorking);
|
||||
|
||||
//发消息参数
|
||||
@@ -267,6 +270,7 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
|
||||
TbMemberProject memberProject = tbMemberProjectService.getById(subitem.getProjectId());
|
||||
|
||||
subitem.setPaymentStatus(PaymentStatusEnum.TO_BE_REVIEWED.getCode());
|
||||
subitem.setMemberStatus(MemberStatusEnum.PAID.getValue());
|
||||
tbMemberProjectSubitemMapper.updateById(subitem);
|
||||
|
||||
//发消息参数
|
||||
@@ -351,6 +355,7 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
|
||||
PayWorkingGroupSubItem payWorking = new PayWorkingGroupSubItem();
|
||||
payWorking.setId(payPaymentRecord.getProjectId());
|
||||
payWorking.setPaymentStatus(PaymentStatusEnum.TO_BE_REVIEWED.getCode());
|
||||
payWorking.setConfirmVoucher(CommonConstant.NO);
|
||||
payWorkingGroupSubItemMapper.updateById(payWorking);
|
||||
|
||||
PayWorkingGroupSubItem oldPayWorking = payWorkingGroupSubItemMapper.selectById(payPaymentRecord.getProjectId());
|
||||
@@ -782,4 +787,14 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
|
||||
|
||||
return paymentStatus;
|
||||
}
|
||||
|
||||
@Override
|
||||
public PayPaymentRecordSub getLastProof(String projectId) {
|
||||
LambdaQueryWrapper<PayPaymentRecordSub> wrapper = new LambdaQueryWrapper<>();
|
||||
wrapper.eq(PayPaymentRecordSub::getProjectId, projectId);
|
||||
wrapper.isNotNull(PayPaymentRecordSub::getProof);
|
||||
wrapper.orderByDesc(PayPaymentRecordSub::getCreateTime);
|
||||
wrapper.last("limit 1");
|
||||
return payPaymentCheckService.getOne(wrapper);
|
||||
}
|
||||
}
|
||||
|
||||
+34
-26
@@ -33,6 +33,7 @@ import com.jero.meeting.entity.PayMeetingSituation;
|
||||
import com.jero.meeting.mapper.PayMeetingSituationMapper;
|
||||
import com.jero.meeting.service.IPayMeetingService;
|
||||
import com.jero.member.entity.*;
|
||||
import com.jero.member.enums.MemberStatusEnum;
|
||||
import com.jero.member.mapper.PayMemberProjectSubitemMapper;
|
||||
import com.jero.member.mapper.TbCertificatePaymentMapper;
|
||||
import com.jero.member.mapper.TbMemberProjectSubitemMapper;
|
||||
@@ -182,19 +183,20 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
|
||||
}
|
||||
//插入待审核状态，供前端判断是否显示审核按钮
|
||||
//先查审核记录表有没有待审核的
|
||||
if(projectIdPaymentStatusMap.containsKey(id)){
|
||||
String paymentStatus = projectIdPaymentStatusMap.get(id);
|
||||
if(PaymentStatusEnum.TO_BE_REVIEWED.getCode().equals(paymentStatus)){
|
||||
commonProject.setCheckPaymentStatus(paymentStatus);
|
||||
continue;
|
||||
}
|
||||
}
|
||||
//再查项目主表状态是不是待审核
|
||||
if(StringUtils.isBlank(commonProject.getCheckPaymentStatus())){
|
||||
if(PaymentStatusEnum.TO_BE_REVIEWED.getCode().equals(commonProject.getPaymentStatus())){
|
||||
commonProject.setCheckPaymentStatus(commonProject.getPaymentStatus());
|
||||
}
|
||||
}
|
||||
//if(projectIdPaymentStatusMap.containsKey(id)){
|
||||
// String paymentStatus = projectIdPaymentStatusMap.get(id);
|
||||
// if(PaymentStatusEnum.TO_BE_REVIEWED.getCode().equals(paymentStatus)){
|
||||
String paymentStatus = commonProject.getPaymentStatus();
|
||||
commonProject.setCheckPaymentStatus(paymentStatus);
|
||||
// continue;
|
||||
// }
|
||||
//}
|
||||
////再查项目主表状态是不是待审核
|
||||
//if(StringUtils.isBlank(commonProject.getCheckPaymentStatus())){
|
||||
// if(PaymentStatusEnum.TO_BE_REVIEWED.getCode().equals(commonProject.getPaymentStatus())){
|
||||
// commonProject.setCheckPaymentStatus(commonProject.getPaymentStatus());
|
||||
// }
|
||||
//}
|
||||
//会议、标协会员、标协证书，来款单位拼接“未审核”
|
||||
//if (commonProject.getProjectType().equals(Integer.parseInt(ProjectCommon.PROJECT_TYPE3))||
|
||||
// commonProject.getProjectType().equals(Integer.parseInt(ProjectCommon.PROJECT_TYPE5))||
|
||||
@@ -420,7 +422,9 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
|
||||
//更新主列表
|
||||
payCommonProject.setPaidAmount(newPaidAmount);
|
||||
payCommonProject.setInAccount(inAccount);
|
||||
payCommonProject.setPaymentStatus(paymentStatus);
|
||||
if ("check".equals(checkOrRecord)){
|
||||
payCommonProject.setPaymentStatus(paymentStatus);
|
||||
}
|
||||
payCommonProjectMapper.updateById(payCommonProject);
|
||||
|
||||
break;
|
||||
@@ -452,7 +456,9 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
|
||||
//更新主列表
|
||||
payWorking.setPaidAmount(newPaidAmount);
|
||||
payWorking.setInAccount(inAccount);
|
||||
payWorking.setPaymentStatus(paymentStatus);
|
||||
if ("check".equals(checkOrRecord)){
|
||||
payWorking.setPaymentStatus(paymentStatus);
|
||||
}
|
||||
payWorkingGroupSubItemMapper.updateById(payWorking);
|
||||
|
||||
break;
|
||||
@@ -482,7 +488,9 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
|
||||
//更新主列表
|
||||
meeting.setPaidAmount(newPaidAmount);
|
||||
meeting.setInAccount(inAccount);
|
||||
meeting.setPaymentStatus(paymentStatus);
|
||||
if ("check".equals(checkOrRecord)){
|
||||
meeting.setPaymentStatus(paymentStatus);
|
||||
}
|
||||
payMeetingSituationMapper.updateById(meeting);
|
||||
|
||||
break;
|
||||
@@ -511,7 +519,9 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
|
||||
//更新主列表
|
||||
member.setPaidAmount(newPaidAmount);
|
||||
member.setInAccount(inAccount);
|
||||
member.setPaymentStatus(paymentStatus);
|
||||
if ("check".equals(checkOrRecord)){
|
||||
member.setPaymentStatus(paymentStatus);
|
||||
}
|
||||
payMemberProjectSubitemMapper.updateById(member);
|
||||
|
||||
break;
|
||||
@@ -541,7 +551,10 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
|
||||
//更新主列表
|
||||
tbMember.setPaidAmount(newPaidAmount);
|
||||
tbMember.setInAccount(inAccount);
|
||||
tbMember.setPaymentStatus(paymentStatus);
|
||||
if ("check".equals(checkOrRecord)){
|
||||
tbMember.setPaymentStatus(paymentStatus);
|
||||
tbMember.setMemberStatus(MemberStatusEnum.PAID.getValue());
|
||||
}
|
||||
tbMemberProjectSubitemMapper.updateById(tbMember);
|
||||
|
||||
// 生成会员有效期
|
||||
@@ -574,16 +587,11 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
|
||||
//更新主列表
|
||||
tbMemberCertificate.setPaidAmount(newPaidAmount);
|
||||
tbMemberCertificate.setInAccount(inAccount);
|
||||
tbMemberCertificate.setPaymentStatus(paymentStatus);
|
||||
if ("check".equals(checkOrRecord)){
|
||||
tbMemberCertificate.setPaymentStatus(paymentStatus);
|
||||
}
|
||||
certificatePaymentMapper.updateById(tbMemberCertificate);
|
||||
|
||||
//拼装推到标协缴费的参数
|
||||
// TbCheckVo tbCheckCerVo = new TbCheckVo();
|
||||
// tbCheckCerVo.setId(tbMemberCertificate.getTbPaymentId());
|
||||
// tbCheckCerVo.setCheckResult(PayProjectCommon.YES);
|
||||
//// tbCheckCerVo.setCheckMark(payPaymentRecord.getRemark());
|
||||
// typr6List.add(tbCheckCerVo);
|
||||
|
||||
break;
|
||||
// 打包项目
|
||||
case PayIncomeContractCommon.PROJECT_TYPE8:
|
||||
|
||||
+68
@@ -26,12 +26,16 @@ import com.jero.mail.entity.PayMailBill;
|
||||
import com.jero.mail.entity.PayMailBillProject;
|
||||
import com.jero.mail.service.IPayMailBillProjectService;
|
||||
import com.jero.mail.service.IPayMailBillService;
|
||||
import com.jero.modules.oss.entity.OSSFile;
|
||||
import com.jero.modules.oss.service.IOSSFileService;
|
||||
import com.jero.modules.system.entity.SysUser;
|
||||
import com.jero.modules.system.service.ISysUserService;
|
||||
import com.jero.pack.entity.PayPackCompany;
|
||||
import com.jero.pack.entity.PayPackCompanyProject;
|
||||
import com.jero.pack.service.IPayPackCompanyProjectService;
|
||||
import com.jero.pack.service.IPayPackCompanyService;
|
||||
import com.jero.payment.entity.PayPaymentRecordSub;
|
||||
import com.jero.payment.service.IPayPaymentCheckService;
|
||||
import com.jero.project.common.PayProjectCommon;
|
||||
import com.jero.project.entity.AnnualDataLocking;
|
||||
import com.jero.project.entity.PayWorkingGroup;
|
||||
@@ -54,6 +58,7 @@ import org.apache.commons.lang3.StringUtils;
|
||||
import org.apache.shiro.SecurityUtils;
|
||||
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
||||
import org.springframework.beans.BeanUtils;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
@@ -108,6 +113,10 @@ public class PayWorkingGroupSubItemController extends JeroController<PayWorkingG
|
||||
private IPayWorkingGroupSubItemContactsService payWorkingGroupSubItemContactsService;
|
||||
@Resource
|
||||
private AnnualDataLockingService annualDataLockingService;
|
||||
@Autowired
|
||||
private IPayPaymentCheckService payPaymentCheckService;
|
||||
@Resource
|
||||
private IOSSFileService ossFileService;
|
||||
|
||||
/**
|
||||
* 分页列表查询
|
||||
@@ -815,6 +824,15 @@ public class PayWorkingGroupSubItemController extends JeroController<PayWorkingG
|
||||
}
|
||||
PayWorkingGroupSubItemExcel excel = new PayWorkingGroupSubItemExcel();
|
||||
BeanUtils.copyProperties(workingGroupSubItem,excel);
|
||||
//获取最新缴费凭证
|
||||
PayPaymentRecordSub lastProof = payPaymentCheckService.getLastProof(workingGroupSubItem.getId());
|
||||
if (lastProof != null){
|
||||
String proof = lastProof.getProof();
|
||||
if (StringUtils.isNotBlank(proof)) {
|
||||
OSSFile ossFile = ossFileService.getById(proof);
|
||||
excel.setPaymentRecord(ossFile.getUrl());
|
||||
}
|
||||
}
|
||||
List<PayWorkingGroupSubItemContacts> listPayWorkingGroupSubItemContacts = payWorkingGroupSubItemContactsList.stream().filter(o->Objects.equals(workingGroupSubItem.getId(),o.getWorkingGroupSubId())).collect(Collectors.toList());
|
||||
if(!CollectionUtils.isEmpty(listPayWorkingGroupSubItemContacts)){
|
||||
listPayWorkingGroupSubItemContacts.sort(Comparator.comparing(PayWorkingGroupSubItemContacts::getOrderNum));
|
||||
@@ -897,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;
|
||||
}
|
||||
|
||||
+4
-4
@@ -20,16 +20,16 @@ public class PayWorkGroupSubletStatistics {
|
||||
@ApiModelProperty(value = "来款单位")
|
||||
private String chargeCompanyTemporaryName;
|
||||
|
||||
@Excel(name = "项目负责人", width = 15)
|
||||
@ApiModelProperty(value = "项目负责人")
|
||||
private String principalName;
|
||||
|
||||
@ApiModelProperty(value = "打包")
|
||||
private Integer pack;
|
||||
|
||||
@Excel(name = "是否打包", width = 15)
|
||||
private String packText;
|
||||
|
||||
@Excel(name = "项目负责人", width = 15)
|
||||
@ApiModelProperty(value = "项目负责人")
|
||||
private String principalName;
|
||||
|
||||
@Excel(name = "年度待确收金额", width = 15)
|
||||
@ApiModelProperty(value = "应收总金额")
|
||||
private String allMoney;
|
||||
|
||||
+252
-1
@@ -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;
|
||||
|
||||
@@ -618,6 +869,6 @@ public class PayWorkingGroupSubItem implements Serializable {
|
||||
@ApiModelProperty(value = "是否审核（1：是，0：否")
|
||||
private Integer checkPaymentStatus;
|
||||
|
||||
@ApiModelProperty(value = "是否确认凭证（1：是，0：否")
|
||||
@ApiModelProperty(value = "是否查看凭证（1：是，0：否")
|
||||
private Integer confirmVoucher;
|
||||
}
|
||||
|
||||
+1
@@ -57,6 +57,7 @@
|
||||
pwgs.label,
|
||||
pwgs.estimated_arrival_date,
|
||||
pwgs.check_payment_status,
|
||||
pwgs.payment_status,
|
||||
pwgs.confirm_voucher
|
||||
FROM pay_working_group_subitem pwgs
|
||||
LEFT JOIN pay_payment_record ppr ON ppr.project_id = pwgs.id
|
||||
|
||||
+15
-3
@@ -244,7 +244,8 @@ public class PayCommonProjectServiceImpl extends ServiceImpl<PayCommonProjectMap
|
||||
|
||||
setPayCommonProjectEdit(payCommonProject,payCommonProjectOld,annualDataLocking);
|
||||
// 变更待确收金额，重新校验状态
|
||||
ProjectStatusVO projectStatusVO = projectDetailService.getStatus(payCommonProject.getId(),payCommonProject.getReceivableAmount(),payCommonProject.getNeedInvoice());
|
||||
BigDecimal receivableAmount = payCommonProject.getReceivableAmount();
|
||||
ProjectStatusVO projectStatusVO = projectDetailService.getStatus(payCommonProject.getId(), receivableAmount,payCommonProject.getNeedInvoice());
|
||||
if(!Objects.isNull(projectStatusVO)){
|
||||
if(!Objects.isNull(projectStatusVO.getInAccount())){
|
||||
payCommonProject.setInAccount(projectStatusVO.getInAccount());
|
||||
@@ -255,9 +256,11 @@ public class PayCommonProjectServiceImpl extends ServiceImpl<PayCommonProjectMap
|
||||
if(!Objects.isNull(projectStatusVO.getMail())){
|
||||
payCommonProject.setMail(projectStatusVO.getMail());
|
||||
}
|
||||
if(!Objects.isNull(projectStatusVO.getAffirmIncome())){
|
||||
payCommonProject.setAffirmIncome(projectStatusVO.getAffirmIncome());
|
||||
}
|
||||
}
|
||||
String paymentStatus = payPaymentCheckService.getPaymentStatus(payCommonProject.getReceivableAmount(),payCommonProject.getPaidAmount(),payCommonProject.getPaymentStatus(), false);
|
||||
payCommonProject.setPaymentStatus(paymentStatus);
|
||||
|
||||
payCommonProjectService.updateById(payCommonProject);
|
||||
|
||||
LambdaUpdateWrapper<PayCommonProject> updatePayCommonProject = new LambdaUpdateWrapper<>();
|
||||
@@ -277,6 +280,15 @@ public class PayCommonProjectServiceImpl extends ServiceImpl<PayCommonProjectMap
|
||||
if(Objects.equals(payCommonProject.getChargeWay(),PayProjectCommon.CHARGE_WAY3)){
|
||||
updatePayCommonProject.set(PayCommonProject::getContractNum,null);
|
||||
}
|
||||
//缴费凭证状态
|
||||
if (receivableAmount.compareTo(BigDecimal.ZERO) == 0){
|
||||
updatePayCommonProject.set(PayCommonProject::getPaymentStatus,null);
|
||||
}else {
|
||||
String paymentStatus = payPaymentCheckService.getPaymentStatus(receivableAmount,payCommonProject.getPaidAmount(),payCommonProject.getPaymentStatus(), false);
|
||||
updatePayCommonProject.set(PayCommonProject::getPaymentStatus,paymentStatus);
|
||||
}
|
||||
|
||||
|
||||
payCommonProjectService.update(updatePayCommonProject);
|
||||
// 如果有邮寄信息更新邮寄联系人信息
|
||||
String mailContactsId = payCommonProject.getMailContactsId();
|
||||
|
||||
+1
-4
@@ -978,16 +978,13 @@ public class PayWorkingGroupServiceImpl extends ServiceImpl<PayWorkingGroupMappe
|
||||
for (PayWorkingGroupDataFile dataFile : fileList) {
|
||||
addFileToZip(dataFile.getFileId(), zipos, otherFilesFolderPath, addedEntries);
|
||||
}
|
||||
}
|
||||
|
||||
for (String projectId : ids) {
|
||||
LambdaQueryWrapper<PayMeeting> lambdaQueryWrapper = new LambdaQueryWrapper<>();
|
||||
lambdaQueryWrapper.eq(PayMeeting::getWorkingGroupId, projectId);
|
||||
lambdaQueryWrapper.eq(PayMeeting::getMeetingType, MeetingCommon.WORKING_GROUP_MEETING_INT);
|
||||
List<PayMeeting> list = payMeetingService.list(lambdaQueryWrapper);
|
||||
for (PayMeeting payMeeting : list) {
|
||||
String meetingName = payMeeting.getMeetingName();
|
||||
String meetingFolderPath = "会议资料/" + meetingName + "/";
|
||||
String meetingFolderPath = groupFolderPath + "会议资料/" + meetingName + "/";
|
||||
String meetingMinutesFolderPath = meetingFolderPath + "会议纪要/";
|
||||
String meetingDataFolderPath = meetingFolderPath + "上传文件/";
|
||||
String meetingNoticeFilesPath = meetingFolderPath + "会议通知/";
|
||||
|
||||
+98
-1
@@ -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;
|
||||
@@ -445,10 +448,12 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
|
||||
if (!Objects.isNull(projectStatusVO.getMail())) {
|
||||
payWorkingGroupSubItem.setMail(projectStatusVO.getMail());
|
||||
}
|
||||
if(!Objects.isNull(projectStatusVO.getAffirmIncome())){
|
||||
payWorkingGroupSubItem.setAffirmIncome(projectStatusVO.getAffirmIncome());
|
||||
}
|
||||
}
|
||||
String paymentStatus = payPaymentCheckService.getPaymentStatus(payWorkingGroupSubItem.getReceivableAmount(), payWorkingGroupSubItemOld.getPaidAmount(), payWorkingGroupSubItemOld.getPaymentStatus(), false);
|
||||
payWorkingGroupSubItem.setPaymentStatus(paymentStatus);
|
||||
payWorkingGroupSubItem.setInAccount(null);
|
||||
payWorkingGroupSubItem.setPaidAmount(null);
|
||||
|
||||
BigDecimal taxRate = payWorkingGroupSubItem.getTaxRate();
|
||||
@@ -771,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)) {
|
||||
@@ -903,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)) {
|
||||
@@ -1025,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;
|
||||
}
|
||||
|
||||
|
||||
+210
@@ -40,6 +40,11 @@ public class PayWorkingGroupSubItemExcel implements Serializable {
|
||||
@Excel(name = "来款方式", width = 15, dicCode = "payment_type")
|
||||
@ApiModelProperty(value = "来款方式（1：无，2：合同，3：收费通知）")
|
||||
private Integer chargeWay;
|
||||
|
||||
/**缴费凭证*/
|
||||
@Excel(name = "缴费凭证", type = 2 ,width = 40 , height = 20)
|
||||
private String paymentRecord;
|
||||
|
||||
/**
|
||||
* 待确收金额（元）
|
||||
*/
|
||||
@@ -86,6 +91,10 @@ public class PayWorkingGroupSubItemExcel implements Serializable {
|
||||
@Excel(name = "需要发票", width = 15, dicCode = "invoice_type")
|
||||
@ApiModelProperty(value = "需要发票（1：增值税普通发票，2：增值税专用发票，0：否）")
|
||||
private Integer needInvoice;
|
||||
|
||||
@ApiModelProperty(value = "是否查看凭证（1：是，0：否")
|
||||
@Excel(name = "是否查看凭证", width = 15, dicCode = "yn")
|
||||
private Integer confirmVoucher;
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@@ -316,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;
|
||||
|
||||
+4
@@ -199,6 +199,10 @@ public class CompanyComeMoneyStatisticsController {
|
||||
if (StringUtils.isBlank(billMoney)) {
|
||||
s.setBillMoney(CommonConstant.ZERO);
|
||||
}
|
||||
String finishRate = s.getFinishRate();
|
||||
if (StringUtils.isBlank(finishRate)) {
|
||||
s.setFinishRate(CommonConstant.ZERO+"%");
|
||||
}
|
||||
}
|
||||
return AmountUtil.exportListXls(pageList, CompanyComeMoneyList.class, "企业来款统计");
|
||||
|
||||
|
||||
+2
@@ -29,4 +29,6 @@ public interface IPayContactsManagementTemporaryService extends IService<PayCont
|
||||
|
||||
PayContactsManagementTemporary getByAllTable(String contactsId, String contactsTemporaryId);
|
||||
|
||||
List<PayContactsManagementTemporary> listByIds (List<String> contactsId);
|
||||
|
||||
}
|
||||
|
||||
+11
@@ -101,4 +101,15 @@ public class PayContactsManagementTemporaryServiceImpl extends ServiceImpl<PayCo
|
||||
}
|
||||
return temporary;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<PayContactsManagementTemporary> listByIds(List<String> contactsId) {
|
||||
List<PayContactsManagementTemporary> temporaryList = super.listByIds(contactsId);
|
||||
List<PayContactsManagement> payContactsManagements = payContactsManagementService.listByIds(contactsId);
|
||||
for (PayContactsManagement contactsManagement : payContactsManagements) {
|
||||
String str = JSONObject.toJSONString(contactsManagement);
|
||||
temporaryList.add(JSON.parseObject(str, PayContactsManagementTemporary.class));
|
||||
}
|
||||
return temporaryList;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user