|
|
@ -1680,6 +1680,47 @@ public class ReportServiceImpl implements ReportService {
|
|
|
|
return resultList;
|
|
|
|
return resultList;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
|
|
|
* 事业部项目进度明细看板
|
|
|
|
|
|
|
|
* @param paramMap
|
|
|
|
|
|
|
|
* @return
|
|
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
|
|
|
public Map<String, Object> projectScheduleReportBoard(Map paramMap) {
|
|
|
|
|
|
|
|
HashMap<String, Object> result = new HashMap<>();
|
|
|
|
|
|
|
|
String user = null;
|
|
|
|
|
|
|
|
if (paramMap.containsKey("career")){
|
|
|
|
|
|
|
|
user = String.valueOf(paramMap.get("career"));
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
result.put("career", user);
|
|
|
|
|
|
|
|
List<Map<String, String>> projectScheduleList = reportMapper.projectScheduleShow(user);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//项目进度圆圈circle
|
|
|
|
|
|
|
|
ArrayList<HashMap<String, String>> projectCircleList = new ArrayList<>();
|
|
|
|
|
|
|
|
Map<String, List<Map<String, String>>> itemNMap = projectScheduleList.stream().collect(Collectors.groupingBy(e -> e.get("item")));
|
|
|
|
|
|
|
|
for (String items : itemNMap.keySet()) {
|
|
|
|
|
|
|
|
List<Map<String, String>> maps = itemNMap.get(items);
|
|
|
|
|
|
|
|
String name = items;
|
|
|
|
|
|
|
|
Float rate = 0.00f;
|
|
|
|
|
|
|
|
Float projectRate = 0.00f;
|
|
|
|
|
|
|
|
for (Map<String, String> map : maps) {
|
|
|
|
|
|
|
|
rate += Float.valueOf(map.get("rate"));
|
|
|
|
|
|
|
|
projectRate += Float.valueOf(map.get("planRate"));
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
HashMap<String, String> objectObjectHashMap = new HashMap<>();
|
|
|
|
|
|
|
|
objectObjectHashMap.put("name",name);
|
|
|
|
|
|
|
|
objectObjectHashMap.put("rate",String.valueOf(rate / maps.size()));
|
|
|
|
|
|
|
|
objectObjectHashMap.put("projectRate",String.valueOf(projectRate / maps.size()));
|
|
|
|
|
|
|
|
projectCircleList.add(objectObjectHashMap);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
result.put("projectCircleList",projectCircleList);
|
|
|
|
|
|
|
|
if (paramMap.containsKey("item")){
|
|
|
|
|
|
|
|
List<Map<String, String>> maps = reportMapper.projectScheduleReportBoard(paramMap);
|
|
|
|
|
|
|
|
result.put("oldData", maps);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
return result;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* 工时统计报表
|
|
|
|
* 工时统计报表
|
|
|
|
* @param paramMap
|
|
|
|
* @param paramMap
|
|
|
|