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-09-01 13:53:44 +08:00
parent 91e2faba69
commit 34d8414bef
3 changed files with 54 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java
+10 -8
View File
@@ -80,7 +80,7 @@ public class PayCommonProjectController extends JeroController<PayCommonProject,
if(!StringUtils.isBlank(payCommonProject.getChargeProject()) && payCommonProject.getChargeProject().length() > 100){ if(!StringUtils.isBlank(payCommonProject.getChargeProject()) && payCommonProject.getChargeProject().length() > 100){
return Result.error("来款项目长度应小于100个字符"); return Result.error("来款项目长度应小于100个字符");
} }
if(!StringUtils.isBlank(payCommonProject.getChargeCompanyName()) && payCommonProject.getChargeCompanyName().length() > 50){ if(!StringUtils.isBlank(payCommonProject.getChargeCompanyTemporaryName()) && payCommonProject.getChargeCompanyTemporaryName().length() > 50){
return Result.error("来款单位长度应小于50个字符"); return Result.error("来款单位长度应小于50个字符");
} }
Page<PayCommonProject> page = new Page<PayCommonProject>(pageNo, pageSize); Page<PayCommonProject> page = new Page<PayCommonProject>(pageNo, pageSize);
@@ -151,6 +151,7 @@ public class PayCommonProjectController extends JeroController<PayCommonProject,
log.info("普通项目管理-编辑异常",e); log.info("普通项目管理-编辑异常",e);
return Result.error("来款项目已存在！"); return Result.error("来款项目已存在！");
} }
payCommonProject = setPayCommonProject(payCommonProject); payCommonProject = setPayCommonProject(payCommonProject);
// 先删除临时表企业信息，联系人信息，邮寄联系人信息 // 先删除临时表企业信息，联系人信息，邮寄联系人信息
PayCommonProject payCommonProjectOld = payCommonProjectService.getById(payCommonProject.getId()); PayCommonProject payCommonProjectOld = payCommonProjectService.getById(payCommonProject.getId());
@@ -159,6 +160,8 @@ public class PayCommonProjectController extends JeroController<PayCommonProject,
} }
payCompanyManagementTemporaryService.removeById(payCommonProjectOld.getChargeCompanyId()); payCompanyManagementTemporaryService.removeById(payCommonProjectOld.getChargeCompanyId());
payContactsManagementTemporaryService.removeByIds(Arrays.asList(payCommonProjectOld.getContactsId(),payCommonProjectOld.getMailContactsId())); payContactsManagementTemporaryService.removeByIds(Arrays.asList(payCommonProjectOld.getContactsId(),payCommonProjectOld.getMailContactsId()));
payCommonProject.setChargeCompanyId(payCommonProject.getChargeCompanyId());
payCommonProject.setContactsId(payCommonProject.getContactsId());
payCommonProjectService.updateById(payCommonProject); payCommonProjectService.updateById(payCommonProject);
return Result.OK("编辑成功!"); return Result.OK("编辑成功!");
} }
@@ -191,15 +194,14 @@ public class PayCommonProjectController extends JeroController<PayCommonProject,
if(Objects.isNull(principalName)){ if(Objects.isNull(principalName)){
throw new JeroBootException("负责人名称为空！"); throw new JeroBootException("负责人名称为空！");
} }
payCommonProject.setPrincipalId(principalName.getId()); payCommonProject.setPrincipalId(principalName.getId());
payCommonProject.setPrincipalName(principalName.getRealname()); payCommonProject.setPrincipalName(principalName.getRealname());
payCommonProject.setContactsId(contactsName.getId()); payCommonProject.setContactsTemporaryId(contactsName.getId());
payCommonProject.setContactsName(contactsName.getName()); payCommonProject.setContactsTemporaryName(contactsName.getName());
payCommonProject.setMailContactsId(mailContactsName.getId()); payCommonProject.setMailContactsTemporaryId(mailContactsName.getId());
payCommonProject.setMailContactsName(mailContactsName.getName()); payCommonProject.setMailContactsTemporaryName(mailContactsName.getName());
payCommonProject.setChargeCompanyId(chargeCompanyName.getId()); payCommonProject.setChargeCompanyTemporaryId(chargeCompanyName.getId());
payCommonProject.setChargeCompanyName(chargeCompanyName.getCompanyName()); payCommonProject.setChargeCompanyTemporaryName(chargeCompanyName.getCompanyName());
return payCommonProject; return payCommonProject;
} }
jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayCommonProject.java
+36 -21
View File
@@ -64,26 +64,36 @@ public class PayCommonProject implements Serializable {
@NotEmpty(message = "来款企业id不能为空！") @NotEmpty(message = "来款企业id不能为空！")
@Size(max = 32,message = "来款企业id长度应小于32个字符") @Size(max = 32,message = "来款企业id长度应小于32个字符")
private String chargeCompanyId; private String chargeCompanyId;
/**临时来款企业id*/
@Excel(name = "临时来款企业id", width = 15)
@ApiModelProperty(value = "临时来款企业id")
@Size(max = 32,message = "临时来款企业id长度应小于32个字符")
private String chargeCompanyTemporaryId;
/**临时来款企业*/
@Excel(name = "临时来款企业", width = 15)
@ApiModelProperty(value = "临时来款企业")
private String chargeCompanyTemporaryName;
/**来款用途（字典表）*/ /**来款用途（字典表）*/
@Excel(name = "来款用途（字典表）", width = 15) @Excel(name = "来款用途（字典表）", width = 15)
@ApiModelProperty(value = "来款用途（字典表）") @ApiModelProperty(value = "来款用途（字典表）")
@Dict(dicCode = "payment_charge_use") @Dict(dicCode = "payment_charge_use")
@NotNull(message = "来款用途不能为空！") @NotNull(message = "来款用途不能为空！")
private String chargeUse; private String chargeUse;
/**来款企业*/
@Excel(name = "来款企业", width = 15)
@ApiModelProperty(value = "来款企业")
private String chargeCompanyName;
/**联系人id*/ /**联系人id*/
@Excel(name = "联系人id", width = 15) @Excel(name = "联系人id", width = 15)
@ApiModelProperty(value = "联系人id") @ApiModelProperty(value = "联系人id")
@NotEmpty(message = "联系人id不能为空！") @NotEmpty(message = "联系人id不能为空！")
@Size(max = 32,message = "来款企业id长度应小于32个字符") @Size(max = 32,message = "来款企业id长度应小于32个字符")
private String contactsId; private String contactsId;
/**联系人名称*/ /**临时联系人id*/
@Excel(name = "联系人名称", width = 15) @Excel(name = "临时联系人id", width = 15)
@ApiModelProperty(value = "联系人名称") @ApiModelProperty(value = "临时联系人id")
private String contactsName; @Size(max = 32,message = "临时联系人id长度应小于32个字符")
private String contactsTemporaryId;
/**临时联系人名称*/
@Excel(name = "临时联系人名称", width = 15)
@ApiModelProperty(value = "临时联系人名称")
private String contactsTemporaryName;
/**应收金额（元）*/ /**应收金额（元）*/
@Excel(name = "应收金额（元）", width = 15) @Excel(name = "应收金额（元）", width = 15)
@ApiModelProperty(value = "应收金额（元）") @ApiModelProperty(value = "应收金额（元）")
@@ -101,10 +111,15 @@ public class PayCommonProject implements Serializable {
@NotEmpty(message = "邮寄联系人id不能为空！") @NotEmpty(message = "邮寄联系人id不能为空！")
@Size(max = 32,message = "邮寄联系人id长度应小于32个字符") @Size(max = 32,message = "邮寄联系人id长度应小于32个字符")
private String mailContactsId; private String mailContactsId;
/**邮寄联系人名称*/ /**临时邮寄联系人id*/
@Excel(name = "邮寄联系人名称", width = 15) @Excel(name = "临时邮寄联系人id", width = 15)
@ApiModelProperty(value = "邮寄联系人名称") @ApiModelProperty(value = "临时邮寄联系人id")
private String mailContactsName; @Size(max = 32,message = "临时邮寄联系人id长度应小于32个字符")
private String mailContactsTemporaryId;
/**临时邮寄联系人名称*/
@Excel(name = "临时邮寄联系人名称", width = 15)
@ApiModelProperty(value = "临时邮寄联系人名称")
private String mailContactsTemporaryName;
/**打包（1：是，0：否）*/ /**打包（1：是，0：否）*/
@Excel(name = "打包（1：是，0：否）", width = 15) @Excel(name = "打包（1：是，0：否）", width = 15)
@ApiModelProperty(value = "打包（1：是，0：否）") @ApiModelProperty(value = "打包（1：是，0：否）")
@@ -114,17 +129,17 @@ public class PayCommonProject implements Serializable {
@ApiModelProperty(value = "需要发票（1：增值税普通发票，2：增值税专用发票，3：否）") @ApiModelProperty(value = "需要发票（1：增值税普通发票，2：增值税专用发票，3：否）")
@NotNull(message = "需要发票不能为空！") @NotNull(message = "需要发票不能为空！")
private Integer needInvoice; private Integer needInvoice;
/**到账（1：全额（对勾），2：0（X），3：>0 && <总金额（半满标志））*/ /**到账（1：全额（对勾），0：0（X），2：>0 && <总金额（半满标志））*/
@Excel(name = "到账（1：全额（对勾），2：0（X），3：>0 && <总金额（半满标志））", width = 15) @Excel(name = "到账（1：全额（对勾），0：0（X），2：>0 && <总金额（半满标志））", width = 15)
@ApiModelProperty(value = "到账（1：全额（对勾），2：0（X），3：>0 && <总金额（半满标志））") @ApiModelProperty(value = "到账（1：全额（对勾），0：0（X），2：>0 && <总金额（半满标志））")
private Integer inAccount; private Integer inAccount;
/**开票（1：全额（对勾），2：0（X），3：>0 && <总金额（半满标志））*/ /**开票（1：全额（对勾），0：0（X），2：>0 && <总金额（半满标志））*/
@Excel(name = "开票（1：全额（对勾），2：0（X），3：>0 && <总金额（半满标志））", width = 15) @Excel(name = "开票（1：全额（对勾），0：0（X），2：>0 && <总金额（半满标志））", width = 15)
@ApiModelProperty(value = "开票（1：全额（对勾），2：0（X），3：>0 && <总金额（半满标志））") @ApiModelProperty(value = "开票（1：全额（对勾），0：0（X），2：>0 && <总金额（半满标志））")
private Integer makeInvoice; private Integer makeInvoice;
/**邮寄（（1：全额（对勾），2：0（X），3：>0 && <总金额（半满标志）））*/ /**邮寄（（1：全额（对勾），0：0（X），2：>0 && <总金额（半满标志）））*/
@Excel(name = "邮寄（（1：全额（对勾），2：0（X），3：>0 && <总金额（半满标志）））", width = 15) @Excel(name = "邮寄（（1：全额（对勾），0：0（X），2：>0 && <总金额（半满标志）））", width = 15)
@ApiModelProperty(value = "邮寄（（1：全额（对勾），2：0（X），3：>0 && <总金额（半满标志）））") @ApiModelProperty(value = "邮寄（（1：全额（对勾），0：0（X），2：>0 && <总金额（半满标志）））")
private Integer mail; private Integer mail;
/**来款方式（1：无，2：合同，3：收费通知）*/ /**来款方式（1：无，2：合同，3：收费通知）*/
@Excel(name = "来款方式（1：无，2：合同，3：收费通知）", width = 15) @Excel(name = "来款方式（1：无，2：合同，3：收费通知）", width = 15)
jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayCommonProjectMapper.xml
+8 -5
View File
@@ -10,14 +10,17 @@
pcp.principal_id AS principalId, pcp.principal_id AS principalId,
pcp.principal_name AS principalName, pcp.principal_name AS principalName,
pcp.charge_company_id AS chargeCompanyId, pcp.charge_company_id AS chargeCompanyId,
pcp.charge_company_temporary_id AS chargeCompanyTemporaryId,
pcp.charge_company_temporary_name AS chargeCompanyTemporaryName,
pcp.charge_use AS chargeUse, pcp.charge_use AS chargeUse,
pcp.charge_company_name AS chargeCompanyName,
pcp.contacts_id AS contactsId, pcp.contacts_id AS contactsId,
pcp.contacts_name AS contactsName, pcp.contacts_temporary_id AS contactsTemporaryId,
pcp.contacts_temporary_name AS contactsTemporaryName,
pcp.receivable_amount AS receivableAmount, pcp.receivable_amount AS receivableAmount,
pcp.paid_amount AS paidAmount, pcp.paid_amount AS paidAmount,
pcp.mail_contacts_temporary_id AS mailContactsTemporaryId,
pcp.mail_contacts_id AS mailContactsId, pcp.mail_contacts_id AS mailContactsId,
pcp.mail_contacts_name AS mailContactsName, pcp.mail_contacts_temporary_name AS mailContactsTemporaryName,
pcp.pack, pcp.pack,
pcp.need_invoice AS needInvoice, pcp.need_invoice AS needInvoice,
pcp.in_account AS inAccount, pcp.in_account AS inAccount,
@@ -39,8 +42,8 @@
<if test="payCommonProject.chargeProject != null and payCommonProject.chargeProject != ''"> <if test="payCommonProject.chargeProject != null and payCommonProject.chargeProject != ''">
AND pcp.charge_project like concat('%',concat(#{payCommonProject.chargeProject},'%')) AND pcp.charge_project like concat('%',concat(#{payCommonProject.chargeProject},'%'))
</if> </if>
<if test="payCommonProject.chargeCompanyName != null and payCommonProject.chargeCompanyName != ''"> <if test="payCommonProject.contactsTemporaryName != null and payCommonProject.contactsTemporaryName != ''">
AND pcp.charge_company_name like concat('%',concat(#{payCommonProject.chargeCompanyName},'%')) AND pcp.charge_company_temporary_name like concat('%',concat(#{payCommonProject.contactsTemporaryName},'%'))
</if> </if>
<if test="payCommonProject.principalId != null and payCommonProject.principalId != ''"> <if test="payCommonProject.principalId != null and payCommonProject.principalId != ''">
AND pcp.principal_id = #{payCommonProject.principalId} AND pcp.principal_id = #{payCommonProject.principalId}