diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java index 08ec568d..8e68e9d9 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java @@ -80,7 +80,7 @@ public class PayCommonProjectController extends JeroController 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个字符"); } Page page = new Page(pageNo, pageSize); @@ -151,6 +151,7 @@ public class PayCommonProjectController extends JeroController0 && <总金额(半满标志))*/ - @Excel(name = "到账(1:全额(对勾),2:0(X),3:>0 && <总金额(半满标志))", width = 15) - @ApiModelProperty(value = "到账(1:全额(对勾),2:0(X),3:>0 && <总金额(半满标志))") + /**到账(1:全额(对勾),0:0(X),2:>0 && <总金额(半满标志))*/ + @Excel(name = "到账(1:全额(对勾),0:0(X),2:>0 && <总金额(半满标志))", width = 15) + @ApiModelProperty(value = "到账(1:全额(对勾),0:0(X),2:>0 && <总金额(半满标志))") private Integer inAccount; - /**开票(1:全额(对勾),2:0(X),3:>0 && <总金额(半满标志))*/ - @Excel(name = "开票(1:全额(对勾),2:0(X),3:>0 && <总金额(半满标志))", width = 15) - @ApiModelProperty(value = "开票(1:全额(对勾),2:0(X),3:>0 && <总金额(半满标志))") + /**开票(1:全额(对勾),0:0(X),2:>0 && <总金额(半满标志))*/ + @Excel(name = "开票(1:全额(对勾),0:0(X),2:>0 && <总金额(半满标志))", width = 15) + @ApiModelProperty(value = "开票(1:全额(对勾),0:0(X),2:>0 && <总金额(半满标志))") private Integer makeInvoice; - /**邮寄((1:全额(对勾),2:0(X),3:>0 && <总金额(半满标志)))*/ - @Excel(name = "邮寄((1:全额(对勾),2:0(X),3:>0 && <总金额(半满标志)))", width = 15) - @ApiModelProperty(value = "邮寄((1:全额(对勾),2:0(X),3:>0 && <总金额(半满标志)))") + /**邮寄((1:全额(对勾),0:0(X),2:>0 && <总金额(半满标志)))*/ + @Excel(name = "邮寄((1:全额(对勾),0:0(X),2:>0 && <总金额(半满标志)))", width = 15) + @ApiModelProperty(value = "邮寄((1:全额(对勾),0:0(X),2:>0 && <总金额(半满标志)))") private Integer mail; /**来款方式(1:无,2:合同,3:收费通知)*/ @Excel(name = "来款方式(1:无,2:合同,3:收费通知)", width = 15) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayCommonProjectMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayCommonProjectMapper.xml index 5b90101c..5a2d2fd4 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayCommonProjectMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayCommonProjectMapper.xml @@ -10,14 +10,17 @@ pcp.principal_id AS principalId, pcp.principal_name AS principalName, 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_company_name AS chargeCompanyName, 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.paid_amount AS paidAmount, + pcp.mail_contacts_temporary_id AS mailContactsTemporaryId, pcp.mail_contacts_id AS mailContactsId, - pcp.mail_contacts_name AS mailContactsName, + pcp.mail_contacts_temporary_name AS mailContactsTemporaryName, pcp.pack, pcp.need_invoice AS needInvoice, pcp.in_account AS inAccount, @@ -39,8 +42,8 @@ AND pcp.charge_project like concat('%',concat(#{payCommonProject.chargeProject},'%')) - - AND pcp.charge_company_name like concat('%',concat(#{payCommonProject.chargeCompanyName},'%')) + + AND pcp.charge_company_temporary_name like concat('%',concat(#{payCommonProject.contactsTemporaryName},'%')) AND pcp.principal_id = #{payCommonProject.principalId}