From 76e35ce69348c704bc91bb2645ed1d9d666260f0 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Mon, 18 Jul 2022 13:49:42 +0800 Subject: [PATCH] =?UTF-8?q?add=20=E6=A0=87=E5=8D=8F=E4=BC=9A=E8=AE=AE?= =?UTF-8?q?=E5=8F=82=E4=BC=9A=E4=BA=BA=E5=AF=BC=E5=87=BA=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=BA=94=E6=94=B6=E9=87=91=E9=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/统计视图.sql | 2 +- .../jero/meeting/vo/excel/StandardsSituationExcel.java | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/db/统计视图.sql b/db/统计视图.sql index 6ad3349c..504925ed 100644 --- a/db/统计视图.sql +++ b/db/统计视图.sql @@ -42,7 +42,7 @@ from (SELECT pwgs.id, 2 as type, pwgs.invoice_amount AS billMoney, confirm_amount as confirmAmount, - GROUP_CONCAT(pwgsc.contacts_temporary_name) as contactsName, + GROUP_CONCAT(pwgsc.contacts_temporary_name order by pwgsc.contacts_temporary_name) as contactsName, pwgs.create_time as createTime FROM pay_working_group pwg right join pay_working_group_subitem pwgs on (pwg.id = pwgs.working_group_id) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/StandardsSituationExcel.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/StandardsSituationExcel.java index 97dee4d9..b5ab4e0f 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/StandardsSituationExcel.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/StandardsSituationExcel.java @@ -1,9 +1,13 @@ package com.jero.meeting.vo.excel; +import com.fasterxml.jackson.annotation.JsonFormat; import com.jero.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.jeecgframework.poi.excel.annotation.Excel; +import java.math.BigDecimal; + /** * @author liJiaRao * @date 2021-09-22 15:40 @@ -64,6 +68,12 @@ public class StandardsSituationExcel extends SituationBaseExcel { @Excel(name = "邮编", width = 15) private String postCode; + /** + * 应收金额 + */ + @Excel(name = "应收金额", width = 15) + private BigDecimal amountReceivable; + /**缴费方式*/ @Excel(name = "缴费方式", width = 15,dicCode = "meeting_pay_type") private Integer payMode;