From b355668284c6f9bbdf56eb06e26e9a48f3cef652 Mon Sep 17 00:00:00 2001 From: FCL Date: Thu, 4 Dec 2025 15:11:12 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E6=8A=A5=E5=91=8A=E7=BC=96=E5=88=B6?= =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=A7=94=E6=89=98=E8=BF=87=E6=BB=A4?= =?UTF-8?q?=EF=BC=8C=E6=8C=89=E6=8A=A5=E8=A1=A8=E7=B1=BB=E5=9E=8B=E8=BF=87?= =?UTF-8?q?=E6=BB=A4=E5=8F=AF=E9=80=89=E5=A7=94=E6=89=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...nessSampleEntrustRegistrationController.java | 3 +++ ...inessSampleEntrustRegistrationPageReqVO.java | 3 +++ .../mapper/BusinessAssayReportDataMapper.xml | 1 - .../BusinessSampleEntrustRegistrationMapper.xml | 17 ++++++++++++++++- 4 files changed, 22 insertions(+), 2 deletions(-) diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSampleEntrustRegistrationController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSampleEntrustRegistrationController.java index bfde1bc..dbbb2cc 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSampleEntrustRegistrationController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSampleEntrustRegistrationController.java @@ -110,6 +110,9 @@ public class BusinessSampleEntrustRegistrationController implements BusinessCont @GetMapping("/queryWaitingDataForReport") @Operation(summary = "查询待编制数据") public CommonResult> queryWaitingDataForReport(@Valid BusinessSampleEntrustRegistrationPageReqVO pageReqVO) { + Long configReportTypeId = pageReqVO.getConfigReportTypeId(); + if(configReportTypeId == null) + return CommonResult.error(0, "缺少configReportTypeId参数，请刷新后重试！"); PageResult result = businessSampleEntrustRegistrationService.queryWaitingDataForReport(pageReqVO); return success(result); } diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSampleEntrustRegistrationPageReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSampleEntrustRegistrationPageReqVO.java index 26e7757..a5dc088 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSampleEntrustRegistrationPageReqVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSampleEntrustRegistrationPageReqVO.java @@ -156,4 +156,7 @@ public class BusinessSampleEntrustRegistrationPageReqVO extends PageParam { //====================扩展字段====================== @Schema(description = "委托来源名称") private String configEntrustSourceName; + + @Schema(description = "报表配置id") + private Long configReportTypeId; } \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayReportDataMapper.xml b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayReportDataMapper.xml index c29e66c..c7901a3 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayReportDataMapper.xml +++ b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayReportDataMapper.xml @@ -10,7 +10,6 @@ --> - -- SELECT d.*, select m.ID as id, m.ENTT_ID as entrustId, @@ -65,6 +64,22 @@ select 1 from T_RPT_DOC_MAIN dm left join T_RPT_DOC_MAIN_CORR dc on dm.id = dc.MAIN_ID where dc.CORR_ID = m.id and dm.FLW_STS in ('not_start','in_progress','completed','rejected') and dm.deleted = 0 ) + + + + and exists ( + select 1 from T_BSN_SMP_ENTT_DTL d + inner join T_BSN_BSE_SMP s on d.BSN_BSE_SMP_ID = s.id + where + d.BSN_SMP_ENTT_REG_ID = m.id + and s.CFG_BSE_SMP_ID in ( + select csr.CFG_BSE_SMP_ID from T_CFG_SMP_RPT csr where + csr.CFG_RPT_TP_ID = ${param.configReportTypeId} + and csr.DELETED = 0 + ) + and d.DELETED = 0 + ) + and m.ASY_STS = #{param.assayStatus}