diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/SampleAnalysisAuditController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/SampleAnalysisAuditController.java index ced06cc..c51e3be 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/SampleAnalysisAuditController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/SampleAnalysisAuditController.java @@ -42,8 +42,8 @@ public class SampleAnalysisAuditController implements BusinessControllerMarker { } @GetMapping("/getSampleResultAssessmentList") - public CommonResult getSampleResultAssessmentList(Long configAssayMethodId, String asmtReportedStatus) { - JSONObject result = sampleAnalysisAuditService.getSampleResultAssessmentList(configAssayMethodId, asmtReportedStatus); + public CommonResult getSampleResultAssessmentList(BusinessAssayTaskDataReqVO reqVO) { + JSONObject result = sampleAnalysisAuditService.getSampleResultAssessmentList(reqVO); 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/BusinessAssayTaskDataReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskDataReqVO.java index 94a73a9..e503688 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskDataReqVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskDataReqVO.java @@ -108,6 +108,10 @@ public class BusinessAssayTaskDataReqVO { @Schema(description = "检测方法配置名称") private String configAssayMethodName; + @Schema(description = "收样时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] sampleReceiveTime; + @Schema(description = "样品编号") private String sampleCode; diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskDataMapper.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskDataMapper.java index 94ba9cf..b01848b 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskDataMapper.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskDataMapper.java @@ -136,7 +136,7 @@ public interface BusinessAssayTaskDataMapper extends BaseMapperX selectList(BusinessAssayTaskDetailReqVO reqVO) { @@ -80,7 +80,7 @@ public interface BusinessAssayTaskDetailMapper extends BaseMapperX selectByBusinessAssayTaskId(Long businessAssayTaskId) { diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleAnalysisAuditService.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleAnalysisAuditService.java index 7e1e9e1..8d036fc 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleAnalysisAuditService.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleAnalysisAuditService.java @@ -3,6 +3,7 @@ package com.zt.plat.module.qms.business.bus.service; import java.util.List; import com.alibaba.fastjson2.JSONObject; +import com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayTaskDataReqVO; /** * SampleAnalysisAuditService @@ -13,7 +14,7 @@ public interface SampleAnalysisAuditService { void crossAuditByByTaskId(Long businessAssayTaskId, String auditStatus); - JSONObject getSampleResultAssessmentList(Long configAssayMethodId, String asmtReportedStatus); + JSONObject getSampleResultAssessmentList(BusinessAssayTaskDataReqVO reqVO); JSONObject getParallelResultAssessment(Long businessSubSampleId, Long configAssayMethodId); diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleAnalysisAuditServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleAnalysisAuditServiceImpl.java index 6d891bb..e6e26b7 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleAnalysisAuditServiceImpl.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleAnalysisAuditServiceImpl.java @@ -152,7 +152,9 @@ public class SampleAnalysisAuditServiceImpl implements SampleAnalysisAuditServic private ConfigSubSampleMethodMapper configSubSampleMethodMapper; @Override - public JSONObject getSampleResultAssessmentList(Long configAssayMethodId, String asmtReportedStatus) { + public JSONObject getSampleResultAssessmentList(BusinessAssayTaskDataReqVO reqVO) { + Long configAssayMethodId = reqVO.getConfigAssayMethodId(); + String asmtReportedStatus = reqVO.getAsmtReportedStatus(); List configAssayMethodProjectDOList = configAssayMethodProjectMapper.selectByConfigAssayMethodId(configAssayMethodId); List> columnList = new ArrayList<>(); @@ -173,6 +175,7 @@ public class SampleAnalysisAuditServiceImpl implements SampleAnalysisAuditServic BusinessAssayTaskDataReqVO search = new BusinessAssayTaskDataReqVO(); search.setConfigAssayMethodId(configAssayMethodId); search.setAsmtReportedStatus(asmtReportedStatus); + search.setSampleReceiveTime(reqVO.getSampleReceiveTime()); List resultAssessmentList = businessAssayTaskDataMapper.selectResultAssessmentList(search); for (BusinessAssayTaskDataExtendRespVO businessAssayTaskDataExtendRespVO : resultAssessmentList) { diff --git a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskDataMapper.xml b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskDataMapper.xml index cf6bef7..b9b5bd6 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskDataMapper.xml +++ b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskDataMapper.xml @@ -79,9 +79,12 @@ AND tbatd.TENANT_ID = 1 AND tbatd.IS_ASN_TSKD = 1 AND tbssag.SMP_STS = '已收样' - + AND tbssag.ASY_DEPT_ID = #{reqVO.assayDepartmentId} - + + + AND tbssag.SMP_RCV_TM BETWEEN #{reqVO.sampleReceiveTime[0]} AND #{reqVO.sampleReceiveTime[1]} + GROUP BY tbatd.TENANT_ID , tbatd.BSN_SB_PRN_SMP_ID , @@ -96,6 +99,9 @@ t.CFG_ASY_MTHD_ID = tcam.ID AND t.TENANT_ID = tcam.TENANT_ID WHERE t.RPOD_STS in ('pending_report', 'pending_assessment', 're_inspected') + + AND tcam.NAME like '%' || #{reqVO.configAssayMethodName} || '%' + GROUP BY t.CFG_ASY_MTHD_ID, t.ASY_TP, diff --git a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSubParentSampleAssessmentProjectMapper.xml b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSubParentSampleAssessmentProjectMapper.xml index e85ea49..a86f065 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSubParentSampleAssessmentProjectMapper.xml +++ b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSubParentSampleAssessmentProjectMapper.xml @@ -39,7 +39,7 @@ AND tbssa.RPOD_STS = 'reported' AND tbspsa.IS_RPOD = 0 - AND tcam.NAME like '%' || #{reqVO.assayDepartmentId} || '%' + AND tcam.NAME like '%' || #{reqVO.configAssayMethodName} || '%' AND tcam.ASY_DEPT_ID = #{reqVO.assayDepartmentId}