From 405bf617af0b0f7359231c227409601225ad5ebf Mon Sep 17 00:00:00 2001
From: zhangqinlin <1500920753@qq.com>
Date: Wed, 3 Nov 2021 10:51:03 +0800
Subject: [PATCH] fixbug

---
 .../FirstPageStatisticsController.java        |  7 +++-
 .../mapper/xml/PayWorkingGroupMapper.xml      | 38 +++++++++++++++----
 2 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/home/controller/FirstPageStatisticsController.java b/jero-boot-incoming-payment/src/main/java/com/jero/home/controller/FirstPageStatisticsController.java
index f62e8734..ec403c39 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/home/controller/FirstPageStatisticsController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/home/controller/FirstPageStatisticsController.java
@@ -32,11 +32,16 @@ public class FirstPageStatisticsController {
     @GetMapping(value = "/firstPage")
     @ApiOperation(value = "首页统计", notes = "首页统计")
     public Result<?> getFirstPage() {
-
+        //个人前十
         List<PrincipalPeopleList> pageList = payWorkingGroupService.queryPageListForPrincipalFirstPage();
+        //工作组前十
         List<PayWorkingGroupStatistics> pageList2 = payWorkingGroupService.queryPageListForStatisticsFirstPage();
+        //企业前十
         List<CompanyComeMoneyList> pageList3 = payWorkingGroupService.queryPageListForCompanyFirstPage();
+        //部门前十
         List<DepartStatistics> pageList4 = payWorkingGroupService.queryPageListForDepartFirstPage();
+
+
         ArrayList<PrincipalPeopleList> list = new ArrayList<>();
         for(PrincipalPeopleList s: pageList){
             if(!(s.getComeAllMoney()== null || s.getComeAllMoney().equals("")|| s.getComeAllMoney().equals("0") )) {
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 74dffc1b..386c5487 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
@@ -220,7 +220,7 @@
 
         </where>) ppp order by  ppp.payment_date desc
     </select>
-
+<!--工作组前十-->
     <select id="queryPageListForStatisticsFirstPage" resultType="com.jero.project.entity.PayWorkingGroupStatistics">
         select ppp.id,ppp.workGroup, ppp.allMoney,ppp.comeAllMoney,ppp.moneyRate from (select pwg1.id,
         pwg1.workGroup,
@@ -949,7 +949,7 @@
 
     </select>
 
-<!--    部门统计-->
+<!--    统计-->
     <select id="queryPageListForDepartFirstPage" resultType="com.jero.statistics.entity.DepartStatistics">
        select sum(pppp.comeAllMoney) as comeAllMoney,sum(pppp.allMoney) as allMoney,sd.depart_name as departName from (select  principalId, principalName,allMoney,comeAllMoney,createTime,
         CONCAT(CAST(ROUND((comeAllMoney/allMoney)*100,2) AS CHAR),'%') AS finishRate from
@@ -986,12 +986,12 @@
         FROM
         (select pcp.principal_id,pcp.principal_name,pcp.receivable_amount,pcp.paid_amount,pcp.create_time from
         pay_common_project pcp inner join pay_payment_record ppr on(pcp.id=ppr.project_id)
-
         group by pcp.id
         ) pcp1
         left JOIN sys_user su on(pcp1.principal_id=su.id) left join sys_depart sd
         on(su.org_code=sd.org_code)
   group by pcp1.principal_id
+
         union all
         select
         pmp.director_id as principalId,
@@ -1005,11 +1005,11 @@
         select pmp1s.id,pmp1s.project_id as projectId,amount_receivable,paid_amount from
         pay_member_project_subitem pmp1s
         inner join pay_payment_record ppr on(pmp1s.id=ppr.project_id)
-
         GROUP BY pmp1s.id
         ) pmp1s group by pmp1s.projectId ) pmps on(pmp.id=pmps.projectId)
         left JOIN sys_user su on(pmp.director_id=su.id) left join sys_depart sd on(su.org_code=sd.org_code)
  group by pmp.director_id
+
         union all
         SELECT
         pm.director_id as principalId,
@@ -1023,11 +1023,27 @@
         from
         (select pm1s.id,meeting_id,amount_receivable,paid_amount from pay_meeting_situation pm1s
         inner join pay_payment_record ppr on(pm1s.id=ppr.project_id)
-
         GROUP BY pm1s.id) pms1 group by pms1.meeting_id) pms on(pm.id=pms.meeting_id)
         left JOIN sys_user su on(pm.director_id=su.id) left join sys_depart sd on(su.org_code=sd.org_code)
- group by  pm.director_id) pp
+ group by  pm.director_id
 
+ union all
+        SELECT
+        tmp.director_id as principalId,
+        tmp.director_name as principalName,
+        sum(tmps.allMoney) as allMoney,
+        sum(tmps.comeAllMoney) as comeAllMoney,
+        tmp.create_time as createTime
+        FROM tb_member_project tmp right join (
+        select id,project_id,SUM(amount_receivable) AS
+        allMoney,SUM(paid_amount) AS comeAllMoney,max(tmps2.payment_date) as payment_date
+        from
+        (select tmps1.id,tmps1.project_id,amount_receivable,paid_amount,max(ppr.payment_date) as payment_date from tb_member_project_subitem tmps1
+        inner join pay_payment_record ppr on(tmps1.id=ppr.project_id)
+        GROUP BY tmps1.id) tmps2 group by tmps2.project_id) tmps on(tmp.id=tmps.project_id)
+        left JOIN sys_user su on(tmp.director_id=su.id) left join sys_depart sd on(su.org_code=sd.org_code)
+ group by  tmp.director_id
+ ) pp
         group by pp.principalId order by pp.createTime) ppp order by ppp.comeAllMoney ) pppp left join sys_user su on(pppp.principalId=su.id) left join sys_depart sd on(su.org_code=sd.org_code) group by sd.org_code order by pppp.comeAllMoney desc limit 10
     </select>
 
@@ -1287,6 +1303,7 @@
         left JOIN sys_user su on(pcp1.principal_id=su.id) left join sys_depart sd
         on(su.org_code=sd.org_code)
   group by pcp1.principal_id
+
         union all
         select
         pmp.director_id as principalId,
@@ -1305,6 +1322,7 @@
         ) pmp1s group by pmp1s.projectId ) pmps on(pmp.id=pmps.projectId)
         left JOIN sys_user su on(pmp.director_id=su.id) left join sys_depart sd on(su.org_code=sd.org_code)
  group by pmp.director_id
+
         union all
         SELECT
         pm.director_id as principalId,
@@ -1322,14 +1340,14 @@
         GROUP BY pm1s.id) pms1 group by pms1.meeting_id) pms on(pm.id=pms.meeting_id)
         left JOIN sys_user su on(pm.director_id=su.id) left join sys_depart sd on(su.org_code=sd.org_code)
  group by  pm.director_id
+
         union all
         SELECT
         tmp.director_id as principalId,
         tmp.director_name as principalName,
         sum(tmps.allMoney) as allMoney,
         sum(tmps.comeAllMoney) as comeAllMoney,
-        tmp.create_time as createTime,
-        max(tmps.payment_date) as payment_date
+        tmp.create_time as createTime
         FROM tb_member_project tmp right join (
         select id,project_id,SUM(amount_receivable) AS
         allMoney,SUM(paid_amount) AS comeAllMoney,max(tmps2.payment_date) as payment_date
@@ -1972,6 +1990,7 @@
         ) pwgs
         left join pay_company_management pcm on(pcm.id=pwgs.charge_company_id)
         union all
+
         SELECT
         pcp1.charge_company_id as chargeCompanyTemporaryId,
         pcm.company_name as chargeCompanyTemporaryName,
@@ -1988,6 +2007,7 @@
         ) pcp1
         left join pay_company_management pcm on(pcm.id=pcp1.charge_company_id)
           group by pcp1.charge_company_id
+
         union all
         SELECT
         company_id as chargeCompanyTemporaryId,
@@ -2004,6 +2024,7 @@
         group by pmp1s.company_id
         ) pmps
         union all
+
         SELECT
         company_id as chargeCompanyTemporaryId,
         company_name as chargeCompanyTemporaryName,
@@ -2018,6 +2039,7 @@
         GROUP BY pm1s.id) pms left join pay_meeting pm  on(pm.id=pms.meeting_id)
      group by pms.company_id) pmss
         union all
+
         SELECT
         company_id as chargeCompanyTemporaryId,
         company_name as chargeCompanyTemporaryName,