diff --git a/aucma-report/src/main/java/com/aucma/report/controller/BoardReportController.java b/aucma-report/src/main/java/com/aucma/report/controller/BoardReportController.java index 67a7792..f5f6b1c 100644 --- a/aucma-report/src/main/java/com/aucma/report/controller/BoardReportController.java +++ b/aucma-report/src/main/java/com/aucma/report/controller/BoardReportController.java @@ -47,6 +47,16 @@ public class BoardReportController extends BaseController { return AjaxResult.success(boardReportService.boxFoamingProductionInterface(paramMap)); } + /** + * 获取当前班组时间 + * @param paramMap + * @return + */ + @PostMapping("/getCurrentTeamTimeList") + public AjaxResult getCurrentTeamTimeList(@RequestBody HashMap paramMap) { + return AjaxResult.success(boardReportService.getCurrentTeamTimeList(paramMap)); + } + /** * 首页接口 diff --git a/aucma-report/src/main/java/com/aucma/report/controller/ProductionReportController.java b/aucma-report/src/main/java/com/aucma/report/controller/ProductionReportController.java index 24b198c..042f507 100644 --- a/aucma-report/src/main/java/com/aucma/report/controller/ProductionReportController.java +++ b/aucma-report/src/main/java/com/aucma/report/controller/ProductionReportController.java @@ -60,4 +60,13 @@ public class ProductionReportController extends BaseController { return success(list); } + /** + * 发泡注料记录报表 + */ + @GetMapping("/foamFillingRecordReportList") + public AjaxResult foamFillingRecordReportList(@RequestParam(required = false) Map hashMap) { + List> list = productionReportService.foamFillingRecordReportList(hashMap); + return success(list); + } + } diff --git a/aucma-report/src/main/java/com/aucma/report/mapper/BoardReportMapper.java b/aucma-report/src/main/java/com/aucma/report/mapper/BoardReportMapper.java index d437163..6141bd1 100644 --- a/aucma-report/src/main/java/com/aucma/report/mapper/BoardReportMapper.java +++ b/aucma-report/src/main/java/com/aucma/report/mapper/BoardReportMapper.java @@ -55,4 +55,11 @@ public interface BoardReportMapper { * @return */ List> boxFoamingProductionInterface(HashMap paramMap); + + /** + * 获取当前班组时间 + * @param paramMap + * @return + */ + List> getCurrentTeamTimeList(HashMap paramMap); } diff --git a/aucma-report/src/main/java/com/aucma/report/mapper/GeneralReportMapper.java b/aucma-report/src/main/java/com/aucma/report/mapper/GeneralReportMapper.java index d7a9136..2a36869 100644 --- a/aucma-report/src/main/java/com/aucma/report/mapper/GeneralReportMapper.java +++ b/aucma-report/src/main/java/com/aucma/report/mapper/GeneralReportMapper.java @@ -85,4 +85,11 @@ public interface GeneralReportMapper { * @return */ List> pourRecordReportList(Map hashMap); + + /** + * 发泡注料记录报表 + * @param hashMap + * @return + */ + List> foamFillingRecordReportList(Map hashMap); } diff --git a/aucma-report/src/main/java/com/aucma/report/service/IBoardReportService.java b/aucma-report/src/main/java/com/aucma/report/service/IBoardReportService.java index 2d4a51c..3629db6 100644 --- a/aucma-report/src/main/java/com/aucma/report/service/IBoardReportService.java +++ b/aucma-report/src/main/java/com/aucma/report/service/IBoardReportService.java @@ -35,4 +35,11 @@ public interface IBoardReportService { */ List> boxFoamingProductionInterface(HashMap paramMap); + /** + * 获取当前班组时间 + * @param paramMap + * @return + */ + List> getCurrentTeamTimeList(HashMap paramMap); + } diff --git a/aucma-report/src/main/java/com/aucma/report/service/impl/BoardReportServiceImpl.java b/aucma-report/src/main/java/com/aucma/report/service/impl/BoardReportServiceImpl.java index 478ce6f..411d22b 100644 --- a/aucma-report/src/main/java/com/aucma/report/service/impl/BoardReportServiceImpl.java +++ b/aucma-report/src/main/java/com/aucma/report/service/impl/BoardReportServiceImpl.java @@ -91,5 +91,15 @@ public class BoardReportServiceImpl implements IBoardReportService { return boardReportMapper.boxFoamingProductionInterface(paramMap); } + /** + * 获取当前班组时间 + * @param paramMap + * @return + */ + @Override + public List> getCurrentTeamTimeList(HashMap paramMap) { + return boardReportMapper.getCurrentTeamTimeList(paramMap); + } + } diff --git a/aucma-report/src/main/java/com/aucma/report/service/impl/ProductionReportServiceImpl.java b/aucma-report/src/main/java/com/aucma/report/service/impl/ProductionReportServiceImpl.java index b0819a4..66b8e89 100644 --- a/aucma-report/src/main/java/com/aucma/report/service/impl/ProductionReportServiceImpl.java +++ b/aucma-report/src/main/java/com/aucma/report/service/impl/ProductionReportServiceImpl.java @@ -59,5 +59,15 @@ public class ProductionReportServiceImpl implements IProductionReportService { return reportMapper.ScanOfflineRecordReportList(hashMap); } + /** + * 发泡注料记录报表 + * @param hashMap + * @return + */ + @Override + public List> foamFillingRecordReportList(Map hashMap) { + return reportMapper.foamFillingRecordReportList(hashMap); + } + } diff --git a/aucma-report/src/main/resources/mapper/report/BoardReportMapper.xml b/aucma-report/src/main/resources/mapper/report/BoardReportMapper.xml index e5688fe..ca9cd7f 100644 --- a/aucma-report/src/main/resources/mapper/report/BoardReportMapper.xml +++ b/aucma-report/src/main/resources/mapper/report/BoardReportMapper.xml @@ -89,4 +89,13 @@ ORDER BY BD.SORT + + diff --git a/aucma-report/src/main/resources/mapper/report/GeneralReportMapper.xml b/aucma-report/src/main/resources/mapper/report/GeneralReportMapper.xml index 8d47688..5d14826 100644 --- a/aucma-report/src/main/resources/mapper/report/GeneralReportMapper.xml +++ b/aucma-report/src/main/resources/mapper/report/GeneralReportMapper.xml @@ -74,6 +74,10 @@ SELECT * FROM VIEW_PERFUSION_RECORD +