|
|
|
@ -615,14 +615,7 @@ public class ReportServiceImpl implements ReportService {
|
|
|
|
|
Float unWorkHours6 = 0.00f;
|
|
|
|
|
Float unWorkHours7 = 0.00f;
|
|
|
|
|
Float unWorkHours8 = 0.00f;
|
|
|
|
|
Float weekRate1 = 0.00f;
|
|
|
|
|
Float weekRate2 = 0.00f;
|
|
|
|
|
Float weekRate3 = 0.00f;
|
|
|
|
|
Float weekRate4 = 0.00f;
|
|
|
|
|
Float weekRate5 = 0.00f;
|
|
|
|
|
Float weekRate6 = 0.00f;
|
|
|
|
|
Float weekRate7 = 0.00f;
|
|
|
|
|
Float weekRate8 = 0.00f;
|
|
|
|
|
|
|
|
|
|
for (Map<String, String> map : resultList) {
|
|
|
|
|
tardinessWork += Float.valueOf(String.valueOf(map.get("tardinessWork")));
|
|
|
|
|
if (!StringUtils.isBlank(map.get("weekCapacity"))){
|
|
|
|
@ -636,14 +629,7 @@ public class ReportServiceImpl implements ReportService {
|
|
|
|
|
unWorkHours6 += Float.valueOf(String.valueOf(map.get("unWorkHours6")));
|
|
|
|
|
unWorkHours7 += Float.valueOf(String.valueOf(map.get("unWorkHours7")));
|
|
|
|
|
unWorkHours8 += Float.valueOf(String.valueOf(map.get("unWorkHours8")));
|
|
|
|
|
weekRate1 += Float.valueOf(String.valueOf(map.get("weekRate1")).replace("%",""));
|
|
|
|
|
weekRate2 += Float.valueOf(String.valueOf(map.get("weekRate2")).replace("%",""));
|
|
|
|
|
weekRate3 += Float.valueOf(String.valueOf(map.get("weekRate3")).replace("%",""));
|
|
|
|
|
weekRate4 += Float.valueOf(String.valueOf(map.get("weekRate4")).replace("%",""));
|
|
|
|
|
weekRate5 += Float.valueOf(String.valueOf(map.get("weekRate5")).replace("%",""));
|
|
|
|
|
weekRate6 += Float.valueOf(String.valueOf(map.get("weekRate6")).replace("%",""));
|
|
|
|
|
weekRate7 += Float.valueOf(String.valueOf(map.get("weekRate7")).replace("%",""));
|
|
|
|
|
weekRate8 += Float.valueOf(String.valueOf(map.get("weekRate8")).replace("%",""));
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
countMap.put("tardinessWork",String.format("%.2f",tardinessWork));
|
|
|
|
|
countMap.put("weekCapacity",String.format("%.2f",weekCapacity));
|
|
|
|
@ -655,14 +641,14 @@ public class ReportServiceImpl implements ReportService {
|
|
|
|
|
countMap.put("unWorkHours6",String.format("%.2f",unWorkHours6));
|
|
|
|
|
countMap.put("unWorkHours7",String.format("%.2f",unWorkHours7));
|
|
|
|
|
countMap.put("unWorkHours8",String.format("%.2f",unWorkHours8));
|
|
|
|
|
countMap.put("weekRate1",String.format("%.2f",weekRate1 / resultList.size()) + "%");
|
|
|
|
|
countMap.put("weekRate2",String.format("%.2f",weekRate2 / resultList.size()) + "%");
|
|
|
|
|
countMap.put("weekRate3",String.format("%.2f",weekRate3 / resultList.size()) + "%");
|
|
|
|
|
countMap.put("weekRate4",String.format("%.2f",weekRate4 / resultList.size()) + "%");
|
|
|
|
|
countMap.put("weekRate5",String.format("%.2f",weekRate5 / resultList.size()) + "%");
|
|
|
|
|
countMap.put("weekRate6",String.format("%.2f",weekRate6 / resultList.size()) + "%");
|
|
|
|
|
countMap.put("weekRate7",String.format("%.2f",weekRate7 / resultList.size()) + "%");
|
|
|
|
|
countMap.put("weekRate8",String.format("%.2f",weekRate8 / resultList.size()) + "%");
|
|
|
|
|
countMap.put("weekRate1",String.format("%.2f",unWorkHours1 / weekCapacity * 100 ) + "%");
|
|
|
|
|
countMap.put("weekRate2",String.format("%.2f",unWorkHours2 / weekCapacity * 100 ) + "%");
|
|
|
|
|
countMap.put("weekRate3",String.format("%.2f",unWorkHours3 / weekCapacity * 100 ) + "%");
|
|
|
|
|
countMap.put("weekRate4",String.format("%.2f",unWorkHours4 / weekCapacity * 100 ) + "%");
|
|
|
|
|
countMap.put("weekRate5",String.format("%.2f",unWorkHours5 / weekCapacity * 100 ) + "%");
|
|
|
|
|
countMap.put("weekRate6",String.format("%.2f",unWorkHours6 / weekCapacity * 100 ) + "%");
|
|
|
|
|
countMap.put("weekRate7",String.format("%.2f",unWorkHours7 / weekCapacity * 100 ) + "%");
|
|
|
|
|
countMap.put("weekRate8",String.format("%.2f",unWorkHours8 / weekCapacity * 100 ) + "%");
|
|
|
|
|
resultList.add(countMap);
|
|
|
|
|
|
|
|
|
|
return resultList;
|
|
|
|
@ -709,18 +695,6 @@ public class ReportServiceImpl implements ReportService {
|
|
|
|
|
Float workHours10 = 0.00f;
|
|
|
|
|
Float workHours11= 0.00f;
|
|
|
|
|
Float workHours12 = 0.00f;
|
|
|
|
|
Float monthRate1 = 0.00f;
|
|
|
|
|
Float monthRate2 = 0.00f;
|
|
|
|
|
Float monthRate3 = 0.00f;
|
|
|
|
|
Float monthRate4 = 0.00f;
|
|
|
|
|
Float monthRate5 = 0.00f;
|
|
|
|
|
Float monthRate6 = 0.00f;
|
|
|
|
|
Float monthRate7 = 0.00f;
|
|
|
|
|
Float monthRate8 = 0.00f;
|
|
|
|
|
Float monthRate9 = 0.00f;
|
|
|
|
|
Float monthRate10 = 0.00f;
|
|
|
|
|
Float monthRate11 = 0.00f;
|
|
|
|
|
Float monthRate12 = 0.00f;
|
|
|
|
|
for (Map<String, String> map : result) {
|
|
|
|
|
tardinessWork += Float.valueOf(String.valueOf(map.get("tardinessWork")));
|
|
|
|
|
if (!StringUtils.isBlank(map.get("monthCapacity"))){
|
|
|
|
@ -738,18 +712,6 @@ public class ReportServiceImpl implements ReportService {
|
|
|
|
|
workHours10 += Float.valueOf(String.valueOf(map.get("workHours10")));
|
|
|
|
|
workHours11 += Float.valueOf(String.valueOf(map.get("workHours11")));
|
|
|
|
|
workHours12 += Float.valueOf(String.valueOf(map.get("workHours12")));
|
|
|
|
|
monthRate1 += Float.valueOf(String.valueOf(map.get("monthRate1")).replace("%",""));
|
|
|
|
|
monthRate2 += Float.valueOf(String.valueOf(map.get("monthRate2")).replace("%",""));
|
|
|
|
|
monthRate3 += Float.valueOf(String.valueOf(map.get("monthRate3")).replace("%",""));
|
|
|
|
|
monthRate4 += Float.valueOf(String.valueOf(map.get("monthRate4")).replace("%",""));
|
|
|
|
|
monthRate5 += Float.valueOf(String.valueOf(map.get("monthRate5")).replace("%",""));
|
|
|
|
|
monthRate6 += Float.valueOf(String.valueOf(map.get("monthRate6")).replace("%",""));
|
|
|
|
|
monthRate7 += Float.valueOf(String.valueOf(map.get("monthRate7")).replace("%",""));
|
|
|
|
|
monthRate8 += Float.valueOf(String.valueOf(map.get("monthRate8")).replace("%",""));
|
|
|
|
|
monthRate9 += Float.valueOf(String.valueOf(map.get("monthRate9")).replace("%",""));
|
|
|
|
|
monthRate10 += Float.valueOf(String.valueOf(map.get("monthRate10")).replace("%",""));
|
|
|
|
|
monthRate11 += Float.valueOf(String.valueOf(map.get("monthRate11")).replace("%",""));
|
|
|
|
|
monthRate12 += Float.valueOf(String.valueOf(map.get("monthRate12")).replace("%",""));
|
|
|
|
|
}
|
|
|
|
|
countMap.put("tardinessWork",String.format("%.2f",tardinessWork));
|
|
|
|
|
countMap.put("monthCapacity",String.format("%.2f",monthCapacity));
|
|
|
|
@ -765,18 +727,18 @@ public class ReportServiceImpl implements ReportService {
|
|
|
|
|
countMap.put("workHours10",String.format("%.2f",workHours10));
|
|
|
|
|
countMap.put("workHours11",String.format("%.2f",workHours11));
|
|
|
|
|
countMap.put("workHours12",String.format("%.2f",workHours12));
|
|
|
|
|
countMap.put("monthRate1",String.format("%.2f",monthRate1 / result.size()) + "%");
|
|
|
|
|
countMap.put("monthRate2",String.format("%.2f",monthRate2 / result.size()) + "%");
|
|
|
|
|
countMap.put("monthRate3",String.format("%.2f",monthRate3 / result.size()) + "%");
|
|
|
|
|
countMap.put("monthRate4",String.format("%.2f",monthRate4 / result.size()) + "%");
|
|
|
|
|
countMap.put("monthRate5",String.format("%.2f",monthRate5 / result.size()) + "%");
|
|
|
|
|
countMap.put("monthRate6",String.format("%.2f",monthRate6 / result.size()) + "%");
|
|
|
|
|
countMap.put("monthRate7",String.format("%.2f",monthRate7 / result.size()) + "%");
|
|
|
|
|
countMap.put("monthRate8",String.format("%.2f",monthRate8 / result.size()) + "%");
|
|
|
|
|
countMap.put("monthRate9",String.format("%.2f",monthRate9 / result.size()) + "%");
|
|
|
|
|
countMap.put("monthRate10",String.format("%.2f",monthRate10 / result.size()) + "%");
|
|
|
|
|
countMap.put("monthRate11",String.format("%.2f",monthRate11 / result.size()) + "%");
|
|
|
|
|
countMap.put("monthRate12",String.format("%.2f",monthRate12 / result.size()) + "%");
|
|
|
|
|
countMap.put("monthRate1",String.format("%.2f",workHours1 / monthCapacity * 100 )+ "%");
|
|
|
|
|
countMap.put("monthRate2",String.format("%.2f",workHours2 / monthCapacity * 100 )+ "%");
|
|
|
|
|
countMap.put("monthRate3",String.format("%.2f",workHours3 / monthCapacity * 100 )+ "%");
|
|
|
|
|
countMap.put("monthRate4",String.format("%.2f",workHours4 / monthCapacity * 100 )+ "%");
|
|
|
|
|
countMap.put("monthRate5",String.format("%.2f",workHours5 / monthCapacity * 100 )+ "%");
|
|
|
|
|
countMap.put("monthRate6",String.format("%.2f",workHours6 / monthCapacity * 100 )+ "%");
|
|
|
|
|
countMap.put("monthRate7",String.format("%.2f",workHours7 / monthCapacity * 100 )+ "%");
|
|
|
|
|
countMap.put("monthRate8",String.format("%.2f",workHours8 / monthCapacity * 100 )+ "%");
|
|
|
|
|
countMap.put("monthRate9",String.format("%.2f",workHours9 / monthCapacity * 100 )+ "%");
|
|
|
|
|
countMap.put("monthRate10",String.format("%.2f",workHours10 / monthCapacity * 100 ) + "%");
|
|
|
|
|
countMap.put("monthRate11",String.format("%.2f",workHours11 / monthCapacity * 100 ) + "%");
|
|
|
|
|
countMap.put("monthRate12",String.format("%.2f",workHours12 / monthCapacity * 100 ) + "%");
|
|
|
|
|
result.add(countMap);
|
|
|
|
|
return result;
|
|
|
|
|
}
|
|
|
|
@ -886,13 +848,11 @@ public class ReportServiceImpl implements ReportService {
|
|
|
|
|
}
|
|
|
|
|
countMap.put("sumQTY",String.format("%.2f",sumQTY));
|
|
|
|
|
countMap.put("sumDoneQTY",String.format("%.2f",sumDoneQTY));
|
|
|
|
|
countMap.put("QTYrate",String.format("%.2f",QTYrate / resultList.size()) + "%");
|
|
|
|
|
countMap.put("QTYrate",String.format("%.2f",sumDoneQTY / sumQTY * 100) + "%");
|
|
|
|
|
countMap.put("sumHours",String.format("%.2f",sumHours));
|
|
|
|
|
countMap.put("sumDoneHours",String.format("%.2f",sumDoneHours));
|
|
|
|
|
countMap.put("HOURSrate",String.format("%.2f",HOURSrate / resultList.size()) + "%");
|
|
|
|
|
|
|
|
|
|
countMap.put("HOURSrate",String.format("%.2f",sumDoneHours / sumHours * 100) + "%");
|
|
|
|
|
resultList.add(countMap);
|
|
|
|
|
|
|
|
|
|
return resultList;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -927,10 +887,10 @@ public class ReportServiceImpl implements ReportService {
|
|
|
|
|
}
|
|
|
|
|
countMap.put("sumQTY",String.format("%.2f",sumQTY));
|
|
|
|
|
countMap.put("sumDoneQTY",String.format("%.2f",sumDoneQTY));
|
|
|
|
|
countMap.put("QTYrate",String.format("%.2f",QTYrate / resultList.size()) + "%");
|
|
|
|
|
countMap.put("QTYrate",String.format("%.2f",sumDoneQTY / sumQTY * 100) + "%");
|
|
|
|
|
countMap.put("sumHours",String.format("%.2f",sumHours));
|
|
|
|
|
countMap.put("sumDoneHours",String.format("%.2f",sumDoneHours));
|
|
|
|
|
countMap.put("HOURSrate",String.format("%.2f",HOURSrate / resultList.size()) + "%");
|
|
|
|
|
countMap.put("HOURSrate",String.format("%.2f",sumDoneHours / sumHours * 100) + "%");
|
|
|
|
|
|
|
|
|
|
resultList.add(countMap);
|
|
|
|
|
return resultList;
|
|
|
|
|