From 4c129dee4e5f31f78c23b24c0310c0850009d4d2 Mon Sep 17 00:00:00 2001
From: wxr <wxr@wangxingrong.com>
Date: Fri, 28 Nov 2025 11:22:41 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=93=E6=9E=9C=E5=88=A4=E5=AE=9A=E5=88=86?=
 =?UTF-8?q?=E6=9E=90=E6=96=B9=E6=B3=95=E4=B8=BA0=E8=BF=98=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=EF=BC=8C=E5=A4=84=E7=90=86=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/BusinessAssayTaskDataMapper.xml    |  1 +
 ...SubParentSampleAssessmentProjectMapper.xml | 63 ++++++++++++-------
 2 files changed, 42 insertions(+), 22 deletions(-)

diff --git a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskDataMapper.xml b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskDataMapper.xml
index 9ca148d..7f0c5e0 100644
--- a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskDataMapper.xml
+++ b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskDataMapper.xml
@@ -88,6 +88,7 @@
         LEFT JOIN T_CFG_ASY_MTHD tcam ON
             t.CFG_ASY_MTHD_ID = tcam.ID
             AND t.TENANT_ID = tcam.TENANT_ID
+        WHERE t.RPOD_STS in ('pending_report', 'pending_assessment', 're_inspected')
         GROUP BY
             t.CFG_ASY_MTHD_ID,
             t.ASY_TP,
diff --git a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSubParentSampleAssessmentProjectMapper.xml b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSubParentSampleAssessmentProjectMapper.xml
index 354ddc4..8ed7baa 100644
--- a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSubParentSampleAssessmentProjectMapper.xml
+++ b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSubParentSampleAssessmentProjectMapper.xml
@@ -11,30 +11,49 @@
 
     <select id="selectUnReportMethodGroupList" resultType="com.zt.plat.module.qms.business.bus.controller.vo.BusinessSubParentSampleAssessmentGroupRespVO" >
         SELECT
-            tbspsa.CFG_ASY_MTHD_ID AS configAssayMethodId,
-            tcam.NAME AS configAssayMethodName,
-            tcam.ASY_DEPT_ID AS assayDepartmentId,
-            tcam.ASY_DEPT_NAME AS assayDepartmentName,
-            COUNT(DISTINCT tbspsa.BSN_SB_PRN_SMP_ID) AS sampleCount
+                t.CFG_ASY_MTHD_ID AS configAssayMethodId,
+                t.NAME AS configAssayMethodName,
+                t.ASY_DEPT_ID AS assayDepartmentId,
+                t.ASY_DEPT_NAME AS assayDepartmentName,
+                COUNT(DISTINCT t.BSN_SB_PRN_SMP_ASMT_ID) AS sampleCount
         FROM
-            T_BSN_SB_PRN_SMP_ASMT tbspsa
-        LEFT JOIN T_CFG_ASY_MTHD tcam ON
-            tbspsa.CFG_ASY_MTHD_ID = tcam.ID
-            AND tbspsa.TENANT_ID = tcam.TENANT_ID
-        WHERE
-            tbspsa.DELETED = 0
-            AND tbspsa.IS_RPOD = 0
-      <if test="reqVO.configAssayMethodName != null and reqVO.configAssayMethodName != ''">
-            AND tcam.NAME like  '%' || #{reqVO.assayDepartmentId} || '%'
-      </if>
-      <if test="reqVO.assayDepartmentId != null and reqVO.assayDepartmentId != ''">
-            AND tcam.ASY_DEPT_ID = #{reqVO.assayDepartmentId}
-      </if>
+            (
+            SELECT
+                tbspsa.TENANT_ID ,
+                tbssa.BSN_SB_PRN_SMP_ASMT_ID ,
+                tbssa.CFG_ASY_MTHD_ID,
+                tcam.NAME,
+                tcam.ASY_DEPT_ID ,
+                tcam.ASY_DEPT_NAME
+            FROM
+                T_BSN_SB_SMP_ASMT tbssa
+            LEFT JOIN T_BSN_SB_PRN_SMP_ASMT tbspsa ON
+                tbssa.BSN_SB_PRN_SMP_ASMT_ID = tbspsa.ID
+            LEFT JOIN T_CFG_ASY_MTHD tcam ON
+                tbssa.CFG_ASY_MTHD_ID = tcam.ID
+            WHERE
+                tbssa.DELETED = 0
+                AND tbssa.RPOD_STS = 'reported'
+                AND tbspsa.IS_RPOD = 0
+          <if test="reqVO.configAssayMethodName != null and reqVO.configAssayMethodName != ''">
+                AND tcam.NAME like  '%' || #{reqVO.assayDepartmentId} || '%'
+          </if>
+          <if test="reqVO.assayDepartmentId != null and reqVO.assayDepartmentId != ''">
+                AND tcam.ASY_DEPT_ID = #{reqVO.assayDepartmentId}
+          </if>
+            GROUP BY
+                tbspsa.TENANT_ID ,
+                tbssa.BSN_SB_PRN_SMP_ASMT_ID ,
+                tbssa.CFG_ASY_MTHD_ID ,
+                tcam.NAME,
+                tcam.ASY_DEPT_ID ,
+                tcam.ASY_DEPT_NAME
+            ) t
         GROUP BY
-            tbspsa.CFG_ASY_MTHD_ID,
-            tcam.NAME,
-            tcam.ASY_DEPT_ID ,
-            tcam.ASY_DEPT_NAME
+                t.CFG_ASY_MTHD_ID,
+                t.NAME,
+                t.ASY_DEPT_ID,
+                t.ASY_DEPT_NAME
     </select>
     
     <select id="selectNoReportSubParentSampleAssessment" resultType="com.zt.plat.module.qms.business.bus.controller.vo.NoReportSubParentSampleAssessmentRespVO" >