From c4e43ff5efd6a7a55d74f0734cc86f83a4eb9a3c Mon Sep 17 00:00:00 2001
From: dinggang <2498628697@qq.com>
Date: Mon, 5 Dec 2022 15:55:44 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E9=87=91=E5=A4=A7=E5=B1=8F=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../processForm/dao/TAbilityApplicationDao.java  |  4 ++++
 .../impl/TAbilityApplicationServiceImpl.java     | 16 +++++-----------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/renren-admin/src/main/java/io/renren/modules/processForm/dao/TAbilityApplicationDao.java b/renren-admin/src/main/java/io/renren/modules/processForm/dao/TAbilityApplicationDao.java
index b1c5e388..3547496a 100644
--- a/renren-admin/src/main/java/io/renren/modules/processForm/dao/TAbilityApplicationDao.java
+++ b/renren-admin/src/main/java/io/renren/modules/processForm/dao/TAbilityApplicationDao.java
@@ -80,4 +80,8 @@ public interface TAbilityApplicationDao extends BaseDao<TAbilityApplicationEntit
     List<Map> getProvideDistrictFundStatement();
 
     List<Map> getApplyDistrictFundStatement();
+
+    Long getApplyPriceCount();
+
+    Long getResourceFundStatementTotal();
 }
\ No newline at end of file
diff --git a/renren-admin/src/main/java/io/renren/modules/processForm/service/impl/TAbilityApplicationServiceImpl.java b/renren-admin/src/main/java/io/renren/modules/processForm/service/impl/TAbilityApplicationServiceImpl.java
index ae796363..421c3cd6 100644
--- a/renren-admin/src/main/java/io/renren/modules/processForm/service/impl/TAbilityApplicationServiceImpl.java
+++ b/renren-admin/src/main/java/io/renren/modules/processForm/service/impl/TAbilityApplicationServiceImpl.java
@@ -234,13 +234,9 @@ public class TAbilityApplicationServiceImpl extends CrudServiceImpl<TAbilityAppl
     @Override
     public Object getResourceFundStatement(Map<String, Object> params) {
         List<Map> list = abilityApplicationDao.getResourceFundStatement();
-        BigDecimal total = BigDecimal.ZERO;
-        for (Map map : list) {
-            total = total.add((BigDecimal) map.get("applyPrice"));
-        }
         Map<String, Object> resultMap = new HashMap<>();
         resultMap.put("list", list);
-        resultMap.put("total", total);
+        resultMap.put("total", abilityApplicationDao.getResourceFundStatementTotal());
         return resultMap;
     }
 
@@ -292,12 +288,10 @@ public class TAbilityApplicationServiceImpl extends CrudServiceImpl<TAbilityAppl
 
     @Override
     public Object getApplyPriceCount() {
-        Map<String, Object> map = new HashMap<>();
-        map.put("applyResult", "通过");
-        Long sum = abilityApplicationDao.getFundStatementSum(map);
-        BigDecimal result = new BigDecimal(sum).divide(new BigDecimal(10000));
-        result = result.setScale(1, BigDecimal.ROUND_HALF_UP);
-        return result ;
+
+        Long sum = 0L;
+        sum = sum + abilityApplicationDao.getApplyPriceCount();
+        return sum ;
     }
 
 }
\ No newline at end of file