diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml index aee470ab..bc39a471 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml @@ -133,15 +133,16 @@ + select * from( - select projectId,projectName,allMoney,comeAllMoney,chargeUse,packText,pack, - billMoney, - confirmAmount + select projectId,projectName,allMoney,chargeUse,packText,pack, + paidNoTaxAmount as comeAllMoney, + invoiceNoTaxAmount as billMoney, + confirmNoTaxAmount as confirmAmount from v_statistical v left join pay_confirm_payment_record pcpr on(v.projectId=pcpr.project_id) @@ -2064,12 +2071,12 @@ select projectId, projectName, allMoney, - comeAllMoney, + paidNoTaxAmount as comeAllMoney, chargeUse, packText, pack, - billMoney, - confirmAmount + invoiceNoTaxAmount as billMoney, + confirmNoTaxAmount as confirmAmount from v_statistical v left join pay_confirm_payment_record pcpr on(v.projectId=pcpr.project_id) @@ -2128,15 +2135,17 @@ comeAllMoney, departName, billMoney, - CONCAT(CAST(ROUND((confirmAmount / allMoney) * 100, 2) AS CHAR), '%') AS finishRate, - confirmAmount + CONCAT(CAST(ROUND((confirmAmount1 / allMoney) * 100, 2) AS CHAR), '%') AS finishRate, + confirmAmount, + confirmAmount1 from (select sum(allMoney) as allMoney, - sum(comeAllMoney) as comeAllMoney, + sum(paidNoTaxAmount) as comeAllMoney, depart as departName, - sum(billMoney) as billMoney, - sum(confirmAmount) as confirmAmount + sum(invoiceNoTaxAmount) as billMoney, + sum(confirmNoTaxAmount) as confirmAmount, + sum(confirmAmount) as confirmAmount1 from v_statistical v left join pay_confirm_payment_record pcpr on(v.projectId=pcpr.project_id) @@ -2185,9 +2194,9 @@ + diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/AllMoney.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/AllMoney.java index 778283ec..695fb73a 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/AllMoney.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/AllMoney.java @@ -7,11 +7,15 @@ import org.jeecgframework.poi.excel.annotation.Excel; @Data public class AllMoney { + private String allMoney; + @ApiModelProperty("到账金额未税") private String comeAllMoney; + @ApiModelProperty("开票金额未税") private String billMoney; + @ApiModelProperty("确认金额未税") private String confirmAmount; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/AllProjectStatistics.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/AllProjectStatistics.java index 03149b6f..7f48ed85 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/AllProjectStatistics.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/AllProjectStatistics.java @@ -5,6 +5,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.jeecgframework.poi.excel.annotation.Excel; +import java.util.Date; + /** * @author zql * @date 2021/9/17 18:04 @@ -61,4 +63,8 @@ public class AllProjectStatistics { @Excel(name = "项目负责人", width = 15) @ApiModelProperty(value = "项目负责人") private String principalName; + + @Excel(name = "到账时间", width = 15) + @ApiModelProperty(value = "到账时间") + private Date paymentDate; }