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 40597b3b..34defed8 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 @@ -527,7 +527,7 @@ public class ReportController { } /** - * 项目齐套率报表 + * 工时统计报表(客户维度) * @param * @return */ @@ -540,6 +540,20 @@ public class ReportController { } } + /** + * 工时统计报表(车间维度) + * @param + * @return + */ + @GetMapping("/timeStatisticsWorkshopReport") + public R timeStatisticsWorkshopReport(@RequestParam(required = false) Map paramMap){ + try { + return R.ok(reportService.timeStatisticsWorkshopReport(paramMap)); + } catch (Exception e) { + return R.failed(e.getMessage()); + } + } + /** * * 客户维度已完工工时报表 diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/WorkCentreDetailsController.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/WorkCentreDetailsController.java index f42f49af..5cb74e36 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/WorkCentreDetailsController.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/WorkCentreDetailsController.java @@ -101,7 +101,8 @@ public class WorkCentreDetailsController { */ @PostMapping public R save(@RequestBody WorkCentreDetails workCentreDetails) { - String handle = StringUtil.createQUID(); + + String user = CommonMethods.getUser(); String site = CommonMethods.getSite(); LocalDateTime now = LocalDateTime.now(); @@ -113,6 +114,7 @@ public class WorkCentreDetailsController { if (selectList.size() != 0) { return R.failed("车间工作中心编号:" + workshopWorkCenterNo + "不允许重复"); } + String handle = "CostCenterBO:" + site + "," + workshopWorkCenterNo; workCentreDetails.setHandle(handle); workCentreDetails.setSite(site); workCentreDetails.setCreatedTime(now); 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 069f86fe..16341d7f 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 @@ -275,4 +275,11 @@ public interface ReportMapper { * @return */ List> timeStatisticsCustomerReport(Map paramMap); + + /** + * 工时统计报表(车间维度) + * @param paramMap + * @return + */ + List> timeStatisticsWorkshopReport(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 b873eeaa..51e44f5b 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 @@ -285,4 +285,11 @@ public interface ReportService { * @return */ List> timeStatisticsCustomerReport(Map paramMap); + + /** + * 工时统计报表(车间维度) + * @param paramMap + * @return + */ + List> timeStatisticsWorkshopReport(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 f63795ae..ec516686 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 @@ -1510,6 +1510,19 @@ public class ReportServiceImpl implements ReportService { return reportMapper.timeStatisticsCustomerReport(paramMap); } + /** + * 工时统计报表(车间维度) + * @param paramMap + * @return + */ + @Override + public List> timeStatisticsWorkshopReport(Map paramMap) { + String site = CommonMethods.getSite(); + paramMap.put("site", site); + paramMap.put("locale", LocaleContextHolder.getLocale().getLanguage()); + return reportMapper.timeStatisticsWorkshopReport(paramMap); + } + /** * 工时统计报表 * @param paramMap diff --git a/anomaly/src/main/resources/mapper/ReportMapper.xml b/anomaly/src/main/resources/mapper/ReportMapper.xml index 0a8c9b26..fc0ec486 100644 --- a/anomaly/src/main/resources/mapper/ReportMapper.xml +++ b/anomaly/src/main/resources/mapper/ReportMapper.xml @@ -2893,5 +2893,69 @@ SELECT zab.CREATED_DATE_TIME, GROUP BY ZWH."shortHandWorkOrder" ORDER BY "totalWorkingHours" DESC + \ No newline at end of file