金额转为万元

renren-admin/src/main/java/io/renren/modules/processForm/dao/TAbilityApplicationDao.java

@@ -67,8 +67,6 @@ public interface TAbilityApplicationDao extends BaseDao<TAbilityApplicationEntit
 
     List<Map> getDistrictFundStatement();
 
-    List<Map> getCenusDistrictList();
-
     List<Map> getComponentFundStatement();
 
     List<Map> getResourceFundStatement();

renren-admin/src/main/java/io/renren/modules/processForm/service/impl/TAbilityApplicationServiceImpl.java

@@ -23,6 +23,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -211,7 +212,7 @@ public class TAbilityApplicationServiceImpl extends CrudServiceImpl<TAbilityAppl
 
     @Override
     public Object getDistrictFundStatement(Map<String, Object> params) {
-        List<Map> cenusDistrictList = abilityApplicationDao.getCenusDistrictList();
+        List<Map> cenusDistrictList = abilityApplicationDao.getDistrictFundStatement();
         List<Map> resultList = new ArrayList<>();
         resultList.addAll(cenusDistrictList);
         return resultList;
@@ -220,9 +221,9 @@ public class TAbilityApplicationServiceImpl extends CrudServiceImpl<TAbilityAppl
     @Override
     public Object getComponentFundStatement(Map<String, Object> params) {
         List<Map> cenusDistrictList = abilityApplicationDao.getComponentFundStatement();
-        Long total = 0L;
+        BigDecimal total = BigDecimal.ZERO;
         for (Map map : cenusDistrictList) {
-            total = total + Long.parseLong(map.get("applyPrice").toString());
+            total = total.add((BigDecimal) map.get("applyPrice"));
         }
         Map<String, Object> resultMap = new HashMap<>();
         resultMap.put("list", cenusDistrictList);
@@ -233,9 +234,9 @@ public class TAbilityApplicationServiceImpl extends CrudServiceImpl<TAbilityAppl
     @Override
     public Object getResourceFundStatement(Map<String, Object> params) {
         List<Map> list = abilityApplicationDao.getResourceFundStatement();
-        Long total = 0L;
+        BigDecimal total = BigDecimal.ZERO;
         for (Map map : list) {
-            total = total + Long.parseLong(map.get("applyPrice").toString());
+            total = total.add((BigDecimal) map.get("applyPrice"));
         }
         Map<String, Object> resultMap = new HashMap<>();
         resultMap.put("list", list);
@@ -246,9 +247,9 @@ public class TAbilityApplicationServiceImpl extends CrudServiceImpl<TAbilityAppl
     @Override
     public Object getInfrastructureFundStatement(Map<String, Object> params) {
         List<Map> list = abilityApplicationDao.getInfrastructureFundStatement();
-        Long total = 0L;
+        BigDecimal total = BigDecimal.ZERO;
         for (Map map : list) {
-            total = total + Long.parseLong(map.get("applyPrice").toString());
+            total = total.add((BigDecimal) map.get("applyPrice"));
         }
         Map<String, Object> resultMap = new HashMap<>();
         resultMap.put("list", list);
@@ -289,4 +290,12 @@ public class TAbilityApplicationServiceImpl extends CrudServiceImpl<TAbilityAppl
         return resultList;
     }
 
+    @Override
+    public Object getApplyPriceCount() {
+        Long sum = abilityApplicationDao.getFundStatementSum(new HashMap<>());
+        BigDecimal result = new BigDecimal(sum).divide(new BigDecimal(10000));
+        result = result.setScale(1, BigDecimal.ROUND_HALF_UP);
+        return result ;
+    }
+
 }

renren-admin/src/main/resources/mapper/processForm/TAbilityApplicationDao.xml

@@ -702,7 +702,7 @@
         ( SELECT
         srg.id AS "districtId ",
         srg.NAME AS "districtName",
-        IFNULL( COUNT( taa.apply_price ), 0 ) AS "applyPrice",
+        convert(IFNULL(SUM( taa.apply_price ), 0) / 10000, decimal(15, 1)) AS "applyPrice",
         srg.sort
         FROM
         ( SELECT id, NAME, sort FROM sys_region WHERE tree_level = 3 AND 9 >= sort ) srg
@@ -741,15 +741,11 @@
         ) ORDER BY sort
     </select>
 
-    <select id="getCenusDistrictList" resultType="java.util.Map">
-        SELECT id AS "districtId", NAME AS "districtName", 0 AS "applyPrice" FROM sys_region WHERE tree_level = 3 AND 9 >= sort
-    </select>
-
     <select id="getComponentFundStatement" resultType="java.util.Map">
         SELECT
             tda.attr_value AS "resourceType",
             COUNT( tdr.id ) AS "resourceAmount",
-            SUM( taa.price ) AS "applyPrice",
+            convert(IFNULL( SUM(taa.price ), 0 ) / 10000, decimal(15,1)) AS "applyPrice",
             SUM( taa.applyCount ) AS "applyCount"
         FROM
             tb_data_attr tda
@@ -780,7 +776,7 @@
         SELECT
             tdr.name AS "resourceName",
             sd.name AS "deptName",
-            taa.price AS "applyPrice",
+            convert( taa.price / 10000, decimal(15,1)) AS "applyPrice",
             taa.applyCount AS "applyCount"
         FROM
             (
@@ -807,7 +803,7 @@
     <select id="getInfrastructureFundStatement" resultType="java.util.Map">
         SELECT
             '会客厅' AS "resourceName",
-            SUM( apply_price ) AS "applyPrice"
+            convert(IFNULL( SUM( apply_price ), 0 ) / 10000, decimal(15,1)) AS "applyPrice"
         FROM
             t_meetingroom_book tmb
         WHERE
@@ -821,7 +817,7 @@
             sd.id AS "deptId",
             sd.NAME AS "deptName",
             COUNT( tdr.id ) AS "resourceCount",
-            SUM( taa.price ) AS "applyPrice"
+            convert(IFNULL( SUM( taa.price ), 0 ) / 10000, decimal(15,1)) AS "applyPrice"
         FROM
             sys_dept sd
                 LEFT JOIN tb_data_resource tdr ON tdr.dept_id = sd.id
@@ -853,7 +849,7 @@
             sd.id AS "deptId",
             sd.NAME AS "deptName",
             SUM( taa.applyCount ) AS "applyCount",
-            SUM( taa.price ) AS "applyPrice"
+            convert(IFNULL( SUM( taa.price ), 0 ) / 10000, decimal(15,1)) AS "applyPrice"
         FROM
             (
                 SELECT
@@ -884,7 +880,7 @@
         srg.id AS "districtId ",
         srg.NAME AS "districtName",
         IFNULL(SUM(taa.applyCount), 0) AS "applyCount",
-        IFNULL( SUM( taa.apply_price ), 0 ) AS "applyPrice",
+        convert(IFNULL( SUM( taa.apply_price ), 0 ) / 10000, decimal(15,1)) AS "applyPrice",
         srg.sort
         FROM
         ( SELECT id, NAME, sort FROM sys_region WHERE tree_level = 3 AND 9 >= sort ) srg
@@ -903,7 +899,7 @@
         srg.id AS "districtId ",
         srg.NAME AS "districtName",
         IFNULL(SUM(taa.applyCount), 0) AS "applyCount",
-        IFNULL( SUM(taa.apply_price ), 0 ) AS "applyPrice",
+        convert(IFNULL( SUM( taa.apply_price ), 0 ) / 10000, decimal(15,1)) AS "applyPrice",
         srg.sort
         FROM
         ( SELECT id, NAME, sort FROM sys_region WHERE tree_level = 3 AND 9 >= sort ) srg