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-24 10:26:51 +08:00
parent 87fbd54692
commit 92ec9454ba
35 changed files with 936 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -42,34 +42,52 @@
t.CFG_ASY_MTHD_ID AS configAssayMethodId,
t.ASY_TP AS assayType,
tcam.NAME AS configAssayMethodName,
COUNT(t.BSN_SB_SMP_ID) AS sampleTaskCount
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,
count(CASE WHEN t.RPOD_STS = 're_inspected' THEN 1 END) AS asmt_re_inspected_count,
count(CASE WHEN t.RPOD_STS = 'reported' THEN 1 END) AS asmt_reported_count
FROM
(
SELECT
tbssa.TENANT_ID ,
tbssa.BSN_SB_PRN_SMP_ID ,
tbssa.BSN_SB_SMP_ID ,
tbssa.CFG_ASY_MTHD_ID,
tbssa.ASY_TP
tbatd.TENANT_ID ,
tbatd.BSN_SB_PRN_SMP_ID ,
tbatd.BSN_SB_SMP_ID ,
tbatd.CFG_ASY_MTHD_ID,
tbatd.ASY_TP,
tbssag.ASY_DEPT_ID ,
tbssag.ASY_DEPT_NAME ,
tbssa.RPOD_STS
FROM
T_BSN_SB_SMP_ASMT tbssa
T_BSN_ASY_TSK_DAT tbatd
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
AND tbatd.TENANT_ID = tbssag.TENANT_ID
LEFT JOIN T_BSN_SB_SMP_ASMT tbssa ON
tbatd.BSN_SB_SMP_ASMT_ID = tbssa.ID
AND tbatd.TENANT_ID = tbssa.TENANT_ID
WHERE
tbssa.DELETED = 0
AND tbssa.IS_RPOD = 0
tbatd.DELETED = 0
AND tbatd.TENANT_ID = 1
AND tbatd.IS_ASN_TSKD = 1
AND tbssag.SMP_STS = '已收样'
<if test="reqVO.assayDepartmentId != null and reqVO.assayDepartmentId != ''">
AND tbssag.ASY_DEPT_ID = #{reqVO.assayDepartmentId}
</if>
GROUP BY
tbssa.TENANT_ID ,
tbssa.BSN_SB_PRN_SMP_ID ,
tbssa.BSN_SB_SMP_ID ,
tbssa.CFG_ASY_MTHD_ID,
tbssa.ASY_TP
tbatd.TENANT_ID ,
tbatd.BSN_SB_PRN_SMP_ID ,
tbatd.BSN_SB_SMP_ID ,
tbatd.CFG_ASY_MTHD_ID,
tbatd.ASY_TP,
tbssag.ASY_DEPT_ID ,
tbssag.ASY_DEPT_NAME ,
tbssa.RPOD_STS
) t
LEFT JOIN T_CFG_ASY_MTHD tcam ON
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
t.CFG_ASY_MTHD_ID,
t.ASY_TP,

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

@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zt.plat.module.qms.business.bus.dal.mapper.BusinessSubParentSampleAssessmentMapper">
<!--
一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。
无法满足的场景，例如说多表关联查询，才使用 XML 编写 SQL。
代码生成器暂时只生成 Mapper XML 文件本身，更多推荐 MybatisX 快速开发插件来生成查询。
文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
-->
</mapper>