Merge remote-tracking branch 'origin/master'

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

@@ -96,6 +96,15 @@ public class QcCheckTaskDetail extends BaseEntity {
     private String typeProjectId;
     private String defectCode;
 	private String checkType;
+	private String standardNo;
+
+	public String getStandardNo() {
+		return standardNo;
+	}
+
+	public void setStandardNo(String standardNo) {
+		this.standardNo = standardNo;
+	}
 
 	public String getCheckType() {
 		return checkType;

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

@@ -138,9 +138,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			   qctp.upper_diff upperDiff,
 			   qctp.down_diff downDiff,
 			   qctp.sample,
-			   qctp.sample_num sampleNum
+			   qctp.sample_num sampleNum,
+			   qpt.standard_no standardNo
 		from qc_check_task_detail td
 		left join qc_check_type_project qctp on td.type_project_id = qctp.id
+		left join qc_check_project qcp on qcp.id = qctp.project_id
+		left join qc_project_type qpt on qpt.project_type_code = qcp.project_type
         where td.belong_to = #{recordId}
 	</select>
     <select id="getTopInfo" resultType="com.op.quality.domain.QcCheckTaskProduce">