From f5f5c33d3943c7b46b03ceb07c8f9dd0dbb1e9e7 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Wed, 26 Oct 2022 10:28:13 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E7=A7=91=E5=AE=A4=E6=80=BB=E4=BD=93?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=94=B9=E4=B8=BA=E5=92=8C=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jero/index/service/IndexService.java  | 22 +++++++++++--------
 .../project/mapper/PayWorkingGroupMapper.java |  3 +++
 .../mapper/xml/PayWorkingGroupMapper.xml      | 20 +++++++++++++++++
 3 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/index/service/IndexService.java b/jero-boot-incoming-payment/src/main/java/com/jero/index/service/IndexService.java
index f368683e..aa113483 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/index/service/IndexService.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/index/service/IndexService.java
@@ -177,16 +177,20 @@ public class IndexService {
     }
 
     public List<HistogramVO> overallDepartmentStatistics() {
-        String year = String.valueOf(DateUtil.year(new DateTime()));
-        DepartStatisticsSearch departStatisticsSearch = new DepartStatisticsSearch();
-        departStatisticsSearch.setYear(year);
-        departStatisticsSearch.setColumn("allMoney");
-        departStatisticsSearch.setOrder("desc");
-        Page<DepartStatistics> page = new Page<>(-1, -1);
-        IPage<DepartStatistics> pageList = payWorkingGroupService.queryPageListDepartment(page, departStatisticsSearch, new ArrayList<>());
-        List<DepartStatistics> records = pageList.getRecords();
 
-        return convertDepartStatistics(records);
+        String year = String.valueOf(DateUtil.year(new DateTime()));
+        List<DepartStatistics> records = payWorkingGroupMapper.overallDepartmentStatistics(year);
+        List<DepartStatistics> all = payWorkingGroupMapper.allDepartmentStatistics(year);
+        for (DepartStatistics a : all) {
+            String departName = a.getDepartName();
+            for (DepartStatistics record : records) {
+                String departName1 = record.getDepartName();
+                if (departName.equals(departName1)){
+                    a.setConfirmAmount(record.getConfirmAmount());
+                }
+            }
+        }
+        return convertDepartStatistics(all);
     }
 
     private List<HistogramVO> convertDepartStatistics(List<DepartStatistics> list){
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java
index 217e5b9b..b1ecf788 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java
@@ -251,4 +251,7 @@ public interface PayWorkingGroupMapper extends BaseMapper<PayWorkingGroup> {
     BigDecimal invoiceAmount(@Param("start") Integer start, @Param("end") Integer end, @Param("departCode") String departCode);
 
 
+    List<DepartStatistics> overallDepartmentStatistics(@Param("year") String year);
+
+    List<DepartStatistics> allDepartmentStatistics(@Param("year") String year);
 }
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 0b5669d6..6018285f 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
@@ -2736,5 +2736,25 @@
         ) a
     </select>
 
+    <select id="overallDepartmentStatistics" resultType="com.jero.statistics.entity.DepartStatistics">
+        select
+        sum(no_tax_amount) as confirmAmount,
+        v.depart as departName
+        from pay_confirm_payment_record pcpr left join v_statistical v on pcpr.project_id = v.projectId
+        <where>
+            DATE_FORMAT (payment_date,'%Y') like concat(#{year}, '%')
+        </where>
+        group by departCode
+    </select>
 
+    <select id="allDepartmentStatistics" resultType="com.jero.statistics.entity.DepartStatistics">
+        select
+        sum(allMoney) as allMoney,
+        v.depart as departName
+        from v_statistical v
+        <where>
+            year = #{year}
+        </where>
+        group by departCode
+    </select>
 </mapper>