账户报表查看

src/main/java/com/ydtech/modules/inv/model/InvAccount.java

@@ -1,5 +1,6 @@
 package com.ydtech.modules.inv.model;
 
+import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -126,6 +127,12 @@ public class InvAccount implements Serializable {
     @TableField(exist = false)
     private String quarterAmountExcess;
 
+    @ExcelProperty("本年开票额")
+    private String yearAmount;
+
+    @ExcelProperty("本季度开票额")
+    private String quarterAmount;
+
 
     @ApiModelProperty(value = "所属账户下的卡")
     @TableField(exist = false)

src/main/java/com/ydtech/modules/inv/service/impl/InvAccountServiceImpl.java

@@ -121,6 +121,20 @@ public class InvAccountServiceImpl extends ServiceImpl<InvAccountMapper, InvAcco
                     invAccount.setInvoicingAmountExcess(null);
                 }
             }
+            //本季度开票总额度和本年开票总额度
+            List<InvAccountSumAmount> sumYearAmount = insAccountMapper.getYearAndQuarterAmount();
+            boolean found = false;
+            for (InvAccountSumAmount yearAmount : sumYearAmount) {
+                if (yearAmount.getAccountId().equals(invAccount.getAccountId())) {
+                    invAccount.setYearAmount(yearAmount.getYearAmount());
+                    invAccount.setQuarterAmount(yearAmount.getQuarterAmount());
+                    found = true;
+                }
+            }
+            if (!found) {
+                invAccount.setYearAmount("0.00");
+                invAccount.setQuarterAmount("0.00");
+            }
         });
         IPage ipage = PageRequest.buildPageRequest(pageRequest);
         ipage.setRecords(collect1.stream().skip((invAccountQueryVo.getPageNo() - 1) * invAccountQueryVo.getPageSize()).limit(invAccountQueryVo.getPageSize()).