zgty/zt-qms
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

结果判定分析方法为0还显示，处理。

Browse Source
This commit is contained in:
王兴荣
2025-11-28 11:22:41 +08:00
parent 63fc44a7d1
commit 4c129dee4e
2 changed files with 42 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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,

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

@@ -11,18 +11,29 @@
<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
(
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
tbspsa.CFG_ASY_MTHD_ID = tcam.ID
AND tbspsa.TENANT_ID = tcam.TENANT_ID
tbssa.CFG_ASY_MTHD_ID = tcam.ID
WHERE
tbspsa.DELETED = 0
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} || '%'
@@ -31,10 +42,18 @@
AND tcam.ASY_DEPT_ID = #{reqVO.assayDepartmentId}
</if>
GROUP BY
tbspsa.CFG_ASY_MTHD_ID,
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
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" >