diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayReportDataPageReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayReportDataPageReqVO.java index 3a0775e..a80f63f 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayReportDataPageReqVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayReportDataPageReqVO.java @@ -70,4 +70,7 @@ public class BusinessAssayReportDataPageReqVO extends PageParam { @Schema(description = "委托id列表") private List businessSampleEntrustRegistrationIdList; + + @Schema(description = "报告类型ID", example = "2124") + private Long reportDocumentTypeId; } \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayReportDataMapper.xml b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayReportDataMapper.xml index 244a778..c29e66c 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayReportDataMapper.xml +++ b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayReportDataMapper.xml @@ -49,8 +49,12 @@ FROM T_RPT_DOC_DAT rd LEFT JOIN T_RPT_DOC_MAIN m on rd.MAIN_ID = m.ID WHERE rd.SRC_ID = d.id - and m.RPT_DOC_TP = #{param.configReportTypeId} + + and m.RPT_DOC_TP = #{param.reportDocumentTypeId} + and m.FLW_STS in ('not_start','in_progress','completed','rejected') + and rd.DELETED = 0 + and m.DELETED = 0 );