|
@@ -598,23 +598,15 @@ public class BscEnterpriseScreenServiceImpl extends AbstractCrudService<BscEnter
|
|
|
demBuildScoreRecordService.demBuildScoreRecordAdd(demBuildScoreRecord);
|
|
|
}
|
|
|
List<DemBuildScoreRecord> demBuildScoreRecordsList = demBuildScoreRecordService.demBuildScoreRecordList(companyId, null);
|
|
|
- List<String> categoriesList = new ArrayList<>();
|
|
|
+ List<Object> data5 = new ArrayList<>();
|
|
|
List<Integer> seriesDataList = new ArrayList<>();
|
|
|
for (int i = 0; i < demBuildScoreRecordsList.size(); i++) {
|
|
|
- categoriesList.add(demBuildScoreRecordsList.get(demBuildScoreRecordsList.size() - (i + 1)).getScoreDate());
|
|
|
- seriesDataList.add(demBuildScoreRecordsList.get(demBuildScoreRecordsList.size() - (i + 1)).getBuildScore());
|
|
|
+ Map<String, Object> map3 = new HashMap<>();
|
|
|
+ map3.put("name", "得分");
|
|
|
+ map3.put("value", demBuildScoreRecordsList.get(demBuildScoreRecordsList.size() - (i + 1)).getBuildScore());
|
|
|
+ map3.put("type", demBuildScoreRecordsList.get(demBuildScoreRecordsList.size() - (i + 1)).getScoreDate());
|
|
|
+ data5.add(map3);
|
|
|
}
|
|
|
- List<Object> series = new ArrayList<>();
|
|
|
- Map<String, Object> map3 = new HashMap<>();
|
|
|
- map3.put("name", "得分");
|
|
|
- map3.put("data", seriesDataList);
|
|
|
- series.add(map3);
|
|
|
- Map<String, Object> map4 = new HashMap<>();
|
|
|
- map4.put("categories", categoriesList);
|
|
|
- map4.put("series", series);
|
|
|
- Map<String, Object> data5 = new HashMap<>();
|
|
|
- data5.put("data", map4);
|
|
|
-
|
|
|
Map<String, Object> map2 = new HashMap<>();
|
|
|
map2.put("data1", data1);
|
|
|
map2.put("data2", data2);
|