fix 工作组统计中已开票金额和到账率不对

jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupStatistics.java

@@ -25,8 +25,14 @@ public class PayWorkingGroupStatistics {
     @Excel(name = "实收总金额", width = 15)
     @ApiModelProperty(value = "实收总金额")
     private String comeAllMoney;
-    @Excel(name = "实收总金额", width = 15)
+    @Excel(name = "实收完成率", width = 15)
-    @ApiModelProperty(value = "实收总金额")
+    @ApiModelProperty(value = "实收完成率")
     private String moneyRate;
+    @Excel(name = "开票金额", width = 15)
+    @ApiModelProperty(value = "开票金额")
+    private String billMoney;
+    @Excel(name = "确认到账金额", width = 15)
+    @ApiModelProperty(value = "确认到账金额")
+    private String confirmAmount;
 
 }

jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml

@@ -132,14 +132,14 @@
 
 <!--    工作组统计-->
     <select id="queryPageListForStatistics" resultType="com.jero.project.entity.PayWorkingGroupStatistics">
-        select *
+        select *,
+        CONCAT(CAST(ROUND((comeAllMoney/allMoney)*100,2) AS CHAR),'%') AS moneyRate
         from (
         select
         superId as id,
         projectName as workGroup,
         sum(allMoney) as allMoney,
         sum(comeAllMoney) as comeAllMoney,
-        CONCAT(CAST(ROUND((comeAllMoney/allMoney)*100,2) AS CHAR),'%') AS moneyRate,
         if(sum(pmb.invoice_amount) is null, 0.00, sum(pmb.invoice_amount)) as billMoney,
         sum(confirmAmount) as confirmAmount
         from