From 7dbdf6bd00c851b81e7ac0367729df5738e492d7 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Fri, 21 Jul 2023 14:22:20 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=81=E4=B8=9A=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=8F=91=E7=A5=A8=EF=BC=8C=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=B2=A1=E6=9C=89=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/mail/mapper/PayMailBillMapper.java | 2 +- .../mail/mapper/xml/PayMailBillMapper.xml | 187 +++++++++--------- .../mail/service/IPayMailBillService.java | 2 +- .../service/impl/PayMailBillServiceImpl.java | 2 +- .../com/jero/mail/vo/MailBillProjectVO.java | 49 +++++ .../com/jero/mail/{ => vo}/PayMailBillVO.java | 2 +- .../PayPaymentRecordController.java | 2 +- 7 files changed, 148 insertions(+), 98 deletions(-) create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/mail/vo/MailBillProjectVO.java rename jero-boot-incoming-payment/src/main/java/com/jero/mail/{ => vo}/PayMailBillVO.java (98%) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/PayMailBillMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/PayMailBillMapper.java index bea13b8a..664cdf9f 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/PayMailBillMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/PayMailBillMapper.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.company.entity.PayContactsManagement; -import com.jero.mail.PayMailBillVO; +import com.jero.mail.vo.PayMailBillVO; import com.jero.mail.entity.PayMailBill; import com.jero.mail.entity.PayMailBillSearch; import org.apache.ibatis.annotations.Param; 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 70e746e2..e8785161 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 @@ -65,7 +65,7 @@ WHERE pmb.id IN (SELECT bill_id FROM pay_mail_bill_project WHERE project_id=#{projectId}) - select pmb.id as id,pmbp.id as bmpId,pmb.project_name,pmbp.invoice_amount,pmb.bill_no,pmb.bill_date,pmbp.remark,pmbp.no_tax_amount,pmbp.tax,pmbp.tax_rate from pay_mail_bill pmb inner JOIN pay_mail_bill_project pmbp on pmb.id = pmbp.bill_id @@ -251,57 +251,58 @@ where id = #{id} - select * from ( SELECT pmb.id, - project_name as projectName, - bill_no AS billNo, - pmb.invoice_amount as invoiceAmount, + project_name, + bill_no, + pmb.invoice_amount, principal_id, - su.phone as principal_phone, - principal_name as principalName, - charge_company_name as chargeCompanyName, - contact_name as contactName, - contact_mobile as contactMobile, - post_status as postStatus, - send_method as sendMethod, - pmbp.project_id as projectId, + su.phone, + principal_name, + charge_company_name, + contact_name, + contact_mobile, + post_status, + send_method, + pmbp.project_id, pmbp.project_type, pmb.create_time, - postal_code as postalCode, + postal_code, mailer, - post_no as postNo, - send_date as sendDate, - contact_address as contactAddress, + post_no, + send_date, + contact_address, pmb.remark from pay_mail_bill pmb left join pay_mail_bill_project pmbp on (pmb.id = pmbp.bill_id) - left join pay_working_group_subitem_contacts pwgsc on pwgsc.working_group_sub_id = pmbp.project_id + left join pay_working_group_subitem_contacts pwgsc + on pwgsc.working_group_sub_id = pmbp.project_id left join sys_user su on pmb.principal_id = su.id where pwgsc.contacts_id = #{userId} group by pmb.id union all SELECT pmb.id, - project_name as projectName, - bill_no AS billNo, - pmb.invoice_amount as invoiceAmount, + project_name, + bill_no, + pmb.invoice_amount, pmb.principal_id, - su.phone as principal_phone, - pmb.principal_name as principalName, - charge_company_name as chargeCompanyName, - contact_name as contactName, - contact_mobile as contactMobile, - post_status as postStatus, - send_method as sendMethod, - pmbp.project_id as projectId, + su.phone, + pmb.principal_name, + charge_company_name, + contact_name, + contact_mobile, + post_status, + send_method, + pmbp.project_id, pmbp.project_type, pmb.create_time, - postal_code as postalCode, + postal_code, mailer, - post_no as postNo, - send_date as sendDate, - contact_address as contactAddress, + post_no, + send_date, + contact_address, pmb.remark from pay_mail_bill pmb left join pay_mail_bill_project pmbp on (pmb.id = pmbp.bill_id) @@ -311,25 +312,25 @@ group by pmb.id union all SELECT pmb.id, - project_name as projectName, - bill_no AS billNo, - pmb.invoice_amount as invoiceAmount, + project_name, + bill_no, + pmb.invoice_amount, pmb.principal_id, - su.phone as principal_phone, - pmb.principal_name as principalName, - charge_company_name as chargeCompanyName, - contact_name as contactName, - contact_mobile as contactMobile, - post_status as postStatus, - send_method as sendMethod, - pmbp.project_id as projectId, + su.phone, + pmb.principal_name, + charge_company_name, + contact_name, + contact_mobile, + post_status, + send_method, + pmbp.project_id, pmbp.project_type, pmb.create_time, - postal_code as postalCode, + postal_code, mailer, - post_no as postNo, - send_date as sendDate, - contact_address as contactAddress, + post_no, + send_date, + contact_address, pmb.remark from pay_mail_bill pmb left join pay_mail_bill_project pmbp on (pmb.id = pmbp.bill_id) @@ -339,25 +340,25 @@ group by pmb.id union all SELECT pmb.id, - project_name as projectName, - bill_no AS billNo, - pmb.invoice_amount as invoiceAmount, + project_name, + bill_no, + pmb.invoice_amount, pmb.principal_id, - su.phone as principal_phone, - pmb.principal_name as principalName, - charge_company_name as chargeCompanyName, - contact_name as contactName, - contact_mobile as contactMobile, - post_status as postStatus, - send_method as sendMethod, - pmbp.project_id as projectId, + su.phone, + pmb.principal_name, + charge_company_name, + contact_name, + contact_mobile, + post_status, + send_method, + pmbp.project_id, pmbp.project_type, pmb.create_time, - postal_code as postalCode, + postal_code, mailer, - post_no as postNo, - send_date as sendDate, - contact_address as contactAddress, + post_no, + send_date, + contact_address, pmb.remark from pay_mail_bill pmb left join pay_mail_bill_project pmbp on (pmb.id = pmbp.bill_id) @@ -367,25 +368,25 @@ group by pmb.id union all SELECT pmb.id, - project_name as projectName, - bill_no AS billNo, - pmb.invoice_amount as invoiceAmount, + project_name, + bill_no, + pmb.invoice_amount, pmb.principal_id, - su.phone as principal_phone, - pmb.principal_name as principalName, - charge_company_name as chargeCompanyName, - contact_name as contactName, - contact_mobile as contactMobile, - post_status as postStatus, - send_method as sendMethod, - pmbp.project_id as projectId, + su.phone, + pmb.principal_name, + charge_company_name, + contact_name, + contact_mobile, + post_status, + send_method, + pmbp.project_id, pmbp.project_type, pmb.create_time, - postal_code as postalCode, + postal_code, mailer, - post_no as postNo, - send_date as sendDate, - contact_address as contactAddress, + post_no, + send_date, + contact_address, pmb.remark from pay_mail_bill pmb left join pay_mail_bill_project pmbp on (pmb.id = pmbp.bill_id) @@ -395,25 +396,25 @@ group by pmb.id union all SELECT pmb.id, - project_name as projectName, - bill_no AS billNo, - pmb.invoice_amount as invoiceAmount, + project_name, + bill_no, + pmb.invoice_amount, pmb.principal_id, - su.phone as principal_phone, - pmb.principal_name as principalName, - charge_company_name as chargeCompanyName, - contact_name as contactName, - contact_mobile as contactMobile, - post_status as postStatus, - send_method as sendMethod, - pmbp.project_id as projectId, + su.phone, + pmb.principal_name, + charge_company_name, + contact_name, + contact_mobile, + post_status, + send_method, + pmbp.project_id, pmbp.project_type, pmb.create_time, - postal_code as postalCode, + postal_code, mailer, - post_no as postNo, - send_date as sendDate, - contact_address as contactAddress, + post_no, + send_date, + contact_address, pmb.remark from pay_mail_bill pmb left join pay_mail_bill_project pmbp on (pmb.id = pmbp.bill_id) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/IPayMailBillService.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/IPayMailBillService.java index bce85cba..f7fdd5ed 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/IPayMailBillService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/IPayMailBillService.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.jero.common.api.vo.Result; import com.jero.company.entity.PayContactsManagement; -import com.jero.mail.PayMailBillVO; +import com.jero.mail.vo.PayMailBillVO; import com.jero.mail.entity.PayMailBill; import com.jero.member.enums.StandardsTypeEnum; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java index 7b989898..d3b6e431 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java @@ -25,7 +25,7 @@ import com.jero.company.service.IPayCompanyManagementService; import com.jero.company.service.IPayContactsManagementService; import com.jero.config.StaticConfig; import com.jero.contract.common.PayIncomeContractCommon; -import com.jero.mail.PayMailBillVO; +import com.jero.mail.vo.PayMailBillVO; import com.jero.mail.entity.BillingInfo; import com.jero.mail.entity.PayMailBill; import com.jero.mail.entity.PayMailBillProject; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/vo/MailBillProjectVO.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/vo/MailBillProjectVO.java new file mode 100644 index 00000000..0bfdfd3c --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/vo/MailBillProjectVO.java @@ -0,0 +1,49 @@ +package com.jero.mail.vo; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.jero.common.aspect.annotation.Dict; +import com.jero.mail.entity.PayMailBill; +import com.jero.mail.entity.PayMailBillProject; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.jeecgframework.poi.excel.annotation.Excel; + +import javax.validation.constraints.DecimalMax; +import java.math.BigDecimal; +import java.util.List; + + +@Data +public class MailBillProjectVO extends PayMailBill { + /** + * 邮寄票据关联项目表 + */ + @TableField(exist = false) + List bmpList; + + /**邮寄票据关联项目表id*/ + @TableField(exist = false) + @ApiModelProperty(value = "bmpId") + private String bmpId; + + /**税率*/ + @ApiModelProperty(value = "税率") + @JsonFormat(shape = JsonFormat.Shape.STRING) + @Dict(dicCode = "rate") + private BigDecimal taxRate; + + /**税额*/ + @Excel(name = "税额", width = 15) + @ApiModelProperty(value = "税额") + @DecimalMax(value = "9999999999.99",message = "税额") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigDecimal tax; + + /**未税金额*/ + @Excel(name = "未税金额", width = 15) + @ApiModelProperty(value = "未税金额") + @DecimalMax(value = "9999999999.99",message = "未税金额") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigDecimal noTaxAmount; +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/PayMailBillVO.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/vo/PayMailBillVO.java similarity index 98% rename from jero-boot-incoming-payment/src/main/java/com/jero/mail/PayMailBillVO.java rename to jero-boot-incoming-payment/src/main/java/com/jero/mail/vo/PayMailBillVO.java index c2446906..14719b54 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/PayMailBillVO.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/vo/PayMailBillVO.java @@ -1,4 +1,4 @@ -package com.jero.mail; +package com.jero.mail.vo; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayPaymentRecordController.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayPaymentRecordController.java index cdeea96e..37a65374 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayPaymentRecordController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayPaymentRecordController.java @@ -9,7 +9,7 @@ import com.jero.common.enums.PaymentStatusEnum; import com.jero.common.system.base.controller.JeroController; import com.jero.common.util.ValidUtil; import com.jero.contract.common.PayIncomeContractCommon; -import com.jero.mail.PayMailBillVO; +import com.jero.mail.vo.PayMailBillVO; import com.jero.mail.service.IPayMailBillService; import com.jero.member.entity.TbCertificatePayment; import com.jero.member.entity.TbMemberProjectSubitem;