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:
FCL
2025-12-24 13:42:42 +08:00
parent f4e4d56e97 4019440537
commit d9f7330f57
22 changed files with 346 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -126,6 +126,8 @@
tbss.SMP_ASY_CD AS sampleAssayCode,
tbss.SMP_RTN_CD AS sampleReturnCode,
tbss.SMP_FLW_NDE_TM AS sampleFlowNodeTime,
tcbs.BSE_SMP_ID AS baseSampleId,
tbbs.BSE_SMP_NAME AS baseSampleName,
tbatd.BSN_SB_SMP_ID AS businessSubSampleId,
tbatd.CFG_ASY_MTHD_ID AS configAssayMethodId,
tcam.NAME AS configAssayMethodName,
@@ -139,7 +141,11 @@
LEFT JOIN T_BSN_SB_SMP tbss ON
tbatd.BSN_SB_SMP_ID = tbss.ID
LEFT JOIN T_CFG_ASY_MTHD tcam ON
tbatd.CFG_ASY_MTHD_ID = tcam.ID
tbatd.CFG_ASY_MTHD_ID = tcam.ID
LEFT JOIN T_BSN_BSE_SMP tbbs ON
tbatd.BSN_BSE_SMP_ID = tbbs.ID
LEFT JOIN T_CFG_BSE_SMP tcbs ON
tbbs.CFG_BSE_SMP_ID = tcbs.ID
WHERE
tbatd.DELETED = 0
AND tbatd.IS_ASN_TSKD = 0
@@ -173,6 +179,8 @@
tbss.SMP_ASY_CD,
tbss.SMP_RTN_CD,
tbss.SMP_FLW_NDE_TM,
tcbs.BSE_SMP_ID,
tbbs.BSE_SMP_NAME,
tbatd.BSN_SB_SMP_ID,
tbatd.CFG_ASY_MTHD_ID,
tcam.NAME,