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

Merge remote-tracking branch 'origin/test' into test

Browse Source
This commit is contained in:
禁止呵呵
2025-12-05 17:23:52 +08:00
parent c7f3bc0a46 54bc4b8b37
commit 8e3994b6a8
22 changed files with 1270 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,6 +13,7 @@
SELECT
tbatd.CFG_ASY_MTHD_ID AS configAssayMethodId,
tcam.NAME AS configAssayMethodName,
tcam.MTHD_NAME_CTGR AS configAssayMethodNameAndCategory,
COUNT(tbatd.ID) AS sampleTaskCount
FROM
T_BSN_ASY_TSK_DAT tbatd
@@ -38,10 +39,14 @@
</if>
<if test="reqVO.configAssayMethodName != null and reqVO.configAssayMethodName != ''">
AND tcam.NAME like '%' || #{reqVO.configAssayMethodName} || '%'
</if>
<if test="reqVO.configAssayMethodNameAndCategory != null and reqVO.configAssayMethodNameAndCategory != ''">
AND tcam.MTHD_NAME_CTGR like '%' || #{reqVO.configAssayMethodNameAndCategory} || '%'
</if>
GROUP BY
tbatd.CFG_ASY_MTHD_ID,
tcam.NAME
tcam.NAME,
tcam.MTHD_NAME_CTGR
</select>
<select id="selectUnAuditTaskGroupList" resultType="com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayTaskDataGroupRespVO">
@@ -49,6 +54,7 @@
t.CFG_ASY_MTHD_ID AS configAssayMethodId,
t.ASY_TP AS assayType,
tcam.NAME AS configAssayMethodName,
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,
count(CASE WHEN t.RPOD_STS = 'pending_assessment' THEN 1 END) AS asmt_pending_assessment_count,
@@ -102,10 +108,14 @@
<if test="reqVO.configAssayMethodName != null and reqVO.configAssayMethodName != ''">
AND tcam.NAME like '%' || #{reqVO.configAssayMethodName} || '%'
</if>
<if test="reqVO.configAssayMethodNameAndCategory != null and reqVO.configAssayMethodNameAndCategory != ''">
AND tcam.MTHD_NAME_CTGR like '%' || #{reqVO.configAssayMethodNameAndCategory} || '%'
</if>
GROUP BY
t.CFG_ASY_MTHD_ID,
t.ASY_TP,
tcam.NAME
tcam.NAME,
tcam.MTHD_NAME_CTGR
</select>
<select id="selectUnAssignTaskedSubSample" resultType="com.zt.plat.module.qms.business.bus.controller.vo.UnAssignTaskedSubSampleRespVO">

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

@@ -13,6 +13,7 @@
SELECT
t.CFG_ASY_MTHD_ID AS configAssayMethodId,
t.NAME AS configAssayMethodName,
t.MTHD_NAME_CTGR AS configAssayMethodNameAndCategory,
t.ASY_DEPT_ID AS assayDepartmentId,
t.ASY_DEPT_NAME AS assayDepartmentName,
COUNT(DISTINCT t.BSN_SB_PRN_SMP_ASMT_ID) AS sampleCount
@@ -23,6 +24,7 @@
tbssa.BSN_SB_PRN_SMP_ASMT_ID ,
tbssa.CFG_ASY_MTHD_ID,
tcam.NAME,
tcam.MTHD_NAME_CTGR,
tcam.ASY_DEPT_ID ,
tcam.ASY_DEPT_NAME
FROM
@@ -41,6 +43,9 @@
<if test="reqVO.configAssayMethodName != null and reqVO.configAssayMethodName != ''">
AND tcam.NAME like '%' || #{reqVO.configAssayMethodName} || '%'
</if>
<if test="reqVO.configAssayMethodNameAndCategory != null and reqVO.configAssayMethodNameAndCategory != ''">
AND tcam.MTHD_NAME_CTGR like '%' || #{reqVO.configAssayMethodNameAndCategory} || '%'
</if>
<if test="reqVO.assayDepartmentId != null and reqVO.assayDepartmentId != ''">
AND tcam.ASY_DEPT_ID = #{reqVO.assayDepartmentId}
</if>
@@ -52,12 +57,14 @@
tbssa.BSN_SB_PRN_SMP_ASMT_ID ,
tbssa.CFG_ASY_MTHD_ID ,
tcam.NAME,
tcam.MTHD_NAME_CTGR,
tcam.ASY_DEPT_ID ,
tcam.ASY_DEPT_NAME
) t
GROUP BY
t.CFG_ASY_MTHD_ID,
t.NAME,
t.MTHD_NAME_CTGR,
t.ASY_DEPT_ID,
t.ASY_DEPT_NAME
</select>
@@ -131,6 +138,7 @@
tdp.SHW_NAME AS dictionaryProjectShowName,
tmasm.CFG_ASY_MTHD_ID AS configAssayMethodId,
tcam.NAME AS configAssayMethodName,
tcam.MTHD_NAME_CTGR AS configAssayMethodNameAndCategory,
tmas.BSE_SMP_ID AS baseSampleId,
tbs.NAME AS baseSampleName,
tmasm.IS_RCHK_DFT AS isRecheckDefault