From 256c6eaac84009e0785a18d3a6eb1b2e78dc6824 Mon Sep 17 00:00:00 2001 From: shaoyong Date: Mon, 29 Jan 2024 17:57:55 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9D=A5=E6=96=99=E6=A3=80=E9=AA=8C=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../quality/controller/QcCheckTaskIncomeController.java | 5 +++++ .../java/com/op/quality/domain/QcCheckTaskDetail.java | 9 +++++++++ .../mapper/quality/QcCheckUnqualifiedMapper.xml | 1 + 3 files changed, 15 insertions(+) diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskIncomeController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskIncomeController.java index 8fd19107..bf4b5556 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskIncomeController.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskIncomeController.java @@ -290,8 +290,13 @@ public class QcCheckTaskIncomeController extends BaseController { .map(QcCheckTaskDetail::getDefectQuality) .reduce(BigDecimal::add) // 使用summingBigDecimal()方法来求和，该方法内部实际上使用reduce()来实现 .orElse(BigDecimal.ZERO); + String defectSubclass = detailsWithSameCode.stream() + .map(QcCheckTaskDetail::getDefectSubclass) + .findFirst() + .orElse(""); QcCheckTaskDefect taskDefect = new QcCheckTaskDefect(); taskDefect.setDefectCode(defectCode); + taskDefect.setDefectSubclass(defectSubclass); taskDefect.setNoOkQuality(sum); return taskDefect; }) diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskDetail.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskDetail.java index d66eace7..05aaffe5 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskDetail.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskDetail.java @@ -96,6 +96,7 @@ public class QcCheckTaskDetail extends BaseEntity { private String typeProjectId; private String defectCode; private BigDecimal defectQuality; + private String defectSubclass; private String checkType; private String fileListStr; private List files; @@ -369,6 +370,14 @@ public class QcCheckTaskDetail extends BaseEntity { this.defectQuality = defectQuality; } + public String getDefectSubclass() { + return defectSubclass; + } + + public void setDefectSubclass(String defectSubclass) { + this.defectSubclass = defectSubclass; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckUnqualifiedMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckUnqualifiedMapper.xml index c19a7dd3..4d6a4555 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckUnqualifiedMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckUnqualifiedMapper.xml @@ -75,6 +75,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" defect_subclass defectSubclass from qc_defect_type where defect_type = #{defectType} and del_flag='0' + order by create_time