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

排序等bug修复

Browse Source
This commit is contained in:
王兴荣
2025-12-03 16:17:50 +08:00
parent 8fa69a0906
commit be89a965d8
11 changed files with 67 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,8 +33,11 @@
<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[1] != null">
AND tbatd.SMP_FLW_NDE_TM #{reqVO.sampleFlowNodeTime[0]} and #{reqVO.sampleFlowNodeTime[1]}
<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>
GROUP BY
tbatd.CFG_ASY_MTHD_ID,
@@ -126,8 +129,17 @@
<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[1] != null">
AND tbatd.SMP_FLW_NDE_TM #{reqVO.sampleFlowNodeTime[0]} and #{reqVO.sampleFlowNodeTime[1]}
<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.sampleCode != null and reqVO.sampleCode != ''">
AND tbss.SMP_CD = #{reqVO.sampleCode}
</if>
<if test="reqVO.sampleAssayCode != null and reqVO.sampleAssayCode != ''">
AND tbss.SMP_ASY_CD = #{reqVO.sampleAssayCode}
</if>
<if test="reqVO.sampleReturnCode != null and reqVO.sampleReturnCode != ''">
AND tbss.SMP_RTN_CD = #{reqVO.sampleReturnCode}
</if>
GROUP BY tbss.ID ,
tbss.SMP_NAME ,