来料检验优化

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;
 					})

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<BaseFile> 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)

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
 	</select>
     <select id="getUnqualifiedList" resultType="com.op.quality.domain.QcCheckUnqualified">
 		select qcu.id,qcu.task_id taskId,qcu.status,qcu.next_node_code nextNodeCode,qcu.next_node_name nextNodeName,qcu.remark,