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

需求变更，打包管理列表添加联系人电话、邮箱

Browse Source
This commit is contained in:
梁琦涛
2021-10-25 17:30:18 +08:00
parent c36aac4a9b
commit bd8c038873
6 changed files with 53 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/pack/controller/PayPackCompanyController.java
+12
View File
@@ -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"));
}
jero-boot-incoming-payment/src/main/java/com/jero/pack/entity/PayPackCompany.java
+6 -4
View File
@@ -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;
jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyMapper.xml
+4 -2
View File
@@ -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},'%'))