fix:字段名错误问题

service-base/src/main/java/com/simuwang/base/mapper/report/ReportFinancialIndicatorMapper.java

@@ -1,9 +1,9 @@
 package com.simuwang.base.mapper.report;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.simuwang.base.pojo.dos.report.ReportFinancialIndicatorDO;
+import com.simuwang.base.pojo.dos.report.ReportFinancialIndicatorsDO;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper
-public interface ReportFinancialIndicatorMapper extends BaseMapper<ReportFinancialIndicatorDO> {
+public interface ReportFinancialIndicatorMapper extends BaseMapper<ReportFinancialIndicatorsDO> {
 }

service-base/src/main/java/com/simuwang/base/pojo/dos/report/ReportFinancialIndicatorDO.java

@@ -9,7 +9,7 @@ import java.math.BigDecimal;
 @Setter
 @Getter
 @TableName("amac_report_financial_indicators")
-public class ReportFinancialIndicatorDO extends BaseReportDO {
+public class ReportFinancialIndicatorsDO extends BaseReportDO {
     private String level;
     /**
      * 年度

service-base/src/main/java/com/simuwang/base/pojo/dto/report/QuarterlyReportData.java

@@ -15,7 +15,7 @@ import java.util.List;
 @Getter
 public class QuarterlyReportData extends ReportData {
     private List<ReportAssetAllocationDTO> assetAllocation;
-    private List<ReportFinancialIndicatorDTO> financialIndicators;
+    private List<ReportFinancialIndicatorsDTO> financialIndicators;
     private List<ReportInvestmentIndustryDTO> investmentIndustry;
     private List<ReportShareChangeDTO> shareChange;
 

service-base/src/main/java/com/simuwang/base/pojo/dto/report/ReportFinancialIndicatorDTO.java

@@ -1,6 +1,6 @@
 package com.simuwang.base.pojo.dto.report;
 
-import com.simuwang.base.pojo.dos.report.ReportFinancialIndicatorDO;
+import com.simuwang.base.pojo.dos.report.ReportFinancialIndicatorsDO;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -8,7 +8,7 @@ import java.math.BigDecimal;
 
 @Setter
 @Getter
-public class ReportFinancialIndicatorDTO extends BaseReportDTO<ReportFinancialIndicatorDO> {
+public class ReportFinancialIndicatorsDTO extends BaseReportDTO<ReportFinancialIndicatorsDO> {
     private String level;
 
     /**
@@ -22,8 +22,8 @@ public class ReportFinancialIndicatorDTO extends BaseReportDTO<ReportFinancialIn
     private BigDecimal realizedIncome;
 
     @Override
-    public ReportFinancialIndicatorDO toEntity() {
-        ReportFinancialIndicatorDO entity = new ReportFinancialIndicatorDO();
+    public ReportFinancialIndicatorsDO toEntity() {
+        ReportFinancialIndicatorsDO entity = new ReportFinancialIndicatorsDO();
         entity.setFileId(this.getFileId());
         entity.setLevel(this.level);
         entity.setEndDate(this.endDate);

service-daq/src/main/java/com/simuwang/daq/components/PythonReportConverter.java

@@ -47,7 +47,7 @@ public class PythonReportConverter {
         reportData.setBaseInfo(convertBaseInfo(jsonObject));
         reportData.setFundInfo(convertFundInfo(jsonObject));
         reportData.setAssetAllocation(convertAssetAllocation(jsonObject));
-        reportData.setFinancialIndicators(convertFinancialIndicator(jsonObject));
+        reportData.setFinancialIndicators(convertFinancialIndicators(jsonObject));
         reportData.setInvestmentIndustry(convertInvestmentIndustry(jsonObject));
         reportData.setShareChange(convertShareChange(jsonObject));
         return reportData;
@@ -179,18 +179,18 @@ public class PythonReportConverter {
         return dtos;
     }
 
-    private static List<ReportFinancialIndicatorDTO> convertFinancialIndicator(JSONObject jsonObject) {
-        List<ReportFinancialIndicatorDTO> dtos = ListUtil.list(false);
-        if (jsonObject == null || !jsonObject.containsKey("financial_indicator")) {
+    private static List<ReportFinancialIndicatorsDTO> convertFinancialIndicators(JSONObject jsonObject) {
+        List<ReportFinancialIndicatorsDTO> dtos = ListUtil.list(false);
+        if (jsonObject == null || !jsonObject.containsKey("financial_indicators")) {
             return dtos;
         }
-        JSONArray jsonArray = jsonObject.getJSONArray("financial_indicator");
+        JSONArray jsonArray = jsonObject.getJSONArray("financial_indicators");
         if (CollUtil.isEmpty(jsonArray)) {
             return dtos;
         }
         for (Object o : jsonArray) {
             JSONObject obj = JSONUtil.parseObj(o);
-            ReportFinancialIndicatorDTO dto = new ReportFinancialIndicatorDTO();
+            ReportFinancialIndicatorsDTO dto = new ReportFinancialIndicatorsDTO();
             if (obj == null || obj.isEmpty()) {
                 continue;
             }

service-daq/src/main/java/com/simuwang/daq/components/writer/QuarterlyReportWriter.java

@@ -3,7 +3,7 @@ package com.simuwang.daq.components.writer;
 import cn.hutool.core.collection.CollUtil;
 import com.simuwang.base.mapper.report.*;
 import com.simuwang.base.pojo.dos.report.ReportAssetAllocationDO;
-import com.simuwang.base.pojo.dos.report.ReportFinancialIndicatorDO;
+import com.simuwang.base.pojo.dos.report.ReportFinancialIndicatorsDO;
 import com.simuwang.base.pojo.dos.report.ReportInvestmentIndustryDO;
 import com.simuwang.base.pojo.dos.report.ReportShareChangeDO;
 import com.simuwang.base.pojo.dto.report.*;
@@ -45,10 +45,10 @@ public class QuarterlyReportWriter<T extends QuarterlyReportData> extends Abstra
             this.assetAllocationMapper.insert(entityList);
         }
 
-        List<ReportFinancialIndicatorDTO> financialIndicators = reportData.getFinancialIndicators();
+        List<ReportFinancialIndicatorsDTO> financialIndicators = reportData.getFinancialIndicators();
         if (CollUtil.isNotEmpty(financialIndicators)) {
-            List<ReportFinancialIndicatorDO> entityList = financialIndicators.stream()
-                    .map(ReportFinancialIndicatorDTO::toEntity).collect(Collectors.toList());
+            List<ReportFinancialIndicatorsDO> entityList = financialIndicators.stream()
+                    .map(ReportFinancialIndicatorsDTO::toEntity).collect(Collectors.toList());
             this.financialIndicatorMapper.insert(entityList);
         }