WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

项目库-项目详情-参数收集统计

Browse Source
This commit is contained in:
liyawei
2022-08-01 14:19:56 +08:00
parent c2983a8ccc
commit 589e1eec3f
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java
+14 -8
View File
@@ -679,10 +679,10 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
// 组装数据 返回前端 // 组装数据 返回前端
List<Map<String, Object>> data = new LinkedList<>(); List<Map<String, Object>> data = new LinkedList<>();
getData(data, cut, notStartNumber, notStartPercent); getData(data, cut, CollectManifestStatisticsStateEnum.NOT_START, notStartNumber, notStartPercent);
getData(data, cut, collectingNumber, collectingPercent); getData(data, cut, CollectManifestStatisticsStateEnum.COLLECTING, collectingNumber, collectingPercent);
getData(data, cut, submitNumber, submitPercent); getData(data, cut, CollectManifestStatisticsStateEnum.SUBMIT, submitNumber, submitPercent);
getData(data, cut, syncReportNumber, syncReportPercent); getData(data, cut, CollectManifestStatisticsStateEnum.SYNC_REPORT, syncReportNumber, syncReportPercent);
if (CutEnum.EN.getValue().equals(cut)) { if (CutEnum.EN.getValue().equals(cut)) {
map.put(item.getTextEn(), data); map.put(item.getTextEn(), data);
@@ -698,20 +698,26 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
return null; return null;
} }
private void getData(List<Map<String, Object>> data, String cut, double quantity, String percentage) { private void getData(List<Map<String, Object>> data, String cut, CollectManifestStatisticsStateEnum statisticsStateEnum, double quantity, String percentage) {
Map<String, Object> notStartMap = new HashMap<>(); Map<String, Object> notStartMap = new HashMap<>();
if (CutEnum.EN.getValue().equals(cut)) { if (CutEnum.EN.getValue().equals(cut)) {
notStartMap.put("name", CollectManifestStatisticsStateEnum.NOT_START.getEnName()); notStartMap.put("name", statisticsStateEnum.getEnName());
} else { } else {
notStartMap.put("name", CollectManifestStatisticsStateEnum.NOT_START.getName()); notStartMap.put("name", statisticsStateEnum.getName());
} }
notStartMap.put("type", CollectManifestStatisticsStateEnum.NOT_START.getValue()); notStartMap.put("type", statisticsStateEnum.getValue());
notStartMap.put("quantity", quantity); notStartMap.put("quantity", quantity);
notStartMap.put("percentage", percentage); notStartMap.put("percentage", percentage);
data.add(notStartMap); data.add(notStartMap);
} }
/**
* 计算百分比
* @param d1
* @param d2
* @return
*/
private String getRatio(Double d1, Double d2) { private String getRatio(Double d1, Double d2) {
if (d1 == null || d2 == null || d2 <= 0) { if (d1 == null || d2 == null || d2 <= 0) {
return "0%"; return "0%";