工时统计-车间维度看板

master
yinq 2 years ago
parent 841ad1d5c0
commit 960a0b96d7

@ -554,6 +554,20 @@ public class ReportController {
}
}
/**
* -
* @param
* @return
*/
@GetMapping("/financialWorkHoursBoard")
public R financialWorkHoursBoard(@RequestParam(required = false) Map paramMap){
try {
return R.ok(reportService.financialWorkHoursBoard(paramMap));
} catch (Exception e) {
return R.failed(e.getMessage());
}
}
/**
*
*

@ -292,4 +292,11 @@ public interface ReportService {
* @return
*/
List<Map<String, String>> timeStatisticsWorkshopReport(Map paramMap);
/**
* -
* @param paramMap
* @return
*/
Map<String, Object> financialWorkHoursBoard(Map paramMap);
}

@ -1523,6 +1523,49 @@ public class ReportServiceImpl implements ReportService {
return reportMapper.timeStatisticsWorkshopReport(paramMap);
}
/**
* -
* @param paramMap
* @return
*/
@Override
public Map<String, Object> financialWorkHoursBoard(Map paramMap) {
HashMap<String, Object> result = new HashMap<>();
List<Map<String, String>> mapList = reportMapper.timeStatisticsWorkshopReport(paramMap);
Map<String, List<Map<String, String>>> workCenterList =
mapList.stream().collect(Collectors.groupingBy(e -> e.get("WORK_CENTER_DESCRIPTION")));
ArrayList<Object> workCenterDescList = new ArrayList<>();
workCenterDescList.add("workCenter");
ArrayList<Object> workHoursList = new ArrayList<>();
workHoursList.add("加工工时");
ArrayList<Object> ZTFWorkHoursList = new ArrayList<>();
ZTFWorkHoursList.add("临时修复工时");
ArrayList<Object> totalHoursList = new ArrayList<>();
totalHoursList.add("总工时");
for (String workCenter : workCenterList.keySet()) {
workCenterDescList.add(workCenter);
List<Map<String, String>>workCenterMapList = workCenterList.get(workCenter);
Float workHours = 0.00f;
Float ZTFWorkHours = 0.00f;
Float totalHours = 0.00f;
for (Map<String, String> map : workCenterMapList) {
workHours += Float.valueOf(String.valueOf(map.get("WORK_HOURS")));
ZTFWorkHours += Float.valueOf(String.valueOf(map.get("ZTF_WORK_HOURS")));
totalHours += Float.valueOf(String.valueOf(map.get("TOTAL_HOURS")));
}
workHoursList.add(workHours);
ZTFWorkHoursList.add(ZTFWorkHours);
totalHoursList.add(totalHours);
}
ArrayList<Object> resultList = new ArrayList<>();
resultList.add(workCenterDescList);
resultList.add(workHoursList);
resultList.add(ZTFWorkHoursList);
resultList.add(totalHoursList);
result.put("resultList",resultList);
return result;
}
/**
*
* @param paramMap

@ -2958,4 +2958,5 @@ SELECT zab.CREATED_DATE_TIME,
ORDER BY NEWIP.Z_YEAR, NEWIP.Z_MONTH, NEWIP.WORK_CENTER_DESCRIPTION,NEWIP.COST_CENTER
</select>
</mapper>
Loading…
Cancel
Save