From c6c44828e010e430a6ba5aa00250128930ad325c Mon Sep 17 00:00:00 2001 From: wxr Date: Wed, 19 Nov 2025 17:18:32 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B9=E6=B3=95=E5=8F=98=E6=9B=B4=E6=A0=B7?= =?UTF-8?q?=E5=93=81=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/SampleTaskAssignController.java | 4 ++-- .../controller/vo/BusinessAssayTaskPageReqVO.java | 2 ++ .../bus/dal/mapper/BusinessAssayTaskDataMapper.java | 2 +- .../bus/dal/mapper/BusinessAssayTaskMapper.java | 2 ++ .../bus/service/SampleTaskAssignService.java | 2 +- .../bus/service/SampleTaskAssignServiceImpl.java | 4 ++-- .../bus/dal/mapper/BusinessAssayTaskDataMapper.xml | 13 ++++++++++++- 7 files changed, 22 insertions(+), 7 deletions(-) diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/SampleTaskAssignController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/SampleTaskAssignController.java index bb028ae..f9db69b 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/SampleTaskAssignController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/SampleTaskAssignController.java @@ -40,8 +40,8 @@ public class SampleTaskAssignController { } @GetMapping("/getAssaySampleList") - public CommonResult getAssaySampleList() { - List list = sampleTaskAssignService.getAssaySampleList(); + public CommonResult getAssaySampleList(BusinessAssayTaskDataReqVO reqVO) { + List list = sampleTaskAssignService.getAssaySampleList(reqVO); return success(list); } diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskPageReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskPageReqVO.java index 65d3703..c7a5c21 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskPageReqVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskPageReqVO.java @@ -107,4 +107,6 @@ public class BusinessAssayTaskPageReqVO extends PageParam { @Schema(description = "备注") private String remark; + @Schema(description = "部门id") + private Long deptId; } \ No newline at end of file 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 3aa916b..929a1b0 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 @@ -329,7 +329,7 @@ public interface BusinessAssayTaskDataMapper extends BaseMapperX selectUnAssignTaskedSubSample(); + List selectUnAssignTaskedSubSample(@Param("reqVO") BusinessAssayTaskDataReqVO reqVO); } \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskMapper.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskMapper.java index 8ceec27..1c24727 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskMapper.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskMapper.java @@ -60,6 +60,7 @@ public interface BusinessAssayTaskMapper extends BaseMapperX getAssaySampleList(); + List getAssaySampleList(BusinessAssayTaskDataReqVO reqVO); /** * 根据子样id查询分析方法 diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleTaskAssignServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleTaskAssignServiceImpl.java index fc4c815..e70cb1d 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleTaskAssignServiceImpl.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleTaskAssignServiceImpl.java @@ -177,8 +177,8 @@ public class SampleTaskAssignServiceImpl implements SampleTaskAssignService { } @Override - public List getAssaySampleList() { - List list = businessAssayTaskDataMapper.selectUnAssignTaskedSubSample(); + public List getAssaySampleList(BusinessAssayTaskDataReqVO reqVO) { + List list = businessAssayTaskDataMapper.selectUnAssignTaskedSubSample(reqVO); return list; } 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 56dd93a..bd0a3cf 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 @@ -74,7 +74,18 @@ T_BSN_ASY_TSK_DAT tbatd LEFT JOIN T_BSN_SB_SMP tbss ON tbatd.BSN_SB_SMP_ID = tbss.ID - WHERE tbatd.IS_ASN_TSKD = 0 + WHERE + tbatd.DELETED = 0 + AND tbatd.IS_ASN_TSKD = 0 + + AND tbatd.ASY_DEPT_ID = #{reqVO.assayDepartmentId} + + + AND tbatd.SMP_FLW_NDE_KY = #{reqVO.sampleFlowNodeKey} + + + AND tbatd.SMP_FLW_NDE_TM #{reqVO.sampleFlowNodeTime[0]} and #{reqVO.sampleFlowNodeTime[1]} + AND tbatd.SMP_FLW_NDE_KY = 'flw_analysis' GROUP BY tbss.ID , tbss.SMP_NAME ,