方法变更修改

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

@@ -9,4 +9,45 @@
         文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
      -->
 
+    <select id="selectAssayMethodProjectByBusinessSubSampleIdListAndConfigAssayMethodId" resultType="com.zt.plat.module.qms.business.bus.controller.vo.AssayMethodProjectRespVO">
+        SELECT
+            tbapd.DIC_PRJ_ID dictionaryProjectId,
+            tdp.NAME AS dictionaryProjectName,
+            tdp.SMPL_NAME AS dictionaryProjectSimpleName,
+            tdp.SHW_NAME AS dictionaryProjectShowName,
+            tbatd.CFG_ASY_MTHD_ID AS configAssayMethodId,
+            tcam.NAME AS configAssayMethodName,
+            tcam.MTHD_NAME_CTGR AS configAssayMethodNameAndCategory,
+            tcamp.SRT_NO
+        FROM
+            T_BSN_ASY_PRJ_DAT tbapd
+        LEFT JOIN T_BSN_ASY_TSK_DAT tbatd ON
+            tbapd.BSN_ASY_TSK_DAT_ID = tbatd.ID
+        LEFT JOIN T_CFG_ASY_MTHD tcam ON
+            tbatd.CFG_ASY_MTHD_ID = tcam.ID
+        LEFT JOIN T_CFG_ASY_MTHD_PRJ tcamp ON
+            tbapd.CFG_ASY_MTHD_PRJ_ID = tcamp.ID
+        LEFT JOIN T_DIC_PRJ tdp ON
+            tbapd.DIC_PRJ_ID = tdp.ID
+        WHERE
+            tbapd.DELETED = 0
+            AND tbapd.IS_ENBD = 1
+            AND tbatd.DELETED = 0
+            AND tbatd.IS_ASN_TSKD = 0
+            AND tbatd.BSN_SB_SMP_ID IN 
+            <foreach collection="businessSubSampleIdList" index="index" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach> 
+            AND tbatd.CFG_ASY_MTHD_ID = #{configAssayMethodId}
+        GROUP BY 
+            tbapd.DIC_PRJ_ID,
+            tdp.NAME,
+            tdp.SMPL_NAME,
+            tdp.SHW_NAME,
+            tbatd.CFG_ASY_MTHD_ID,
+            tcam.NAME,
+            tcam.MTHD_NAME_CTGR,
+            tcamp.SRT_NO
+        ORDER BY tcamp.SRT_NO ASC        
+    </select>
 </mapper>

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

@@ -128,6 +128,8 @@
             tbss.SMP_FLW_NDE_TM AS sampleFlowNodeTime,
             tbatd.BSN_SB_SMP_ID AS businessSubSampleId,
             tbatd.CFG_ASY_MTHD_ID AS configAssayMethodId,
+            tcam.NAME AS configAssayMethodName,
+            tcam.MTHD_NAME_CTGR AS configAssayMethodNameAndCategory,
             tbatd.ASY_TP AS assayType,
             tbatd.ASY_PRJ AS assayProject,
             tbatd.ASY_DEPT_ID AS assayDepartmentId,
@@ -136,6 +138,8 @@
             T_BSN_ASY_TSK_DAT tbatd
         LEFT JOIN T_BSN_SB_SMP tbss ON
             tbatd.BSN_SB_SMP_ID = tbss.ID
+        LEFT JOIN T_CFG_ASY_MTHD tcam ON 
+            tbatd.CFG_ASY_MTHD_ID = tcam.ID 
         WHERE 
             tbatd.DELETED = 0
             AND tbatd.IS_ASN_TSKD = 0
@@ -157,15 +161,23 @@
       <if test="reqVO.sampleReturnCode != null and reqVO.sampleReturnCode != ''">
             AND tbss.SMP_RTN_CD = #{reqVO.sampleReturnCode}
       </if>
-        GROUP BY tbss.ID ,
-            tbss.SMP_NAME ,
-            tbss.SMP_CD ,
-            tbss.SMP_ASY_CD ,
-            tbss.SMP_RTN_CD ,
+      <if test="reqVO.sampleName != null and reqVO.sampleName != ''">
+            AND tbss.SMP_NAME  like '%' || #{reqVO.sampleName} || '%'
+      </if>
+      <if test="reqVO.configAssayMethodNameAndCategory != null and reqVO.configAssayMethodNameAndCategory != ''">
+            AND tcam.MTHD_NAME_CTGR  like '%' || #{reqVO.configAssayMethodNameAndCategory} || '%'
+      </if>
+        GROUP BY tbss.ID,
+            tbss.SMP_NAME,
+            tbss.SMP_CD,
+            tbss.SMP_ASY_CD,
+            tbss.SMP_RTN_CD,
             tbss.SMP_FLW_NDE_TM,
-            tbatd.BSN_SB_SMP_ID ,
-            tbatd.CFG_ASY_MTHD_ID ,
-            tbatd.ASY_TP ,
+            tbatd.BSN_SB_SMP_ID,
+            tbatd.CFG_ASY_MTHD_ID,
+            tcam.NAME,
+            tcam.MTHD_NAME_CTGR,
+            tbatd.ASY_TP,
             tbatd.ASY_PRJ,
             tbatd.ASY_DEPT_ID,
             tbatd.ASY_DEPT_NAME