Merge remote-tracking branch 'origin/master'

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

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);//累计不合格数

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

op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml

@@ -322,12 +322,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</select>
 	<select id="getCkeckDefectList" resultType="com.op.quality.domain.QcCheckTaskDefect">
 		select
-			record_id recordId,
+			qctd.record_id recordId,
+			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,
+			defect_subclass defectSubclass
-			noOk_quality noOkQuality
+		from qc_defect_type qdt
-		from qc_check_task_defect
+				 left join qc_check_type qct on qdt.defect_type = qct.type_code
-		where del_flag = '0' and belong_to = #{belongTo}
+		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(