diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/commont/constant.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/commont/constant.java index 7ba1ba62..1f1338d7 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/commont/constant.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/commont/constant.java @@ -39,4 +39,5 @@ public interface constant { public static final String XMFZR="xmfzr"; + } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailContracrList.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailContracrList.java index 69fe7328..f5e8ff76 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailContracrList.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailContracrList.java @@ -12,7 +12,6 @@ public class PayMailContracrList { @ApiModelProperty(value = "id主键") private java.lang.String id; - @Excel(name = "合同编号", width = 15) @ApiModelProperty(value = "合同编号") private java.lang.String contractNum; @@ -53,6 +52,10 @@ public class PayMailContracrList { private java.util.Date sendDate; @ApiModelProperty(value = "邮寄人") private java.lang.String mailer; + @ApiModelProperty(value = "邮政编码") + private java.lang.String postalCode; + @ApiModelProperty(value = "邮寄联系人地址") + private java.lang.String contactAddress; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailBillMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailBillMapper.xml index 1633aa38..021e317b 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailBillMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailBillMapper.xml @@ -70,6 +70,7 @@ send_method as sendMethod , pmbp.project_id as projectId, create_time, + postal_code as postalCode, mailer, post_no as postNo, send_date as sendDate, diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailContractMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailContractMapper.xml index 53da266b..4b15a792 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailContractMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailContractMapper.xml @@ -17,7 +17,9 @@ pic.contract_name as contractName, pic.signed_company_temporary_name as signedCompanyTemporaryName, pic.principal_name as principalName, pic.principal_id as principalId, -pic.contract_amount as contractAmount FROM pay_mail_contract as pc left join pay_income_contract as pic on(pc.contract_id=pic.id) +pcmt.postal_code as postalCode, +pcmt.contact_address as contactAddress, +pic.contract_amount as contractAmount FROM pay_mail_contract as pc left join pay_income_contract as pic on(pc.contract_id=pic.id) left join pay_contacts_management_temporary as pcmt on(pic.signed_contacts_temporary_id=pcmt.id) pic.contract_num like concat('%',concat(#{payMailContracrList.contractNum},'%')) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java index 2a7fc8e0..eef7f9d7 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java @@ -90,7 +90,6 @@ public class CompanyComeMoneyStatisticsController { return Result.OK(); } Page page = new Page<>(pageNo, pageSize); - IPage pageList = payWorkingGroupService.queryPageListForCompany(page,companyComeMoneySearch,idList); HashMap hashMap = new HashMap<>(); double sum=0;