From ee47ccebee3cb1c550e4231d27ef1f4d5a1b683b Mon Sep 17 00:00:00 2001 From: yinq Date: Mon, 22 Apr 2024 17:56:25 +0800 Subject: [PATCH] =?UTF-8?q?change=20-=20add=E5=B9=B4=E5=BA=A6=E4=B8=8D?= =?UTF-8?q?=E8=89=AF=E7=8E=87=E5=90=8C=E6=AF=94=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/QualityReportController.java | 11 ++ .../domain/AdverseRecordYearOnYearReport.java | 137 ++++++++++++++++++ .../domain/DowngradeProportionReport.java | 10 +- .../report/mapper/GeneralReportMapper.java | 7 + .../report/service/IQualityReportService.java | 7 + .../impl/QualityReportServiceImpl.java | 13 ++ .../mapper/report/GeneralReportMapper.xml | 46 +++++- 7 files changed, 225 insertions(+), 6 deletions(-) create mode 100644 aucma-report/src/main/java/com/aucma/report/domain/AdverseRecordYearOnYearReport.java 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 89ea37b..9ea1c6d 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 @@ -236,4 +236,15 @@ public class QualityReportController extends BaseController { ExcelUtil util = new ExcelUtil<>(DowngradeProportionReport. class); util.exportExcel(response, list, "降级率报表" ); } + + /** + * 年度不良率同比报表 + * @param hashMap + * @return + */ + @GetMapping("/adverseRecordYearOnYearList") + public AjaxResult adverseRecordYearOnYearList(@RequestParam(required = false) Map hashMap) { + List list = qualityReportService.adverseRecordYearOnYearList(hashMap); + return success(list); + } } diff --git a/aucma-report/src/main/java/com/aucma/report/domain/AdverseRecordYearOnYearReport.java b/aucma-report/src/main/java/com/aucma/report/domain/AdverseRecordYearOnYearReport.java new file mode 100644 index 0000000..3f940f6 --- /dev/null +++ b/aucma-report/src/main/java/com/aucma/report/domain/AdverseRecordYearOnYearReport.java @@ -0,0 +1,137 @@ +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 AdverseRecordYearOnYearReport extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** + * 产线编号 + */ + @Excel(name = "产线编号") + @JsonProperty("PRODUCT_LINE_CODE") + private String PRODUCT_LINE_CODE; + + /** + * 产线名称 + */ + @Excel(name = "产线名称") + @JsonProperty("PRODUCT_LINE_NAME") + private String PRODUCT_LINE_NAME; + + /** + * 工序编号 + */ + @Excel(name = "工序编号") + @JsonProperty("PROCESS_CODE") + private String PROCESS_CODE; + + /** + * 工序名称 + */ + @Excel(name = "工序名称") + @JsonProperty("PROCESS_NAME") + private String PROCESS_NAME; + + /** + * 月份 + */ + @Excel(name = "月份") + @JsonProperty("INSPECTOR_MONTH") + private String INSPECTOR_MONTH; + + /** + * 异常数 + */ + @Excel(name = "异常数") + @JsonProperty("QUALITY_SUM") + private Long QUALITY_SUM; + + /** + * 产量 + */ + @Excel(name = "产量") + @JsonProperty("OFF_LINE_NUM") + private Long OFF_LINE_NUM; + + /** + * 异常率 + */ + @Excel(name = "异常率") + @JsonProperty("REPAIR_RATE") + private String REPAIR_RATE; + + + public String getPRODUCT_LINE_CODE() { + return PRODUCT_LINE_CODE; + } + + public void setPRODUCT_LINE_CODE(String PRODUCT_LINE_CODE) { + this.PRODUCT_LINE_CODE = PRODUCT_LINE_CODE; + } + + 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 getPROCESS_CODE() { + return PROCESS_CODE; + } + + public void setPROCESS_CODE(String PROCESS_CODE) { + this.PROCESS_CODE = PROCESS_CODE; + } + + public String getPROCESS_NAME() { + return PROCESS_NAME; + } + + public void setPROCESS_NAME(String PROCESS_NAME) { + this.PROCESS_NAME = PROCESS_NAME; + } + + public String getINSPECTOR_MONTH() { + return INSPECTOR_MONTH; + } + + public void setINSPECTOR_MONTH(String INSPECTOR_MONTH) { + this.INSPECTOR_MONTH = INSPECTOR_MONTH; + } + + public Long getQUALITY_SUM() { + return QUALITY_SUM; + } + + public void setQUALITY_SUM(Long QUALITY_SUM) { + this.QUALITY_SUM = QUALITY_SUM; + } + + public Long getOFF_LINE_NUM() { + return OFF_LINE_NUM; + } + + public void setOFF_LINE_NUM(Long OFF_LINE_NUM) { + this.OFF_LINE_NUM = OFF_LINE_NUM; + } + + public String getREPAIR_RATE() { + return REPAIR_RATE; + } + + public void setREPAIR_RATE(String REPAIR_RATE) { + this.REPAIR_RATE = REPAIR_RATE; + } + +} diff --git a/aucma-report/src/main/java/com/aucma/report/domain/DowngradeProportionReport.java b/aucma-report/src/main/java/com/aucma/report/domain/DowngradeProportionReport.java index 1622213..284f1e3 100644 --- a/aucma-report/src/main/java/com/aucma/report/domain/DowngradeProportionReport.java +++ b/aucma-report/src/main/java/com/aucma/report/domain/DowngradeProportionReport.java @@ -5,7 +5,7 @@ import com.aucma.common.core.domain.BaseEntity; import com.fasterxml.jackson.annotation.JsonProperty; /** - * 降级品占比报表 + * 降级/报废品占比报表 * * @author Yinq * @date 2024-03-15 @@ -21,9 +21,9 @@ public class DowngradeProportionReport extends BaseEntity { private String INSPECTOR_TIME; /** - * 样品机数 + * 异常数 */ - @Excel(name = "样品机数") + @Excel(name = "异常数") @JsonProperty("QUALITY_SUM") private Long QUALITY_SUM; @@ -35,9 +35,9 @@ public class DowngradeProportionReport extends BaseEntity { private Long OFF_LINE_NUM; /** - * 降级率 + * 异常率 */ - @Excel(name = "降级率") + @Excel(name = "异常率") @JsonProperty("REPAIR_RATE") private String REPAIR_RATE; 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 ee019d4..ea366ea 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 @@ -150,4 +150,11 @@ public interface GeneralReportMapper { * @return */ List downgradeProportionReportList(Map hashMap); + + /** + * 年度不良率同比报表 + * @param hashMap + * @return + */ + List adverseRecordYearOnYearList(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 fc28079..f0b761a 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 @@ -92,4 +92,11 @@ public interface IQualityReportService * @return */ List downgradeProportionReportList(Map hashMap); + + /** + * 年度不良率同比报表 + * @param hashMap + * @return + */ + List adverseRecordYearOnYearList(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 03dc8f4..712d9ed 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 @@ -173,4 +173,17 @@ public class QualityReportServiceImpl implements IQualityReportService { return reportMapper.downgradeProportionReportList(hashMap); } + /** + * 年度不良率同比报表 + * @param hashMap + * @return + */ + @Override + public List adverseRecordYearOnYearList(Map hashMap) { + if (!hashMap.containsKey("year")){ + return null; + } + return reportMapper.adverseRecordYearOnYearList(hashMap); + } + } diff --git a/aucma-report/src/main/resources/mapper/report/GeneralReportMapper.xml b/aucma-report/src/main/resources/mapper/report/GeneralReportMapper.xml index 7166e5a..ed933a9 100644 --- a/aucma-report/src/main/resources/mapper/report/GeneralReportMapper.xml +++ b/aucma-report/src/main/resources/mapper/report/GeneralReportMapper.xml @@ -711,7 +711,13 @@ LEFT JOIN (SELECT INSPECTOR_TIME, NVL(COUNT(*), 0) QUALITY_SUM FROM (SELECT TO_CHAR(RQI.INSPECTOR_TIME, 'YYYY-MM-DD') INSPECTOR_TIME, RQI.BAR_CODE FROM REPORT_QUALITY_INSPECTION RQI - WHERE RQI.PROCESS_RESULT = 'KA' + + + WHERE RQI.PROCESS_RESULT = 'KA' + + + WHERE RQI.PROCESS_RESULT = '报废重做' + GROUP BY TO_CHAR(RQI.INSPECTOR_TIME, 'YYYY-MM-DD'), RQI.BAR_CODE) GROUP BY INSPECTOR_TIME) RQI ON VPO.PRODUCT_SCANTIME = RQI.INSPECTOR_TIME CROSS JOIN (SELECT TO_CHAR(CUSTOM_DATA) || '%' TARGET @@ -721,5 +727,43 @@ GROUP BY SUBSTR(VPO.PRODUCT_SCANTIME, 1, DT.TIMESUB), TARGET ORDER BY INSPECTOR_TIME +