diff --git a/src/main/java/com/xujie/sys/modules/pms/data/QcFAIRecordData.java b/src/main/java/com/xujie/sys/modules/pms/data/QcFAIRecordData.java index 1cb8106f..b468946e 100644 --- a/src/main/java/com/xujie/sys/modules/pms/data/QcFAIRecordData.java +++ b/src/main/java/com/xujie/sys/modules/pms/data/QcFAIRecordData.java @@ -237,6 +237,26 @@ public class QcFAIRecordData extends QueryPage { private String flag; + private String submissionRemark; + + private String submissionType; + + public String getSubmissionRemark() { + return submissionRemark; + } + + public void setSubmissionRemark(String submissionRemark) { + this.submissionRemark = submissionRemark; + } + + public String getSubmissionType() { + return submissionType; + } + + public void setSubmissionType(String submissionType) { + this.submissionType = submissionType; + } + public String getFlag() { return flag; } diff --git a/src/main/resources/mapper/pms/QcMapper.xml b/src/main/resources/mapper/pms/QcMapper.xml index e29e26aa..49355694 100644 --- a/src/main/resources/mapper/pms/QcMapper.xml +++ b/src/main/resources/mapper/pms/QcMapper.xml @@ -2303,7 +2303,9 @@ isnull(dbo.joint_id(site, bu_no, inspection_no, 'coordination'), '') as operator, isnull(dbo.joint_name(site, bu_no, inspection_no, 'coordination'), '') as operatorName, isnull(dbo.joint_id(site, bu_no, inspection_no, 'responsible'), '') as responsiblePerson, - isnull(dbo.joint_name2(site, bu_no, inspection_no, 'responsible'), '') as responsiblePersonName + isnull(dbo.joint_name2(site, bu_no, inspection_no, 'responsible'), '') as responsiblePersonName, + submission_remark, + submission_type FROM qc_iqc_record site in (select site from eam_access_site where username = #{query.userName}) @@ -2365,6 +2367,9 @@ AND dbo.qc_get_order_type(site, po_orderNo, po_itemNo) = #{query.orderType} + + AND submission_type = #{query.submissionType} + ORDER BY CASE WHEN state = '待检验' THEN 1