结果报送，复检修改

zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskDataMapper.xml

@@ -13,6 +13,7 @@
         SELECT
             tbatd.CFG_ASY_MTHD_ID AS configAssayMethodId,
             tcam.NAME AS configAssayMethodName,
+            tcam.DIC_BSN_KY AS configAssayMethodDictionaryBusinessKey,
             tcam.MTHD_NAME_CTGR AS configAssayMethodNameAndCategory,
             COUNT(tbatd.ID) AS sampleTaskCount
         FROM
@@ -47,7 +48,9 @@
         GROUP BY
             tbatd.CFG_ASY_MTHD_ID,
             tcam.NAME,
+            tcam.DIC_BSN_KY,
             tcam.MTHD_NAME_CTGR
+        ORDER BY tcam.DIC_BSN_KY ASC
      </select>
 
      <select id="selectUnAuditTaskGroupList" resultType="com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayTaskDataGroupRespVO">
@@ -55,6 +58,7 @@
             t.CFG_ASY_MTHD_ID AS configAssayMethodId,
             t.ASY_TP AS assayType,
             tcam.NAME AS configAssayMethodName,
+            tcam.DIC_BSN_KY AS configAssayMethodDictionaryBusinessKey,
             tcam.MTHD_NAME_CTGR AS configAssayMethodNameAndCategory,
             count(CASE WHEN t.RPOD_STS = 'initial' THEN 1 END) AS asmt_initial_count,
             count(CASE WHEN t.RPOD_STS = 'pending_report' THEN 1 END) AS asmt_pending_report_count,
@@ -116,7 +120,9 @@
             t.CFG_ASY_MTHD_ID,
             t.ASY_TP,
             tcam.NAME,
+            tcam.DIC_BSN_KY,
             tcam.MTHD_NAME_CTGR
+        ORDER BY tcam.DIC_BSN_KY ASC
      </select>
      
      <select id="selectUnAssignTaskedSubSample" resultType="com.zt.plat.module.qms.business.bus.controller.vo.UnAssignTaskedSubSampleRespVO">

zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSubParentSampleAssessmentProjectMapper.xml

@@ -13,6 +13,7 @@
         SELECT
                 t.CFG_ASY_MTHD_ID AS configAssayMethodId,
                 t.NAME AS configAssayMethodName,
+                t.DIC_BSN_KY AS configAssayMethodDictionaryBusinessKey,
                 t.MTHD_NAME_CTGR AS configAssayMethodNameAndCategory,
                 t.ASY_DEPT_ID AS assayDepartmentId,
                 t.ASY_DEPT_NAME AS assayDepartmentName,
@@ -24,6 +25,7 @@
                 tbssa.BSN_SB_PRN_SMP_ASMT_ID ,
                 tbssa.CFG_ASY_MTHD_ID,
                 tcam.NAME,
+                tcam.DIC_BSN_KY,
                 tcam.MTHD_NAME_CTGR,
                 tcam.ASY_DEPT_ID ,
                 tcam.ASY_DEPT_NAME
@@ -57,6 +59,7 @@
                 tbssa.BSN_SB_PRN_SMP_ASMT_ID ,
                 tbssa.CFG_ASY_MTHD_ID ,
                 tcam.NAME,
+                tcam.DIC_BSN_KY,
                 tcam.MTHD_NAME_CTGR,
                 tcam.ASY_DEPT_ID ,
                 tcam.ASY_DEPT_NAME
@@ -64,19 +67,23 @@
         GROUP BY
                 t.CFG_ASY_MTHD_ID,
                 t.NAME,
+                t.DIC_BSN_KY,
                 t.MTHD_NAME_CTGR,
                 t.ASY_DEPT_ID,
                 t.ASY_DEPT_NAME
+        ORDER BY t.DIC_BSN_KY ASC
     </select>
     
     <select id="selectNoReportSubParentSampleAssessment" resultType="com.zt.plat.module.qms.business.bus.controller.vo.NoReportSubParentSampleAssessmentRespVO" >                
         SELECT
+            t.ID AS businessSubParentSampleAssessmentId,
             tcssp.BSE_SMP_ID AS baseSampleId,
             tbsps.BSN_BSE_SMP_ID AS businessBaseSampleId,
             tbssa.BSN_SB_PRN_SMP_ID AS businessSubParentSampleId,
             tbssa.CFG_ASY_MTHD_ID AS configAssayMethodId ,
             tbssa.TSK_TP AS taskType,
             tbssa.ASY_TP AS assayType,
+            tbssa.RTST_CNT AS retestCount,
             tbsps.CFG_SB_SMP_PRN_ID AS configSubSampleParentId,
             tbsps.SMP_NAME AS sampleName,
             tbs.NAME AS baseSampleName,
@@ -96,21 +103,21 @@
             AND tcam.ASY_DEPT_ID = tbssag.ASY_DEPT_ID
         LEFT JOIN (
             SELECT
+                tbspsa.ID,
                 tbspsa.BSN_SB_PRN_SMP_ID ,
                 tbspsa.CFG_ASY_MTHD_ID ,
-                tbspsa.IS_RPOD
+                tbspsa.IS_RPOD, 
+                tbspsa.RTST_CNT
             FROM
                 T_BSN_SB_PRN_SMP_ASMT tbspsa
             WHERE
                 tbspsa.IS_RPOD = 0
                 AND tbspsa.DELETED = 0
                 AND tbspsa.CFG_ASY_MTHD_ID = #{reqVO.configAssayMethodId}
-            GROUP BY
-                tbspsa.BSN_SB_PRN_SMP_ID ,
-                tbspsa.CFG_ASY_MTHD_ID ,
-                tbspsa.IS_RPOD
         ) t ON
-            tbssa.BSN_SB_PRN_SMP_ID = t.BSN_SB_PRN_SMP_ID
+            tbssa.BSN_SB_PRN_SMP_ID = t.BSN_SB_PRN_SMP_ID 
+            AND tbssa.CFG_ASY_MTHD_ID = t.CFG_ASY_MTHD_ID 
+            AND tbssa.RTST_CNT = t.RTST_CNT
         WHERE
             tbssa.IS_RPOD = 1
             AND t.IS_RPOD = 0
@@ -119,12 +126,14 @@
             AND tbssag.SMP_RCV_TM BETWEEN #{reqVO.sampleReceiveTime[0]} AND #{reqVO.sampleReceiveTime[1]}
           </if>
         GROUP BY
+            t.ID,
             tcssp.BSE_SMP_ID ,
             tbsps.BSN_BSE_SMP_ID ,
             tbssa.BSN_SB_PRN_SMP_ID,
             tbssa.CFG_ASY_MTHD_ID,
             tbssa.TSK_TP ,
             tbssa.ASY_TP ,
+            tbssa.RTST_CNT,
             tbsps.CFG_SB_SMP_PRN_ID,
             tbsps.SMP_NAME ,
             tbs.NAME,

zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSubSampleParentRetestMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zt.plat.module.qms.business.bus.dal.mapper.BusinessSubSampleParentRecheckMapper">
+<mapper namespace="com.zt.plat.module.qms.business.bus.dal.mapper.BusinessSubSampleParentRetestMapper">
 
     <!--
         一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。