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

任务分配等修改

Browse Source
This commit is contained in:
王兴荣
2026-02-23 13:42:13 +08:00
parent fdd3657ba9
commit 0851f33efd
32 changed files with 634 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -52,6 +52,50 @@
tcam.MTHD_NAME_CTGR
ORDER BY tcam.DIC_BSN_KY ASC
</select>
<select id="selectUnAssayTaskGroupTypeList" resultType="com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayTaskDataGroupRespVO">
SELECT
tcam.DIC_BSN_ID AS configAssayMethodDictionaryBusinessId,
tcam.DIC_BSN_KY AS configAssayMethodDictionaryBusinessKey,
tdb.NAME AS configAssayMethodDictionaryBusinessName,
COUNT(tbatd.ID) AS sampleTaskCount
FROM
T_BSN_ASY_TSK_DAT tbatd
LEFT JOIN T_CFG_ASY_MTHD tcam ON
tbatd.CFG_ASY_MTHD_ID = tcam.ID
LEFT JOIN T_DIC_BSN tdb ON
tcam.DIC_BSN_ID = tdb.ID
LEFT JOIN T_BSN_SB_SMP_ANL_GRP tbssag ON
tbatd.BSN_SB_SMP_ID = tbssag.BSN_SB_SMP_ID
AND tbatd.ASY_DEPT_ID = tbssag.ASY_DEPT_ID
WHERE
tbatd.DELETED = 0
AND tcam.DELETED = 0
AND tbssag.DELETED = 0
AND tbatd.IS_ASN_TSKD = 0
AND tbatd.IS_RPOD = 0
AND tbssag.SMP_STS = '已收样'
<if test="reqVO.assayDepartmentId != null and reqVO.assayDepartmentId != ''">
AND tbatd.ASY_DEPT_ID = #{reqVO.assayDepartmentId}
</if>
<if test="reqVO.sampleFlowNodeKey != null and reqVO.sampleFlowNodeKey != ''">
AND tbatd.SMP_FLW_NDE_KY = #{reqVO.sampleFlowNodeKey}
</if>
<if test="reqVO.sampleFlowNodeTime != null and reqVO.sampleFlowNodeTime.length == 2">
AND tbatd.SMP_FLW_NDE_TM BETWEEN #{reqVO.sampleFlowNodeTime[0]} AND #{reqVO.sampleFlowNodeTime[1]}
</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
tcam.DIC_BSN_ID,
tcam.DIC_BSN_KY,
tdb.NAME
ORDER BY tcam.DIC_BSN_KY ASC
</select>
<select id="selectUnAuditTaskGroupList" resultType="com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayTaskDataGroupRespVO">
SELECT