From d51637e44ae086c582436ed30d5202001c556b3b Mon Sep 17 00:00:00 2001 From: wxr Date: Thu, 6 Nov 2025 19:52:27 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=A8=E6=8E=A7=E6=A0=B7=E7=A7=BB=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusinessStandardSampleController.java | 12 +++++++--- .../admin/SampleTaskAssignController.java | 6 +++++ ...yTaskAnalysisSampleAndQcProjectRespVO.java | 2 +- .../controller/vo/DeleteQcSampleReqVO.java | 19 +++++++++++++++ ...BusinessQCManagementProjectDataMapper.java | 10 ++++++++ .../mapper/BusinessStandardSampleMapper.java | 23 +++++++++++++------ .../BusinessStandardSampleService.java | 4 +++- .../BusinessStandardSampleServiceImpl.java | 9 ++++++-- .../service/SampleAnalysisServiceImpl.java | 8 ++++--- .../bus/service/SampleTaskAssignService.java | 6 +++++ .../service/SampleTaskAssignServiceImpl.java | 15 ++++++++++++ .../BusinessAssayTaskAnalysisDataRespVO.java | 3 +++ 12 files changed, 100 insertions(+), 17 deletions(-) create mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/DeleteQcSampleReqVO.java diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessStandardSampleController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessStandardSampleController.java index 39cd959..e0fea37 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessStandardSampleController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessStandardSampleController.java @@ -89,9 +89,15 @@ public class BusinessStandardSampleController implements BusinessControllerMarke return success(BeanUtils.toBean(pageResult, BusinessStandardSampleRespVO.class)); } - @GetMapping("/getBusinessStandardSampleByConfigQCSampleMethodId") - public CommonResult getBusinessStandardSampleByConfigQCSampleMethodId(@RequestParam("configQCSampleMethodId") Long configQCSampleMethodId) { - List list = businessStandardSampleService.getBusinessStandardSampleByConfigQCSampleMethodId(configQCSampleMethodId); +// @GetMapping("/getBusinessStandardSampleByConfigQCSampleMethodId") +// public CommonResult getBusinessStandardSampleByConfigQCSampleMethodId(@RequestParam("configQCSampleMethodId") Long configQCSampleMethodId) { +// List list = businessStandardSampleService.getBusinessStandardSampleByConfigQCSampleMethodId(configQCSampleMethodId); +// return success(list); +// } + + @GetMapping("/getBusinessStandardSampleLeafList") + public CommonResult getBusinessStandardSampleLeafList() { + List list = businessStandardSampleService.getBusinessStandardSampleLeafList(); return success(list); } 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 dc47247..bb028ae 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 @@ -86,6 +86,12 @@ public class SampleTaskAssignController { sampleTaskAssignService.createQcSample(req); return success("成功"); } + + @PostMapping("/deleteQcSample") + public CommonResult deleteQcSample(@RequestBody DeleteQcSampleReqVO req) { + sampleTaskAssignService.deleteQcSample(req); + return success("成功"); + } @PostMapping("/submitAssign") public CommonResult submitAssign(Long id) { diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskAnalysisSampleAndQcProjectRespVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskAnalysisSampleAndQcProjectRespVO.java index bb7036e..313c2da 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskAnalysisSampleAndQcProjectRespVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskAnalysisSampleAndQcProjectRespVO.java @@ -44,7 +44,7 @@ public class BusinessAssayTaskAnalysisSampleAndQcProjectRespVO { private String formValue; /** 质量控制分析方法 **/ - private List configQCSampleMethodList; + //private List configQCSampleMethodList; /** 分配任务的分析数据 **/ private List assayTaskAnalysisDataList; diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/DeleteQcSampleReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/DeleteQcSampleReqVO.java new file mode 100644 index 0000000..370da2d --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/DeleteQcSampleReqVO.java @@ -0,0 +1,19 @@ +package com.zt.plat.module.qms.business.bus.controller.vo; + +import java.util.List; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +@Data +public class DeleteQcSampleReqVO { + + @Schema(description = "质控类型_ID,字典表【T_DIC_BSN】质控类型：空白样、管理样、标准样、标样", example = "9549") + private Long dictionaryBusinessId; + + @Schema(description = "质控类型_Key,字典表【T_DIC_BSN】质控类型：空白样、管理样、标准样、标样") + private String dictionaryBusinessKey; + + @Schema(description = "质控样id") + private List qcSampleIdList; +} diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessQCManagementProjectDataMapper.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessQCManagementProjectDataMapper.java index e673344..ea742c0 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessQCManagementProjectDataMapper.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessQCManagementProjectDataMapper.java @@ -73,4 +73,14 @@ public interface BusinessQCManagementProjectDataMapper extends BaseMapperX selectByBusinessQCManagementDataId(Long businessQCManagementDataId) { + return selectList(new LambdaQueryWrapperX() + .eq(BusinessQCManagementProjectDataDO::getBusinessQCManagementDataId, businessQCManagementDataId)); + } + + default List selectByBusinessQCManagementDataIds(List businessQCManagementDataIds) { + return selectList(new LambdaQueryWrapperX() + .in(BusinessQCManagementProjectDataDO::getBusinessQCManagementDataId, businessQCManagementDataIds)); + } } \ 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/BusinessStandardSampleMapper.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessStandardSampleMapper.java index 1cc95c9..21d522f 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessStandardSampleMapper.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessStandardSampleMapper.java @@ -4,10 +4,8 @@ import com.zt.plat.framework.common.pojo.PageResult; import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX; import com.zt.plat.framework.mybatis.core.query.MPJLambdaWrapperX; import com.zt.plat.module.qms.business.bus.controller.vo.*; -import com.zt.plat.module.qms.business.bus.controller.vo.BusinessStandardSamplePageReqVO; import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessStandardSampleDO; import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessStandardSampleProjectDO; -import com.zt.plat.module.qms.business.config.dal.dataobject.ConfigQCStandardSampleDO; import com.zt.plat.module.qms.enums.QmsCommonConstant; import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX; @@ -38,15 +36,26 @@ public interface BusinessStandardSampleMapper extends BaseMapperX selectByConfigQCSampleMethodId(Long configQCSampleMethodId) { +// default List selectByConfigQCSampleMethodId(Long configQCSampleMethodId) { +// return selectJoinList(BusinessStandardSampleExtendRespVO.class, new MPJLambdaWrapperX() +// .rightJoin(ConfigQCStandardSampleDO.class, ConfigQCStandardSampleDO::getBusinessStandardSampleId, BusinessStandardSampleDO::getId) +// .selectAll(BusinessStandardSampleDO.class) +// .selectAs(ConfigQCStandardSampleDO::getConfigQCSampleMethodId, BusinessStandardSampleExtendRespVO::getConfigQCSampleMethodId) +// .selectCollection(BusinessStandardSampleProjectDO.class, BusinessStandardSampleExtendRespVO::getStandardSampleProjectList) +// .leftJoin(BusinessStandardSampleProjectDO.class, BusinessStandardSampleProjectDO::getBusinessStandardSampleId, BusinessStandardSampleDO::getId) +// .eq(ConfigQCStandardSampleDO::getConfigQCSampleMethodId, configQCSampleMethodId) +// .eq(BusinessStandardSampleDO::getIsPublish, QmsCommonConstant.YES) +// .eq(BusinessStandardSampleDO::getIsUse, QmsCommonConstant.YES)); +// } + + + default List getBusinessStandardSampleLeafList() { return selectJoinList(BusinessStandardSampleExtendRespVO.class, new MPJLambdaWrapperX() - .rightJoin(ConfigQCStandardSampleDO.class, ConfigQCStandardSampleDO::getBusinessStandardSampleId, BusinessStandardSampleDO::getId) .selectAll(BusinessStandardSampleDO.class) - .selectAs(ConfigQCStandardSampleDO::getConfigQCSampleMethodId, BusinessStandardSampleExtendRespVO::getConfigQCSampleMethodId) .selectCollection(BusinessStandardSampleProjectDO.class, BusinessStandardSampleExtendRespVO::getStandardSampleProjectList) .leftJoin(BusinessStandardSampleProjectDO.class, BusinessStandardSampleProjectDO::getBusinessStandardSampleId, BusinessStandardSampleDO::getId) - .eq(ConfigQCStandardSampleDO::getConfigQCSampleMethodId, configQCSampleMethodId) + .ne(BusinessStandardSampleDO::getParentId, 0) .eq(BusinessStandardSampleDO::getIsPublish, QmsCommonConstant.YES) .eq(BusinessStandardSampleDO::getIsUse, QmsCommonConstant.YES)); - } + } } \ 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/service/BusinessStandardSampleService.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessStandardSampleService.java index 40e7042..220c167 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessStandardSampleService.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessStandardSampleService.java @@ -60,6 +60,8 @@ public interface BusinessStandardSampleService { */ PageResult getBusinessStandardSamplePage(BusinessStandardSamplePageReqVO pageReqVO); - List getBusinessStandardSampleByConfigQCSampleMethodId(Long configQCSampleMethodId); + //List getBusinessStandardSampleByConfigQCSampleMethodId(Long configQCSampleMethodId); + + List getBusinessStandardSampleLeafList(); } \ 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/service/BusinessStandardSampleServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessStandardSampleServiceImpl.java index cf15ce4..7219fe5 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessStandardSampleServiceImpl.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessStandardSampleServiceImpl.java @@ -88,9 +88,14 @@ public class BusinessStandardSampleServiceImpl implements BusinessStandardSample return businessStandardSampleMapper.selectPage(pageReqVO); } +// @Override +// public List getBusinessStandardSampleByConfigQCSampleMethodId(Long configQCSampleMethodId) { +// return businessStandardSampleMapper.selectByConfigQCSampleMethodId(configQCSampleMethodId); +// } + @Override - public List getBusinessStandardSampleByConfigQCSampleMethodId(Long configQCSampleMethodId) { - return businessStandardSampleMapper.selectByConfigQCSampleMethodId(configQCSampleMethodId); + public List getBusinessStandardSampleLeafList() { + return businessStandardSampleMapper.getBusinessStandardSampleLeafList(); } } \ 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/service/SampleAnalysisServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleAnalysisServiceImpl.java index 16a7b81..e0f6464 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleAnalysisServiceImpl.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleAnalysisServiceImpl.java @@ -378,8 +378,8 @@ public class SampleAnalysisServiceImpl implements SampleAnalysisService { businessAssayTaskAnalysisSampleAndQcProjectRespVO.setAssayTaskAnalysisDataList(assayTaskAnalysisDataList); - List configQCSampleMethodList = configQCSampleMethodMapper.selectByConfigAssayMethodId(businessAssayTaskDO.getConfigAssayMethodId()); - businessAssayTaskAnalysisSampleAndQcProjectRespVO.setConfigQCSampleMethodList(configQCSampleMethodList); +// List configQCSampleMethodList = configQCSampleMethodMapper.selectByConfigAssayMethodId(businessAssayTaskDO.getConfigAssayMethodId()); +// businessAssayTaskAnalysisSampleAndQcProjectRespVO.setConfigQCSampleMethodList(configQCSampleMethodList); //查询区间范围 List configAssayMethodProjectRangeDOList = configAssayMethodProjectRangeMapper.selectList(new LambdaQueryWrapperX().eq(ConfigAssayMethodProjectRangeDO::getConfigAssayMethodId, businessAssayTaskDO.getConfigAssayMethodId())); @@ -395,6 +395,7 @@ public class SampleAnalysisServiceImpl implements SampleAnalysisService { private BusinessAssayTaskAnalysisDataRespVO getAnalysis(BusinessAssayTaskDO businessAssayTaskDO) { BusinessAssayTaskAnalysisDataRespVO businessAssayTaskAnalysisDataRespVO = new BusinessAssayTaskAnalysisDataRespVO(); businessAssayTaskAnalysisDataRespVO.setAnalysisType("analysis"); + businessAssayTaskAnalysisDataRespVO.setAnalysisName("分析样"); businessAssayTaskAnalysisDataRespVO.setSortNo(99); @@ -480,8 +481,9 @@ public class SampleAnalysisServiceImpl implements SampleAnalysisService { for (ConfigQCSampleMethodExtendRespVO configQCSampleMethodExtendRespVO : configQCSampleMethodList) { businessAssayTaskAnalysisDataRespVO = new BusinessAssayTaskAnalysisDataRespVO(); businessAssayTaskAnalysisDataRespVO.setAnalysisType(configQCSampleMethodExtendRespVO.getDictionaryBusinessKey()); + businessAssayTaskAnalysisDataRespVO.setAnalysisName(configQCSampleMethodExtendRespVO.getDictionaryBusinessName()); businessAssayTaskAnalysisDataRespVO.setSortNo(configQCSampleMethodExtendRespVO.getSortNo()); - + businessAssayTaskAnalysisDataRespVO.setConfigQCSampleMethod(configQCSampleMethodExtendRespVO); //处理列 List cloumns = new ArrayList<>(); diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleTaskAssignService.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleTaskAssignService.java index 1160557..b287b5e 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleTaskAssignService.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleTaskAssignService.java @@ -81,5 +81,11 @@ public interface SampleTaskAssignService { */ void createQcSample(CreateQcSampleReqVO req); + /** + * 删除质控样 + * @param req + */ + void deleteQcSample(DeleteQcSampleReqVO req); + } 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 c75fe08..f2b56f9 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 @@ -614,4 +614,19 @@ public class SampleTaskAssignServiceImpl implements SampleTaskAssignService { businessQCCoefficientParameterDataMapper.insertBatch(businessQCCoefficientParameterDataDOList); } } + + @Override + @Transactional(rollbackFor = Exception.class) + public void deleteQcSample(DeleteQcSampleReqVO req) { + if ("kby".equals(req.getDictionaryBusinessKey()) || "by".equals(req.getDictionaryBusinessKey())) {//空白样和标样 + businessQCCoefficientDataMapper.deleteByIds(req.getQcSampleIdList()); + businessQCCoefficientParameterDataMapper.delete(new LambdaQueryWrapperX().in(BusinessQCCoefficientParameterDataDO::getBusinessQCCoefficientDataId, req.getQcSampleIdList())); + } else { //管理样和标准样 + businessQCManagementDataMapper.deleteByIds(req.getQcSampleIdList()); + List businessQCManagementProjectDataList = businessQCManagementProjectDataMapper.selectByBusinessQCManagementDataIds(req.getQcSampleIdList()); + List businessQCManagementProjectDataIdList = businessQCManagementProjectDataList.stream().map(m -> m.getId()).collect(Collectors.toList()); + businessQCManagementProjectDataMapper.deleteByIds(businessQCManagementProjectDataIdList); + businessQCManagementParameterDataMapper.delete(new LambdaQueryWrapperX().in(BusinessQCManagementParameterDataDO::getBusinessQCManagementProjectDataId, businessQCManagementProjectDataIdList)); + } + } } diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/BusinessAssayTaskAnalysisDataRespVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/BusinessAssayTaskAnalysisDataRespVO.java index ae8c135..45fb2a9 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/BusinessAssayTaskAnalysisDataRespVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/BusinessAssayTaskAnalysisDataRespVO.java @@ -16,6 +16,9 @@ public class BusinessAssayTaskAnalysisDataRespVO { /** 分析类型 **/ private String analysisType; + /** 分析名称 **/ + private String analysisName; + /** 排序号 **/ private Integer sortNo;