From 813f5d6291e29c46b5923414f2a9a62441f12f12 Mon Sep 17 00:00:00 2001
From: zhangqinlin <1500920753@qq.com>
Date: Sun, 26 Sep 2021 11:21:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A8=E6=89=80=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml  | 2 +-
 .../java/com/jero/statistics/entity/AllProjectStatistics.java   | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

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 17243bf3..15170606 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
@@ -177,7 +177,7 @@
 
 <!--    全所统计-->
     <select id="queryPageList3" resultType="com.jero.statistics.entity.AllProjectStatistics">
-       select pp.projectName, principalName, chargeCompanyTemporaryName, allMoney, comeAllMoney, chargeUse, depart, createTime,pp.id from
+       select pp.id as projectId,pp.projectName, principalName, chargeCompanyTemporaryName, allMoney, comeAllMoney, chargeUse, depart, createTime,pp.id from
         (SELECT
         pwgs.id,
         pwg.working_group_project AS projectName,
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 07a68c24..1e06c433 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
@@ -10,6 +10,8 @@ import org.jeecgframework.poi.excel.annotation.Excel;
  */
 @Data
 public class AllProjectStatistics {
+    @ApiModelProperty(value = "项目id")
+    private String projectId;
 
     @Excel(name = "来款项目", width = 15)
     @ApiModelProperty(value = "来款项目")