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

添加班组送样

Browse Source
This commit is contained in:
王兴荣
2025-11-20 17:50:19 +08:00
parent 9037a27cb8
commit 8b3bfe2083
22 changed files with 219 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,7 +29,7 @@
<if test="reqVO.sampleFlowNodeKey != null and reqVO.sampleFlowNodeKey != ''">
AND tbatd.SMP_FLW_NDE_KY = #{reqVO.sampleFlowNodeKey}
</if>
<if test="reqVO.sampleFlowNodeTime[0] != null and reqVO.sampleFlowNodeTime[0] != null">
<if test="reqVO.sampleFlowNodeTime[0] != null and reqVO.sampleFlowNodeTime[1] != null">
AND tbatd.SMP_FLW_NDE_TM #{reqVO.sampleFlowNodeTime[0]} and #{reqVO.sampleFlowNodeTime[1]}
</if>
GROUP BY
@@ -39,20 +39,40 @@
<select id="selectUnAuditTaskGroupList" resultType="com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayTaskDataGroupRespVO">
SELECT
tbatd.CFG_ASY_MTHD_ID AS configAssayMethodId,
tbatd.ASY_TP AS assayType,
t.CFG_ASY_MTHD_ID AS configAssayMethodId,
t.ASY_TP AS assayType,
tcam.NAME AS configAssayMethodName,
COUNT(tbatd.ID) AS sampleTaskCount
COUNT(t.BSN_SB_SMP_ID) AS sampleTaskCount
FROM
T_BSN_ASY_TSK_DAT tbatd
(
SELECT
tbssa.TENANT_ID ,
tbssa.BSN_SB_PRN_SMP_ID ,
tbssa.BSN_SB_SMP_ID ,
tbssa.CFG_ASY_MTHD_ID,
tbssa.ASY_TP
FROM
T_BSN_SB_SMP_ASMT tbssa
WHERE
tbssa.DELETED = 0
AND tbssa.IS_RPOD = 0
GROUP BY
tbssa.TENANT_ID ,
tbssa.BSN_SB_PRN_SMP_ID ,
tbssa.BSN_SB_SMP_ID ,
tbssa.CFG_ASY_MTHD_ID,
tbssa.ASY_TP
) t
LEFT JOIN T_CFG_ASY_MTHD tcam ON
tbatd.CFG_ASY_MTHD_ID = tcam.ID
WHERE
tbatd.SMP_FLW_NDE_KY = 'flw_analysis'
AND tbatd.DELETED = 0
t.CFG_ASY_MTHD_ID = tcam.ID
AND t.TENANT_ID = tcam.TENANT_ID
WHERE tcam.DELETED = 0
<if test="reqVO.assayDepartmentId != null and reqVO.assayDepartmentId != ''">
AND tcam.ASY_DEPT_ID = #{reqVO.assayDepartmentId}
</if>
GROUP BY
tbatd.CFG_ASY_MTHD_ID,
tbatd.ASY_TP,
t.CFG_ASY_MTHD_ID,
t.ASY_TP,
tcam.NAME
</select>
@@ -83,10 +103,9 @@
<if test="reqVO.sampleFlowNodeKey != null and reqVO.sampleFlowNodeKey != ''">
AND tbatd.SMP_FLW_NDE_KY = #{reqVO.sampleFlowNodeKey}
</if>
<if test="reqVO.sampleFlowNodeTime[0] != null and reqVO.sampleFlowNodeTime[0] != null">
<if test="reqVO.sampleFlowNodeTime[0] != null and reqVO.sampleFlowNodeTime[1] != null">
AND tbatd.SMP_FLW_NDE_TM #{reqVO.sampleFlowNodeTime[0]} and #{reqVO.sampleFlowNodeTime[1]}
</if>
AND tbatd.SMP_FLW_NDE_KY = 'flw_analysis'
GROUP BY tbss.ID ,
tbss.SMP_NAME ,
tbss.SMP_CD ,

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

@@ -13,6 +13,8 @@
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
FROM
T_BSN_SB_PRN_SMP_ASMT tbspsa
@@ -21,9 +23,17 @@
WHERE
tbspsa.DELETED = 0
AND tbspsa.IS_RPOD = 0
<if test="reqVO.configAssayMethodName != null and reqVO.configAssayMethodName != ''">
AND tcam.NAME like '%' || #{reqVO.assayDepartmentId} || '%'
</if>
<if test="reqVO.assayDepartmentId != null and reqVO.assayDepartmentId != ''">
AND tcam.ASY_DEPT_ID = #{reqVO.assayDepartmentId}
</if>
GROUP BY
tbspsa.CFG_ASY_MTHD_ID,
tcam.NAME
tcam.NAME,
tcam.ASY_DEPT_ID ,
tcam.ASY_DEPT_NAME
</select>
<select id="selectNoReportSubParentSampleAssessment" resultType="com.zt.plat.module.qms.business.bus.controller.vo.NoReportSubParentSampleAssessmentRespVO" >