From 2e485943bc78833ea6b814f0bd92d3d326ac99e4 Mon Sep 17 00:00:00 2001 From: yinq <1345442242@qq.com> Date: Mon, 17 Oct 2022 15:02:46 +0800 Subject: [PATCH] =?UTF-8?q?add=E5=B7=B2=E6=B4=BE=E5=B7=A5=E5=B7=A5?= =?UTF-8?q?=E5=8D=95=E6=98=8E=E7=BB=86=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anomaly/controller/ReportController.java | 14 +++++ .../mesnac/anomaly/mapper/ReportMapper.java | 9 ++- .../mesnac/anomaly/service/ReportService.java | 7 +++ .../service/impl/ReportServiceImpl.java | 20 ++++++- .../main/resources/mapper/ReportMapper.xml | 60 ++++++++++++++----- 5 files changed, 91 insertions(+), 19 deletions(-) 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 2cfc894c..117ff447 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 @@ -428,6 +428,20 @@ public class ReportController { } } + /** + * 已派工工单明细报表 + * @param paramMap + * @return + */ + @GetMapping("/assignedWorkersOrdersReport") + public R assignedWorkersOrdersReport(@RequestParam(required = false) Map paramMap){ + try{ + return R.ok(reportService.assignedWorkersOrdersReport(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 cb82de59..06a2e305 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 @@ -199,9 +199,16 @@ public interface ReportMapper { List> lastOperationCompletedReport(Map paramMap); /** - * + * 订单查询报表 * @param paramMap * @return */ List> orderQueryReportReport(Map paramMap); + + /** + * 已派工工单明细报表 + * @param paramMap + * @return + */ + List> assignedWorkersOrdersReport(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 33ac2431..74898a96 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 @@ -216,4 +216,11 @@ public interface ReportService { */ List> orderQueryReportReport(Map paramMap); + /** + * 已派工工单明细报表 + * @param paramMap + * @return + */ + List> assignedWorkersOrdersReport(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 94fb4610..376b171a 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 @@ -1067,13 +1067,14 @@ public class ReportServiceImpl implements ReportService { //计划工时 ArrayList planList = new ArrayList<>(); planList.add(Float.valueOf(String.valueOf(map.get("tardinessWork")))); + planList.add(Float.valueOf(String.valueOf(map.get("planCapacity1")))); planList.add(Float.valueOf(String.valueOf(map.get("planCapacity2")))); planList.add(Float.valueOf(String.valueOf(map.get("planCapacity3")))); planList.add(Float.valueOf(String.valueOf(map.get("planCapacity4")))); planList.add(Float.valueOf(String.valueOf(map.get("planCapacity5")))); planList.add(Float.valueOf(String.valueOf(map.get("planCapacity6")))); planList.add(Float.valueOf(String.valueOf(map.get("planCapacity7")))); - planList.add(Float.valueOf(String.valueOf(map.get("planCapacity8")))); +// planList.add(Float.valueOf(String.valueOf(map.get("planCapacity8")))); resourceMap.put("planCapacityList",planList); //标准产能 resourceMap.put("standardWeekCapacity",map.get("standardWeekCapacity")); @@ -1102,8 +1103,8 @@ public class ReportServiceImpl implements ReportService { planUndoneHoursList.add(Float.valueOf(String.valueOf(map.get("planUndoneHours")))); eightList.add(resourceMap); } - result.put("planCapacity",String.format("%.2f", planCapacity)); - result.put("standardCapacity",String.format("%.2f", standardCapacity)); + result.put("planCapacity",Math.round(planCapacity)); + result.put("standardCapacity",Math.round(standardCapacity)); //八个柱状图 result.put("eightList",eightList); //中心 计划工时、未完成工时List @@ -1252,6 +1253,19 @@ public class ReportServiceImpl implements ReportService { return reportMapper.orderQueryReportReport(paramMap); } + /** + * 已派工工单明细报表 + * @param paramMap + * @return + */ + @Override + public List> assignedWorkersOrdersReport(Map paramMap) { + String site = CommonMethods.getSite(); + paramMap.put("site", site); + paramMap.put("locale", LocaleContextHolder.getLocale().getLanguage()); + return reportMapper.assignedWorkersOrdersReport(paramMap); + } + /** * 事业部质量看板数据接口 * @param user diff --git a/anomaly/src/main/resources/mapper/ReportMapper.xml b/anomaly/src/main/resources/mapper/ReportMapper.xml index 031de070..083dc2fa 100644 --- a/anomaly/src/main/resources/mapper/ReportMapper.xml +++ b/anomaly/src/main/resources/mapper/ReportMapper.xml @@ -1264,34 +1264,40 @@ + \ No newline at end of file