diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/ReportController.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/ReportController.java index 904d05db..d40c405f 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/ReportController.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/ReportController.java @@ -498,6 +498,21 @@ public class ReportController { } } + /** + * + * 客户维度已完工工时报表 + * @param + * @return + */ + @GetMapping("/customerDimensionFinishedTimeReport") + public R customerDimensionFinishedTimeReport(@RequestParam(required = false) Map paramMap){ + try { + return R.ok(reportService.customerDimensionFinishedTimeReport(paramMap)); + } catch (Exception e) { + return R.failed(e.getMessage()); + } + } + /** * 项目生产加工周期看板 * @param diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/ReportMapper.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/ReportMapper.java index c568b048..87979e05 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/ReportMapper.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/ReportMapper.java @@ -239,4 +239,11 @@ public interface ReportMapper { * @return */ List> machineFinishedTimeReport(Map paramMap); + + /** + * 客户维度已完工工时报表 + * @param paramMap + * @return + */ + List> customerDimensionFinishedTimeReport(Map paramMap); } diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/ReportService.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/ReportService.java index 2de20db1..e0833d35 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/ReportService.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/ReportService.java @@ -251,4 +251,11 @@ public interface ReportService { */ List> machineFinishedTimeReport(Map paramMap); + /** + * 客户维度已完工工时报表 + * @param paramMap + * @return + */ + List> customerDimensionFinishedTimeReport(Map paramMap); + } diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/ReportServiceImpl.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/ReportServiceImpl.java index c31320be..8792ada1 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/ReportServiceImpl.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/ReportServiceImpl.java @@ -1348,6 +1348,67 @@ public class ReportServiceImpl implements ReportService { return result; } + /** + * 客户维度已完工工时报表 + * @param paramMap + * @return + */ + @Override + public List> customerDimensionFinishedTimeReport(Map paramMap) { + String site = CommonMethods.getSite(); + paramMap.put("site", site); + paramMap.put("locale", LocaleContextHolder.getLocale().getLanguage()); + List> result = reportMapper.customerDimensionFinishedTimeReport(paramMap); + HashMap countMap = new HashMap<>(); + countMap.put("workCenterDescription","总计:"); + Float tardinessWork = 0.00f; + Float workHours1 = 0.00f; + Float workHours2 = 0.00f; + Float workHours3 = 0.00f; + Float workHours4 = 0.00f; + Float workHours5 = 0.00f; + Float workHours6 = 0.00f; + Float workHours7 = 0.00f; + Float workHours8 = 0.00f; + Float workHours9 = 0.00f; + Float workHours10 = 0.00f; + Float workHours11= 0.00f; + Float workHours12 = 0.00f; + Float totalWorkingHours = 0.00f; + for (Map map : result) { + workHours1 += Float.valueOf(String.valueOf(map.get("workHours1"))); + workHours2 += Float.valueOf(String.valueOf(map.get("workHours2"))); + workHours3 += Float.valueOf(String.valueOf(map.get("workHours3"))); + workHours4 += Float.valueOf(String.valueOf(map.get("workHours4"))); + workHours5 += Float.valueOf(String.valueOf(map.get("workHours5"))); + workHours6 += Float.valueOf(String.valueOf(map.get("workHours6"))); + workHours7 += Float.valueOf(String.valueOf(map.get("workHours7"))); + workHours8 += Float.valueOf(String.valueOf(map.get("workHours8"))); + workHours9 += Float.valueOf(String.valueOf(map.get("workHours9"))); + workHours10 += Float.valueOf(String.valueOf(map.get("workHours10"))); + workHours11 += Float.valueOf(String.valueOf(map.get("workHours11"))); + workHours12 += Float.valueOf(String.valueOf(map.get("workHours12"))); + tardinessWork += Float.valueOf(String.valueOf(map.get("tardinessWork"))); + totalWorkingHours += Float.valueOf(String.valueOf(map.get("totalWorkingHours"))); + } + countMap.put("tardinessWork",String.format("%.2f",tardinessWork)); + countMap.put("workHours1",String.format("%.2f",workHours1)); + countMap.put("workHours2",String.format("%.2f",workHours2)); + countMap.put("workHours3",String.format("%.2f",workHours3)); + countMap.put("workHours4",String.format("%.2f",workHours4)); + countMap.put("workHours5",String.format("%.2f",workHours5)); + countMap.put("workHours6",String.format("%.2f",workHours6)); + countMap.put("workHours7",String.format("%.2f",workHours7)); + countMap.put("workHours8",String.format("%.2f",workHours8)); + countMap.put("workHours9",String.format("%.2f",workHours9)); + countMap.put("workHours10",String.format("%.2f",workHours10)); + countMap.put("workHours11",String.format("%.2f",workHours11)); + countMap.put("workHours12",String.format("%.2f",workHours12)); + countMap.put("totalWorkingHours",String.format("%.2f",totalWorkingHours)); + result.add(countMap); + return result; + } + /** * 工时统计报表 * @param paramMap diff --git a/anomaly/src/main/resources/mapper/ReportMapper.xml b/anomaly/src/main/resources/mapper/ReportMapper.xml index a8a1baae..14d391aa 100644 --- a/anomaly/src/main/resources/mapper/ReportMapper.xml +++ b/anomaly/src/main/resources/mapper/ReportMapper.xml @@ -2605,5 +2605,151 @@ SELECT zab.CREATED_DATE_TIME, ORDER BY WIP.WORK_CENTER_DESCRIPTION,WIP."operation" + \ No newline at end of file