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 9ea1c6d..9c47c8d 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 @@ -247,4 +247,27 @@ public class QualityReportController extends BaseController { List list = qualityReportService.adverseRecordYearOnYearList(hashMap); return success(list); } + + /** + * 高故障率TOP20报表 + * @param hashMap + * @return + */ + @GetMapping("/highFaultList") + public AjaxResult highFaultList(@RequestParam(required = false) Map hashMap) { + List list = qualityReportService.highFaultList(hashMap); + return success(list); + } + + /** + * 焊漏率报表 + * @param hashMap + * @return + */ + @GetMapping("/weldLeakRateList") + public AjaxResult weldLeakRateList(@RequestParam(required = false) Map hashMap) { + List list = qualityReportService.weldLeakRateList(hashMap); + return success(list); + } + } diff --git a/aucma-report/src/main/java/com/aucma/report/domain/HighFaultReport.java b/aucma-report/src/main/java/com/aucma/report/domain/HighFaultReport.java new file mode 100644 index 0000000..6c14eb0 --- /dev/null +++ b/aucma-report/src/main/java/com/aucma/report/domain/HighFaultReport.java @@ -0,0 +1,75 @@ +package com.aucma.report.domain; + +import com.aucma.common.annotation.Excel; +import com.aucma.common.core.domain.BaseEntity; +import com.fasterxml.jackson.annotation.JsonProperty; + +/** + * 高故障率TOP20报表 + * + * @author Yinq + * @date 2024-03-15 + */ +public class HighFaultReport extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** + * 工厂 + */ + @Excel(name = "工厂") + @JsonProperty("FACTORY_NAME") + private String FACTORY_NAME; + + /** + * 产线 + */ + @Excel(name = "产线") + @JsonProperty("PRODUCT_LINE_NAME") + private String PRODUCT_LINE_NAME; + + /** + * 产品型号 + */ + @Excel(name = "产品型号") + @JsonProperty("MATERIAL_MODEL") + private String MATERIAL_MODEL; + + /** + * 数量 + */ + @Excel(name = "数量") + @JsonProperty("Q_SUM") + private Long Q_SUM; + + public String getFACTORY_NAME() { + return FACTORY_NAME; + } + + public void setFACTORY_NAME(String FACTORY_NAME) { + this.FACTORY_NAME = FACTORY_NAME; + } + + public String getPRODUCT_LINE_NAME() { + return PRODUCT_LINE_NAME; + } + + public void setPRODUCT_LINE_NAME(String PRODUCT_LINE_NAME) { + this.PRODUCT_LINE_NAME = PRODUCT_LINE_NAME; + } + + public String getMATERIAL_MODEL() { + return MATERIAL_MODEL; + } + + public void setMATERIAL_MODEL(String MATERIAL_MODEL) { + this.MATERIAL_MODEL = MATERIAL_MODEL; + } + + public Long getQ_SUM() { + return Q_SUM; + } + + public void setQ_SUM(Long q_SUM) { + Q_SUM = q_SUM; + } +} diff --git a/aucma-report/src/main/java/com/aucma/report/domain/WeldLeakRateReport.java b/aucma-report/src/main/java/com/aucma/report/domain/WeldLeakRateReport.java new file mode 100644 index 0000000..2bc5258 --- /dev/null +++ b/aucma-report/src/main/java/com/aucma/report/domain/WeldLeakRateReport.java @@ -0,0 +1,89 @@ +package com.aucma.report.domain; + +import com.aucma.common.annotation.Excel; +import com.aucma.common.core.domain.BaseEntity; +import com.fasterxml.jackson.annotation.JsonProperty; + +/** + * 焊漏率报表 + * + * @author Yinq + * @date 2024-03-15 + */ +public class WeldLeakRateReport extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** + * 工厂 + */ + @Excel(name = "工厂") + @JsonProperty("FACTORY_NAME") + private String FACTORY_NAME; + + /** + * 产线 + */ + @Excel(name = "产线") + @JsonProperty("PRODUCT_LINE_NAME") + private String PRODUCT_LINE_NAME; + + /** + * 产品型号 + */ + @Excel(name = "产品型号") + @JsonProperty("MATERIAL_MODEL") + private String MATERIAL_MODEL; + + /** + * 检验数 + */ + @Excel(name = "检验数") + @JsonProperty("Q_SUM") + private Long Q_SUM; + + /** + * 焊漏数 + */ + @Excel(name = "焊漏数") + @JsonProperty("LEAK_SUM") + private Long LEAK_SUM; + + /** + * 焊漏率 + */ + @Excel(name = "焊漏率") + @JsonProperty("REPAIR_RATE") + private String REPAIR_RATE; + + public String getFACTORY_NAME() { + return FACTORY_NAME; + } + + public void setFACTORY_NAME(String FACTORY_NAME) { + this.FACTORY_NAME = FACTORY_NAME; + } + + public String getPRODUCT_LINE_NAME() { + return PRODUCT_LINE_NAME; + } + + public void setPRODUCT_LINE_NAME(String PRODUCT_LINE_NAME) { + this.PRODUCT_LINE_NAME = PRODUCT_LINE_NAME; + } + + public String getMATERIAL_MODEL() { + return MATERIAL_MODEL; + } + + public void setMATERIAL_MODEL(String MATERIAL_MODEL) { + this.MATERIAL_MODEL = MATERIAL_MODEL; + } + + public Long getQ_SUM() { + return Q_SUM; + } + + public void setQ_SUM(Long q_SUM) { + Q_SUM = q_SUM; + } +} 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 ea366ea..d2239a7 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 @@ -157,4 +157,18 @@ public interface GeneralReportMapper { * @return */ List adverseRecordYearOnYearList(Map hashMap); + + /** + * 高故障率TOP20报表 + * @param hashMap + * @return + */ + List highFaultList(Map hashMap); + + /** + * 焊漏率报表 + * @param hashMap + * @return + */ + List weldLeakRateList(Map hashMap); } diff --git a/aucma-report/src/main/java/com/aucma/report/service/IQualityReportService.java b/aucma-report/src/main/java/com/aucma/report/service/IQualityReportService.java index f0b761a..bc15334 100644 --- a/aucma-report/src/main/java/com/aucma/report/service/IQualityReportService.java +++ b/aucma-report/src/main/java/com/aucma/report/service/IQualityReportService.java @@ -99,4 +99,18 @@ public interface IQualityReportService * @return */ List adverseRecordYearOnYearList(Map hashMap); + + /** + * 高故障率TOP20报表 + * @param hashMap + * @return + */ + List highFaultList(Map hashMap); + + /** + * 焊漏率报表 + * @param hashMap + * @return + */ + List weldLeakRateList(Map hashMap); } diff --git a/aucma-report/src/main/java/com/aucma/report/service/impl/QualityReportServiceImpl.java b/aucma-report/src/main/java/com/aucma/report/service/impl/QualityReportServiceImpl.java index 712d9ed..98cbc09 100644 --- a/aucma-report/src/main/java/com/aucma/report/service/impl/QualityReportServiceImpl.java +++ b/aucma-report/src/main/java/com/aucma/report/service/impl/QualityReportServiceImpl.java @@ -186,4 +186,24 @@ public class QualityReportServiceImpl implements IQualityReportService { return reportMapper.adverseRecordYearOnYearList(hashMap); } + /** + * 高故障率TOP20报表 + * @param hashMap + * @return + */ + @Override + public List highFaultList(Map hashMap) { + return reportMapper.highFaultList(hashMap); + } + + /** + * 焊漏率报表 + * @param hashMap + * @return + */ + @Override + public List weldLeakRateList(Map hashMap) { + return reportMapper.weldLeakRateList(hashMap); + } + } diff --git a/aucma-report/src/main/resources/mapper/report/GeneralReportMapper.xml b/aucma-report/src/main/resources/mapper/report/GeneralReportMapper.xml index ed933a9..b33631e 100644 --- a/aucma-report/src/main/resources/mapper/report/GeneralReportMapper.xml +++ b/aucma-report/src/main/resources/mapper/report/GeneralReportMapper.xml @@ -4,7 +4,6 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + + + +