质量问题修改8

op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckUnqualified.java

@@ -88,6 +88,24 @@ public class QcCheckUnqualified extends BaseEntity {
 	private String checkResult;
 	private String requestid;
 	private String typeCode;
+	private String sampleQuality;
+	private String noOkQuality;
+
+	public String getSampleQuality() {
+		return sampleQuality;
+	}
+
+	public void setSampleQuality(String sampleQuality) {
+		this.sampleQuality = sampleQuality;
+	}
+
+	public String getNoOkQuality() {
+		return noOkQuality;
+	}
+
+	public void setNoOkQuality(String noOkQuality) {
+		this.noOkQuality = noOkQuality;
+	}
 
 	public String getTypeCode() {
 		return typeCode;

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

@@ -36,6 +36,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="sampleQuality" column="sample_quality" />
 		<result property="checkName" column="check_name" />
 		<result property="checkType" column="check_type"/>
+		<result property="noOkQuality" column="noOk_quality"/>
+
 	</resultMap>
 
 	<resultMap type="QcCheckReportIncome" id="QcCheckReportIncomeResult">
@@ -90,7 +92,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			qct.check_man_code, qct.check_man_name,qct.check_time, qct.check_result, qct.status,
 			qct.create_by,qct.create_time, qct.update_by, qct.update_time,
 		    qct.check_type,qct.sample_quality,qct.noOk_quality,
-		    qct.aNoOkquality,qct.bNoOkquality,qct.cNoOkquality,
 			q.type_code,q.check_name
 		from qc_check_task qct
 		left join qc_check_type q on q.id = qct.check_type

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

@@ -34,7 +34,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		       qcu.create_time createTime,
 		       qct.check_type checkType,qtn.check_name checkName,qct.check_no checkNo,qct.income_batch_no incomeBatchNo,qct.order_no orderNo,
 				qct.material_code materialCode,qct.material_name materialName,qct.quality,qct.unit,qct.supplier_code supplierCode,
-				qct.supplier_name supplierName,qct.income_time incomeTime,qct.check_loc checkLoc,qct.check_status checkStatus,qct.check_man_code checkManCode,
+				qct.supplier_name supplierName,qct.income_time incomeTime,qct.check_loc checkLoc,qct.check_status checkStatus,
+		       qct.check_man_code checkManCode,qct.sample_quality sampleQuality,qct.noOk_quality noOkQuality,
 				qct.check_man_name checkManName,qct.check_time checkTime,qct.check_result checkResult
 		from qc_check_unqualified qcu
 		left join qc_check_task qct on qcu.task_id = qct.record_id