kingbase8 jianrongwenti

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/PowerStationMapper.xml

@@ -35,7 +35,8 @@
         SUBSTRING_INDEX(ph.project_address_name, '/', 1) AS province,
         lc.stamp_status,
         lc.status,
-        ps.kc_create_time  AS firstSubmitDate
+        ps.kc_create_time  AS firstSubmitDate,
+        ps.rec_date
     FROM
         hygf_power_station ps
             LEFT JOIN (

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/StatisticsHomepageMapper.xml

@@ -543,8 +543,7 @@
         SELECT
         sum( CASE WHEN repay_state = '1' THEN rent ELSE 0 END ) yhk,
         sum( CASE WHEN repay_state = '0' THEN rent ELSE 0 END ) sywhk,
-        sum( CASE WHEN repay_state = '0' AND ( YEAR ( repay_date ) = YEAR ( CURDATE())) THEN rent ELSE 0 END ) jnwhk,
-        max(regional_companies_code) regionalCompaniesCode,
+        SUM(CASE WHEN repay_state = '0' AND EXTRACT(YEAR FROM repay_date) = EXTRACT(YEAR FROM CURRENT_DATE) THEN rent ELSE 0 END) AS jnwhk,        max(regional_companies_code) regionalCompaniesCode,
         max(hygf_repayment.company_name) regionalCompaniesName,
         max(pc.REGION_SEQ) regionSeq
         FROM

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/StatisticsHomepageServiceImpl.java

@@ -209,10 +209,11 @@ public class StatisticsHomepageServiceImpl {
                     while (iterator.hasNext()) {
                         Map<String, Object> map = iterator.next();
                         workNum += (long) map.get("total");
-                        stationRealScale += (double) map.get("realScale");
+                        BigDecimal realScale1 = new BigDecimal(String.valueOf(map.get("realScale")));
+                        stationRealScale += realScale1.doubleValue();
                         if ("施工资料上传".equals(map.get("statusText"))) {
                             sgtotal += (long) map.get("total");
-                            sgrealScale += (double) map.get("realScale");
+                            sgrealScale +=  new BigDecimal(String.valueOf(map.get("realScale"))).doubleValue();
                             iterator.remove();
                         }
                     }
@@ -235,7 +236,7 @@ public class StatisticsHomepageServiceImpl {
                         gridNum += (long) map.get("total");
                         if ("审核中".equals(map.get("statusText"))) {
                             total += (long) map.get("total");
-                            realScale += (double) map.get("realScale");
+                            realScale +=  new BigDecimal(String.valueOf(map.get("realScale"))).doubleValue();
                             iterator1.remove();
                         }
                     }
@@ -256,7 +257,7 @@ public class StatisticsHomepageServiceImpl {
                         acceptanceNum += (long) map.get("total");
                         if ("审核中".equals(map.get("statusText"))) {
                             total += (long) map.get("total");
-                            realScale += (double) map.get("realScale");
+                            realScale += new BigDecimal(String.valueOf(map.get("realScale"))).doubleValue();
                             iterator2.remove();
                         }
                     }
@@ -277,11 +278,11 @@ public class StatisticsHomepageServiceImpl {
                         Map<String, Object> map = iterator2.next();
                         financingNum += (long) map.get("total");
                         if ("放款完成".equals(map.get("statusText"))) {
-                            disbursementMoney += (double)map.get("disbursementMoney");
+                            disbursementMoney +=  new BigDecimal(String.valueOf(map.get("realScale"))).doubleValue();
                         }
                         if ("未通过".equals(map.get("statusText"))) {
                             trtotal += (long) map.get("total");
-                            trrealScale += (double) map.get("realScale");
+                            trrealScale += new BigDecimal(String.valueOf(map.get("realScale"))).doubleValue();
                             iterator2.remove();
                         }
                     }