|
|
@@ -106,31 +106,71 @@ public class CoreEvaluateTaskServiceImpl extends ServiceImpl<CoreEvaluateTaskMap
|
|
|
return TableDataInfo.build(page);
|
|
|
}
|
|
|
|
|
|
+ private Map beiyong(EvaluateTaskStatisticsDTO evaluateTaskStatisticsDTO) {
|
|
|
+/* Map map = new HashMap();
|
|
|
+ Page<Map> page;
|
|
|
+ //分页
|
|
|
+ if (evaluateTaskStatisticsDTO.getPageNum() != null && evaluateTaskStatisticsDTO.getPageSize() != null) {
|
|
|
+ page = new Page<>(evaluateTaskStatisticsDTO.getPageNum(), evaluateTaskStatisticsDTO.getPageSize());
|
|
|
+ } else {
|
|
|
+ page = new Page<>();
|
|
|
+ }
|
|
|
+ SysOrg sysOrg = remoteOrgService.selectSysOrgById(evaluateTaskStatisticsDTO.getOrgId(), SecurityConstants.INNER);
|
|
|
+ evaluateTaskStatisticsDTO.setOrgPath(sysOrg.getPath());
|
|
|
+ if (sysOrg.getType().equals(1)) {
|
|
|
+ evaluateTaskStatisticsDTO.setType(3);
|
|
|
+ } else {
|
|
|
+ evaluateTaskStatisticsDTO.setType(4);
|
|
|
+ }
|
|
|
+ evaluateTaskStatisticsDTO.setOrgId(null);
|
|
|
+ evaluateTaskStatisticsDTO.setOrgPath(null);
|
|
|
+ // List<LinkedHashMap> rows = baseMapper.statisticsAll(evaluateTaskStatisticsDTO);
|
|
|
+ Integer average = 0;
|
|
|
+ Integer all = 0;
|
|
|
+ for (int i = 0; i < rows.size(); i++) {
|
|
|
+ Object id = rows.get(i).get("id");
|
|
|
+ rows.get(i).remove("id");
|
|
|
+ List<Map> contentByTaskId = baseMapper.getContentByTaskId((Long) id);
|
|
|
+ if (CollectionUtils.isNotEmpty(contentByTaskId)) {
|
|
|
+ int total = 0;
|
|
|
+ for (int l = 0; l < contentByTaskId.size(); l++) {
|
|
|
+ Double score = Double.valueOf(contentByTaskId.get(l).get("score").toString());
|
|
|
+ total += score;
|
|
|
+ }
|
|
|
+ rows.get(i).put("评价得分", total);
|
|
|
+ all += total;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ map.put("list", rows);
|
|
|
+ if (rows.size() > 0) {
|
|
|
+ average = all / rows.size();
|
|
|
+ }
|
|
|
+ map.put("average", average);
|
|
|
+ return map;*/
|
|
|
+ return null;
|
|
|
+ }
|
|
|
+
|
|
|
@Override
|
|
|
public Map statistics(EvaluateTaskStatisticsDTO evaluateTaskStatisticsDTO) {
|
|
|
Map map = new HashMap();
|
|
|
- Page<Map> page;
|
|
|
- //分页
|
|
|
- if (evaluateTaskStatisticsDTO.getPageNum() != null && evaluateTaskStatisticsDTO.getPageSize() != null) {
|
|
|
- page = new Page<>(evaluateTaskStatisticsDTO.getPageNum(), evaluateTaskStatisticsDTO.getPageSize());
|
|
|
- } else {
|
|
|
- page = new Page<>();
|
|
|
- }
|
|
|
- SysOrg sysOrg = remoteOrgService.selectSysOrgById(evaluateTaskStatisticsDTO.getOrgId(), SecurityConstants.INNER);
|
|
|
- evaluateTaskStatisticsDTO.setOrgPath(sysOrg.getPath());
|
|
|
- if (sysOrg.getType().equals(1)) {
|
|
|
- evaluateTaskStatisticsDTO.setType(3);
|
|
|
- } else {
|
|
|
- evaluateTaskStatisticsDTO.setType(4);
|
|
|
- }
|
|
|
- evaluateTaskStatisticsDTO.setOrgId(null);
|
|
|
- evaluateTaskStatisticsDTO.setOrgPath(null);
|
|
|
- List<LinkedHashMap> rows = baseMapper.statisticsAll(evaluateTaskStatisticsDTO);
|
|
|
- Integer average = 0;
|
|
|
+ List<SysOrg> sysOrgs = remoteOrgService.selectSysOrgByParentId(evaluateTaskStatisticsDTO.getOrgId(), SecurityConstants.INNER);
|
|
|
+ List<LinkedHashMap> rows = new ArrayList<>();
|
|
|
+ Double average = null;
|
|
|
Integer all = 0;
|
|
|
- for (int i = 0; i < rows.size(); i++) {
|
|
|
- Object id = rows.get(i).get("id");
|
|
|
- rows.get(i).remove("id");
|
|
|
+ for (int i = 0; i < sysOrgs.size(); i++) {
|
|
|
+ evaluateTaskStatisticsDTO.setOrgId(sysOrgs.get(i).getId());
|
|
|
+ LinkedHashMap linkedHashMap = new LinkedHashMap();
|
|
|
+ linkedHashMap.put("评价机构", sysOrgs.get(i).getShortName());
|
|
|
+ LinkedHashMap linkedHashMap1 = baseMapper.statisticsAll(evaluateTaskStatisticsDTO);
|
|
|
+ if (null == linkedHashMap1) {
|
|
|
+ linkedHashMap.put("被评价机构名称", "");
|
|
|
+ linkedHashMap.put("评价得分", 0);
|
|
|
+ } else {
|
|
|
+ linkedHashMap.put("被评价机构名称", linkedHashMap1.get("被评价机构名称"));
|
|
|
+ linkedHashMap.put("id", linkedHashMap1.get("id"));
|
|
|
+ }
|
|
|
+ Object id = linkedHashMap.get("id");
|
|
|
+ linkedHashMap.remove("id");
|
|
|
List<Map> contentByTaskId = baseMapper.getContentByTaskId((Long) id);
|
|
|
if (CollectionUtils.isNotEmpty(contentByTaskId)) {
|
|
|
int total = 0;
|
|
|
@@ -138,15 +178,16 @@ public class CoreEvaluateTaskServiceImpl extends ServiceImpl<CoreEvaluateTaskMap
|
|
|
Double score = Double.valueOf(contentByTaskId.get(l).get("score").toString());
|
|
|
total += score;
|
|
|
}
|
|
|
- rows.get(i).put("评价得分", total);
|
|
|
+ linkedHashMap.put("评价得分", total);
|
|
|
all += total;
|
|
|
}
|
|
|
+ rows.add(linkedHashMap);
|
|
|
}
|
|
|
map.put("list", rows);
|
|
|
if (rows.size() > 0) {
|
|
|
- average = all / rows.size();
|
|
|
+ average = (double) all / rows.size();
|
|
|
}
|
|
|
- map.put("average", average);
|
|
|
+ map.put("average", String.format("%.2f", average));
|
|
|
return map;
|
|
|
}
|
|
|
|
luowei