需求变更，打包管理列表添加联系人电话、邮箱
This commit is contained in:
梁琦涛
+2
-2
@@ -80,11 +80,11 @@ public class PayIncomeContractCommon {
|
||||
*/
|
||||
public final static List<String> LIST_SPENDING_CONTRACT = Arrays.asList("合同编号","合同名称","签订单位","签订联系人","是否开口","负责人",
|
||||
"部门名称","签订合同总金额","税率","未税金额","合同签订日期","合同终止日期","合同约定主要时点",
|
||||
"应收金额","已收金额","未收金额","账款状态","合同约定付款次数","是否打包","打包年份");
|
||||
"应付金额","已付金额","未付金额","账款状态","合同约定付款次数","是否打包","打包年份");
|
||||
/**
|
||||
* 支出合同分期信息excel 表头
|
||||
*/
|
||||
public final static List<String> LIST_SPENDING_CONTRACT_INSTALLMENT = Arrays.asList("阶段","阶段应收","阶段应收时间","阶段实收","阶段实收时间");
|
||||
public final static List<String> LIST_SPENDING_CONTRACT_INSTALLMENT = Arrays.asList("阶段","阶段应付","阶段应付时间","阶段实付","阶段实付时间");
|
||||
|
||||
/**
|
||||
* 来源（1:收入合同,2:打包管理）
|
||||
|
||||
+14
-14
@@ -134,25 +134,25 @@ public class PaySpendingContract implements Serializable {
|
||||
@ApiModelProperty(value = "合同约定主要时点")
|
||||
@Size(max = 200, message = "合同约定主要时点不能大于200个字符")
|
||||
private String contractTimePoints;
|
||||
/**应收金额*/
|
||||
@Excel(name = "应收金额", width = 15)
|
||||
@ApiModelProperty(value = "应收金额")
|
||||
@NotNull(message = "应收金额不能为空")
|
||||
/**应付金额*/
|
||||
@Excel(name = "应付金额", width = 15)
|
||||
@ApiModelProperty(value = "应付金额")
|
||||
@NotNull(message = "应付金额不能为空")
|
||||
@JsonFormat(shape = JsonFormat.Shape.STRING)
|
||||
@DecimalMax(value = "9999999999.99",message = "应收金额格式错误")
|
||||
@DecimalMax(value = "9999999999.99",message = "应付金额格式错误")
|
||||
private BigDecimal accountsReceivableAmount;
|
||||
/**已收金额*/
|
||||
@Excel(name = "已收金额", width = 15)
|
||||
@ApiModelProperty(value = "已收金额")
|
||||
@NotNull(message = "已收金额不能为空")
|
||||
/**已付金额*/
|
||||
@Excel(name = "已付金额", width = 15)
|
||||
@ApiModelProperty(value = "已付金额")
|
||||
@NotNull(message = "已付金额不能为空")
|
||||
@JsonFormat(shape = JsonFormat.Shape.STRING)
|
||||
@DecimalMax(value = "9999999999.99",message = "已收金额格式错误")
|
||||
@DecimalMax(value = "9999999999.99",message = "已付金额格式错误")
|
||||
private BigDecimal amountReceived;
|
||||
/**未收金额*/
|
||||
@Excel(name = "未收金额", width = 15)
|
||||
@ApiModelProperty(value = "未收金额")
|
||||
/**未付金额*/
|
||||
@Excel(name = "未付金额", width = 15)
|
||||
@ApiModelProperty(value = "未付金额")
|
||||
@JsonFormat(shape = JsonFormat.Shape.STRING)
|
||||
@DecimalMax(value = "9999999999.99",message = "未收金额格式错误")
|
||||
@DecimalMax(value = "9999999999.99",message = "未付金额格式错误")
|
||||
private BigDecimal outstandingAmount;
|
||||
/**账款状态（1：未支付，2：部分支付，3：已付全款）*/
|
||||
@Excel(name = "账款状态（1：未支付，2：部分支付，3：已付全款）", width = 15)
|
||||
|
||||
+15
-15
@@ -47,30 +47,30 @@ public class PaySpendingContractInstallment implements Serializable {
|
||||
@NotEmpty(message = "阶段不能为空")
|
||||
@Size(max = 50, message = "阶段长度不能大于50个字符")
|
||||
private String phaseName;
|
||||
/**应收金额*/
|
||||
@Excel(name = "阶段应收金额", width = 15)
|
||||
@ApiModelProperty(value = "应收金额")
|
||||
@NotNull(message = "阶段应收不能为空")
|
||||
@DecimalMax(value = "9999999999.99",message = "阶段应收格式错误")
|
||||
/**应付金额*/
|
||||
@Excel(name = "阶段应付金额", width = 15)
|
||||
@ApiModelProperty(value = "应付金额")
|
||||
@NotNull(message = "阶段应付不能为空")
|
||||
@DecimalMax(value = "9999999999.99",message = "阶段应付格式错误")
|
||||
@JsonFormat(shape = JsonFormat.Shape.STRING)
|
||||
private BigDecimal accountsReceivableAmount;
|
||||
/**应收时间*/
|
||||
@Excel(name = "阶段应收时间", width = 15, format = "yyyy-MM-dd")
|
||||
/**应付时间*/
|
||||
@Excel(name = "阶段应付时间", width = 15, format = "yyyy-MM-dd")
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd")
|
||||
@ApiModelProperty(value = "应收时间")
|
||||
@ApiModelProperty(value = "应付时间")
|
||||
private Date accountsReceivableTime;
|
||||
/**实收金额*/
|
||||
@Excel(name = "阶段实收金额", width = 15)
|
||||
@ApiModelProperty(value = "阶段实收金额")
|
||||
@DecimalMax(value = "9999999999.99",message = "阶段实收格式错误")
|
||||
/**实付金额*/
|
||||
@Excel(name = "阶段实付金额", width = 15)
|
||||
@ApiModelProperty(value = "阶段实付金额")
|
||||
@DecimalMax(value = "9999999999.99",message = "阶段实付格式错误")
|
||||
@JsonFormat(shape = JsonFormat.Shape.STRING)
|
||||
private BigDecimal paidAmount;
|
||||
/**实收时间*/
|
||||
@Excel(name = "实收时间", width = 15, format = "yyyy-MM-dd")
|
||||
/**实付时间*/
|
||||
@Excel(name = "实付时间", width = 15, format = "yyyy-MM-dd")
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd")
|
||||
@ApiModelProperty(value = "实收时间")
|
||||
@ApiModelProperty(value = "实付时间")
|
||||
private Date paidTime;
|
||||
/**创建人*/
|
||||
@ApiModelProperty(value = "创建人")
|
||||
|
||||
+12
@@ -97,6 +97,12 @@ public class PayPackCompanyController extends JeroController<PayPackCompany, IPa
|
||||
p.setReceiptExpense(listCount.get(0).getPaidAmount());
|
||||
}
|
||||
}
|
||||
if(!StringUtils.isEmpty(p.getPhone())){
|
||||
p.setPhone(PasswordUtil.decrypt(p.getPhone()));
|
||||
}
|
||||
if(!StringUtils.isEmpty(p.getEmail())){
|
||||
p.setEmail(PasswordUtil.decrypt(p.getEmail()));
|
||||
}
|
||||
if(Objects.isNull(p.getReceiptExpense())){
|
||||
p.setReceiptExpense(new BigDecimal("0.00"));
|
||||
}
|
||||
@@ -286,6 +292,12 @@ public class PayPackCompanyController extends JeroController<PayPackCompany, IPa
|
||||
p.setReceiptExpense(listCount.get(0).getPaidAmount());
|
||||
}
|
||||
}
|
||||
if(!StringUtils.isEmpty(p.getPhone())){
|
||||
p.setPhone(PasswordUtil.decrypt(p.getPhone()));
|
||||
}
|
||||
if(!StringUtils.isEmpty(p.getEmail())){
|
||||
p.setEmail(PasswordUtil.decrypt(p.getEmail()));
|
||||
}
|
||||
if (Objects.isNull(p.getReceiptExpense())) {
|
||||
p.setReceiptExpense(new BigDecimal("0.00"));
|
||||
}
|
||||
|
||||
@@ -61,10 +61,6 @@ public class PayPackCompany implements Serializable {
|
||||
@Excel(name = "打包年份", width = 15)
|
||||
@ApiModelProperty(value = "打包年份")
|
||||
private java.lang.String packYear;
|
||||
/**企业联系人*/
|
||||
@Excel(name = "企业联系人", width = 15)
|
||||
@ApiModelProperty(value = "企业联系人")
|
||||
private java.lang.String companyContactTemporaryName;
|
||||
/**打包联系人id*/
|
||||
// @Excel(name = "打包联系人id", width = 15)
|
||||
@ApiModelProperty(value = "打包联系人id")
|
||||
@@ -125,15 +121,21 @@ public class PayPackCompany implements Serializable {
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd")
|
||||
@ApiModelProperty(value = "更新日期")
|
||||
private java.util.Date updateTime;
|
||||
/**企业联系人*/
|
||||
@Excel(name = "企业联系人", width = 15)
|
||||
@ApiModelProperty(value = "企业联系人")
|
||||
private java.lang.String companyContactTemporaryName;
|
||||
/**
|
||||
* 手机号
|
||||
*/
|
||||
@Excel(name = "联系人电话", width = 15)
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value = "手机号")
|
||||
private String phone;
|
||||
/**
|
||||
* 邮箱
|
||||
*/
|
||||
@Excel(name = "邮箱", width = 15)
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value = "邮箱")
|
||||
private String email;
|
||||
|
||||
+4
-2
@@ -15,8 +15,9 @@
|
||||
group by ppcp.pack_id
|
||||
</select>
|
||||
<select id="queryPageList" resultType="com.jero.pack.entity.PayPackCompany">
|
||||
select ppc.* from pay_pack_company ppc
|
||||
select ppc.*,pcmt.phone,pcmt.email from pay_pack_company ppc
|
||||
LEFT JOIN pay_company_management pcm on ppc.company_id = pcm.id
|
||||
LEFT JOIN pay_contacts_management_temporary pcmt ON pcmt.id = ppc.company_contact_temporary_id
|
||||
<where>
|
||||
<if test="payPackCompany.companyTemporaryName != null and payPackCompany.companyTemporaryName != ''">
|
||||
AND ppc.company_temporary_name like concat('%',concat(#{payPackCompany.companyTemporaryName},'%'))
|
||||
@@ -28,8 +29,9 @@
|
||||
ORDER BY pcm.create_time desc,ppc.pack_year desc
|
||||
</select>
|
||||
<select id="queryPageListExport" resultType="com.jero.pack.entity.PayPackCompany">
|
||||
select ppc.* from pay_pack_company ppc
|
||||
select ppc.*,pcmt.phone,pcmt.email from pay_pack_company ppc
|
||||
LEFT JOIN pay_company_management pcm on ppc.company_id = pcm.id
|
||||
LEFT JOIN pay_contacts_management_temporary pcmt ON pcmt.id = ppc.company_contact_temporary_id
|
||||
<where>
|
||||
<if test="payPackCompany.companyTemporaryName != null and payPackCompany.companyTemporaryName != ''">
|
||||
AND ppc.company_temporary_name like concat('%',concat(#{payPackCompany.companyTemporaryName},'%'))
|
||||
|
||||
Reference in New Issue
Block a user