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

fix:报告编制数据过滤优化

Browse Source
This commit is contained in:
FCL
2025-10-31 17:15:21 +08:00
parent 04d9746fb7
commit a084efdcdd
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayReportDataPageReqVO.java
View File

@@ -70,4 +70,7 @@ public class BusinessAssayReportDataPageReqVO extends PageParam {
@Schema(description = "委托id列表") @Schema(description = "委托id列表")
private List<Long> businessSampleEntrustRegistrationIdList; private List<Long> businessSampleEntrustRegistrationIdList;
@Schema(description = "报告类型ID", example = "2124")
private Long reportDocumentTypeId;
} }

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

@@ -49,8 +49,12 @@
FROM T_RPT_DOC_DAT rd FROM T_RPT_DOC_DAT rd
LEFT JOIN T_RPT_DOC_MAIN m on rd.MAIN_ID = m.ID LEFT JOIN T_RPT_DOC_MAIN m on rd.MAIN_ID = m.ID
WHERE rd.SRC_ID = d.id WHERE rd.SRC_ID = d.id
and m.RPT_DOC_TP = #{param.configReportTypeId} <if test="param.reportDocumentTypeId != null and param.reportDocumentTypeId != ''">
and m.RPT_DOC_TP = #{param.reportDocumentTypeId}
</if>
and m.FLW_STS in ('not_start','in_progress','completed','rejected') and m.FLW_STS in ('not_start','in_progress','completed','rejected')
and rd.DELETED = 0
and m.DELETED = 0
); );
</if> </if>
<if test="param.businessSampleEntrustRegistrationIdList != null and param.businessSampleEntrustRegistrationIdList.size > 0"> <if test="param.businessSampleEntrustRegistrationIdList != null and param.businessSampleEntrustRegistrationIdList.size > 0">