From 1f3230611c3e9b29fce92b36d0c33972d15ba972 Mon Sep 17 00:00:00 2001
From: wangshaoping <wspsc@163.com>
Date: Tue, 15 Jul 2025 18:36:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=BC=94=E7=A4=BA=E7=B3=BB=E7=BB=9F=E7=A7=BB?=
 =?UTF-8?q?=E6=A4=8D=E5=88=B0=20java=20=E8=A7=84=E5=88=99=E5=BC=95?=
 =?UTF-8?q?=E6=93=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gradle.properties                                         | 2 +-
 .../rating/service/impl/FinanceReportServiceImpl.java     | 6 +++---
 .../java/irbs/cust/rating/service/support/Subject.java    | 8 ++++----
 .../resources/META-INF/platform/plugins/liquibase.json    | 4 ++--
 irbs.frontend/.npmrc                                      | 2 +-
 irbs.shrcb.poc.frontend/package.json                      | 2 +-
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 6fafff8..4615c00 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -36,7 +36,7 @@ application_version=1.0.1
 # platform
 ###########################################################rwa_version
 platform_group=io.sc
-platform_version=8.2.23
+platform_version=8.2.24
 platform_plugin_version=8.2.10
 platform_core_frontend_version=8.2.84
 
diff --git a/irbs.cust.rating/src/main/java/irbs/cust/rating/service/impl/FinanceReportServiceImpl.java b/irbs.cust.rating/src/main/java/irbs/cust/rating/service/impl/FinanceReportServiceImpl.java
index 260c93f..f8d90aa 100644
--- a/irbs.cust.rating/src/main/java/irbs/cust/rating/service/impl/FinanceReportServiceImpl.java
+++ b/irbs.cust.rating/src/main/java/irbs/cust/rating/service/impl/FinanceReportServiceImpl.java
@@ -133,7 +133,7 @@ public class FinanceReportServiceImpl extends DaoServiceImpl<FinanceReport, Stri
     }
 
     // 根据科目数据map与转换结果map，使用转换结果的科目号重新组装科目数据。
-    public Map<String, Object> buildSubjectData(Map<String, BigDecimal> subjectDataMap, LinkedHashMap<String, String> mappedMap) {
+    public Map<String, Object> buildSubjectData(Map<String, Double> subjectDataMap, LinkedHashMap<String, String> mappedMap) {
         Map<String, Object> map = new HashMap<>();
         Iterator<java.util.Map.Entry<String, String>> it = mappedMap.entrySet().iterator();
         while(it.hasNext()) {
@@ -148,10 +148,10 @@ public class FinanceReportServiceImpl extends DaoServiceImpl<FinanceReport, Stri
     // 根据财报数据，获得科目编码集合与科目数据map组装的java类
     public Subject getSubject(List<FinanceReportDetail> list) throws Exception {
         List<String> codeList = new ArrayList<>();
-        Map<String, BigDecimal> dataMap = new HashMap<>();
+        Map<String, Double> dataMap = new HashMap<>();
         for (FinanceReportDetail detail: list) {
             codeList.add(detail.getProjectCode());
-            dataMap.put(detail.getProjectCode(), detail.getProjectValue());
+            dataMap.put(detail.getProjectCode(), detail.getProjectValue()==null?null:detail.getProjectValue().doubleValue());
         }
         return new Subject(codeList, dataMap);
     }
diff --git a/irbs.cust.rating/src/main/java/irbs/cust/rating/service/support/Subject.java b/irbs.cust.rating/src/main/java/irbs/cust/rating/service/support/Subject.java
index fc133df..7f1139e 100644
--- a/irbs.cust.rating/src/main/java/irbs/cust/rating/service/support/Subject.java
+++ b/irbs.cust.rating/src/main/java/irbs/cust/rating/service/support/Subject.java
@@ -14,11 +14,11 @@ public class Subject {
     /**
      * 科目数据map
      */
-    public Map<String, BigDecimal> dataMap;
+    public Map<String, Double> dataMap;
 
     public Subject() {}
 
-    public Subject(List<String> list, Map<String, BigDecimal> map) {
+    public Subject(List<String> list, Map<String, Double> map) {
         this.codeList = list;
         this.dataMap = map;
     }
@@ -31,11 +31,11 @@ public class Subject {
         this.codeList = codeList;
     }
 
-    public Map<String, BigDecimal> getDataMap() {
+    public Map<String, Double> getDataMap() {
         return dataMap;
     }
 
-    public void setDataMap(Map<String, BigDecimal> dataMap) {
+    public void setDataMap(Map<String, Double> dataMap) {
         this.dataMap = dataMap;
     }
 }
diff --git a/irbs.cust.rating/src/main/resources/META-INF/platform/plugins/liquibase.json b/irbs.cust.rating/src/main/resources/META-INF/platform/plugins/liquibase.json
index d15a4d6..193c43a 100644
--- a/irbs.cust.rating/src/main/resources/META-INF/platform/plugins/liquibase.json
+++ b/irbs.cust.rating/src/main/resources/META-INF/platform/plugins/liquibase.json
@@ -43,8 +43,8 @@
     "description":"全部表创建",
     "locations":[
       "classpath:/liquibase/20240326_ALL_TABLES_DDL.xml",
-      "classpath:/liquibase/20240401_REPORTS_TABLES_DDL.xml",
-      "classpath:/liquibase/20250714_RPT_VIEW__DDL.xml"
+      "classpath:/liquibase/20240401_REPORTS_TABLES_DDL.xml"
+      /*"classpath:/liquibase/20250714_RPT_VIEW__DDL.xml"*/
     ]
   },
   {
diff --git a/irbs.frontend/.npmrc b/irbs.frontend/.npmrc
index 36b4f9f..ac3953c 100644
--- a/irbs.frontend/.npmrc
+++ b/irbs.frontend/.npmrc
@@ -1,5 +1,5 @@
 # npm 仓库地址, 在 npm install 时使用
-registry=http://58.33.84.154:8000/repository/npm-public/
+registry=http://nexus.sc.io:8000/repository/npm-public/
 
 # 用户邮箱
 email=
diff --git a/irbs.shrcb.poc.frontend/package.json b/irbs.shrcb.poc.frontend/package.json
index b0ca336..b6665d0 100644
--- a/irbs.shrcb.poc.frontend/package.json
+++ b/irbs.shrcb.poc.frontend/package.json
@@ -112,7 +112,7 @@
     "mockjs": "1.1.0",
     "node-sql-parser": "5.3.6",
     "pinia": "2.3.0",
-    "platform-core": "8.2.78",
+    "platform-core": "8.2.84",
     "quasar": "2.17.6",
     "sort-array": "5.0.0",
     "svg-path-commander": "2.1.7",