From a084efdcdd3bb134a32b68f99e7036786fef81f7 Mon Sep 17 00:00:00 2001
From: FCL <fantoutou@163.com>
Date: Fri, 31 Oct 2025 17:15:21 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=8A=A5=E5=91=8A=E7=BC=96=E5=88=B6?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=BF=87=E6=BB=A4=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bus/controller/vo/BusinessAssayReportDataPageReqVO.java | 3 +++
 .../bus/dal/mapper/BusinessAssayReportDataMapper.xml        | 6 +++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

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<Long> 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}
+                    <if test="param.reportDocumentTypeId != null and param.reportDocumentTypeId != ''">
+                        and m.RPT_DOC_TP = #{param.reportDocumentTypeId}
+                    </if>
                     and m.FLW_STS in ('not_start','in_progress','completed','rejected')
+                    and rd.DELETED = 0
+                    and m.DELETED = 0
                 );
             </if>
             <if test="param.businessSampleEntrustRegistrationIdList != null and param.businessSampleEntrustRegistrationIdList.size > 0">