|
@ -133,7 +133,7 @@ public class FinanceReportServiceImpl extends DaoServiceImpl<FinanceReport, Stri |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
// 根据科目数据map与转换结果map,使用转换结果的科目号重新组装科目数据。
|
|
|
// 根据科目数据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<>(); |
|
|
Map<String, Object> map = new HashMap<>(); |
|
|
Iterator<java.util.Map.Entry<String, String>> it = mappedMap.entrySet().iterator(); |
|
|
Iterator<java.util.Map.Entry<String, String>> it = mappedMap.entrySet().iterator(); |
|
|
while(it.hasNext()) { |
|
|
while(it.hasNext()) { |
|
@ -148,10 +148,10 @@ public class FinanceReportServiceImpl extends DaoServiceImpl<FinanceReport, Stri |
|
|
// 根据财报数据,获得科目编码集合与科目数据map组装的java类
|
|
|
// 根据财报数据,获得科目编码集合与科目数据map组装的java类
|
|
|
public Subject getSubject(List<FinanceReportDetail> list) throws Exception { |
|
|
public Subject getSubject(List<FinanceReportDetail> list) throws Exception { |
|
|
List<String> codeList = new ArrayList<>(); |
|
|
List<String> codeList = new ArrayList<>(); |
|
|
Map<String, BigDecimal> dataMap = new HashMap<>(); |
|
|
Map<String, Double> dataMap = new HashMap<>(); |
|
|
for (FinanceReportDetail detail: list) { |
|
|
for (FinanceReportDetail detail: list) { |
|
|
codeList.add(detail.getProjectCode()); |
|
|
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); |
|
|
return new Subject(codeList, dataMap); |
|
|
} |
|
|
} |
|
|