From d6d6d33110308373619bbd37d39d8d96e8eb7f02 Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Thu, 28 Dec 2023 10:32:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E6=89=8B=E6=8C=81=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/QcCheckTaskIncomeMapper.java       |  2 ++
 .../impl/QcCheckTaskIncomeServiceImpl.java    |  1 +
 .../service/impl/QcProCheckServiceImpl.java   |  4 ++++
 .../quality/QcCheckTaskIncomeMapper.xml       | 19 +++++++++++++------
 4 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskIncomeMapper.java b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskIncomeMapper.java
index aadd15b1..85071716 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskIncomeMapper.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskIncomeMapper.java
@@ -94,4 +94,6 @@ public interface QcCheckTaskIncomeMapper {
     int addQcCheckTaskDefects(@Param("list") List<QcCheckTaskDefect> defects);
 
 	List<QcCheckTaskDefect> getCkeckDefectList(QcCheckTaskDetail qcCheckTaskDetail);
+
+	List<QcCheckTaskDefect> getDefectType(QcCheckTaskDetail qcCheckTaskDetail);
 }
diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java
index 10f2870c..248906d9 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java
@@ -484,6 +484,7 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService {
 			defect.setCreateTime(nowTime);
 			defect.setCreateBy(updateBy);
 			defect.setFactoryCode(factoryCode);
+			defect.setBelongTo(belongId);
 			noOkQquality = noOkQquality.add(defect.getNoOkQuality());
 		}
 		qcCheckTask.setNoOkQuality(noOkQquality);//累计不合格数
diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcProCheckServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcProCheckServiceImpl.java
index b9a2a1c6..daee7bf0 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcProCheckServiceImpl.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcProCheckServiceImpl.java
@@ -1,5 +1,6 @@
 package com.op.quality.service.impl;
 
+import com.alibaba.nacos.common.utils.CollectionUtils;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
 import com.op.common.core.domain.BaseFileData;
@@ -126,6 +127,9 @@ public class QcProCheckServiceImpl implements QcProCheckService {
         List<QcCheckTaskDetail> qcCheckTaskDetails =qcCheckTaskIncomeMapper.getCkeckProjectList(qcCheckTaskDetail);
         dto.setQcCheckTaskDetails(qcCheckTaskDetails);
         List<QcCheckTaskDefect> defects =qcCheckTaskIncomeMapper.getCkeckDefectList(qcCheckTaskDetail);
+        if(CollectionUtils.isEmpty(defects)){
+            defects =qcCheckTaskIncomeMapper.getDefectType(qcCheckTaskDetail);
+        }
         dto.setDefects(defects);
         return dto;
     }
diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml
index 4548caef..8cb572ac 100644
--- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml
+++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml
@@ -323,14 +323,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<select id="getCkeckDefectList" resultType="com.op.quality.domain.QcCheckTaskDefect">
 		select
 			qctd.record_id recordId,
-			qdt.defect_code defectCode,
-			qdt.defect_subclass defectSubclass,
+			qctd.defect_code defectCode,
+			qctd.defect_subclass defectSubclass,
 			qctd.noOk_quality noOkQuality
+		from qc_check_task_defect qctd
+		where qctd.del_flag = '0' and qctd.belong_to = #{belongTo}
+		order by qctd.defect_code
+	</select>
+	<select id="getDefectType" resultType="com.op.quality.domain.QcCheckTaskDefect">
+		select
+			defect_code defectCode,
+			defect_subclass defectSubclass
 		from qc_defect_type qdt
-	    left join qc_check_task_defect qctd on qdt.defect_code = qctd.defect_code
-	                                               and qctd.del_flag = '0'
-	                                               and qctd.belong_to = #{belongTo}
-		where qdt.defect_type = #{checkType}
+				 left join qc_check_type qct on qdt.defect_type = qct.type_code
+		where qct.order_code = #{checkType} and qdt.del_flag = '0'
+		order by qdt.defect_code
 	</select>
 	<insert id="addCheckUsers">
 		insert into qc_check_task_user(