diff --git a/src/main/java/com/gaotao/modules/pms/data/QcFAIRecordData.java b/src/main/java/com/gaotao/modules/pms/data/QcFAIRecordData.java index 28aaac2..5165d1d 100644 --- a/src/main/java/com/gaotao/modules/pms/data/QcFAIRecordData.java +++ b/src/main/java/com/gaotao/modules/pms/data/QcFAIRecordData.java @@ -53,6 +53,8 @@ public class QcFAIRecordData extends QueryPage { private Date endDate; // 检验类型编码 private String inspectionTypeNo; + // 检验类型编码列表(用于多类型过滤) + private List inspectionTypeNos; // 检验类型名称 private String inspectionTypeName; // 工单号 diff --git a/src/main/resources/mapper/pms/QcMapper.xml b/src/main/resources/mapper/pms/QcMapper.xml index b2d65a7..eba3a89 100644 --- a/src/main/resources/mapper/pms/QcMapper.xml +++ b/src/main/resources/mapper/pms/QcMapper.xml @@ -600,6 +600,12 @@ AND a.inspection_type_no = #{query.inspectionTypeNo} + + AND a.inspection_type_no in + + #{item} + + AND a.inspection_result = #{query.inspectionResult}