|
@@ -1599,9 +1599,16 @@ public class TaskAnalysisManagerImpl implements ITaskAnalysisManager{
|
|
|
@Override
|
|
|
public List<Map<String, Object>> findTypeScopeTaskCountAnalysis(Map<String, Object> param) throws BusinessException{
|
|
|
//办件量是c,现在不显示办件量,所以先注释掉
|
|
|
- //List<Map<String, Object>> list = taskAnalysisDao.findTypeScopeCount(param);
|
|
|
+ List<Map<String, Object>> list1 = taskAnalysisDao.findTypeScopeCount(param);
|
|
|
+ Map<String, Map<String, Object>> list1Map = list1.stream()
|
|
|
+ .collect(Collectors.toMap(e -> e.get("id").toString(), e -> e));
|
|
|
List<Map<String, Object>> list = taskAnalysisDao.findTaskTypeSettingDataAnalysis(param);
|
|
|
list.forEach(e -> {
|
|
|
+ String id = e.get("id").toString();
|
|
|
+ Map<String, Object> map = list1Map.get(id);
|
|
|
+ if(MapUtil.isNotEmpty(map)){
|
|
|
+ e.putAll(map);
|
|
|
+ }
|
|
|
BigDecimal c1 = new BigDecimal(e.get("c1").toString());
|
|
|
BigDecimal c2 = new BigDecimal(e.get("c2").toString());
|
|
|
String value = "";
|
|
@@ -1610,7 +1617,7 @@ public class TaskAnalysisManagerImpl implements ITaskAnalysisManager{
|
|
|
value = c1.divide(c2, 2, RoundingMode.HALF_UP).multiply(new BigDecimal("100")).toPlainString() + "%";
|
|
|
e.put("valueType", "满足率");
|
|
|
} else{
|
|
|
- value = "1:" + c1.divide(c2, 1, RoundingMode.HALF_DOWN).toPlainString();
|
|
|
+ value = "1:" + c1.divide(c2, 2, RoundingMode.HALF_DOWN).toPlainString();
|
|
|
e.put("valueType", "比值");
|
|
|
}
|
|
|
}
|