diff --git a/aucma-api/src/main/java/com/aucma/api/controller/ElectricalInspectionController.java b/aucma-api/src/main/java/com/aucma/api/controller/ElectricalInspectionController.java index 0205eed..529ccf7 100644 --- a/aucma-api/src/main/java/com/aucma/api/controller/ElectricalInspectionController.java +++ b/aucma-api/src/main/java/com/aucma/api/controller/ElectricalInspectionController.java @@ -1,9 +1,6 @@ package com.aucma.api.controller; -import com.aucma.api.domain.dto.SAPPortDto; -import com.aucma.api.domain.dto.WERKSDto; -import com.aucma.base.domain.BaseMaterialInfo; -import com.aucma.common.core.domain.AjaxResult; + import com.aucma.report.service.IRecordElectricalInspectionService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; @@ -12,7 +9,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import java.util.HashMap; -import java.util.List; + import java.util.Map; /** @@ -38,6 +35,16 @@ public class ElectricalInspectionController { return electricalInspectionService.analysisElectricalInspectionData(paramMap); } + /** + * 解析电检数据接口NEW + * @param paramMap + * @return + */ + @PostMapping("/Electricalinspection") + public HashMap electricalInspection(@RequestBody Map paramMap) { + return electricalInspectionService.analysisElectricalInspectionData(paramMap); + } + } diff --git a/aucma-report/src/main/java/com/aucma/report/controller/QualityReportController.java b/aucma-report/src/main/java/com/aucma/report/controller/QualityReportController.java index a977174..89ea37b 100644 --- a/aucma-report/src/main/java/com/aucma/report/controller/QualityReportController.java +++ b/aucma-report/src/main/java/com/aucma/report/controller/QualityReportController.java @@ -45,6 +45,8 @@ public class QualityReportController extends BaseController { */ @PostMapping("/qualityDefectsStatisticalAnalysisList/export" ) public void qualityDefectsStatisticalAnalysisListExport(HttpServletResponse response, @RequestParam(required = false) Map hashMap) { + hashMap.put("pageNum",null); + hashMap.put("pageSize",null); List list = qualityReportService.qualityDefectsStatisticalAnalysisList(hashMap); ExcelUtil util = new ExcelUtil<>(QualityDefectsStatisticalAnalysis. class); util.exportExcel(response, list, "质量缺陷统计分析" ); @@ -68,6 +70,8 @@ public class QualityReportController extends BaseController { */ @PostMapping("/qualityDefectsDetailList/export" ) public void qualityDefectsDetailListExport(HttpServletResponse response, @RequestParam(required = false) Map hashMap) { + hashMap.put("pageNum",null); + hashMap.put("pageSize",null); List list = qualityReportService.qualityDefectsDetailListExport(hashMap); ExcelUtil util = new ExcelUtil<>(QualityDefectsDetail. class); util.exportExcel(response, list, "质量缺陷统计分析明细" ); @@ -91,6 +95,8 @@ public class QualityReportController extends BaseController { */ @PostMapping("/fewerMistakesReportList/export" ) public void fewerMistakesReportListExport(HttpServletResponse response, @RequestParam(required = false) Map hashMap) { + hashMap.put("pageNum",null); + hashMap.put("pageSize",null); List list = qualityReportService.fewerMistakesReportList(hashMap); ExcelUtil util = new ExcelUtil<>(FewerMistakesReport. class); util.exportExcel(response, list, "少错件报表" ); @@ -115,6 +121,8 @@ public class QualityReportController extends BaseController { */ @PostMapping("/qualityIssuesReportList/export" ) public void qualityIssuesReportListExport(HttpServletResponse response, @RequestParam(required = false) Map hashMap) { + hashMap.put("pageNum",null); + hashMap.put("pageSize",null); List list = qualityReportService.qualityIssuesReportList(hashMap); ExcelUtil util = new ExcelUtil<>(QualityIssuesReport. class); util.exportExcel(response, list, "质量问题前80报表" ); @@ -139,6 +147,8 @@ public class QualityReportController extends BaseController { */ @PostMapping("/productTraceabilityReportList/export" ) public void productTraceabilityReportListExport(HttpServletResponse response, @RequestParam(required = false) Map hashMap) { + hashMap.put("pageNum",null); + hashMap.put("pageSize",null); List list = qualityReportService.productTraceabilityReportList(hashMap); ExcelUtil util = new ExcelUtil<>(ProductTraceabilityReport. class); util.exportExcel(response, list, "产品追溯报表" ); @@ -195,6 +205,8 @@ public class QualityReportController extends BaseController { */ @PostMapping("/repairRateReportList/export" ) public void repairRateReportListExport(HttpServletResponse response, @RequestParam(required = false) Map hashMap) { + hashMap.put("pageNum",null); + hashMap.put("pageSize",null); List list = qualityReportService.repairRateReportList(hashMap); ExcelUtil util = new ExcelUtil<>(RepairRateReport. class); util.exportExcel(response, list, "质量返修率报表" ); @@ -218,6 +230,8 @@ public class QualityReportController extends BaseController { */ @PostMapping("/downgradeProportionReportList/export" ) public void downgradeProportionReportListExport(HttpServletResponse response, @RequestParam(required = false) Map hashMap) { + hashMap.put("pageNum",null); + hashMap.put("pageSize",null); List list = qualityReportService.downgradeProportionReportList(hashMap); ExcelUtil util = new ExcelUtil<>(DowngradeProportionReport. class); util.exportExcel(response, list, "降级率报表" );