From fb8706441bab6e7d0fb6e68730876117765bd897 Mon Sep 17 00:00:00 2001 From: wxr Date: Wed, 5 Nov 2025 16:53:15 +0800 Subject: [PATCH 1/4] fix --- .../admin/SampleAnalysisController.java | 8 +- ...yTaskAnalysisSampleAndQcProjectRespVO.java | 56 ++++++++++++++ ...sAssayTaskAnalysisSampleProjectRespVO.java | 4 + .../mapper/BusinessQCProjectDataMapper.java | 5 ++ .../bus/service/SampleAnalysisService.java | 8 +- .../service/SampleAnalysisServiceImpl.java | 74 +++++++++++++++++++ .../BusinessAssayTaskAnalysisDataRespVO.java | 28 +++++++ 7 files changed, 181 insertions(+), 2 deletions(-) create mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskAnalysisSampleAndQcProjectRespVO.java create mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/BusinessAssayTaskAnalysisDataRespVO.java diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/SampleAnalysisController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/SampleAnalysisController.java index a345dda..eca31d3 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/SampleAnalysisController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/SampleAnalysisController.java @@ -8,7 +8,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import com.zt.plat.framework.common.pojo.CommonResult; -import com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayTaskAnalysisSampleProjectRespVO; +import com.zt.plat.module.qms.business.bus.controller.vo.*; import com.zt.plat.module.qms.business.bus.service.SampleAnalysisService; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.annotation.Resource; @@ -39,6 +39,12 @@ public class SampleAnalysisController { return success("成功"); } + @GetMapping("/batchSampleAndQcAnalysisByTaskId") + public CommonResult batchSampleAndQcAnalysisByTaskId(Long businessAssayTaskId) { + BusinessAssayTaskAnalysisSampleAndQcProjectRespVO businessAssayTaskAnalysisSampleAndQcProject = sampleAnalysisService.batchSampleAndQcAnalysisByTaskId(businessAssayTaskId); + return success(businessAssayTaskAnalysisSampleAndQcProject); + } + @PostMapping("/submitSampleAnalysisByTaskId") public CommonResult submitSampleAnalysisByTaskId(Long businessAssayTaskId) { 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 new file mode 100644 index 0000000..bba4d9d --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskAnalysisSampleAndQcProjectRespVO.java @@ -0,0 +1,56 @@ +package com.zt.plat.module.qms.business.bus.controller.vo; + +import java.time.LocalDateTime; +import java.util.List; + +import com.zt.plat.module.qms.business.config.controller.vo.*; + +import lombok.Data; + +/** + * 分配任务单 分析样品及质控样品检测项目 + */ +@Data +public class BusinessAssayTaskAnalysisSampleAndQcProjectRespVO { + + /** 分配任务单id **/ + private Long businessAssayTaskId; + + /** 任务分配单编号 **/ + private String businessAssayTasNo; + + /** 任务分配单名称 **/ + private String businessAssayTasName; + + /** 分析人员 **/ + private String assayOperator; + + /** 分析时间 **/ + private LocalDateTime assayTime; + + /** 检测方法id **/ + private Long configAssayMethodId; + + /** 检测方法名称 **/ + private String configAssayMethodName; + + /** 数据集key **/ + private String dataCollectionKey; + + /** 数据集id **/ + private Long dataCollectionId; + + /** 动态表单值 **/ + private String formValue; + + /** 分配任务的分析数据 **/ + private List assayTaskAnalysisDataList; + + /** 检测方法分析项目补正系数 **/ + private List configAssayMethodProjectCoefficientList; + + /** 检测方法范围 **/ + private List configAssayMethodProjectRangeList; + + +} diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskAnalysisSampleProjectRespVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskAnalysisSampleProjectRespVO.java index 10d8279..c1dbc4a 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskAnalysisSampleProjectRespVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskAnalysisSampleProjectRespVO.java @@ -4,6 +4,7 @@ import java.time.LocalDateTime; import java.util.List; import java.util.Map; +import com.zt.plat.module.qms.business.config.controller.vo.ConfigAssayMethodProjectCoefficientRespVO; import com.zt.plat.module.qms.business.config.controller.vo.ConfigAssayMethodProjectRangeRespVO; import lombok.Data; @@ -48,6 +49,9 @@ public class BusinessAssayTaskAnalysisSampleProjectRespVO { /** 分析的数据 **/ private List> datas; + + /** 检测方法分析项目补正系数 **/ + private List configAssayMethodProjectCoefficientList; /** 检测方法范围 **/ private List configAssayMethodProjectRangeList; diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessQCProjectDataMapper.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessQCProjectDataMapper.java index d5ed79e..e06bcf1 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessQCProjectDataMapper.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessQCProjectDataMapper.java @@ -35,5 +35,10 @@ public interface BusinessQCProjectDataMapper extends BaseMapperX selectByBusinessQCDataIds(List businessQCDataIds) { + return selectList(new LambdaQueryWrapperX() + .in(BusinessQCProjectDataDO::getBusinessQCDataId, businessQCDataIds)); + } } \ 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/SampleAnalysisService.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleAnalysisService.java index 5f248c0..9069f58 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleAnalysisService.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleAnalysisService.java @@ -1,7 +1,6 @@ package com.zt.plat.module.qms.business.bus.service; import com.zt.plat.module.qms.business.bus.controller.vo.*; -import com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayTaskAnalysisSampleProjectRespVO; /** * SampleAnalysisService @@ -30,6 +29,13 @@ public interface SampleAnalysisService { */ void saveBatchSampleAnalysis(BusinessAssayTaskAnalysisSampleProjectRespVO vo); + /** + * 根据分配任务id 获取任务分配单 分析样品项目及品控样品项目 + * @param businessAssayTaskId + * @return + */ + BusinessAssayTaskAnalysisSampleAndQcProjectRespVO batchSampleAndQcAnalysisByTaskId(Long businessAssayTaskId); + /** * 根据任务单id提交分析数据 * @param businessAssayTaskId 任务单id 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 05c2996..2881e9b 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 @@ -23,22 +23,33 @@ import com.zt.plat.module.qms.business.bus.controller.vo.BatchSampleAnalysisColu import com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayParameterDataReqVO; import com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayProjectAndParameterRespVO; import com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayProjectDataReqVO; +import com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayTaskAnalysisSampleAndQcProjectRespVO; import com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayTaskAnalysisSampleProjectRespVO; import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessAssayParameterDataDO; import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessAssayProjectDataDO; import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessAssayTaskDO; import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessAssayTaskDataDO; import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessAssayTaskDetailDO; +import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCDataDO; import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessAssayParameterDataMapper; import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessAssayProjectDataMapper; import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessAssayTaskDataMapper; import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessAssayTaskDetailMapper; import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessAssayTaskMapper; +import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessQCDataMapper; +import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessQCParameterDataMapper; +import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessQCProjectDataMapper; +import com.zt.plat.module.qms.business.config.controller.vo.BusinessAssayTaskAnalysisDataRespVO; +import com.zt.plat.module.qms.business.config.controller.vo.ConfigAssayMethodProjectCoefficientRespVO; import com.zt.plat.module.qms.business.config.controller.vo.ConfigAssayMethodProjectRangeRespVO; +import com.zt.plat.module.qms.business.config.controller.vo.ConfigQCSampleMethodExtendRespVO; import com.zt.plat.module.qms.business.config.dal.dataobject.ConfigAssayMethodDO; +import com.zt.plat.module.qms.business.config.dal.dataobject.ConfigAssayMethodProjectCoefficientDO; import com.zt.plat.module.qms.business.config.dal.dataobject.ConfigAssayMethodProjectRangeDO; import com.zt.plat.module.qms.business.config.dal.mapper.ConfigAssayMethodMapper; +import com.zt.plat.module.qms.business.config.dal.mapper.ConfigAssayMethodProjectCoefficientMapper; import com.zt.plat.module.qms.business.config.dal.mapper.ConfigAssayMethodProjectRangeMapper; +import com.zt.plat.module.qms.business.config.dal.mapper.ConfigQCSampleMethodMapper; import com.zt.plat.module.qms.common.data.dal.dataobject.DataCollectionDO; import com.zt.plat.module.qms.common.data.service.DataCollectionService; import com.zt.plat.module.qms.enums.QmsCommonConstant; @@ -67,6 +78,9 @@ public class SampleAnalysisServiceImpl implements SampleAnalysisService { @Resource private ConfigAssayMethodProjectRangeMapper configAssayMethodProjectRangeMapper; + @Resource + private ConfigAssayMethodProjectCoefficientMapper configAssayMethodProjectCoefficientMapper; + @Resource private BusinessAssayTaskMapper businessAssayTaskMapper; @@ -82,6 +96,18 @@ public class SampleAnalysisServiceImpl implements SampleAnalysisService { @Resource private BusinessAssayParameterDataMapper businessAssayParameterDataMapper; + @Resource + private ConfigQCSampleMethodMapper configQCSampleMethodMapper; + + @Resource + private BusinessQCDataMapper businessQCDataMapper; + + @Resource + private BusinessQCProjectDataMapper businessQCProjectDataMapper; + + @Resource + private BusinessQCParameterDataMapper businessQCParameterDataMapper; + @Resource private DataCollectionService dataCollectionService; @@ -180,6 +206,10 @@ public class SampleAnalysisServiceImpl implements SampleAnalysisService { List configAssayMethodProjectRangeDOList = configAssayMethodProjectRangeMapper.selectList(new LambdaQueryWrapperX().eq(ConfigAssayMethodProjectRangeDO::getConfigAssayMethodId, businessAssayTaskDO.getConfigAssayMethodId())); businessAssayTaskAnalysisSampleProjectRespVO.setConfigAssayMethodProjectRangeList(BeanUtils.toBean(configAssayMethodProjectRangeDOList, ConfigAssayMethodProjectRangeRespVO.class)); + //查询补正系数 + List configAssayMethodProjectCoefficientDOList = configAssayMethodProjectCoefficientMapper.selectList(new LambdaQueryWrapperX().eq(ConfigAssayMethodProjectCoefficientDO::getConfigAssayMethodId, businessAssayTaskDO.getConfigAssayMethodId())); + businessAssayTaskAnalysisSampleProjectRespVO.setConfigAssayMethodProjectCoefficientList(BeanUtils.toBean(configAssayMethodProjectCoefficientDOList, ConfigAssayMethodProjectCoefficientRespVO.class)); + return businessAssayTaskAnalysisSampleProjectRespVO; } @@ -304,6 +334,50 @@ public class SampleAnalysisServiceImpl implements SampleAnalysisService { } } + @Override + public BusinessAssayTaskAnalysisSampleAndQcProjectRespVO batchSampleAndQcAnalysisByTaskId(Long businessAssayTaskId) { + BusinessAssayTaskAnalysisSampleAndQcProjectRespVO businessAssayTaskAnalysisSampleAndQcProjectRespVO = new BusinessAssayTaskAnalysisSampleAndQcProjectRespVO(); + BusinessAssayTaskDO businessAssayTaskDO = businessAssayTaskMapper.selectById(businessAssayTaskId); + if (businessAssayTaskDO == null) { + throw new ServiceException(1_032_100_000, "未找到任务分配单"); + } + businessAssayTaskAnalysisSampleAndQcProjectRespVO.setBusinessAssayTaskId(businessAssayTaskId); + businessAssayTaskAnalysisSampleAndQcProjectRespVO.setBusinessAssayTasNo(businessAssayTaskDO.getTaskNo()); + businessAssayTaskAnalysisSampleAndQcProjectRespVO.setBusinessAssayTasName(businessAssayTaskDO.getTaskName()); + businessAssayTaskAnalysisSampleAndQcProjectRespVO.setAssayOperator(businessAssayTaskDO.getAssayOperator()); + businessAssayTaskAnalysisSampleAndQcProjectRespVO.setAssayTime(businessAssayTaskDO.getAssayTime()); + businessAssayTaskAnalysisSampleAndQcProjectRespVO.setConfigAssayMethodId(businessAssayTaskDO.getConfigAssayMethodId()); + businessAssayTaskAnalysisSampleAndQcProjectRespVO.setDataCollectionId(businessAssayTaskDO.getFormDataCollectionId()); + businessAssayTaskAnalysisSampleAndQcProjectRespVO.setFormValue(businessAssayTaskDO.getFormValue()); + + ConfigAssayMethodDO configAssayMethodDO = configAssayMethodMapper.selectById(businessAssayTaskDO.getConfigAssayMethodId()); + businessAssayTaskAnalysisSampleAndQcProjectRespVO.setConfigAssayMethodName(configAssayMethodDO.getName()); + businessAssayTaskAnalysisSampleAndQcProjectRespVO.setDataCollectionKey(configAssayMethodDO.getDataCollectionKey()); + + + + + //查询区间范围 + List configAssayMethodProjectRangeDOList = configAssayMethodProjectRangeMapper.selectList(new LambdaQueryWrapperX().eq(ConfigAssayMethodProjectRangeDO::getConfigAssayMethodId, businessAssayTaskDO.getConfigAssayMethodId())); + businessAssayTaskAnalysisSampleAndQcProjectRespVO.setConfigAssayMethodProjectRangeList(BeanUtils.toBean(configAssayMethodProjectRangeDOList, ConfigAssayMethodProjectRangeRespVO.class)); + + //查询补正系数 + List configAssayMethodProjectCoefficientDOList = configAssayMethodProjectCoefficientMapper.selectList(new LambdaQueryWrapperX().eq(ConfigAssayMethodProjectCoefficientDO::getConfigAssayMethodId, businessAssayTaskDO.getConfigAssayMethodId())); + businessAssayTaskAnalysisSampleAndQcProjectRespVO.setConfigAssayMethodProjectCoefficientList(BeanUtils.toBean(configAssayMethodProjectCoefficientDOList, ConfigAssayMethodProjectCoefficientRespVO.class)); + + return businessAssayTaskAnalysisSampleAndQcProjectRespVO; + } + + private List getQcAnalysis(BusinessAssayTaskDO businessAssayTaskDO) { + List list = new ArrayList<>(); + List configQCSampleMethodList = configQCSampleMethodMapper.selectByConfigAssayMethodId(businessAssayTaskDO.getConfigAssayMethodId()); + List businessQCDataDOList = businessQCDataMapper.selectByBusinessAssayTaskId(businessAssayTaskDO.getConfigAssayMethodId()); + //businessQCProjectDataMapper.selectby + + return list; + } + + @Override public void submitSampleAnalysisByTaskId(Long businessAssayTaskId) { String loginUserNickname = SecurityFrameworkUtils.getLoginUserNickname(); 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 new file mode 100644 index 0000000..b62aec8 --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/BusinessAssayTaskAnalysisDataRespVO.java @@ -0,0 +1,28 @@ +package com.zt.plat.module.qms.business.config.controller.vo; + +import java.util.List; +import java.util.Map; + +import com.zt.plat.module.qms.business.bus.controller.vo.BatchSampleAnalysisColumnRespVO; + +import lombok.Data; + +/** + * 分析数据 + */ +@Data +public class BusinessAssayTaskAnalysisDataRespVO { + + /** 分析类型 **/ + private String analysisType; + + /** 排序号 **/ + private Integer sortNo; + + + /** 分析的列 **/ + private List columns; + + /** 分析的数据 **/ + private List> datas; +} From 44402884799384b14ebe265f0a8a6248cec4667c Mon Sep 17 00:00:00 2001 From: wxr Date: Wed, 5 Nov 2025 18:18:11 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=A9=BA=E7=99=BD?= =?UTF-8?q?=E6=A0=B7=E4=B8=8E=E8=B4=A8=E6=8E=A7=E6=A0=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/qms/enums/ErrorCodeConstants.java | 7 + .../BusinessQCCoefficientDataController.java | 106 ++++++++++++++ ...sQCCoefficientParameterDataController.java | 106 ++++++++++++++ .../BusinessQCManagementDataController.java | 106 ++++++++++++++ ...ssQCManagementParameterDataController.java | 106 ++++++++++++++ ...nessQCManagementProjectDataController.java | 106 ++++++++++++++ .../BusinessQCCoefficientDataPageReqVO.java | 79 +++++++++++ .../vo/BusinessQCCoefficientDataRespVO.java | 99 +++++++++++++ .../BusinessQCCoefficientDataSaveReqVO.java | 79 +++++++++++ ...ssQCCoefficientParameterDataPageReqVO.java | 47 +++++++ ...inessQCCoefficientParameterDataRespVO.java | 59 ++++++++ ...ssQCCoefficientParameterDataSaveReqVO.java | 47 +++++++ .../vo/BusinessQCManagementDataPageReqVO.java | 79 +++++++++++ .../vo/BusinessQCManagementDataRespVO.java | 99 +++++++++++++ .../vo/BusinessQCManagementDataSaveReqVO.java | 79 +++++++++++ ...essQCManagementParameterDataPageReqVO.java | 47 +++++++ ...sinessQCManagementParameterDataRespVO.java | 59 ++++++++ ...essQCManagementParameterDataSaveReqVO.java | 47 +++++++ ...inessQCManagementProjectDataPageReqVO.java | 59 ++++++++ ...BusinessQCManagementProjectDataRespVO.java | 75 ++++++++++ ...inessQCManagementProjectDataSaveReqVO.java | 61 ++++++++ .../BusinessQCCoefficientDataDO.java | 132 ++++++++++++++++++ .../BusinessQCCoefficientParameterDataDO.java | 80 +++++++++++ .../BusinessQCManagementDataDO.java | 132 ++++++++++++++++++ .../BusinessQCManagementParameterDataDO.java | 80 +++++++++++ .../BusinessQCManagementProjectDataDO.java | 100 +++++++++++++ .../BusinessQCCoefficientDataMapper.java | 45 ++++++ ...inessQCCoefficientParameterDataMapper.java | 35 +++++ .../BusinessQCManagementDataMapper.java | 45 ++++++ ...sinessQCManagementParameterDataMapper.java | 35 +++++ ...BusinessQCManagementProjectDataMapper.java | 39 ++++++ .../BusinessQCCoefficientDataService.java | 62 ++++++++ .../BusinessQCCoefficientDataServiceImpl.java | 91 ++++++++++++ ...nessQCCoefficientParameterDataService.java | 62 ++++++++ ...QCCoefficientParameterDataServiceImpl.java | 91 ++++++++++++ .../BusinessQCManagementDataService.java | 62 ++++++++ .../BusinessQCManagementDataServiceImpl.java | 91 ++++++++++++ ...inessQCManagementParameterDataService.java | 62 ++++++++ ...sQCManagementParameterDataServiceImpl.java | 91 ++++++++++++ ...usinessQCManagementProjectDataService.java | 62 ++++++++ ...essQCManagementProjectDataServiceImpl.java | 91 ++++++++++++ .../BusinessQCCoefficientDataMapper.xml | 12 ++ ...sinessQCCoefficientParameterDataMapper.xml | 12 ++ .../mapper/BusinessQCManagementDataMapper.xml | 12 ++ ...usinessQCManagementParameterDataMapper.xml | 12 ++ .../BusinessQCManagementProjectDataMapper.xml | 12 ++ 46 files changed, 3100 insertions(+) create mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessQCCoefficientDataController.java create mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessQCCoefficientParameterDataController.java create mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessQCManagementDataController.java create mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessQCManagementParameterDataController.java create mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessQCManagementProjectDataController.java create mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessQCCoefficientDataPageReqVO.java create mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessQCCoefficientDataRespVO.java create mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessQCCoefficientDataSaveReqVO.java create mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessQCCoefficientParameterDataPageReqVO.java create mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessQCCoefficientParameterDataRespVO.java create mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessQCCoefficientParameterDataSaveReqVO.java create mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessQCManagementDataPageReqVO.java create mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessQCManagementDataRespVO.java create mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessQCManagementDataSaveReqVO.java create mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessQCManagementParameterDataPageReqVO.java create mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessQCManagementParameterDataRespVO.java create mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessQCManagementParameterDataSaveReqVO.java create mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessQCManagementProjectDataPageReqVO.java create mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessQCManagementProjectDataRespVO.java create mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessQCManagementProjectDataSaveReqVO.java create mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessQCCoefficientDataDO.java create mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessQCCoefficientParameterDataDO.java create mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessQCManagementDataDO.java create mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessQCManagementParameterDataDO.java create mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessQCManagementProjectDataDO.java create mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessQCCoefficientDataMapper.java create mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessQCCoefficientParameterDataMapper.java create mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessQCManagementDataMapper.java create mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessQCManagementParameterDataMapper.java create mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessQCManagementProjectDataMapper.java create mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessQCCoefficientDataService.java create mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessQCCoefficientDataServiceImpl.java create mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessQCCoefficientParameterDataService.java create mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessQCCoefficientParameterDataServiceImpl.java create mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessQCManagementDataService.java create mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessQCManagementDataServiceImpl.java create mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessQCManagementParameterDataService.java create mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessQCManagementParameterDataServiceImpl.java create mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessQCManagementProjectDataService.java create mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessQCManagementProjectDataServiceImpl.java create mode 100644 zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessQCCoefficientDataMapper.xml create mode 100644 zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessQCCoefficientParameterDataMapper.xml create mode 100644 zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessQCManagementDataMapper.xml create mode 100644 zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessQCManagementParameterDataMapper.xml create mode 100644 zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessQCManagementProjectDataMapper.xml diff --git a/zt-module-qms/zt-module-qms-api/src/main/java/com/zt/plat/module/qms/enums/ErrorCodeConstants.java b/zt-module-qms/zt-module-qms-api/src/main/java/com/zt/plat/module/qms/enums/ErrorCodeConstants.java index 65744d4..0d92bf7 100644 --- a/zt-module-qms/zt-module-qms-api/src/main/java/com/zt/plat/module/qms/enums/ErrorCodeConstants.java +++ b/zt-module-qms/zt-module-qms-api/src/main/java/com/zt/plat/module/qms/enums/ErrorCodeConstants.java @@ -113,6 +113,13 @@ public interface ErrorCodeConstants { ErrorCode BUSINESS_QC_DATA_NOT_EXISTS = new ErrorCode(1_032_100_000, "质控样业务不存在"); ErrorCode BUSINESS_QC_PROJECT_DATA_NOT_EXISTS = new ErrorCode(1_032_100_000, "质控样检测项目数据业务不存在"); ErrorCode BUSINESS_QC_PARAMETER_DATA_NOT_EXISTS = new ErrorCode(1_032_100_000, "质控样检测参数数据业务不存在"); + + ErrorCode BUSINESS_QC_MANAGEMENT_DATA_NOT_EXISTS = new ErrorCode(1_032_100_000, "质控管理样检测任务数据,管理样、标准样不存在"); + ErrorCode BUSINESS_QC_MANAGEMENT_PROJECT_DATA_NOT_EXISTS = new ErrorCode(1_032_100_000, "质控样检测项目数据业务不存在"); + ErrorCode BUSINESS_QC_MANAGEMENT_PARAMETER_DATA_NOT_EXISTS = new ErrorCode(1_032_100_000, "质控样检测参数数据业务不存在"); + ErrorCode BUSINESS_QC_COEFFICIENT_DATA_NOT_EXISTS = new ErrorCode(1_032_100_000, "质控样检测系数任务数据,空白样、标样不存在"); + ErrorCode BUSINESS_QC_COEFFICIENT_PARAMETER_DATA_NOT_EXISTS = new ErrorCode(1_032_100_000, "质控样检测系数参数业务不存在"); + //检测报告 ErrorCode REPORT_DOCUMENT_MAIN_NOT_EXISTS = new ErrorCode(1_032_100_000, "检测报告业务不存在"); diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessQCCoefficientDataController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessQCCoefficientDataController.java new file mode 100644 index 0000000..9963b50 --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessQCCoefficientDataController.java @@ -0,0 +1,106 @@ +package com.zt.plat.module.qms.business.bus.controller.admin; + +import org.springframework.web.bind.annotation.*; +import jakarta.annotation.Resource; +import org.springframework.validation.annotation.Validated; +import org.springframework.security.access.prepost.PreAuthorize; +import com.zt.plat.framework.business.interceptor.BusinessControllerMarker; + +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.Operation; + +import jakarta.validation.constraints.*; +import jakarta.validation.*; +import jakarta.servlet.http.*; +import java.util.*; +import java.io.IOException; + +import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO; +import com.zt.plat.framework.common.pojo.PageParam; +import com.zt.plat.framework.common.pojo.PageResult; +import com.zt.plat.framework.common.pojo.CommonResult; +import com.zt.plat.framework.common.util.object.BeanUtils; +import static com.zt.plat.framework.common.pojo.CommonResult.success; + +import com.zt.plat.framework.excel.core.util.ExcelUtils; +import com.zt.plat.module.qms.business.bus.controller.vo.*; +import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCCoefficientDataDO; +import com.zt.plat.module.qms.business.bus.service.BusinessQCCoefficientDataService; +import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog; +import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*; + +@Tag(name = "管理后台 - 质控样检测系数任务数据,空白样、标样") +@RestController +@RequestMapping("/qms/business-qc-coefficient-data") +@Validated +public class BusinessQCCoefficientDataController implements BusinessControllerMarker { + + + @Resource + private BusinessQCCoefficientDataService businessQCCoefficientDataService; + + @PostMapping("/create") + @Operation(summary = "创建质控样检测系数任务数据,空白样、标样") + @PreAuthorize("@ss.hasPermission('qms:business-QC-coefficient-data:create')") + public CommonResult createBusinessQCCoefficientData(@Valid @RequestBody BusinessQCCoefficientDataSaveReqVO createReqVO) { + return success(businessQCCoefficientDataService.createBusinessQCCoefficientData(createReqVO)); + } + + @PutMapping("/update") + @Operation(summary = "更新质控样检测系数任务数据,空白样、标样") + @PreAuthorize("@ss.hasPermission('qms:business-QC-coefficient-data:update')") + public CommonResult updateBusinessQCCoefficientData(@Valid @RequestBody BusinessQCCoefficientDataSaveReqVO updateReqVO) { + businessQCCoefficientDataService.updateBusinessQCCoefficientData(updateReqVO); + return success(true); + } + + @DeleteMapping("/delete") + @Operation(summary = "删除质控样检测系数任务数据,空白样、标样") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('qms:business-QC-coefficient-data:delete')") + public CommonResult deleteBusinessQCCoefficientData(@RequestParam("id") Long id) { + businessQCCoefficientDataService.deleteBusinessQCCoefficientData(id); + return success(true); + } + + @DeleteMapping("/delete-list") + @Parameter(name = "ids", description = "编号", required = true) + @Operation(summary = "批量删除质控样检测系数任务数据,空白样、标样") + @PreAuthorize("@ss.hasPermission('qms:business-QC-coefficient-data:delete')") + public CommonResult deleteBusinessQCCoefficientDataList(@RequestBody BatchDeleteReqVO req) { + businessQCCoefficientDataService.deleteBusinessQCCoefficientDataListByIds(req.getIds()); + return success(true); + } + + @GetMapping("/get") + @Operation(summary = "获得质控样检测系数任务数据,空白样、标样") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('qms:business-QC-coefficient-data:query')") + public CommonResult getBusinessQCCoefficientData(@RequestParam("id") Long id) { + BusinessQCCoefficientDataDO businessQCCoefficientData = businessQCCoefficientDataService.getBusinessQCCoefficientData(id); + return success(BeanUtils.toBean(businessQCCoefficientData, BusinessQCCoefficientDataRespVO.class)); + } + + @GetMapping("/page") + @Operation(summary = "获得质控样检测系数任务数据,空白样、标样分页") + @PreAuthorize("@ss.hasPermission('qms:business-QC-coefficient-data:query')") + public CommonResult> getBusinessQCCoefficientDataPage(@Valid BusinessQCCoefficientDataPageReqVO pageReqVO) { + PageResult pageResult = businessQCCoefficientDataService.getBusinessQCCoefficientDataPage(pageReqVO); + return success(BeanUtils.toBean(pageResult, BusinessQCCoefficientDataRespVO.class)); + } + + @GetMapping("/export-excel") + @Operation(summary = "导出质控样检测系数任务数据,空白样、标样 Excel") + @PreAuthorize("@ss.hasPermission('qms:business-QC-coefficient-data:export')") + @ApiAccessLog(operateType = EXPORT) + public void exportBusinessQCCoefficientDataExcel(@Valid BusinessQCCoefficientDataPageReqVO pageReqVO, + HttpServletResponse response) throws IOException { + pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); + List list = businessQCCoefficientDataService.getBusinessQCCoefficientDataPage(pageReqVO).getList(); + // 导出 Excel + ExcelUtils.write(response, "质控样检测系数任务数据,空白样、标样.xls", "数据", BusinessQCCoefficientDataRespVO.class, + BeanUtils.toBean(list, BusinessQCCoefficientDataRespVO.class)); + } + +} \ 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/controller/admin/BusinessQCCoefficientParameterDataController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessQCCoefficientParameterDataController.java new file mode 100644 index 0000000..6356dd4 --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessQCCoefficientParameterDataController.java @@ -0,0 +1,106 @@ +package com.zt.plat.module.qms.business.bus.controller.admin; + +import org.springframework.web.bind.annotation.*; +import jakarta.annotation.Resource; +import org.springframework.validation.annotation.Validated; +import org.springframework.security.access.prepost.PreAuthorize; +import com.zt.plat.framework.business.interceptor.BusinessControllerMarker; + +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.Operation; + +import jakarta.validation.constraints.*; +import jakarta.validation.*; +import jakarta.servlet.http.*; +import java.util.*; +import java.io.IOException; + +import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO; +import com.zt.plat.framework.common.pojo.PageParam; +import com.zt.plat.framework.common.pojo.PageResult; +import com.zt.plat.framework.common.pojo.CommonResult; +import com.zt.plat.framework.common.util.object.BeanUtils; +import static com.zt.plat.framework.common.pojo.CommonResult.success; + +import com.zt.plat.framework.excel.core.util.ExcelUtils; +import com.zt.plat.module.qms.business.bus.controller.vo.*; +import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCCoefficientParameterDataDO; +import com.zt.plat.module.qms.business.bus.service.BusinessQCCoefficientParameterDataService; +import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog; +import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*; + +@Tag(name = "管理后台 - 质控样检测系数参数业务") +@RestController +@RequestMapping("/qms/business-qc-coefficient-parameter-data") +@Validated +public class BusinessQCCoefficientParameterDataController implements BusinessControllerMarker { + + + @Resource + private BusinessQCCoefficientParameterDataService businessQCCoefficientParameterDataService; + + @PostMapping("/create") + @Operation(summary = "创建质控样检测系数参数业务") + @PreAuthorize("@ss.hasPermission('qms:business-QC-coefficient-parameter-data:create')") + public CommonResult createBusinessQCCoefficientParameterData(@Valid @RequestBody BusinessQCCoefficientParameterDataSaveReqVO createReqVO) { + return success(businessQCCoefficientParameterDataService.createBusinessQCCoefficientParameterData(createReqVO)); + } + + @PutMapping("/update") + @Operation(summary = "更新质控样检测系数参数业务") + @PreAuthorize("@ss.hasPermission('qms:business-QC-coefficient-parameter-data:update')") + public CommonResult updateBusinessQCCoefficientParameterData(@Valid @RequestBody BusinessQCCoefficientParameterDataSaveReqVO updateReqVO) { + businessQCCoefficientParameterDataService.updateBusinessQCCoefficientParameterData(updateReqVO); + return success(true); + } + + @DeleteMapping("/delete") + @Operation(summary = "删除质控样检测系数参数业务") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('qms:business-QC-coefficient-parameter-data:delete')") + public CommonResult deleteBusinessQCCoefficientParameterData(@RequestParam("id") Long id) { + businessQCCoefficientParameterDataService.deleteBusinessQCCoefficientParameterData(id); + return success(true); + } + + @DeleteMapping("/delete-list") + @Parameter(name = "ids", description = "编号", required = true) + @Operation(summary = "批量删除质控样检测系数参数业务") + @PreAuthorize("@ss.hasPermission('qms:business-QC-coefficient-parameter-data:delete')") + public CommonResult deleteBusinessQCCoefficientParameterDataList(@RequestBody BatchDeleteReqVO req) { + businessQCCoefficientParameterDataService.deleteBusinessQCCoefficientParameterDataListByIds(req.getIds()); + return success(true); + } + + @GetMapping("/get") + @Operation(summary = "获得质控样检测系数参数业务") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('qms:business-QC-coefficient-parameter-data:query')") + public CommonResult getBusinessQCCoefficientParameterData(@RequestParam("id") Long id) { + BusinessQCCoefficientParameterDataDO businessQCCoefficientParameterData = businessQCCoefficientParameterDataService.getBusinessQCCoefficientParameterData(id); + return success(BeanUtils.toBean(businessQCCoefficientParameterData, BusinessQCCoefficientParameterDataRespVO.class)); + } + + @GetMapping("/page") + @Operation(summary = "获得质控样检测系数参数业务分页") + @PreAuthorize("@ss.hasPermission('qms:business-QC-coefficient-parameter-data:query')") + public CommonResult> getBusinessQCCoefficientParameterDataPage(@Valid BusinessQCCoefficientParameterDataPageReqVO pageReqVO) { + PageResult pageResult = businessQCCoefficientParameterDataService.getBusinessQCCoefficientParameterDataPage(pageReqVO); + return success(BeanUtils.toBean(pageResult, BusinessQCCoefficientParameterDataRespVO.class)); + } + + @GetMapping("/export-excel") + @Operation(summary = "导出质控样检测系数参数业务 Excel") + @PreAuthorize("@ss.hasPermission('qms:business-QC-coefficient-parameter-data:export')") + @ApiAccessLog(operateType = EXPORT) + public void exportBusinessQCCoefficientParameterDataExcel(@Valid BusinessQCCoefficientParameterDataPageReqVO pageReqVO, + HttpServletResponse response) throws IOException { + pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); + List list = businessQCCoefficientParameterDataService.getBusinessQCCoefficientParameterDataPage(pageReqVO).getList(); + // 导出 Excel + ExcelUtils.write(response, "质控样检测系数参数业务.xls", "数据", BusinessQCCoefficientParameterDataRespVO.class, + BeanUtils.toBean(list, BusinessQCCoefficientParameterDataRespVO.class)); + } + +} \ 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/controller/admin/BusinessQCManagementDataController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessQCManagementDataController.java new file mode 100644 index 0000000..6b5998f --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessQCManagementDataController.java @@ -0,0 +1,106 @@ +package com.zt.plat.module.qms.business.bus.controller.admin; + +import org.springframework.web.bind.annotation.*; +import jakarta.annotation.Resource; +import org.springframework.validation.annotation.Validated; +import org.springframework.security.access.prepost.PreAuthorize; +import com.zt.plat.framework.business.interceptor.BusinessControllerMarker; + +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.Operation; + +import jakarta.validation.constraints.*; +import jakarta.validation.*; +import jakarta.servlet.http.*; +import java.util.*; +import java.io.IOException; + +import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO; +import com.zt.plat.framework.common.pojo.PageParam; +import com.zt.plat.framework.common.pojo.PageResult; +import com.zt.plat.framework.common.pojo.CommonResult; +import com.zt.plat.framework.common.util.object.BeanUtils; +import static com.zt.plat.framework.common.pojo.CommonResult.success; + +import com.zt.plat.framework.excel.core.util.ExcelUtils; +import com.zt.plat.module.qms.business.bus.controller.vo.*; +import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCManagementDataDO; +import com.zt.plat.module.qms.business.bus.service.BusinessQCManagementDataService; +import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog; +import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*; + +@Tag(name = "管理后台 - 质控管理样检测任务数据,管理样、标准样") +@RestController +@RequestMapping("/qms/business-qc-management-data") +@Validated +public class BusinessQCManagementDataController implements BusinessControllerMarker { + + + @Resource + private BusinessQCManagementDataService businessQCManagementDataService; + + @PostMapping("/create") + @Operation(summary = "创建质控管理样检测任务数据,管理样、标准样") + @PreAuthorize("@ss.hasPermission('qms:business-QC-management-data:create')") + public CommonResult createBusinessQCManagementData(@Valid @RequestBody BusinessQCManagementDataSaveReqVO createReqVO) { + return success(businessQCManagementDataService.createBusinessQCManagementData(createReqVO)); + } + + @PutMapping("/update") + @Operation(summary = "更新质控管理样检测任务数据,管理样、标准样") + @PreAuthorize("@ss.hasPermission('qms:business-QC-management-data:update')") + public CommonResult updateBusinessQCManagementData(@Valid @RequestBody BusinessQCManagementDataSaveReqVO updateReqVO) { + businessQCManagementDataService.updateBusinessQCManagementData(updateReqVO); + return success(true); + } + + @DeleteMapping("/delete") + @Operation(summary = "删除质控管理样检测任务数据,管理样、标准样") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('qms:business-QC-management-data:delete')") + public CommonResult deleteBusinessQCManagementData(@RequestParam("id") Long id) { + businessQCManagementDataService.deleteBusinessQCManagementData(id); + return success(true); + } + + @DeleteMapping("/delete-list") + @Parameter(name = "ids", description = "编号", required = true) + @Operation(summary = "批量删除质控管理样检测任务数据,管理样、标准样") + @PreAuthorize("@ss.hasPermission('qms:business-QC-management-data:delete')") + public CommonResult deleteBusinessQCManagementDataList(@RequestBody BatchDeleteReqVO req) { + businessQCManagementDataService.deleteBusinessQCManagementDataListByIds(req.getIds()); + return success(true); + } + + @GetMapping("/get") + @Operation(summary = "获得质控管理样检测任务数据,管理样、标准样") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('qms:business-QC-management-data:query')") + public CommonResult getBusinessQCManagementData(@RequestParam("id") Long id) { + BusinessQCManagementDataDO businessQCManagementData = businessQCManagementDataService.getBusinessQCManagementData(id); + return success(BeanUtils.toBean(businessQCManagementData, BusinessQCManagementDataRespVO.class)); + } + + @GetMapping("/page") + @Operation(summary = "获得质控管理样检测任务数据,管理样、标准样分页") + @PreAuthorize("@ss.hasPermission('qms:business-QC-management-data:query')") + public CommonResult> getBusinessQCManagementDataPage(@Valid BusinessQCManagementDataPageReqVO pageReqVO) { + PageResult pageResult = businessQCManagementDataService.getBusinessQCManagementDataPage(pageReqVO); + return success(BeanUtils.toBean(pageResult, BusinessQCManagementDataRespVO.class)); + } + + @GetMapping("/export-excel") + @Operation(summary = "导出质控管理样检测任务数据,管理样、标准样 Excel") + @PreAuthorize("@ss.hasPermission('qms:business-QC-management-data:export')") + @ApiAccessLog(operateType = EXPORT) + public void exportBusinessQCManagementDataExcel(@Valid BusinessQCManagementDataPageReqVO pageReqVO, + HttpServletResponse response) throws IOException { + pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); + List list = businessQCManagementDataService.getBusinessQCManagementDataPage(pageReqVO).getList(); + // 导出 Excel + ExcelUtils.write(response, "质控管理样检测任务数据,管理样、标准样.xls", "数据", BusinessQCManagementDataRespVO.class, + BeanUtils.toBean(list, BusinessQCManagementDataRespVO.class)); + } + +} \ 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/controller/admin/BusinessQCManagementParameterDataController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessQCManagementParameterDataController.java new file mode 100644 index 0000000..4eeaf63 --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessQCManagementParameterDataController.java @@ -0,0 +1,106 @@ +package com.zt.plat.module.qms.business.bus.controller.admin; + +import org.springframework.web.bind.annotation.*; +import jakarta.annotation.Resource; +import org.springframework.validation.annotation.Validated; +import org.springframework.security.access.prepost.PreAuthorize; +import com.zt.plat.framework.business.interceptor.BusinessControllerMarker; + +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.Operation; + +import jakarta.validation.constraints.*; +import jakarta.validation.*; +import jakarta.servlet.http.*; +import java.util.*; +import java.io.IOException; + +import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO; +import com.zt.plat.framework.common.pojo.PageParam; +import com.zt.plat.framework.common.pojo.PageResult; +import com.zt.plat.framework.common.pojo.CommonResult; +import com.zt.plat.framework.common.util.object.BeanUtils; +import static com.zt.plat.framework.common.pojo.CommonResult.success; + +import com.zt.plat.framework.excel.core.util.ExcelUtils; +import com.zt.plat.module.qms.business.bus.controller.vo.*; +import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCManagementParameterDataDO; +import com.zt.plat.module.qms.business.bus.service.BusinessQCManagementParameterDataService; +import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog; +import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*; + +@Tag(name = "管理后台 - 质控样检测参数数据业务") +@RestController +@RequestMapping("/qms/business-qc-management-parameter-data") +@Validated +public class BusinessQCManagementParameterDataController implements BusinessControllerMarker { + + + @Resource + private BusinessQCManagementParameterDataService businessQCManagementParameterDataService; + + @PostMapping("/create") + @Operation(summary = "创建质控样检测参数数据业务") + @PreAuthorize("@ss.hasPermission('qms:business-QC-management-parameter-data:create')") + public CommonResult createBusinessQCManagementParameterData(@Valid @RequestBody BusinessQCManagementParameterDataSaveReqVO createReqVO) { + return success(businessQCManagementParameterDataService.createBusinessQCManagementParameterData(createReqVO)); + } + + @PutMapping("/update") + @Operation(summary = "更新质控样检测参数数据业务") + @PreAuthorize("@ss.hasPermission('qms:business-QC-management-parameter-data:update')") + public CommonResult updateBusinessQCManagementParameterData(@Valid @RequestBody BusinessQCManagementParameterDataSaveReqVO updateReqVO) { + businessQCManagementParameterDataService.updateBusinessQCManagementParameterData(updateReqVO); + return success(true); + } + + @DeleteMapping("/delete") + @Operation(summary = "删除质控样检测参数数据业务") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('qms:business-QC-management-parameter-data:delete')") + public CommonResult deleteBusinessQCManagementParameterData(@RequestParam("id") Long id) { + businessQCManagementParameterDataService.deleteBusinessQCManagementParameterData(id); + return success(true); + } + + @DeleteMapping("/delete-list") + @Parameter(name = "ids", description = "编号", required = true) + @Operation(summary = "批量删除质控样检测参数数据业务") + @PreAuthorize("@ss.hasPermission('qms:business-QC-management-parameter-data:delete')") + public CommonResult deleteBusinessQCManagementParameterDataList(@RequestBody BatchDeleteReqVO req) { + businessQCManagementParameterDataService.deleteBusinessQCManagementParameterDataListByIds(req.getIds()); + return success(true); + } + + @GetMapping("/get") + @Operation(summary = "获得质控样检测参数数据业务") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('qms:business-QC-management-parameter-data:query')") + public CommonResult getBusinessQCManagementParameterData(@RequestParam("id") Long id) { + BusinessQCManagementParameterDataDO businessQCManagementParameterData = businessQCManagementParameterDataService.getBusinessQCManagementParameterData(id); + return success(BeanUtils.toBean(businessQCManagementParameterData, BusinessQCManagementParameterDataRespVO.class)); + } + + @GetMapping("/page") + @Operation(summary = "获得质控样检测参数数据业务分页") + @PreAuthorize("@ss.hasPermission('qms:business-QC-management-parameter-data:query')") + public CommonResult> getBusinessQCManagementParameterDataPage(@Valid BusinessQCManagementParameterDataPageReqVO pageReqVO) { + PageResult pageResult = businessQCManagementParameterDataService.getBusinessQCManagementParameterDataPage(pageReqVO); + return success(BeanUtils.toBean(pageResult, BusinessQCManagementParameterDataRespVO.class)); + } + + @GetMapping("/export-excel") + @Operation(summary = "导出质控样检测参数数据业务 Excel") + @PreAuthorize("@ss.hasPermission('qms:business-QC-management-parameter-data:export')") + @ApiAccessLog(operateType = EXPORT) + public void exportBusinessQCManagementParameterDataExcel(@Valid BusinessQCManagementParameterDataPageReqVO pageReqVO, + HttpServletResponse response) throws IOException { + pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); + List list = businessQCManagementParameterDataService.getBusinessQCManagementParameterDataPage(pageReqVO).getList(); + // 导出 Excel + ExcelUtils.write(response, "质控样检测参数数据业务.xls", "数据", BusinessQCManagementParameterDataRespVO.class, + BeanUtils.toBean(list, BusinessQCManagementParameterDataRespVO.class)); + } + +} \ 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/controller/admin/BusinessQCManagementProjectDataController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessQCManagementProjectDataController.java new file mode 100644 index 0000000..cf3ee27 --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessQCManagementProjectDataController.java @@ -0,0 +1,106 @@ +package com.zt.plat.module.qms.business.bus.controller.admin; + +import org.springframework.web.bind.annotation.*; +import jakarta.annotation.Resource; +import org.springframework.validation.annotation.Validated; +import org.springframework.security.access.prepost.PreAuthorize; +import com.zt.plat.framework.business.interceptor.BusinessControllerMarker; + +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.Operation; + +import jakarta.validation.constraints.*; +import jakarta.validation.*; +import jakarta.servlet.http.*; +import java.util.*; +import java.io.IOException; + +import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO; +import com.zt.plat.framework.common.pojo.PageParam; +import com.zt.plat.framework.common.pojo.PageResult; +import com.zt.plat.framework.common.pojo.CommonResult; +import com.zt.plat.framework.common.util.object.BeanUtils; +import static com.zt.plat.framework.common.pojo.CommonResult.success; + +import com.zt.plat.framework.excel.core.util.ExcelUtils; +import com.zt.plat.module.qms.business.bus.controller.vo.*; +import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCManagementProjectDataDO; +import com.zt.plat.module.qms.business.bus.service.BusinessQCManagementProjectDataService; +import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog; +import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*; + +@Tag(name = "管理后台 - 质控样检测项目数据业务") +@RestController +@RequestMapping("/qms/business-qc-management-project-data") +@Validated +public class BusinessQCManagementProjectDataController implements BusinessControllerMarker { + + + @Resource + private BusinessQCManagementProjectDataService businessQCManagementProjectDataService; + + @PostMapping("/create") + @Operation(summary = "创建质控样检测项目数据业务") + @PreAuthorize("@ss.hasPermission('qms:business-QC-management-project-data:create')") + public CommonResult createBusinessQCManagementProjectData(@Valid @RequestBody BusinessQCManagementProjectDataSaveReqVO createReqVO) { + return success(businessQCManagementProjectDataService.createBusinessQCManagementProjectData(createReqVO)); + } + + @PutMapping("/update") + @Operation(summary = "更新质控样检测项目数据业务") + @PreAuthorize("@ss.hasPermission('qms:business-QC-management-project-data:update')") + public CommonResult updateBusinessQCManagementProjectData(@Valid @RequestBody BusinessQCManagementProjectDataSaveReqVO updateReqVO) { + businessQCManagementProjectDataService.updateBusinessQCManagementProjectData(updateReqVO); + return success(true); + } + + @DeleteMapping("/delete") + @Operation(summary = "删除质控样检测项目数据业务") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('qms:business-QC-management-project-data:delete')") + public CommonResult deleteBusinessQCManagementProjectData(@RequestParam("id") Long id) { + businessQCManagementProjectDataService.deleteBusinessQCManagementProjectData(id); + return success(true); + } + + @DeleteMapping("/delete-list") + @Parameter(name = "ids", description = "编号", required = true) + @Operation(summary = "批量删除质控样检测项目数据业务") + @PreAuthorize("@ss.hasPermission('qms:business-QC-management-project-data:delete')") + public CommonResult deleteBusinessQCManagementProjectDataList(@RequestBody BatchDeleteReqVO req) { + businessQCManagementProjectDataService.deleteBusinessQCManagementProjectDataListByIds(req.getIds()); + return success(true); + } + + @GetMapping("/get") + @Operation(summary = "获得质控样检测项目数据业务") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('qms:business-QC-management-project-data:query')") + public CommonResult getBusinessQCManagementProjectData(@RequestParam("id") Long id) { + BusinessQCManagementProjectDataDO businessQCManagementProjectData = businessQCManagementProjectDataService.getBusinessQCManagementProjectData(id); + return success(BeanUtils.toBean(businessQCManagementProjectData, BusinessQCManagementProjectDataRespVO.class)); + } + + @GetMapping("/page") + @Operation(summary = "获得质控样检测项目数据业务分页") + @PreAuthorize("@ss.hasPermission('qms:business-QC-management-project-data:query')") + public CommonResult> getBusinessQCManagementProjectDataPage(@Valid BusinessQCManagementProjectDataPageReqVO pageReqVO) { + PageResult pageResult = businessQCManagementProjectDataService.getBusinessQCManagementProjectDataPage(pageReqVO); + return success(BeanUtils.toBean(pageResult, BusinessQCManagementProjectDataRespVO.class)); + } + + @GetMapping("/export-excel") + @Operation(summary = "导出质控样检测项目数据业务 Excel") + @PreAuthorize("@ss.hasPermission('qms:business-QC-management-project-data:export')") + @ApiAccessLog(operateType = EXPORT) + public void exportBusinessQCManagementProjectDataExcel(@Valid BusinessQCManagementProjectDataPageReqVO pageReqVO, + HttpServletResponse response) throws IOException { + pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); + List list = businessQCManagementProjectDataService.getBusinessQCManagementProjectDataPage(pageReqVO).getList(); + // 导出 Excel + ExcelUtils.write(response, "质控样检测项目数据业务.xls", "数据", BusinessQCManagementProjectDataRespVO.class, + BeanUtils.toBean(list, BusinessQCManagementProjectDataRespVO.class)); + } + +} \ 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/controller/vo/BusinessQCCoefficientDataPageReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessQCCoefficientDataPageReqVO.java new file mode 100644 index 0000000..0223ac0 --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessQCCoefficientDataPageReqVO.java @@ -0,0 +1,79 @@ +package com.zt.plat.module.qms.business.bus.controller.vo; + +import lombok.*; +import java.util.*; +import io.swagger.v3.oas.annotations.media.Schema; +import com.zt.plat.framework.common.pojo.PageParam; +import org.springframework.format.annotation.DateTimeFormat; +import java.time.LocalDateTime; + +import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; + +@Schema(description = "管理后台 - 质控样检测系数任务数据,空白样、标样分页 Request VO") +@Data +public class BusinessQCCoefficientDataPageReqVO extends PageParam { + + @Schema(description = "样品编号") + private String sampleCode; + + @Schema(description = "样品名称", example = "赵六") + private String sampleName; + + @Schema(description = "检测方法配置ID", example = "31198") + private Long configAssayMethodId; + + @Schema(description = "指派单ID", example = "28147") + private Long businessAssayTaskId; + + @Schema(description = "定值样业务ID", example = "5300") + private Long businessStandardSampleId; + + @Schema(description = "质控类型_ID,字典表【T_DIC_BSN】质控类型：空白样、管理样、标准样、标样", example = "21660") + private Long dictionaryBusinessId; + + @Schema(description = "质控类型_Key,字典表【T_DIC_BSN】质控类型：空白样、管理样、标准样、标样") + private String dictionaryBusinessKey; + + @Schema(description = "检测项目") + private String assayProject; + + @Schema(description = "分析部门ID", example = "12186") + private Long assayDepartmentId; + + @Schema(description = "分析部门名称", example = "芋艿") + private String assayDepartmentName; + + @Schema(description = "分析人") + private String assayOperator; + + @Schema(description = "分配任务时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] assignTaskTime; + + @Schema(description = "是否已分配任务") + private Integer isAssignTasked; + + @Schema(description = "是否已上报") + private Integer isReported; + + @Schema(description = "上报人") + private String reporter; + + @Schema(description = "上报时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] reportTime; + + @Schema(description = "乐观锁", example = "6160") + private Integer updateCount; + + @Schema(description = "所属部门") + private String systemDepartmentCode; + + @Schema(description = "创建时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] createTime; + + @Schema(description = "备注") + private String remark; + +} \ 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/controller/vo/BusinessQCCoefficientDataRespVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessQCCoefficientDataRespVO.java new file mode 100644 index 0000000..b0cc663 --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessQCCoefficientDataRespVO.java @@ -0,0 +1,99 @@ +package com.zt.plat.module.qms.business.bus.controller.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import java.util.*; +import org.springframework.format.annotation.DateTimeFormat; +import java.time.LocalDateTime; +import com.alibaba.excel.annotation.*; + +@Schema(description = "管理后台 - 质控样检测系数任务数据,空白样、标样 Response VO") +@Data +@ExcelIgnoreUnannotated +public class BusinessQCCoefficientDataRespVO { + + @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "19352") + @ExcelProperty("ID") + private Long id; + + @Schema(description = "样品编号") + @ExcelProperty("样品编号") + private String sampleCode; + + @Schema(description = "样品名称", example = "赵六") + @ExcelProperty("样品名称") + private String sampleName; + + @Schema(description = "检测方法配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "31198") + @ExcelProperty("检测方法配置ID") + private Long configAssayMethodId; + + @Schema(description = "指派单ID", example = "28147") + @ExcelProperty("指派单ID") + private Long businessAssayTaskId; + + @Schema(description = "定值样业务ID", example = "5300") + @ExcelProperty("定值样业务ID") + private Long businessStandardSampleId; + + @Schema(description = "质控类型_ID,字典表【T_DIC_BSN】质控类型：空白样、管理样、标准样、标样", requiredMode = Schema.RequiredMode.REQUIRED, example = "21660") + @ExcelProperty("质控类型_ID,字典表【T_DIC_BSN】质控类型：空白样、管理样、标准样、标样") + private Long dictionaryBusinessId; + + @Schema(description = "质控类型_Key,字典表【T_DIC_BSN】质控类型：空白样、管理样、标准样、标样") + @ExcelProperty("质控类型_Key,字典表【T_DIC_BSN】质控类型：空白样、管理样、标准样、标样") + private String dictionaryBusinessKey; + + @Schema(description = "检测项目", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("检测项目") + private String assayProject; + + @Schema(description = "分析部门ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "12186") + @ExcelProperty("分析部门ID") + private Long assayDepartmentId; + + @Schema(description = "分析部门名称", example = "芋艿") + @ExcelProperty("分析部门名称") + private String assayDepartmentName; + + @Schema(description = "分析人") + @ExcelProperty("分析人") + private String assayOperator; + + @Schema(description = "分配任务时间") + @ExcelProperty("分配任务时间") + private LocalDateTime assignTaskTime; + + @Schema(description = "是否已分配任务") + @ExcelProperty("是否已分配任务") + private Integer isAssignTasked; + + @Schema(description = "是否已上报") + @ExcelProperty("是否已上报") + private Integer isReported; + + @Schema(description = "上报人") + @ExcelProperty("上报人") + private String reporter; + + @Schema(description = "上报时间") + @ExcelProperty("上报时间") + private LocalDateTime reportTime; + + @Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "6160") + @ExcelProperty("乐观锁") + private Integer updateCount; + + @Schema(description = "所属部门") + @ExcelProperty("所属部门") + private String systemDepartmentCode; + + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("创建时间") + private LocalDateTime createTime; + + @Schema(description = "备注") + @ExcelProperty("备注") + private String remark; + +} \ 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/controller/vo/BusinessQCCoefficientDataSaveReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessQCCoefficientDataSaveReqVO.java new file mode 100644 index 0000000..0e15ac3 --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessQCCoefficientDataSaveReqVO.java @@ -0,0 +1,79 @@ +package com.zt.plat.module.qms.business.bus.controller.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import java.util.*; +import jakarta.validation.constraints.*; +import org.springframework.format.annotation.DateTimeFormat; +import java.time.LocalDateTime; + +@Schema(description = "管理后台 - 质控样检测系数任务数据,空白样、标样新增/修改 Request VO") +@Data +public class BusinessQCCoefficientDataSaveReqVO { + + @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "19352") + private Long id; + + @Schema(description = "样品编号") + private String sampleCode; + + @Schema(description = "样品名称", example = "赵六") + private String sampleName; + + @Schema(description = "检测方法配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "31198") + @NotNull(message = "检测方法配置ID不能为空") + private Long configAssayMethodId; + + @Schema(description = "指派单ID", example = "28147") + private Long businessAssayTaskId; + + @Schema(description = "定值样业务ID", example = "5300") + private Long businessStandardSampleId; + + @Schema(description = "质控类型_ID,字典表【T_DIC_BSN】质控类型：空白样、管理样、标准样、标样", requiredMode = Schema.RequiredMode.REQUIRED, example = "21660") + @NotNull(message = "质控类型_ID,字典表【T_DIC_BSN】质控类型：空白样、管理样、标准样、标样不能为空") + private Long dictionaryBusinessId; + + @Schema(description = "质控类型_Key,字典表【T_DIC_BSN】质控类型：空白样、管理样、标准样、标样") + private String dictionaryBusinessKey; + + @Schema(description = "检测项目", requiredMode = Schema.RequiredMode.REQUIRED) + @NotEmpty(message = "检测项目不能为空") + private String assayProject; + + @Schema(description = "分析部门ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "12186") + @NotNull(message = "分析部门ID不能为空") + private Long assayDepartmentId; + + @Schema(description = "分析部门名称", example = "芋艿") + private String assayDepartmentName; + + @Schema(description = "分析人") + private String assayOperator; + + @Schema(description = "分配任务时间") + private LocalDateTime assignTaskTime; + + @Schema(description = "是否已分配任务") + private Integer isAssignTasked; + + @Schema(description = "是否已上报") + private Integer isReported; + + @Schema(description = "上报人") + private String reporter; + + @Schema(description = "上报时间") + private LocalDateTime reportTime; + + @Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "6160") + @NotNull(message = "乐观锁不能为空") + private Integer updateCount; + + @Schema(description = "所属部门") + private String systemDepartmentCode; + + @Schema(description = "备注") + private String remark; + +} \ 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/controller/vo/BusinessQCCoefficientParameterDataPageReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessQCCoefficientParameterDataPageReqVO.java new file mode 100644 index 0000000..1f9d122 --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessQCCoefficientParameterDataPageReqVO.java @@ -0,0 +1,47 @@ +package com.zt.plat.module.qms.business.bus.controller.vo; + +import lombok.*; +import java.util.*; +import io.swagger.v3.oas.annotations.media.Schema; +import com.zt.plat.framework.common.pojo.PageParam; +import org.springframework.format.annotation.DateTimeFormat; +import java.time.LocalDateTime; + +import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; + +@Schema(description = "管理后台 - 质控样检测系数参数业务分页 Request VO") +@Data +public class BusinessQCCoefficientParameterDataPageReqVO extends PageParam { + + @Schema(description = "检测项目业务ID", example = "23013") + private Long businessQCCoefficientDataId; + + @Schema(description = "质控样检测方法参数配置ID", example = "870") + private Long configQCSampleMethodParameterId; + + @Schema(description = "参数ID,字典表【T_DIC_PRM】", example = "7977") + private Long dictionaryParameterId; + + @Schema(description = "值") + private String value; + + @Schema(description = "数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间", example = "2") + private String dataType; + + @Schema(description = "小数位") + private Integer decimalPosition; + + @Schema(description = "所属部门") + private String systemDepartmentCode; + + @Schema(description = "创建时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] createTime; + + @Schema(description = "乐观锁", example = "25016") + private Integer updateCount; + + @Schema(description = "备注") + private String remark; + +} \ 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/controller/vo/BusinessQCCoefficientParameterDataRespVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessQCCoefficientParameterDataRespVO.java new file mode 100644 index 0000000..5ecf14a --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessQCCoefficientParameterDataRespVO.java @@ -0,0 +1,59 @@ +package com.zt.plat.module.qms.business.bus.controller.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import java.util.*; +import org.springframework.format.annotation.DateTimeFormat; +import java.time.LocalDateTime; +import com.alibaba.excel.annotation.*; + +@Schema(description = "管理后台 - 质控样检测系数参数业务 Response VO") +@Data +@ExcelIgnoreUnannotated +public class BusinessQCCoefficientParameterDataRespVO { + + @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "14408") + @ExcelProperty("ID") + private Long id; + + @Schema(description = "检测项目业务ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "23013") + @ExcelProperty("检测项目业务ID") + private Long businessQCCoefficientDataId; + + @Schema(description = "质控样检测方法参数配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "870") + @ExcelProperty("质控样检测方法参数配置ID") + private Long configQCSampleMethodParameterId; + + @Schema(description = "参数ID,字典表【T_DIC_PRM】", requiredMode = Schema.RequiredMode.REQUIRED, example = "7977") + @ExcelProperty("参数ID,字典表【T_DIC_PRM】") + private Long dictionaryParameterId; + + @Schema(description = "值") + @ExcelProperty("值") + private String value; + + @Schema(description = "数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") + @ExcelProperty("数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间") + private String dataType; + + @Schema(description = "小数位") + @ExcelProperty("小数位") + private Integer decimalPosition; + + @Schema(description = "所属部门") + @ExcelProperty("所属部门") + private String systemDepartmentCode; + + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("创建时间") + private LocalDateTime createTime; + + @Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "25016") + @ExcelProperty("乐观锁") + private Integer updateCount; + + @Schema(description = "备注") + @ExcelProperty("备注") + private String remark; + +} \ 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/controller/vo/BusinessQCCoefficientParameterDataSaveReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessQCCoefficientParameterDataSaveReqVO.java new file mode 100644 index 0000000..b36512a --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessQCCoefficientParameterDataSaveReqVO.java @@ -0,0 +1,47 @@ +package com.zt.plat.module.qms.business.bus.controller.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import java.util.*; +import jakarta.validation.constraints.*; + +@Schema(description = "管理后台 - 质控样检测系数参数业务新增/修改 Request VO") +@Data +public class BusinessQCCoefficientParameterDataSaveReqVO { + + @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "14408") + private Long id; + + @Schema(description = "检测项目业务ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "23013") + @NotNull(message = "检测项目业务ID不能为空") + private Long businessQCCoefficientDataId; + + @Schema(description = "质控样检测方法参数配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "870") + @NotNull(message = "质控样检测方法参数配置ID不能为空") + private Long configQCSampleMethodParameterId; + + @Schema(description = "参数ID,字典表【T_DIC_PRM】", requiredMode = Schema.RequiredMode.REQUIRED, example = "7977") + @NotNull(message = "参数ID,字典表【T_DIC_PRM】不能为空") + private Long dictionaryParameterId; + + @Schema(description = "值") + private String value; + + @Schema(description = "数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") + @NotEmpty(message = "数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间不能为空") + private String dataType; + + @Schema(description = "小数位") + private Integer decimalPosition; + + @Schema(description = "所属部门") + private String systemDepartmentCode; + + @Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "25016") + @NotNull(message = "乐观锁不能为空") + private Integer updateCount; + + @Schema(description = "备注") + private String remark; + +} \ 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/controller/vo/BusinessQCManagementDataPageReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessQCManagementDataPageReqVO.java new file mode 100644 index 0000000..f9c44bf --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessQCManagementDataPageReqVO.java @@ -0,0 +1,79 @@ +package com.zt.plat.module.qms.business.bus.controller.vo; + +import lombok.*; +import java.util.*; +import io.swagger.v3.oas.annotations.media.Schema; +import com.zt.plat.framework.common.pojo.PageParam; +import org.springframework.format.annotation.DateTimeFormat; +import java.time.LocalDateTime; + +import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; + +@Schema(description = "管理后台 - 质控管理样检测任务数据,管理样、标准样分页 Request VO") +@Data +public class BusinessQCManagementDataPageReqVO extends PageParam { + + @Schema(description = "样品编号") + private String sampleCode; + + @Schema(description = "样品名称", example = "李四") + private String sampleName; + + @Schema(description = "检测方法配置ID", example = "22240") + private Long configAssayMethodId; + + @Schema(description = "指派单ID", example = "12452") + private Long businessAssayTaskId; + + @Schema(description = "定值样业务ID", example = "29446") + private Long businessStandardSampleId; + + @Schema(description = "质控类型_ID,字典表【T_DIC_BSN】质控类型：空白样、管理样、标准样、标样", example = "512") + private Long dictionaryBusinessId; + + @Schema(description = "质控类型_Key,字典表【T_DIC_BSN】质控类型：空白样、管理样、标准样、标样") + private String dictionaryBusinessKey; + + @Schema(description = "检测项目") + private String assayProject; + + @Schema(description = "分析部门ID", example = "21281") + private Long assayDepartmentId; + + @Schema(description = "分析部门名称", example = "赵六") + private String assayDepartmentName; + + @Schema(description = "分析人") + private String assayOperator; + + @Schema(description = "分配任务时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] assignTaskTime; + + @Schema(description = "是否已分配任务") + private Integer isAssignTasked; + + @Schema(description = "是否已上报") + private Integer isReported; + + @Schema(description = "上报人") + private String reporter; + + @Schema(description = "上报时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] reportTime; + + @Schema(description = "乐观锁", example = "16695") + private Integer updateCount; + + @Schema(description = "所属部门") + private String systemDepartmentCode; + + @Schema(description = "创建时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] createTime; + + @Schema(description = "备注") + private String remark; + +} \ 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/controller/vo/BusinessQCManagementDataRespVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessQCManagementDataRespVO.java new file mode 100644 index 0000000..fc265de --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessQCManagementDataRespVO.java @@ -0,0 +1,99 @@ +package com.zt.plat.module.qms.business.bus.controller.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import java.util.*; +import org.springframework.format.annotation.DateTimeFormat; +import java.time.LocalDateTime; +import com.alibaba.excel.annotation.*; + +@Schema(description = "管理后台 - 质控管理样检测任务数据,管理样、标准样 Response VO") +@Data +@ExcelIgnoreUnannotated +public class BusinessQCManagementDataRespVO { + + @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "31717") + @ExcelProperty("ID") + private Long id; + + @Schema(description = "样品编号") + @ExcelProperty("样品编号") + private String sampleCode; + + @Schema(description = "样品名称", example = "李四") + @ExcelProperty("样品名称") + private String sampleName; + + @Schema(description = "检测方法配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "22240") + @ExcelProperty("检测方法配置ID") + private Long configAssayMethodId; + + @Schema(description = "指派单ID", example = "12452") + @ExcelProperty("指派单ID") + private Long businessAssayTaskId; + + @Schema(description = "定值样业务ID", example = "29446") + @ExcelProperty("定值样业务ID") + private Long businessStandardSampleId; + + @Schema(description = "质控类型_ID,字典表【T_DIC_BSN】质控类型：空白样、管理样、标准样、标样", requiredMode = Schema.RequiredMode.REQUIRED, example = "512") + @ExcelProperty("质控类型_ID,字典表【T_DIC_BSN】质控类型：空白样、管理样、标准样、标样") + private Long dictionaryBusinessId; + + @Schema(description = "质控类型_Key,字典表【T_DIC_BSN】质控类型：空白样、管理样、标准样、标样") + @ExcelProperty("质控类型_Key,字典表【T_DIC_BSN】质控类型：空白样、管理样、标准样、标样") + private String dictionaryBusinessKey; + + @Schema(description = "检测项目", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("检测项目") + private String assayProject; + + @Schema(description = "分析部门ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "21281") + @ExcelProperty("分析部门ID") + private Long assayDepartmentId; + + @Schema(description = "分析部门名称", example = "赵六") + @ExcelProperty("分析部门名称") + private String assayDepartmentName; + + @Schema(description = "分析人") + @ExcelProperty("分析人") + private String assayOperator; + + @Schema(description = "分配任务时间") + @ExcelProperty("分配任务时间") + private LocalDateTime assignTaskTime; + + @Schema(description = "是否已分配任务") + @ExcelProperty("是否已分配任务") + private Integer isAssignTasked; + + @Schema(description = "是否已上报") + @ExcelProperty("是否已上报") + private Integer isReported; + + @Schema(description = "上报人") + @ExcelProperty("上报人") + private String reporter; + + @Schema(description = "上报时间") + @ExcelProperty("上报时间") + private LocalDateTime reportTime; + + @Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "16695") + @ExcelProperty("乐观锁") + private Integer updateCount; + + @Schema(description = "所属部门") + @ExcelProperty("所属部门") + private String systemDepartmentCode; + + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("创建时间") + private LocalDateTime createTime; + + @Schema(description = "备注") + @ExcelProperty("备注") + private String remark; + +} \ 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/controller/vo/BusinessQCManagementDataSaveReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessQCManagementDataSaveReqVO.java new file mode 100644 index 0000000..77dc4d1 --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessQCManagementDataSaveReqVO.java @@ -0,0 +1,79 @@ +package com.zt.plat.module.qms.business.bus.controller.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import java.util.*; +import jakarta.validation.constraints.*; +import org.springframework.format.annotation.DateTimeFormat; +import java.time.LocalDateTime; + +@Schema(description = "管理后台 - 质控管理样检测任务数据,管理样、标准样新增/修改 Request VO") +@Data +public class BusinessQCManagementDataSaveReqVO { + + @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "31717") + private Long id; + + @Schema(description = "样品编号") + private String sampleCode; + + @Schema(description = "样品名称", example = "李四") + private String sampleName; + + @Schema(description = "检测方法配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "22240") + @NotNull(message = "检测方法配置ID不能为空") + private Long configAssayMethodId; + + @Schema(description = "指派单ID", example = "12452") + private Long businessAssayTaskId; + + @Schema(description = "定值样业务ID", example = "29446") + private Long businessStandardSampleId; + + @Schema(description = "质控类型_ID,字典表【T_DIC_BSN】质控类型：空白样、管理样、标准样、标样", requiredMode = Schema.RequiredMode.REQUIRED, example = "512") + @NotNull(message = "质控类型_ID,字典表【T_DIC_BSN】质控类型：空白样、管理样、标准样、标样不能为空") + private Long dictionaryBusinessId; + + @Schema(description = "质控类型_Key,字典表【T_DIC_BSN】质控类型：空白样、管理样、标准样、标样") + private String dictionaryBusinessKey; + + @Schema(description = "检测项目", requiredMode = Schema.RequiredMode.REQUIRED) + @NotEmpty(message = "检测项目不能为空") + private String assayProject; + + @Schema(description = "分析部门ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "21281") + @NotNull(message = "分析部门ID不能为空") + private Long assayDepartmentId; + + @Schema(description = "分析部门名称", example = "赵六") + private String assayDepartmentName; + + @Schema(description = "分析人") + private String assayOperator; + + @Schema(description = "分配任务时间") + private LocalDateTime assignTaskTime; + + @Schema(description = "是否已分配任务") + private Integer isAssignTasked; + + @Schema(description = "是否已上报") + private Integer isReported; + + @Schema(description = "上报人") + private String reporter; + + @Schema(description = "上报时间") + private LocalDateTime reportTime; + + @Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "16695") + @NotNull(message = "乐观锁不能为空") + private Integer updateCount; + + @Schema(description = "所属部门") + private String systemDepartmentCode; + + @Schema(description = "备注") + private String remark; + +} \ 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/controller/vo/BusinessQCManagementParameterDataPageReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessQCManagementParameterDataPageReqVO.java new file mode 100644 index 0000000..17aa571 --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessQCManagementParameterDataPageReqVO.java @@ -0,0 +1,47 @@ +package com.zt.plat.module.qms.business.bus.controller.vo; + +import lombok.*; +import java.util.*; +import io.swagger.v3.oas.annotations.media.Schema; +import com.zt.plat.framework.common.pojo.PageParam; +import org.springframework.format.annotation.DateTimeFormat; +import java.time.LocalDateTime; + +import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; + +@Schema(description = "管理后台 - 质控样检测参数数据业务分页 Request VO") +@Data +public class BusinessQCManagementParameterDataPageReqVO extends PageParam { + + @Schema(description = "检测项目业务ID", example = "23428") + private Long businessQCManagementProjectDataId; + + @Schema(description = "检测方法分析项目参数配置表ID", example = "12018") + private Long configAssayMethodProjectParameterId; + + @Schema(description = "参数ID,字典表【T_DIC_PRM】", example = "18162") + private Long dictionaryParameterId; + + @Schema(description = "值") + private String value; + + @Schema(description = "数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间", example = "2") + private String dataType; + + @Schema(description = "小数位") + private Integer decimalPosition; + + @Schema(description = "所属部门") + private String systemDepartmentCode; + + @Schema(description = "创建时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] createTime; + + @Schema(description = "乐观锁", example = "18772") + private Integer updateCount; + + @Schema(description = "备注") + private String remark; + +} \ 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/controller/vo/BusinessQCManagementParameterDataRespVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessQCManagementParameterDataRespVO.java new file mode 100644 index 0000000..1e31364 --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessQCManagementParameterDataRespVO.java @@ -0,0 +1,59 @@ +package com.zt.plat.module.qms.business.bus.controller.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import java.util.*; +import org.springframework.format.annotation.DateTimeFormat; +import java.time.LocalDateTime; +import com.alibaba.excel.annotation.*; + +@Schema(description = "管理后台 - 质控样检测参数数据业务 Response VO") +@Data +@ExcelIgnoreUnannotated +public class BusinessQCManagementParameterDataRespVO { + + @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "23533") + @ExcelProperty("ID") + private Long id; + + @Schema(description = "检测项目业务ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "23428") + @ExcelProperty("检测项目业务ID") + private Long businessQCManagementProjectDataId; + + @Schema(description = "检测方法分析项目参数配置表ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "12018") + @ExcelProperty("检测方法分析项目参数配置表ID") + private Long configAssayMethodProjectParameterId; + + @Schema(description = "参数ID,字典表【T_DIC_PRM】", requiredMode = Schema.RequiredMode.REQUIRED, example = "18162") + @ExcelProperty("参数ID,字典表【T_DIC_PRM】") + private Long dictionaryParameterId; + + @Schema(description = "值") + @ExcelProperty("值") + private String value; + + @Schema(description = "数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") + @ExcelProperty("数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间") + private String dataType; + + @Schema(description = "小数位") + @ExcelProperty("小数位") + private Integer decimalPosition; + + @Schema(description = "所属部门") + @ExcelProperty("所属部门") + private String systemDepartmentCode; + + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("创建时间") + private LocalDateTime createTime; + + @Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "18772") + @ExcelProperty("乐观锁") + private Integer updateCount; + + @Schema(description = "备注") + @ExcelProperty("备注") + private String remark; + +} \ 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/controller/vo/BusinessQCManagementParameterDataSaveReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessQCManagementParameterDataSaveReqVO.java new file mode 100644 index 0000000..c89a8dd --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessQCManagementParameterDataSaveReqVO.java @@ -0,0 +1,47 @@ +package com.zt.plat.module.qms.business.bus.controller.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import java.util.*; +import jakarta.validation.constraints.*; + +@Schema(description = "管理后台 - 质控样检测参数数据业务新增/修改 Request VO") +@Data +public class BusinessQCManagementParameterDataSaveReqVO { + + @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "23533") + private Long id; + + @Schema(description = "检测项目业务ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "23428") + @NotNull(message = "检测项目业务ID不能为空") + private Long businessQCManagementProjectDataId; + + @Schema(description = "检测方法分析项目参数配置表ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "12018") + @NotNull(message = "检测方法分析项目参数配置表ID不能为空") + private Long configAssayMethodProjectParameterId; + + @Schema(description = "参数ID,字典表【T_DIC_PRM】", requiredMode = Schema.RequiredMode.REQUIRED, example = "18162") + @NotNull(message = "参数ID,字典表【T_DIC_PRM】不能为空") + private Long dictionaryParameterId; + + @Schema(description = "值") + private String value; + + @Schema(description = "数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") + @NotEmpty(message = "数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间不能为空") + private String dataType; + + @Schema(description = "小数位") + private Integer decimalPosition; + + @Schema(description = "所属部门") + private String systemDepartmentCode; + + @Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "18772") + @NotNull(message = "乐观锁不能为空") + private Integer updateCount; + + @Schema(description = "备注") + private String remark; + +} \ 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/controller/vo/BusinessQCManagementProjectDataPageReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessQCManagementProjectDataPageReqVO.java new file mode 100644 index 0000000..90a541e --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessQCManagementProjectDataPageReqVO.java @@ -0,0 +1,59 @@ +package com.zt.plat.module.qms.business.bus.controller.vo; + +import lombok.*; +import java.util.*; +import io.swagger.v3.oas.annotations.media.Schema; +import com.zt.plat.framework.common.pojo.PageParam; +import org.springframework.format.annotation.DateTimeFormat; +import java.time.LocalDateTime; + +import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; + +@Schema(description = "管理后台 - 质控样检测项目数据业务分页 Request VO") +@Data +public class BusinessQCManagementProjectDataPageReqVO extends PageParam { + + @Schema(description = "检测任务ID", example = "940") + private Long businessQCManagementDataId; + + @Schema(description = "检测方法分析项目配置ID", example = "413") + private Long configAssayMethodProjectId; + + @Schema(description = "检测项目字典ID,字典表【T_DIC_PRJ】", example = "3746") + private Long dictionaryProjectId; + + @Schema(description = "用途,ingredient-配料、report-报出、ingredient_report-配料及报出、quality_control-品质控制") + private String usage; + + @Schema(description = "符号,=、>、<、等") + private String symbol; + + @Schema(description = "值") + private String value; + + @Schema(description = "数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间", example = "2") + private String dataType; + + @Schema(description = "小数位") + private Integer decimalPosition; + + @Schema(description = "是否不参与超差判定") + private Integer isNotAssessment; + + @Schema(description = "是否启用") + private Integer isEnabled; + + @Schema(description = "乐观锁", example = "10206") + private Integer updateCount; + + @Schema(description = "所属部门") + private String systemDepartmentCode; + + @Schema(description = "创建时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] createTime; + + @Schema(description = "备注") + private String remark; + +} \ 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/controller/vo/BusinessQCManagementProjectDataRespVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessQCManagementProjectDataRespVO.java new file mode 100644 index 0000000..9558976 --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessQCManagementProjectDataRespVO.java @@ -0,0 +1,75 @@ +package com.zt.plat.module.qms.business.bus.controller.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import java.util.*; +import org.springframework.format.annotation.DateTimeFormat; +import java.time.LocalDateTime; +import com.alibaba.excel.annotation.*; + +@Schema(description = "管理后台 - 质控样检测项目数据业务 Response VO") +@Data +@ExcelIgnoreUnannotated +public class BusinessQCManagementProjectDataRespVO { + + @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "6446") + @ExcelProperty("ID") + private Long id; + + @Schema(description = "检测任务ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "940") + @ExcelProperty("检测任务ID") + private Long businessQCManagementDataId; + + @Schema(description = "检测方法分析项目配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "413") + @ExcelProperty("检测方法分析项目配置ID") + private Long configAssayMethodProjectId; + + @Schema(description = "检测项目字典ID,字典表【T_DIC_PRJ】", requiredMode = Schema.RequiredMode.REQUIRED, example = "3746") + @ExcelProperty("检测项目字典ID,字典表【T_DIC_PRJ】") + private Long dictionaryProjectId; + + @Schema(description = "用途,ingredient-配料、report-报出、ingredient_report-配料及报出、quality_control-品质控制") + @ExcelProperty("用途,ingredient-配料、report-报出、ingredient_report-配料及报出、quality_control-品质控制") + private String usage; + + @Schema(description = "符号,=、>、<、等") + @ExcelProperty("符号,=、>、<、等") + private String symbol; + + @Schema(description = "值") + @ExcelProperty("值") + private String value; + + @Schema(description = "数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") + @ExcelProperty("数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间") + private String dataType; + + @Schema(description = "小数位") + @ExcelProperty("小数位") + private Integer decimalPosition; + + @Schema(description = "是否不参与超差判定", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("是否不参与超差判定") + private Integer isNotAssessment; + + @Schema(description = "是否启用", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("是否启用") + private Integer isEnabled; + + @Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "10206") + @ExcelProperty("乐观锁") + private Integer updateCount; + + @Schema(description = "所属部门") + @ExcelProperty("所属部门") + private String systemDepartmentCode; + + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("创建时间") + private LocalDateTime createTime; + + @Schema(description = "备注") + @ExcelProperty("备注") + private String remark; + +} \ 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/controller/vo/BusinessQCManagementProjectDataSaveReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessQCManagementProjectDataSaveReqVO.java new file mode 100644 index 0000000..c6aaa83 --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessQCManagementProjectDataSaveReqVO.java @@ -0,0 +1,61 @@ +package com.zt.plat.module.qms.business.bus.controller.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import java.util.*; +import jakarta.validation.constraints.*; + +@Schema(description = "管理后台 - 质控样检测项目数据业务新增/修改 Request VO") +@Data +public class BusinessQCManagementProjectDataSaveReqVO { + + @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "6446") + private Long id; + + @Schema(description = "检测任务ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "940") + @NotNull(message = "检测任务ID不能为空") + private Long businessQCManagementDataId; + + @Schema(description = "检测方法分析项目配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "413") + @NotNull(message = "检测方法分析项目配置ID不能为空") + private Long configAssayMethodProjectId; + + @Schema(description = "检测项目字典ID,字典表【T_DIC_PRJ】", requiredMode = Schema.RequiredMode.REQUIRED, example = "3746") + @NotNull(message = "检测项目字典ID,字典表【T_DIC_PRJ】不能为空") + private Long dictionaryProjectId; + + @Schema(description = "用途,ingredient-配料、report-报出、ingredient_report-配料及报出、quality_control-品质控制") + private String usage; + + @Schema(description = "符号,=、>、<、等") + private String symbol; + + @Schema(description = "值") + private String value; + + @Schema(description = "数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") + @NotEmpty(message = "数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间不能为空") + private String dataType; + + @Schema(description = "小数位") + private Integer decimalPosition; + + @Schema(description = "是否不参与超差判定", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "是否不参与超差判定不能为空") + private Integer isNotAssessment; + + @Schema(description = "是否启用", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "是否启用不能为空") + private Integer isEnabled; + + @Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "10206") + @NotNull(message = "乐观锁不能为空") + private Integer updateCount; + + @Schema(description = "所属部门") + private String systemDepartmentCode; + + @Schema(description = "备注") + private String remark; + +} \ 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/dataobject/BusinessQCCoefficientDataDO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessQCCoefficientDataDO.java new file mode 100644 index 0000000..76e5dc6 --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessQCCoefficientDataDO.java @@ -0,0 +1,132 @@ +package com.zt.plat.module.qms.business.bus.dal.dataobject; + +import lombok.*; +import java.util.*; + import java.time.LocalDateTime; + import java.time.LocalDateTime; + import java.time.LocalDateTime; + import java.time.LocalDateTime; +import com.baomidou.mybatisplus.annotation.*; +import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO; +/** +* 质控样检测系数任务数据,空白样、标样 DO +* +* @author 后台管理 +*/ +@TableName("t_bsn_qc_coef_dat") +@KeySequence("t_bsn_qc_coef_dat_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +/** +* 支持业务基类继承：isBusiness=true 时继承 BusinessBaseDO，否则继承 BaseDO +*/ +public class BusinessQCCoefficientDataDO extends BusinessBaseDO { + + + + /** + * ID + */ + @TableId(type = IdType.ASSIGN_ID) + private Long id; + /** + * 样品编号 + */ + @TableField("SMP_CD") + private String sampleCode; + /** + * 样品名称 + */ + @TableField("SMP_NAME") + private String sampleName; + /** + * 检测方法配置ID + */ + @TableField("CFG_ASY_MTHD_ID") + private Long configAssayMethodId; + /** + * 指派单ID + */ + @TableField("BSN_ASY_TSK_ID") + private Long businessAssayTaskId; + /** + * 定值样业务ID + */ + @TableField("BSN_STD_SMP_ID") + private Long businessStandardSampleId; + /** + * 质控类型_ID,字典表【T_DIC_BSN】质控类型：空白样、管理样、标准样、标样 + */ + @TableField("DIC_BSN_ID") + private Long dictionaryBusinessId; + /** + * 质控类型_Key,字典表【T_DIC_BSN】质控类型：空白样、管理样、标准样、标样 + */ + @TableField("DIC_BSN_KY") + private String dictionaryBusinessKey; + /** + * 检测项目 + */ + @TableField("ASY_PRJ") + private String assayProject; + /** + * 分析部门ID + */ + @TableField("ASY_DEPT_ID") + private Long assayDepartmentId; + /** + * 分析部门名称 + */ + @TableField("ASY_DEPT_NAME") + private String assayDepartmentName; + /** + * 分析人 + */ + @TableField("ASY_OPTR") + private String assayOperator; + /** + * 分配任务时间 + */ + @TableField("ASN_TSK_TM") + private LocalDateTime assignTaskTime; + /** + * 是否已分配任务 + */ + @TableField("IS_ASN_TSKD") + private Integer isAssignTasked; + /** + * 是否已上报 + */ + @TableField("IS_RPOD") + private Integer isReported; + /** + * 上报人 + */ + @TableField("RPTR") + private String reporter; + /** + * 上报时间 + */ + @TableField("RPT_TM") + private LocalDateTime reportTime; + /** + * 乐观锁 + */ + @TableField("UPD_CNT") + private Integer updateCount; + /** + * 所属部门 + */ + @TableField("SYS_DEPT_CD") + private String systemDepartmentCode; + /** + * 备注 + */ + @TableField("RMK") + private String remark; + +} \ 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/dataobject/BusinessQCCoefficientParameterDataDO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessQCCoefficientParameterDataDO.java new file mode 100644 index 0000000..5be6059 --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessQCCoefficientParameterDataDO.java @@ -0,0 +1,80 @@ +package com.zt.plat.module.qms.business.bus.dal.dataobject; + +import lombok.*; +import java.util.*; + import java.time.LocalDateTime; + import java.time.LocalDateTime; +import com.baomidou.mybatisplus.annotation.*; +import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO; +/** +* 质控样检测系数参数业务 DO +* +* @author 后台管理 +*/ +@TableName("t_bsn_qc_coef_prm_dat") +@KeySequence("t_bsn_qc_coef_prm_dat_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +/** +* 支持业务基类继承：isBusiness=true 时继承 BusinessBaseDO，否则继承 BaseDO +*/ +public class BusinessQCCoefficientParameterDataDO extends BusinessBaseDO { + + + + /** + * ID + */ + @TableId(type = IdType.ASSIGN_ID) + private Long id; + /** + * 检测项目业务ID + */ + @TableField("BSN_QC_COEF_DAT_ID") + private Long businessQCCoefficientDataId; + /** + * 质控样检测方法参数配置ID + */ + @TableField("CFG_QC_SMP_MTHD_PRM_ID") + private Long configQCSampleMethodParameterId; + /** + * 参数ID,字典表【T_DIC_PRM】 + */ + @TableField("DIC_PRM_ID") + private Long dictionaryParameterId; + /** + * 值 + */ + @TableField("VAL") + private String value; + /** + * 数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间 + */ + @TableField("DAT_TP") + private String dataType; + /** + * 小数位 + */ + @TableField("DEC_POS") + private Integer decimalPosition; + /** + * 所属部门 + */ + @TableField("SYS_DEPT_CD") + private String systemDepartmentCode; + /** + * 乐观锁 + */ + @TableField("UPD_CNT") + private Integer updateCount; + /** + * 备注 + */ + @TableField("RMK") + private String remark; + +} \ 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/dataobject/BusinessQCManagementDataDO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessQCManagementDataDO.java new file mode 100644 index 0000000..3938b80 --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessQCManagementDataDO.java @@ -0,0 +1,132 @@ +package com.zt.plat.module.qms.business.bus.dal.dataobject; + +import lombok.*; +import java.util.*; + import java.time.LocalDateTime; + import java.time.LocalDateTime; + import java.time.LocalDateTime; + import java.time.LocalDateTime; +import com.baomidou.mybatisplus.annotation.*; +import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO; +/** +* 质控管理样检测任务数据,管理样、标准样 DO +* +* @author 后台管理 +*/ +@TableName("t_bsn_qc_mngt_dat") +@KeySequence("t_bsn_qc_mngt_dat_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +/** +* 支持业务基类继承：isBusiness=true 时继承 BusinessBaseDO，否则继承 BaseDO +*/ +public class BusinessQCManagementDataDO extends BusinessBaseDO { + + + + /** + * ID + */ + @TableId(type = IdType.ASSIGN_ID) + private Long id; + /** + * 样品编号 + */ + @TableField("SMP_CD") + private String sampleCode; + /** + * 样品名称 + */ + @TableField("SMP_NAME") + private String sampleName; + /** + * 检测方法配置ID + */ + @TableField("CFG_ASY_MTHD_ID") + private Long configAssayMethodId; + /** + * 指派单ID + */ + @TableField("BSN_ASY_TSK_ID") + private Long businessAssayTaskId; + /** + * 定值样业务ID + */ + @TableField("BSN_STD_SMP_ID") + private Long businessStandardSampleId; + /** + * 质控类型_ID,字典表【T_DIC_BSN】质控类型：空白样、管理样、标准样、标样 + */ + @TableField("DIC_BSN_ID") + private Long dictionaryBusinessId; + /** + * 质控类型_Key,字典表【T_DIC_BSN】质控类型：空白样、管理样、标准样、标样 + */ + @TableField("DIC_BSN_KY") + private String dictionaryBusinessKey; + /** + * 检测项目 + */ + @TableField("ASY_PRJ") + private String assayProject; + /** + * 分析部门ID + */ + @TableField("ASY_DEPT_ID") + private Long assayDepartmentId; + /** + * 分析部门名称 + */ + @TableField("ASY_DEPT_NAME") + private String assayDepartmentName; + /** + * 分析人 + */ + @TableField("ASY_OPTR") + private String assayOperator; + /** + * 分配任务时间 + */ + @TableField("ASN_TSK_TM") + private LocalDateTime assignTaskTime; + /** + * 是否已分配任务 + */ + @TableField("IS_ASN_TSKD") + private Integer isAssignTasked; + /** + * 是否已上报 + */ + @TableField("IS_RPOD") + private Integer isReported; + /** + * 上报人 + */ + @TableField("RPTR") + private String reporter; + /** + * 上报时间 + */ + @TableField("RPT_TM") + private LocalDateTime reportTime; + /** + * 乐观锁 + */ + @TableField("UPD_CNT") + private Integer updateCount; + /** + * 所属部门 + */ + @TableField("SYS_DEPT_CD") + private String systemDepartmentCode; + /** + * 备注 + */ + @TableField("RMK") + private String remark; + +} \ 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/dataobject/BusinessQCManagementParameterDataDO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessQCManagementParameterDataDO.java new file mode 100644 index 0000000..88d7026 --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessQCManagementParameterDataDO.java @@ -0,0 +1,80 @@ +package com.zt.plat.module.qms.business.bus.dal.dataobject; + +import lombok.*; +import java.util.*; + import java.time.LocalDateTime; + import java.time.LocalDateTime; +import com.baomidou.mybatisplus.annotation.*; +import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO; +/** +* 质控样检测参数数据业务 DO +* +* @author 后台管理 +*/ +@TableName("t_bsn_qc_mngt_prm_dat") +@KeySequence("t_bsn_qc_mngt_prm_dat_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +/** +* 支持业务基类继承：isBusiness=true 时继承 BusinessBaseDO，否则继承 BaseDO +*/ +public class BusinessQCManagementParameterDataDO extends BusinessBaseDO { + + + + /** + * ID + */ + @TableId(type = IdType.ASSIGN_ID) + private Long id; + /** + * 检测项目业务ID + */ + @TableField("BSN_QC_MNGT_PRJ_DAT_ID") + private Long businessQCManagementProjectDataId; + /** + * 检测方法分析项目参数配置表ID + */ + @TableField("CFG_ASY_MTHD_PRJ_PRM_ID") + private Long configAssayMethodProjectParameterId; + /** + * 参数ID,字典表【T_DIC_PRM】 + */ + @TableField("DIC_PRM_ID") + private Long dictionaryParameterId; + /** + * 值 + */ + @TableField("VAL") + private String value; + /** + * 数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间 + */ + @TableField("DAT_TP") + private String dataType; + /** + * 小数位 + */ + @TableField("DEC_POS") + private Integer decimalPosition; + /** + * 所属部门 + */ + @TableField("SYS_DEPT_CD") + private String systemDepartmentCode; + /** + * 乐观锁 + */ + @TableField("UPD_CNT") + private Integer updateCount; + /** + * 备注 + */ + @TableField("RMK") + private String remark; + +} \ 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/dataobject/BusinessQCManagementProjectDataDO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessQCManagementProjectDataDO.java new file mode 100644 index 0000000..c23a5b5 --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessQCManagementProjectDataDO.java @@ -0,0 +1,100 @@ +package com.zt.plat.module.qms.business.bus.dal.dataobject; + +import lombok.*; +import java.util.*; + import java.time.LocalDateTime; + import java.time.LocalDateTime; +import com.baomidou.mybatisplus.annotation.*; +import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO; +/** +* 质控样检测项目数据业务 DO +* +* @author 后台管理 +*/ +@TableName("t_bsn_qc_mngt_prj_dat") +@KeySequence("t_bsn_qc_mngt_prj_dat_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +/** +* 支持业务基类继承：isBusiness=true 时继承 BusinessBaseDO，否则继承 BaseDO +*/ +public class BusinessQCManagementProjectDataDO extends BusinessBaseDO { + + + + /** + * ID + */ + @TableId(type = IdType.ASSIGN_ID) + private Long id; + /** + * 检测任务ID + */ + @TableField("BSN_QC_MNGT_DAT_ID") + private Long businessQCManagementDataId; + /** + * 检测方法分析项目配置ID + */ + @TableField("CFG_ASY_MTHD_PRJ_ID") + private Long configAssayMethodProjectId; + /** + * 检测项目字典ID,字典表【T_DIC_PRJ】 + */ + @TableField("DIC_PRJ_ID") + private Long dictionaryProjectId; + /** + * 用途,ingredient-配料、report-报出、ingredient_report-配料及报出、quality_control-品质控制 + */ + @TableField("USG") + private String usage; + /** + * 符号,=、>、<、等 + */ + @TableField("SMB") + private String symbol; + /** + * 值 + */ + @TableField("VAL") + private String value; + /** + * 数据类型,字典表【T_DIC_BSN】string-字符串，int-整数，decimal-小数,date-日期，datetime-时间 + */ + @TableField("DAT_TP") + private String dataType; + /** + * 小数位 + */ + @TableField("DEC_POS") + private Integer decimalPosition; + /** + * 是否不参与超差判定 + */ + @TableField("IS_NT_ASMT") + private Integer isNotAssessment; + /** + * 是否启用 + */ + @TableField("IS_ENBD") + private Integer isEnabled; + /** + * 乐观锁 + */ + @TableField("UPD_CNT") + private Integer updateCount; + /** + * 所属部门 + */ + @TableField("SYS_DEPT_CD") + private String systemDepartmentCode; + /** + * 备注 + */ + @TableField("RMK") + private String remark; + +} \ 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/BusinessQCCoefficientDataMapper.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessQCCoefficientDataMapper.java new file mode 100644 index 0000000..2342db3 --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessQCCoefficientDataMapper.java @@ -0,0 +1,45 @@ +package com.zt.plat.module.qms.business.bus.dal.mapper; + +import java.util.*; + +import com.zt.plat.framework.common.pojo.PageResult; +import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX; +import com.zt.plat.module.qms.business.bus.controller.vo.*; +import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCCoefficientDataDO; +import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX; +import org.apache.ibatis.annotations.Mapper; + +/** + * 质控样检测系数任务数据,空白样、标样 Mapper + * + * @author 后台管理 + */ +@Mapper +public interface BusinessQCCoefficientDataMapper extends BaseMapperX { + + default PageResult selectPage(BusinessQCCoefficientDataPageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .eqIfPresent(BusinessQCCoefficientDataDO::getSampleCode, reqVO.getSampleCode()) + .likeIfPresent(BusinessQCCoefficientDataDO::getSampleName, reqVO.getSampleName()) + .eqIfPresent(BusinessQCCoefficientDataDO::getConfigAssayMethodId, reqVO.getConfigAssayMethodId()) + .eqIfPresent(BusinessQCCoefficientDataDO::getBusinessAssayTaskId, reqVO.getBusinessAssayTaskId()) + .eqIfPresent(BusinessQCCoefficientDataDO::getBusinessStandardSampleId, reqVO.getBusinessStandardSampleId()) + .eqIfPresent(BusinessQCCoefficientDataDO::getDictionaryBusinessId, reqVO.getDictionaryBusinessId()) + .eqIfPresent(BusinessQCCoefficientDataDO::getDictionaryBusinessKey, reqVO.getDictionaryBusinessKey()) + .eqIfPresent(BusinessQCCoefficientDataDO::getAssayProject, reqVO.getAssayProject()) + .eqIfPresent(BusinessQCCoefficientDataDO::getAssayDepartmentId, reqVO.getAssayDepartmentId()) + .likeIfPresent(BusinessQCCoefficientDataDO::getAssayDepartmentName, reqVO.getAssayDepartmentName()) + .eqIfPresent(BusinessQCCoefficientDataDO::getAssayOperator, reqVO.getAssayOperator()) + .betweenIfPresent(BusinessQCCoefficientDataDO::getAssignTaskTime, reqVO.getAssignTaskTime()) + .eqIfPresent(BusinessQCCoefficientDataDO::getIsAssignTasked, reqVO.getIsAssignTasked()) + .eqIfPresent(BusinessQCCoefficientDataDO::getIsReported, reqVO.getIsReported()) + .eqIfPresent(BusinessQCCoefficientDataDO::getReporter, reqVO.getReporter()) + .betweenIfPresent(BusinessQCCoefficientDataDO::getReportTime, reqVO.getReportTime()) + .eqIfPresent(BusinessQCCoefficientDataDO::getUpdateCount, reqVO.getUpdateCount()) + .eqIfPresent(BusinessQCCoefficientDataDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode()) + .betweenIfPresent(BusinessQCCoefficientDataDO::getCreateTime, reqVO.getCreateTime()) + .eqIfPresent(BusinessQCCoefficientDataDO::getRemark, reqVO.getRemark()) + .orderByDesc(BusinessQCCoefficientDataDO::getId)); + } + +} \ 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/BusinessQCCoefficientParameterDataMapper.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessQCCoefficientParameterDataMapper.java new file mode 100644 index 0000000..716400f --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessQCCoefficientParameterDataMapper.java @@ -0,0 +1,35 @@ +package com.zt.plat.module.qms.business.bus.dal.mapper; + +import java.util.*; + +import com.zt.plat.framework.common.pojo.PageResult; +import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX; +import com.zt.plat.module.qms.business.bus.controller.vo.BusinessQCCoefficientParameterDataPageReqVO; +import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCCoefficientParameterDataDO; +import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX; +import org.apache.ibatis.annotations.Mapper; + +/** + * 质控样检测系数参数业务 Mapper + * + * @author 后台管理 + */ +@Mapper +public interface BusinessQCCoefficientParameterDataMapper extends BaseMapperX { + + default PageResult selectPage(BusinessQCCoefficientParameterDataPageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .eqIfPresent(BusinessQCCoefficientParameterDataDO::getBusinessQCCoefficientDataId, reqVO.getBusinessQCCoefficientDataId()) + .eqIfPresent(BusinessQCCoefficientParameterDataDO::getConfigQCSampleMethodParameterId, reqVO.getConfigQCSampleMethodParameterId()) + .eqIfPresent(BusinessQCCoefficientParameterDataDO::getDictionaryParameterId, reqVO.getDictionaryParameterId()) + .eqIfPresent(BusinessQCCoefficientParameterDataDO::getValue, reqVO.getValue()) + .eqIfPresent(BusinessQCCoefficientParameterDataDO::getDataType, reqVO.getDataType()) + .eqIfPresent(BusinessQCCoefficientParameterDataDO::getDecimalPosition, reqVO.getDecimalPosition()) + .eqIfPresent(BusinessQCCoefficientParameterDataDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode()) + .betweenIfPresent(BusinessQCCoefficientParameterDataDO::getCreateTime, reqVO.getCreateTime()) + .eqIfPresent(BusinessQCCoefficientParameterDataDO::getUpdateCount, reqVO.getUpdateCount()) + .eqIfPresent(BusinessQCCoefficientParameterDataDO::getRemark, reqVO.getRemark()) + .orderByDesc(BusinessQCCoefficientParameterDataDO::getId)); + } + +} \ 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/BusinessQCManagementDataMapper.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessQCManagementDataMapper.java new file mode 100644 index 0000000..8b43fe8 --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessQCManagementDataMapper.java @@ -0,0 +1,45 @@ +package com.zt.plat.module.qms.business.bus.dal.mapper; + +import java.util.*; + +import com.zt.plat.framework.common.pojo.PageResult; +import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX; +import com.zt.plat.module.qms.business.bus.controller.vo.*; +import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCManagementDataDO; +import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX; +import org.apache.ibatis.annotations.Mapper; + +/** + * 质控管理样检测任务数据,管理样、标准样 Mapper + * + * @author 后台管理 + */ +@Mapper +public interface BusinessQCManagementDataMapper extends BaseMapperX { + + default PageResult selectPage(BusinessQCManagementDataPageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .eqIfPresent(BusinessQCManagementDataDO::getSampleCode, reqVO.getSampleCode()) + .likeIfPresent(BusinessQCManagementDataDO::getSampleName, reqVO.getSampleName()) + .eqIfPresent(BusinessQCManagementDataDO::getConfigAssayMethodId, reqVO.getConfigAssayMethodId()) + .eqIfPresent(BusinessQCManagementDataDO::getBusinessAssayTaskId, reqVO.getBusinessAssayTaskId()) + .eqIfPresent(BusinessQCManagementDataDO::getBusinessStandardSampleId, reqVO.getBusinessStandardSampleId()) + .eqIfPresent(BusinessQCManagementDataDO::getDictionaryBusinessId, reqVO.getDictionaryBusinessId()) + .eqIfPresent(BusinessQCManagementDataDO::getDictionaryBusinessKey, reqVO.getDictionaryBusinessKey()) + .eqIfPresent(BusinessQCManagementDataDO::getAssayProject, reqVO.getAssayProject()) + .eqIfPresent(BusinessQCManagementDataDO::getAssayDepartmentId, reqVO.getAssayDepartmentId()) + .likeIfPresent(BusinessQCManagementDataDO::getAssayDepartmentName, reqVO.getAssayDepartmentName()) + .eqIfPresent(BusinessQCManagementDataDO::getAssayOperator, reqVO.getAssayOperator()) + .betweenIfPresent(BusinessQCManagementDataDO::getAssignTaskTime, reqVO.getAssignTaskTime()) + .eqIfPresent(BusinessQCManagementDataDO::getIsAssignTasked, reqVO.getIsAssignTasked()) + .eqIfPresent(BusinessQCManagementDataDO::getIsReported, reqVO.getIsReported()) + .eqIfPresent(BusinessQCManagementDataDO::getReporter, reqVO.getReporter()) + .betweenIfPresent(BusinessQCManagementDataDO::getReportTime, reqVO.getReportTime()) + .eqIfPresent(BusinessQCManagementDataDO::getUpdateCount, reqVO.getUpdateCount()) + .eqIfPresent(BusinessQCManagementDataDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode()) + .betweenIfPresent(BusinessQCManagementDataDO::getCreateTime, reqVO.getCreateTime()) + .eqIfPresent(BusinessQCManagementDataDO::getRemark, reqVO.getRemark()) + .orderByDesc(BusinessQCManagementDataDO::getId)); + } + +} \ 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/BusinessQCManagementParameterDataMapper.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessQCManagementParameterDataMapper.java new file mode 100644 index 0000000..f96cd51 --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessQCManagementParameterDataMapper.java @@ -0,0 +1,35 @@ +package com.zt.plat.module.qms.business.bus.dal.mapper; + +import java.util.*; + +import com.zt.plat.framework.common.pojo.PageResult; +import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX; +import com.zt.plat.module.qms.business.bus.controller.vo.*; +import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCManagementParameterDataDO; +import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX; +import org.apache.ibatis.annotations.Mapper; + +/** + * 质控样检测参数数据业务 Mapper + * + * @author 后台管理 + */ +@Mapper +public interface BusinessQCManagementParameterDataMapper extends BaseMapperX { + + default PageResult selectPage(BusinessQCManagementParameterDataPageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .eqIfPresent(BusinessQCManagementParameterDataDO::getBusinessQCManagementProjectDataId, reqVO.getBusinessQCManagementProjectDataId()) + .eqIfPresent(BusinessQCManagementParameterDataDO::getConfigAssayMethodProjectParameterId, reqVO.getConfigAssayMethodProjectParameterId()) + .eqIfPresent(BusinessQCManagementParameterDataDO::getDictionaryParameterId, reqVO.getDictionaryParameterId()) + .eqIfPresent(BusinessQCManagementParameterDataDO::getValue, reqVO.getValue()) + .eqIfPresent(BusinessQCManagementParameterDataDO::getDataType, reqVO.getDataType()) + .eqIfPresent(BusinessQCManagementParameterDataDO::getDecimalPosition, reqVO.getDecimalPosition()) + .eqIfPresent(BusinessQCManagementParameterDataDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode()) + .betweenIfPresent(BusinessQCManagementParameterDataDO::getCreateTime, reqVO.getCreateTime()) + .eqIfPresent(BusinessQCManagementParameterDataDO::getUpdateCount, reqVO.getUpdateCount()) + .eqIfPresent(BusinessQCManagementParameterDataDO::getRemark, reqVO.getRemark()) + .orderByDesc(BusinessQCManagementParameterDataDO::getId)); + } + +} \ 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/BusinessQCManagementProjectDataMapper.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessQCManagementProjectDataMapper.java new file mode 100644 index 0000000..4fb5fcf --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessQCManagementProjectDataMapper.java @@ -0,0 +1,39 @@ +package com.zt.plat.module.qms.business.bus.dal.mapper; + +import java.util.*; + +import com.zt.plat.framework.common.pojo.PageResult; +import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX; +import com.zt.plat.module.qms.business.bus.controller.vo.*; +import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCManagementProjectDataDO; +import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX; +import org.apache.ibatis.annotations.Mapper; + +/** + * 质控样检测项目数据业务 Mapper + * + * @author 后台管理 + */ +@Mapper +public interface BusinessQCManagementProjectDataMapper extends BaseMapperX { + + default PageResult selectPage(BusinessQCManagementProjectDataPageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .eqIfPresent(BusinessQCManagementProjectDataDO::getBusinessQCManagementDataId, reqVO.getBusinessQCManagementDataId()) + .eqIfPresent(BusinessQCManagementProjectDataDO::getConfigAssayMethodProjectId, reqVO.getConfigAssayMethodProjectId()) + .eqIfPresent(BusinessQCManagementProjectDataDO::getDictionaryProjectId, reqVO.getDictionaryProjectId()) + .eqIfPresent(BusinessQCManagementProjectDataDO::getUsage, reqVO.getUsage()) + .eqIfPresent(BusinessQCManagementProjectDataDO::getSymbol, reqVO.getSymbol()) + .eqIfPresent(BusinessQCManagementProjectDataDO::getValue, reqVO.getValue()) + .eqIfPresent(BusinessQCManagementProjectDataDO::getDataType, reqVO.getDataType()) + .eqIfPresent(BusinessQCManagementProjectDataDO::getDecimalPosition, reqVO.getDecimalPosition()) + .eqIfPresent(BusinessQCManagementProjectDataDO::getIsNotAssessment, reqVO.getIsNotAssessment()) + .eqIfPresent(BusinessQCManagementProjectDataDO::getIsEnabled, reqVO.getIsEnabled()) + .eqIfPresent(BusinessQCManagementProjectDataDO::getUpdateCount, reqVO.getUpdateCount()) + .eqIfPresent(BusinessQCManagementProjectDataDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode()) + .betweenIfPresent(BusinessQCManagementProjectDataDO::getCreateTime, reqVO.getCreateTime()) + .eqIfPresent(BusinessQCManagementProjectDataDO::getRemark, reqVO.getRemark()) + .orderByDesc(BusinessQCManagementProjectDataDO::getId)); + } + +} \ 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/BusinessQCCoefficientDataService.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessQCCoefficientDataService.java new file mode 100644 index 0000000..7069cf3 --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessQCCoefficientDataService.java @@ -0,0 +1,62 @@ +package com.zt.plat.module.qms.business.bus.service; + +import java.util.*; +import jakarta.validation.*; +import com.zt.plat.framework.common.pojo.PageResult; +import com.zt.plat.module.qms.business.bus.controller.vo.*; +import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCCoefficientDataDO; +import com.zt.plat.framework.common.pojo.PageParam; + +/** + * 质控样检测系数任务数据,空白样、标样 Service 接口 + * + * @author 后台管理 + */ +public interface BusinessQCCoefficientDataService { + + /** + * 创建质控样检测系数任务数据,空白样、标样 + * + * @param createReqVO 创建信息 + * @return 编号 + */ + BusinessQCCoefficientDataRespVO createBusinessQCCoefficientData(@Valid BusinessQCCoefficientDataSaveReqVO createReqVO); + + /** + * 更新质控样检测系数任务数据,空白样、标样 + * + * @param updateReqVO 更新信息 + */ + void updateBusinessQCCoefficientData(@Valid BusinessQCCoefficientDataSaveReqVO updateReqVO); + + /** + * 删除质控样检测系数任务数据,空白样、标样 + * + * @param id 编号 + */ + void deleteBusinessQCCoefficientData(Long id); + + /** + * 批量删除质控样检测系数任务数据,空白样、标样 + * + * @param ids 编号 + */ + void deleteBusinessQCCoefficientDataListByIds(List ids); + + /** + * 获得质控样检测系数任务数据,空白样、标样 + * + * @param id 编号 + * @return 质控样检测系数任务数据,空白样、标样 + */ + BusinessQCCoefficientDataDO getBusinessQCCoefficientData(Long id); + + /** + * 获得质控样检测系数任务数据,空白样、标样分页 + * + * @param pageReqVO 分页查询 + * @return 质控样检测系数任务数据,空白样、标样分页 + */ + PageResult getBusinessQCCoefficientDataPage(BusinessQCCoefficientDataPageReqVO pageReqVO); + +} \ 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/BusinessQCCoefficientDataServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessQCCoefficientDataServiceImpl.java new file mode 100644 index 0000000..f0a9e71 --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessQCCoefficientDataServiceImpl.java @@ -0,0 +1,91 @@ +package com.zt.plat.module.qms.business.bus.service; + +import cn.hutool.core.collection.CollUtil; +import org.springframework.stereotype.Service; +import jakarta.annotation.Resource; +import org.springframework.validation.annotation.Validated; +import org.springframework.transaction.annotation.Transactional; + +import java.util.*; +import com.zt.plat.framework.common.pojo.PageResult; +import com.zt.plat.framework.common.pojo.PageParam; +import com.zt.plat.framework.common.util.object.BeanUtils; +import com.zt.plat.module.qms.business.bus.controller.vo.*; +import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCCoefficientDataDO; +import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessQCCoefficientDataMapper; + +import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.exception; +import static com.zt.plat.framework.common.util.collection.CollectionUtils.convertList; +import static com.zt.plat.framework.common.util.collection.CollectionUtils.diffList; +import static com.zt.plat.module.qms.enums.ErrorCodeConstants.*; + +/** + * 质控样检测系数任务数据,空白样、标样 Service 实现类 + * + * @author 后台管理 + */ +@Service +@Validated +public class BusinessQCCoefficientDataServiceImpl implements BusinessQCCoefficientDataService { + + @Resource + private BusinessQCCoefficientDataMapper businessQCCoefficientDataMapper; + + @Override + public BusinessQCCoefficientDataRespVO createBusinessQCCoefficientData(BusinessQCCoefficientDataSaveReqVO createReqVO) { + // 插入 + BusinessQCCoefficientDataDO businessQCCoefficientData = BeanUtils.toBean(createReqVO, BusinessQCCoefficientDataDO.class); + businessQCCoefficientDataMapper.insert(businessQCCoefficientData); + // 返回 + return BeanUtils.toBean(businessQCCoefficientData, BusinessQCCoefficientDataRespVO.class); + } + + @Override + public void updateBusinessQCCoefficientData(BusinessQCCoefficientDataSaveReqVO updateReqVO) { + // 校验存在 + validateBusinessQCCoefficientDataExists(updateReqVO.getId()); + // 更新 + BusinessQCCoefficientDataDO updateObj = BeanUtils.toBean(updateReqVO, BusinessQCCoefficientDataDO.class); + businessQCCoefficientDataMapper.updateById(updateObj); + } + + @Override + public void deleteBusinessQCCoefficientData(Long id) { + // 校验存在 + validateBusinessQCCoefficientDataExists(id); + // 删除 + businessQCCoefficientDataMapper.deleteById(id); + } + + @Override + public void deleteBusinessQCCoefficientDataListByIds(List ids) { + // 校验存在 + validateBusinessQCCoefficientDataExists(ids); + // 删除 + businessQCCoefficientDataMapper.deleteByIds(ids); + } + + private void validateBusinessQCCoefficientDataExists(List ids) { + List list = businessQCCoefficientDataMapper.selectByIds(ids); + if (CollUtil.isEmpty(list) || list.size() != ids.size()) { + throw exception(BUSINESS_QC_COEFFICIENT_DATA_NOT_EXISTS); + } + } + + private void validateBusinessQCCoefficientDataExists(Long id) { + if (businessQCCoefficientDataMapper.selectById(id) == null) { + throw exception(BUSINESS_QC_COEFFICIENT_DATA_NOT_EXISTS); + } + } + + @Override + public BusinessQCCoefficientDataDO getBusinessQCCoefficientData(Long id) { + return businessQCCoefficientDataMapper.selectById(id); + } + + @Override + public PageResult getBusinessQCCoefficientDataPage(BusinessQCCoefficientDataPageReqVO pageReqVO) { + return businessQCCoefficientDataMapper.selectPage(pageReqVO); + } + +} \ 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/BusinessQCCoefficientParameterDataService.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessQCCoefficientParameterDataService.java new file mode 100644 index 0000000..833980a --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessQCCoefficientParameterDataService.java @@ -0,0 +1,62 @@ +package com.zt.plat.module.qms.business.bus.service; + +import java.util.*; +import jakarta.validation.*; +import com.zt.plat.framework.common.pojo.PageResult; +import com.zt.plat.module.qms.business.bus.controller.vo.*; +import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCCoefficientParameterDataDO; +import com.zt.plat.framework.common.pojo.PageParam; + +/** + * 质控样检测系数参数业务 Service 接口 + * + * @author 后台管理 + */ +public interface BusinessQCCoefficientParameterDataService { + + /** + * 创建质控样检测系数参数业务 + * + * @param createReqVO 创建信息 + * @return 编号 + */ + BusinessQCCoefficientParameterDataRespVO createBusinessQCCoefficientParameterData(@Valid BusinessQCCoefficientParameterDataSaveReqVO createReqVO); + + /** + * 更新质控样检测系数参数业务 + * + * @param updateReqVO 更新信息 + */ + void updateBusinessQCCoefficientParameterData(@Valid BusinessQCCoefficientParameterDataSaveReqVO updateReqVO); + + /** + * 删除质控样检测系数参数业务 + * + * @param id 编号 + */ + void deleteBusinessQCCoefficientParameterData(Long id); + + /** + * 批量删除质控样检测系数参数业务 + * + * @param ids 编号 + */ + void deleteBusinessQCCoefficientParameterDataListByIds(List ids); + + /** + * 获得质控样检测系数参数业务 + * + * @param id 编号 + * @return 质控样检测系数参数业务 + */ + BusinessQCCoefficientParameterDataDO getBusinessQCCoefficientParameterData(Long id); + + /** + * 获得质控样检测系数参数业务分页 + * + * @param pageReqVO 分页查询 + * @return 质控样检测系数参数业务分页 + */ + PageResult getBusinessQCCoefficientParameterDataPage(BusinessQCCoefficientParameterDataPageReqVO pageReqVO); + +} \ 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/BusinessQCCoefficientParameterDataServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessQCCoefficientParameterDataServiceImpl.java new file mode 100644 index 0000000..e877443 --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessQCCoefficientParameterDataServiceImpl.java @@ -0,0 +1,91 @@ +package com.zt.plat.module.qms.business.bus.service; + +import cn.hutool.core.collection.CollUtil; +import org.springframework.stereotype.Service; +import jakarta.annotation.Resource; +import org.springframework.validation.annotation.Validated; +import org.springframework.transaction.annotation.Transactional; + +import java.util.*; +import com.zt.plat.framework.common.pojo.PageResult; +import com.zt.plat.framework.common.pojo.PageParam; +import com.zt.plat.framework.common.util.object.BeanUtils; +import com.zt.plat.module.qms.business.bus.controller.vo.*; +import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCCoefficientParameterDataDO; +import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessQCCoefficientParameterDataMapper; + +import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.exception; +import static com.zt.plat.framework.common.util.collection.CollectionUtils.convertList; +import static com.zt.plat.framework.common.util.collection.CollectionUtils.diffList; +import static com.zt.plat.module.qms.enums.ErrorCodeConstants.*; + +/** + * 质控样检测系数参数业务 Service 实现类 + * + * @author 后台管理 + */ +@Service +@Validated +public class BusinessQCCoefficientParameterDataServiceImpl implements BusinessQCCoefficientParameterDataService { + + @Resource + private BusinessQCCoefficientParameterDataMapper businessQCCoefficientParameterDataMapper; + + @Override + public BusinessQCCoefficientParameterDataRespVO createBusinessQCCoefficientParameterData(BusinessQCCoefficientParameterDataSaveReqVO createReqVO) { + // 插入 + BusinessQCCoefficientParameterDataDO businessQCCoefficientParameterData = BeanUtils.toBean(createReqVO, BusinessQCCoefficientParameterDataDO.class); + businessQCCoefficientParameterDataMapper.insert(businessQCCoefficientParameterData); + // 返回 + return BeanUtils.toBean(businessQCCoefficientParameterData, BusinessQCCoefficientParameterDataRespVO.class); + } + + @Override + public void updateBusinessQCCoefficientParameterData(BusinessQCCoefficientParameterDataSaveReqVO updateReqVO) { + // 校验存在 + validateBusinessQCCoefficientParameterDataExists(updateReqVO.getId()); + // 更新 + BusinessQCCoefficientParameterDataDO updateObj = BeanUtils.toBean(updateReqVO, BusinessQCCoefficientParameterDataDO.class); + businessQCCoefficientParameterDataMapper.updateById(updateObj); + } + + @Override + public void deleteBusinessQCCoefficientParameterData(Long id) { + // 校验存在 + validateBusinessQCCoefficientParameterDataExists(id); + // 删除 + businessQCCoefficientParameterDataMapper.deleteById(id); + } + + @Override + public void deleteBusinessQCCoefficientParameterDataListByIds(List ids) { + // 校验存在 + validateBusinessQCCoefficientParameterDataExists(ids); + // 删除 + businessQCCoefficientParameterDataMapper.deleteByIds(ids); + } + + private void validateBusinessQCCoefficientParameterDataExists(List ids) { + List list = businessQCCoefficientParameterDataMapper.selectByIds(ids); + if (CollUtil.isEmpty(list) || list.size() != ids.size()) { + throw exception(BUSINESS_QC_COEFFICIENT_PARAMETER_DATA_NOT_EXISTS); + } + } + + private void validateBusinessQCCoefficientParameterDataExists(Long id) { + if (businessQCCoefficientParameterDataMapper.selectById(id) == null) { + throw exception(BUSINESS_QC_COEFFICIENT_PARAMETER_DATA_NOT_EXISTS); + } + } + + @Override + public BusinessQCCoefficientParameterDataDO getBusinessQCCoefficientParameterData(Long id) { + return businessQCCoefficientParameterDataMapper.selectById(id); + } + + @Override + public PageResult getBusinessQCCoefficientParameterDataPage(BusinessQCCoefficientParameterDataPageReqVO pageReqVO) { + return businessQCCoefficientParameterDataMapper.selectPage(pageReqVO); + } + +} \ 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/BusinessQCManagementDataService.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessQCManagementDataService.java new file mode 100644 index 0000000..b65394b --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessQCManagementDataService.java @@ -0,0 +1,62 @@ +package com.zt.plat.module.qms.business.bus.service; + +import java.util.*; +import jakarta.validation.*; +import com.zt.plat.framework.common.pojo.PageResult; +import com.zt.plat.module.qms.business.bus.controller.vo.*; +import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCManagementDataDO; +import com.zt.plat.framework.common.pojo.PageParam; + +/** + * 质控管理样检测任务数据,管理样、标准样 Service 接口 + * + * @author 后台管理 + */ +public interface BusinessQCManagementDataService { + + /** + * 创建质控管理样检测任务数据,管理样、标准样 + * + * @param createReqVO 创建信息 + * @return 编号 + */ + BusinessQCManagementDataRespVO createBusinessQCManagementData(@Valid BusinessQCManagementDataSaveReqVO createReqVO); + + /** + * 更新质控管理样检测任务数据,管理样、标准样 + * + * @param updateReqVO 更新信息 + */ + void updateBusinessQCManagementData(@Valid BusinessQCManagementDataSaveReqVO updateReqVO); + + /** + * 删除质控管理样检测任务数据,管理样、标准样 + * + * @param id 编号 + */ + void deleteBusinessQCManagementData(Long id); + + /** + * 批量删除质控管理样检测任务数据,管理样、标准样 + * + * @param ids 编号 + */ + void deleteBusinessQCManagementDataListByIds(List ids); + + /** + * 获得质控管理样检测任务数据,管理样、标准样 + * + * @param id 编号 + * @return 质控管理样检测任务数据,管理样、标准样 + */ + BusinessQCManagementDataDO getBusinessQCManagementData(Long id); + + /** + * 获得质控管理样检测任务数据,管理样、标准样分页 + * + * @param pageReqVO 分页查询 + * @return 质控管理样检测任务数据,管理样、标准样分页 + */ + PageResult getBusinessQCManagementDataPage(BusinessQCManagementDataPageReqVO pageReqVO); + +} \ 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/BusinessQCManagementDataServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessQCManagementDataServiceImpl.java new file mode 100644 index 0000000..8323b04 --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessQCManagementDataServiceImpl.java @@ -0,0 +1,91 @@ +package com.zt.plat.module.qms.business.bus.service; + +import cn.hutool.core.collection.CollUtil; +import org.springframework.stereotype.Service; +import jakarta.annotation.Resource; +import org.springframework.validation.annotation.Validated; +import org.springframework.transaction.annotation.Transactional; + +import java.util.*; +import com.zt.plat.framework.common.pojo.PageResult; +import com.zt.plat.framework.common.pojo.PageParam; +import com.zt.plat.framework.common.util.object.BeanUtils; +import com.zt.plat.module.qms.business.bus.controller.vo.*; +import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCManagementDataDO; +import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessQCManagementDataMapper; + +import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.exception; +import static com.zt.plat.framework.common.util.collection.CollectionUtils.convertList; +import static com.zt.plat.framework.common.util.collection.CollectionUtils.diffList; +import static com.zt.plat.module.qms.enums.ErrorCodeConstants.*; + +/** + * 质控管理样检测任务数据,管理样、标准样 Service 实现类 + * + * @author 后台管理 + */ +@Service +@Validated +public class BusinessQCManagementDataServiceImpl implements BusinessQCManagementDataService { + + @Resource + private BusinessQCManagementDataMapper businessQCManagementDataMapper; + + @Override + public BusinessQCManagementDataRespVO createBusinessQCManagementData(BusinessQCManagementDataSaveReqVO createReqVO) { + // 插入 + BusinessQCManagementDataDO businessQCManagementData = BeanUtils.toBean(createReqVO, BusinessQCManagementDataDO.class); + businessQCManagementDataMapper.insert(businessQCManagementData); + // 返回 + return BeanUtils.toBean(businessQCManagementData, BusinessQCManagementDataRespVO.class); + } + + @Override + public void updateBusinessQCManagementData(BusinessQCManagementDataSaveReqVO updateReqVO) { + // 校验存在 + validateBusinessQCManagementDataExists(updateReqVO.getId()); + // 更新 + BusinessQCManagementDataDO updateObj = BeanUtils.toBean(updateReqVO, BusinessQCManagementDataDO.class); + businessQCManagementDataMapper.updateById(updateObj); + } + + @Override + public void deleteBusinessQCManagementData(Long id) { + // 校验存在 + validateBusinessQCManagementDataExists(id); + // 删除 + businessQCManagementDataMapper.deleteById(id); + } + + @Override + public void deleteBusinessQCManagementDataListByIds(List ids) { + // 校验存在 + validateBusinessQCManagementDataExists(ids); + // 删除 + businessQCManagementDataMapper.deleteByIds(ids); + } + + private void validateBusinessQCManagementDataExists(List ids) { + List list = businessQCManagementDataMapper.selectByIds(ids); + if (CollUtil.isEmpty(list) || list.size() != ids.size()) { + throw exception(BUSINESS_QC_MANAGEMENT_DATA_NOT_EXISTS); + } + } + + private void validateBusinessQCManagementDataExists(Long id) { + if (businessQCManagementDataMapper.selectById(id) == null) { + throw exception(BUSINESS_QC_MANAGEMENT_DATA_NOT_EXISTS); + } + } + + @Override + public BusinessQCManagementDataDO getBusinessQCManagementData(Long id) { + return businessQCManagementDataMapper.selectById(id); + } + + @Override + public PageResult getBusinessQCManagementDataPage(BusinessQCManagementDataPageReqVO pageReqVO) { + return businessQCManagementDataMapper.selectPage(pageReqVO); + } + +} \ 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/BusinessQCManagementParameterDataService.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessQCManagementParameterDataService.java new file mode 100644 index 0000000..0d9b56f --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessQCManagementParameterDataService.java @@ -0,0 +1,62 @@ +package com.zt.plat.module.qms.business.bus.service; + +import java.util.*; +import jakarta.validation.*; +import com.zt.plat.framework.common.pojo.PageResult; +import com.zt.plat.module.qms.business.bus.controller.vo.*; +import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCManagementParameterDataDO; +import com.zt.plat.framework.common.pojo.PageParam; + +/** + * 质控样检测参数数据业务 Service 接口 + * + * @author 后台管理 + */ +public interface BusinessQCManagementParameterDataService { + + /** + * 创建质控样检测参数数据业务 + * + * @param createReqVO 创建信息 + * @return 编号 + */ + BusinessQCManagementParameterDataRespVO createBusinessQCManagementParameterData(@Valid BusinessQCManagementParameterDataSaveReqVO createReqVO); + + /** + * 更新质控样检测参数数据业务 + * + * @param updateReqVO 更新信息 + */ + void updateBusinessQCManagementParameterData(@Valid BusinessQCManagementParameterDataSaveReqVO updateReqVO); + + /** + * 删除质控样检测参数数据业务 + * + * @param id 编号 + */ + void deleteBusinessQCManagementParameterData(Long id); + + /** + * 批量删除质控样检测参数数据业务 + * + * @param ids 编号 + */ + void deleteBusinessQCManagementParameterDataListByIds(List ids); + + /** + * 获得质控样检测参数数据业务 + * + * @param id 编号 + * @return 质控样检测参数数据业务 + */ + BusinessQCManagementParameterDataDO getBusinessQCManagementParameterData(Long id); + + /** + * 获得质控样检测参数数据业务分页 + * + * @param pageReqVO 分页查询 + * @return 质控样检测参数数据业务分页 + */ + PageResult getBusinessQCManagementParameterDataPage(BusinessQCManagementParameterDataPageReqVO pageReqVO); + +} \ 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/BusinessQCManagementParameterDataServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessQCManagementParameterDataServiceImpl.java new file mode 100644 index 0000000..832d04a --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessQCManagementParameterDataServiceImpl.java @@ -0,0 +1,91 @@ +package com.zt.plat.module.qms.business.bus.service; + +import cn.hutool.core.collection.CollUtil; +import org.springframework.stereotype.Service; +import jakarta.annotation.Resource; +import org.springframework.validation.annotation.Validated; +import org.springframework.transaction.annotation.Transactional; + +import java.util.*; +import com.zt.plat.framework.common.pojo.PageResult; +import com.zt.plat.framework.common.pojo.PageParam; +import com.zt.plat.framework.common.util.object.BeanUtils; +import com.zt.plat.module.qms.business.bus.controller.vo.*; +import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCManagementParameterDataDO; +import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessQCManagementParameterDataMapper; + +import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.exception; +import static com.zt.plat.framework.common.util.collection.CollectionUtils.convertList; +import static com.zt.plat.framework.common.util.collection.CollectionUtils.diffList; +import static com.zt.plat.module.qms.enums.ErrorCodeConstants.*; + +/** + * 质控样检测参数数据业务 Service 实现类 + * + * @author 后台管理 + */ +@Service +@Validated +public class BusinessQCManagementParameterDataServiceImpl implements BusinessQCManagementParameterDataService { + + @Resource + private BusinessQCManagementParameterDataMapper businessQCManagementParameterDataMapper; + + @Override + public BusinessQCManagementParameterDataRespVO createBusinessQCManagementParameterData(BusinessQCManagementParameterDataSaveReqVO createReqVO) { + // 插入 + BusinessQCManagementParameterDataDO businessQCManagementParameterData = BeanUtils.toBean(createReqVO, BusinessQCManagementParameterDataDO.class); + businessQCManagementParameterDataMapper.insert(businessQCManagementParameterData); + // 返回 + return BeanUtils.toBean(businessQCManagementParameterData, BusinessQCManagementParameterDataRespVO.class); + } + + @Override + public void updateBusinessQCManagementParameterData(BusinessQCManagementParameterDataSaveReqVO updateReqVO) { + // 校验存在 + validateBusinessQCManagementParameterDataExists(updateReqVO.getId()); + // 更新 + BusinessQCManagementParameterDataDO updateObj = BeanUtils.toBean(updateReqVO, BusinessQCManagementParameterDataDO.class); + businessQCManagementParameterDataMapper.updateById(updateObj); + } + + @Override + public void deleteBusinessQCManagementParameterData(Long id) { + // 校验存在 + validateBusinessQCManagementParameterDataExists(id); + // 删除 + businessQCManagementParameterDataMapper.deleteById(id); + } + + @Override + public void deleteBusinessQCManagementParameterDataListByIds(List ids) { + // 校验存在 + validateBusinessQCManagementParameterDataExists(ids); + // 删除 + businessQCManagementParameterDataMapper.deleteByIds(ids); + } + + private void validateBusinessQCManagementParameterDataExists(List ids) { + List list = businessQCManagementParameterDataMapper.selectByIds(ids); + if (CollUtil.isEmpty(list) || list.size() != ids.size()) { + throw exception(BUSINESS_QC_MANAGEMENT_PARAMETER_DATA_NOT_EXISTS); + } + } + + private void validateBusinessQCManagementParameterDataExists(Long id) { + if (businessQCManagementParameterDataMapper.selectById(id) == null) { + throw exception(BUSINESS_QC_MANAGEMENT_PARAMETER_DATA_NOT_EXISTS); + } + } + + @Override + public BusinessQCManagementParameterDataDO getBusinessQCManagementParameterData(Long id) { + return businessQCManagementParameterDataMapper.selectById(id); + } + + @Override + public PageResult getBusinessQCManagementParameterDataPage(BusinessQCManagementParameterDataPageReqVO pageReqVO) { + return businessQCManagementParameterDataMapper.selectPage(pageReqVO); + } + +} \ 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/BusinessQCManagementProjectDataService.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessQCManagementProjectDataService.java new file mode 100644 index 0000000..ae2b5c7 --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessQCManagementProjectDataService.java @@ -0,0 +1,62 @@ +package com.zt.plat.module.qms.business.bus.service; + +import java.util.*; +import jakarta.validation.*; +import com.zt.plat.framework.common.pojo.PageResult; +import com.zt.plat.module.qms.business.bus.controller.vo.*; +import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCManagementProjectDataDO; +import com.zt.plat.framework.common.pojo.PageParam; + +/** + * 质控样检测项目数据业务 Service 接口 + * + * @author 后台管理 + */ +public interface BusinessQCManagementProjectDataService { + + /** + * 创建质控样检测项目数据业务 + * + * @param createReqVO 创建信息 + * @return 编号 + */ + BusinessQCManagementProjectDataRespVO createBusinessQCManagementProjectData(@Valid BusinessQCManagementProjectDataSaveReqVO createReqVO); + + /** + * 更新质控样检测项目数据业务 + * + * @param updateReqVO 更新信息 + */ + void updateBusinessQCManagementProjectData(@Valid BusinessQCManagementProjectDataSaveReqVO updateReqVO); + + /** + * 删除质控样检测项目数据业务 + * + * @param id 编号 + */ + void deleteBusinessQCManagementProjectData(Long id); + + /** + * 批量删除质控样检测项目数据业务 + * + * @param ids 编号 + */ + void deleteBusinessQCManagementProjectDataListByIds(List ids); + + /** + * 获得质控样检测项目数据业务 + * + * @param id 编号 + * @return 质控样检测项目数据业务 + */ + BusinessQCManagementProjectDataDO getBusinessQCManagementProjectData(Long id); + + /** + * 获得质控样检测项目数据业务分页 + * + * @param pageReqVO 分页查询 + * @return 质控样检测项目数据业务分页 + */ + PageResult getBusinessQCManagementProjectDataPage(BusinessQCManagementProjectDataPageReqVO pageReqVO); + +} \ 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/BusinessQCManagementProjectDataServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessQCManagementProjectDataServiceImpl.java new file mode 100644 index 0000000..38baa44 --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessQCManagementProjectDataServiceImpl.java @@ -0,0 +1,91 @@ +package com.zt.plat.module.qms.business.bus.service; + +import cn.hutool.core.collection.CollUtil; +import org.springframework.stereotype.Service; +import jakarta.annotation.Resource; +import org.springframework.validation.annotation.Validated; +import org.springframework.transaction.annotation.Transactional; + +import java.util.*; +import com.zt.plat.framework.common.pojo.PageResult; +import com.zt.plat.framework.common.pojo.PageParam; +import com.zt.plat.framework.common.util.object.BeanUtils; +import com.zt.plat.module.qms.business.bus.controller.vo.*; +import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCManagementProjectDataDO; +import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessQCManagementProjectDataMapper; + +import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.exception; +import static com.zt.plat.framework.common.util.collection.CollectionUtils.convertList; +import static com.zt.plat.framework.common.util.collection.CollectionUtils.diffList; +import static com.zt.plat.module.qms.enums.ErrorCodeConstants.*; + +/** + * 质控样检测项目数据业务 Service 实现类 + * + * @author 后台管理 + */ +@Service +@Validated +public class BusinessQCManagementProjectDataServiceImpl implements BusinessQCManagementProjectDataService { + + @Resource + private BusinessQCManagementProjectDataMapper businessQCManagementProjectDataMapper; + + @Override + public BusinessQCManagementProjectDataRespVO createBusinessQCManagementProjectData(BusinessQCManagementProjectDataSaveReqVO createReqVO) { + // 插入 + BusinessQCManagementProjectDataDO businessQCManagementProjectData = BeanUtils.toBean(createReqVO, BusinessQCManagementProjectDataDO.class); + businessQCManagementProjectDataMapper.insert(businessQCManagementProjectData); + // 返回 + return BeanUtils.toBean(businessQCManagementProjectData, BusinessQCManagementProjectDataRespVO.class); + } + + @Override + public void updateBusinessQCManagementProjectData(BusinessQCManagementProjectDataSaveReqVO updateReqVO) { + // 校验存在 + validateBusinessQCManagementProjectDataExists(updateReqVO.getId()); + // 更新 + BusinessQCManagementProjectDataDO updateObj = BeanUtils.toBean(updateReqVO, BusinessQCManagementProjectDataDO.class); + businessQCManagementProjectDataMapper.updateById(updateObj); + } + + @Override + public void deleteBusinessQCManagementProjectData(Long id) { + // 校验存在 + validateBusinessQCManagementProjectDataExists(id); + // 删除 + businessQCManagementProjectDataMapper.deleteById(id); + } + + @Override + public void deleteBusinessQCManagementProjectDataListByIds(List ids) { + // 校验存在 + validateBusinessQCManagementProjectDataExists(ids); + // 删除 + businessQCManagementProjectDataMapper.deleteByIds(ids); + } + + private void validateBusinessQCManagementProjectDataExists(List ids) { + List list = businessQCManagementProjectDataMapper.selectByIds(ids); + if (CollUtil.isEmpty(list) || list.size() != ids.size()) { + throw exception(BUSINESS_QC_MANAGEMENT_PROJECT_DATA_NOT_EXISTS); + } + } + + private void validateBusinessQCManagementProjectDataExists(Long id) { + if (businessQCManagementProjectDataMapper.selectById(id) == null) { + throw exception(BUSINESS_QC_MANAGEMENT_PROJECT_DATA_NOT_EXISTS); + } + } + + @Override + public BusinessQCManagementProjectDataDO getBusinessQCManagementProjectData(Long id) { + return businessQCManagementProjectDataMapper.selectById(id); + } + + @Override + public PageResult getBusinessQCManagementProjectDataPage(BusinessQCManagementProjectDataPageReqVO pageReqVO) { + return businessQCManagementProjectDataMapper.selectPage(pageReqVO); + } + +} \ 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/BusinessQCCoefficientDataMapper.xml b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessQCCoefficientDataMapper.xml new file mode 100644 index 0000000..9d24433 --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessQCCoefficientDataMapper.xml @@ -0,0 +1,12 @@ + + + + + + + \ 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/BusinessQCCoefficientParameterDataMapper.xml b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessQCCoefficientParameterDataMapper.xml new file mode 100644 index 0000000..17c3b3e --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessQCCoefficientParameterDataMapper.xml @@ -0,0 +1,12 @@ + + + + + + + \ 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/BusinessQCManagementDataMapper.xml b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessQCManagementDataMapper.xml new file mode 100644 index 0000000..4c2c714 --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessQCManagementDataMapper.xml @@ -0,0 +1,12 @@ + + + + + + + \ 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/BusinessQCManagementParameterDataMapper.xml b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessQCManagementParameterDataMapper.xml new file mode 100644 index 0000000..ed46fff --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessQCManagementParameterDataMapper.xml @@ -0,0 +1,12 @@ + + + + + + + \ 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/BusinessQCManagementProjectDataMapper.xml b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessQCManagementProjectDataMapper.xml new file mode 100644 index 0000000..094b251 --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessQCManagementProjectDataMapper.xml @@ -0,0 +1,12 @@ + + + + + + + \ No newline at end of file From 9eb42b930fe1d65d5b35db4ae861c305e503144d Mon Sep 17 00:00:00 2001 From: wxr Date: Wed, 5 Nov 2025 18:27:17 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E7=A9=BA=E7=99=BD=E6=A0=B7=E6=A3=80?= =?UTF-8?q?=E6=B5=8B=E9=A1=B9=E7=9B=AE=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/qms/enums/ErrorCodeConstants.java | 1 + ...nfigQCSampleMethodParameterController.java | 106 ++++++++++++++++++ ...onfigQCSampleMethodParameterPageReqVO.java | 56 +++++++++ .../ConfigQCSampleMethodParameterRespVO.java | 71 ++++++++++++ ...onfigQCSampleMethodParameterSaveReqVO.java | 57 ++++++++++ .../ConfigQCSampleMethodParameterDO.java | 95 ++++++++++++++++ .../ConfigQCSampleMethodParameterMapper.java | 38 +++++++ .../ConfigQCSampleMethodParameterService.java | 62 ++++++++++ ...figQCSampleMethodParameterServiceImpl.java | 91 +++++++++++++++ .../ConfigQCSampleMethodParameterMapper.xml | 12 ++ 10 files changed, 589 insertions(+) create mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigQCSampleMethodParameterController.java create mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigQCSampleMethodParameterPageReqVO.java create mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigQCSampleMethodParameterRespVO.java create mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigQCSampleMethodParameterSaveReqVO.java create mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/dal/dataobject/ConfigQCSampleMethodParameterDO.java create mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/dal/mapper/ConfigQCSampleMethodParameterMapper.java create mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/service/ConfigQCSampleMethodParameterService.java create mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/service/ConfigQCSampleMethodParameterServiceImpl.java create mode 100644 zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/config/dal/mapper/ConfigQCSampleMethodParameterMapper.xml diff --git a/zt-module-qms/zt-module-qms-api/src/main/java/com/zt/plat/module/qms/enums/ErrorCodeConstants.java b/zt-module-qms/zt-module-qms-api/src/main/java/com/zt/plat/module/qms/enums/ErrorCodeConstants.java index 0d92bf7..f5bafab 100644 --- a/zt-module-qms/zt-module-qms-api/src/main/java/com/zt/plat/module/qms/enums/ErrorCodeConstants.java +++ b/zt-module-qms/zt-module-qms-api/src/main/java/com/zt/plat/module/qms/enums/ErrorCodeConstants.java @@ -79,6 +79,7 @@ public interface ErrorCodeConstants { ErrorCode CONFIG_QC_SAMPLE_METHOD_NOT_EXISTS = new ErrorCode(1_032_050_000, "质控样与检测方法配置不存在"); ErrorCode CONFIG_QC_STANDARD_SAMPLE_NOT_EXISTS = new ErrorCode(1_032_050_000, "质控与定值样关系不存在"); + ErrorCode CONFIG_QC_SAMPLE_METHOD_PARAMETER_NOT_EXISTS = new ErrorCode(1_032_050_000, "质控样检测方法参数配置不存在"); /*=================================bus 检验业务 1_032_100_000 ~ 1_032_149_999==================================*/ ErrorCode BUSINESS_SAMPLE_ENTRUST_REGISTRATION_NOT_EXISTS = new ErrorCode(1_032_100_000, "委检登记业务不存在"); diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigQCSampleMethodParameterController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigQCSampleMethodParameterController.java new file mode 100644 index 0000000..6662b7b --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigQCSampleMethodParameterController.java @@ -0,0 +1,106 @@ +package com.zt.plat.module.qms.business.config.controller.admin; + +import org.springframework.web.bind.annotation.*; +import jakarta.annotation.Resource; +import org.springframework.validation.annotation.Validated; +import org.springframework.security.access.prepost.PreAuthorize; +import com.zt.plat.framework.business.interceptor.BusinessControllerMarker; + +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.Operation; + +import jakarta.validation.constraints.*; +import jakarta.validation.*; +import jakarta.servlet.http.*; +import java.util.*; +import java.io.IOException; + +import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO; +import com.zt.plat.framework.common.pojo.PageParam; +import com.zt.plat.framework.common.pojo.PageResult; +import com.zt.plat.framework.common.pojo.CommonResult; +import com.zt.plat.framework.common.util.object.BeanUtils; +import static com.zt.plat.framework.common.pojo.CommonResult.success; + +import com.zt.plat.framework.excel.core.util.ExcelUtils; +import com.zt.plat.module.qms.business.config.controller.vo.*; +import com.zt.plat.module.qms.business.config.dal.dataobject.ConfigQCSampleMethodParameterDO; +import com.zt.plat.module.qms.business.config.service.ConfigQCSampleMethodParameterService; +import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog; +import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*; + +@Tag(name = "管理后台 - 质控样检测方法参数配置") +@RestController +@RequestMapping("/qms/config-QC-sample-method-parameter") +@Validated +public class ConfigQCSampleMethodParameterController implements BusinessControllerMarker { + + + @Resource + private ConfigQCSampleMethodParameterService configQCSampleMethodParameterService; + + @PostMapping("/create") + @Operation(summary = "创建质控样检测方法参数配置") + @PreAuthorize("@ss.hasPermission('qms:config-QC-sample-method-parameter:create')") + public CommonResult createConfigQCSampleMethodParameter(@Valid @RequestBody ConfigQCSampleMethodParameterSaveReqVO createReqVO) { + return success(configQCSampleMethodParameterService.createConfigQCSampleMethodParameter(createReqVO)); + } + + @PutMapping("/update") + @Operation(summary = "更新质控样检测方法参数配置") + @PreAuthorize("@ss.hasPermission('qms:config-QC-sample-method-parameter:update')") + public CommonResult updateConfigQCSampleMethodParameter(@Valid @RequestBody ConfigQCSampleMethodParameterSaveReqVO updateReqVO) { + configQCSampleMethodParameterService.updateConfigQCSampleMethodParameter(updateReqVO); + return success(true); + } + + @DeleteMapping("/delete") + @Operation(summary = "删除质控样检测方法参数配置") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('qms:config-QC-sample-method-parameter:delete')") + public CommonResult deleteConfigQCSampleMethodParameter(@RequestParam("id") Long id) { + configQCSampleMethodParameterService.deleteConfigQCSampleMethodParameter(id); + return success(true); + } + + @DeleteMapping("/delete-list") + @Parameter(name = "ids", description = "编号", required = true) + @Operation(summary = "批量删除质控样检测方法参数配置") + @PreAuthorize("@ss.hasPermission('qms:config-QC-sample-method-parameter:delete')") + public CommonResult deleteConfigQCSampleMethodParameterList(@RequestBody BatchDeleteReqVO req) { + configQCSampleMethodParameterService.deleteConfigQCSampleMethodParameterListByIds(req.getIds()); + return success(true); + } + + @GetMapping("/get") + @Operation(summary = "获得质控样检测方法参数配置") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('qms:config-QC-sample-method-parameter:query')") + public CommonResult getConfigQCSampleMethodParameter(@RequestParam("id") Long id) { + ConfigQCSampleMethodParameterDO configQCSampleMethodParameter = configQCSampleMethodParameterService.getConfigQCSampleMethodParameter(id); + return success(BeanUtils.toBean(configQCSampleMethodParameter, ConfigQCSampleMethodParameterRespVO.class)); + } + + @GetMapping("/page") + @Operation(summary = "获得质控样检测方法参数配置分页") + @PreAuthorize("@ss.hasPermission('qms:config-QC-sample-method-parameter:query')") + public CommonResult> getConfigQCSampleMethodParameterPage(@Valid ConfigQCSampleMethodParameterPageReqVO pageReqVO) { + PageResult pageResult = configQCSampleMethodParameterService.getConfigQCSampleMethodParameterPage(pageReqVO); + return success(BeanUtils.toBean(pageResult, ConfigQCSampleMethodParameterRespVO.class)); + } + + @GetMapping("/export-excel") + @Operation(summary = "导出质控样检测方法参数配置 Excel") + @PreAuthorize("@ss.hasPermission('qms:config-QC-sample-method-parameter:export')") + @ApiAccessLog(operateType = EXPORT) + public void exportConfigQCSampleMethodParameterExcel(@Valid ConfigQCSampleMethodParameterPageReqVO pageReqVO, + HttpServletResponse response) throws IOException { + pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); + List list = configQCSampleMethodParameterService.getConfigQCSampleMethodParameterPage(pageReqVO).getList(); + // 导出 Excel + ExcelUtils.write(response, "质控样检测方法参数配置.xls", "数据", ConfigQCSampleMethodParameterRespVO.class, + BeanUtils.toBean(list, ConfigQCSampleMethodParameterRespVO.class)); + } + +} \ 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/config/controller/vo/ConfigQCSampleMethodParameterPageReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigQCSampleMethodParameterPageReqVO.java new file mode 100644 index 0000000..52af350 --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigQCSampleMethodParameterPageReqVO.java @@ -0,0 +1,56 @@ +package com.zt.plat.module.qms.business.config.controller.vo; + +import lombok.*; +import java.util.*; +import io.swagger.v3.oas.annotations.media.Schema; +import com.zt.plat.framework.common.pojo.PageParam; +import org.springframework.format.annotation.DateTimeFormat; +import java.time.LocalDateTime; + +import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; + +@Schema(description = "管理后台 - 质控样检测方法参数配置分页 Request VO") +@Data +public class ConfigQCSampleMethodParameterPageReqVO extends PageParam { + + @Schema(description = "检测方法与质控样类型配置ID", example = "28109") + private Long configQCSampleMethodId; + + @Schema(description = "参数ID,字典表【T_DIC_PRM】", example = "29135") + private Long dictionaryParameterId; + + @Schema(description = "数据类型,【字典】【jy_sample_data_type】字符串，整数，小数,日期，时间", example = "1") + private String dataType; + + @Schema(description = "小数位") + private Integer decimalPosition; + + @Schema(description = "默认值") + private String defaultValue; + + @Schema(description = "是否允许为空") + private Integer isNull; + + @Schema(description = "计算公式") + private String formula; + + @Schema(description = "pc界面是否显示") + private Integer isShow; + + @Schema(description = "排序号") + private Integer sortNo; + + @Schema(description = "所属部门") + private String systemDepartmentCode; + + @Schema(description = "创建时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] createTime; + + @Schema(description = "备注") + private String remark; + + @Schema(description = "版本") + private Integer version; + +} \ 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/config/controller/vo/ConfigQCSampleMethodParameterRespVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigQCSampleMethodParameterRespVO.java new file mode 100644 index 0000000..14592c9 --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigQCSampleMethodParameterRespVO.java @@ -0,0 +1,71 @@ +package com.zt.plat.module.qms.business.config.controller.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import java.util.*; +import org.springframework.format.annotation.DateTimeFormat; +import java.time.LocalDateTime; +import com.alibaba.excel.annotation.*; + +@Schema(description = "管理后台 - 质控样检测方法参数配置 Response VO") +@Data +@ExcelIgnoreUnannotated +public class ConfigQCSampleMethodParameterRespVO { + + @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "26251") + @ExcelProperty("ID") + private Long id; + + @Schema(description = "检测方法与质控样类型配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "28109") + @ExcelProperty("检测方法与质控样类型配置ID") + private Long configQCSampleMethodId; + + @Schema(description = "参数ID,字典表【T_DIC_PRM】", requiredMode = Schema.RequiredMode.REQUIRED, example = "29135") + @ExcelProperty("参数ID,字典表【T_DIC_PRM】") + private Long dictionaryParameterId; + + @Schema(description = "数据类型,【字典】【jy_sample_data_type】字符串，整数，小数,日期，时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @ExcelProperty("数据类型,【字典】【jy_sample_data_type】字符串，整数，小数,日期，时间") + private String dataType; + + @Schema(description = "小数位") + @ExcelProperty("小数位") + private Integer decimalPosition; + + @Schema(description = "默认值") + @ExcelProperty("默认值") + private String defaultValue; + + @Schema(description = "是否允许为空", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("是否允许为空") + private Integer isNull; + + @Schema(description = "计算公式") + @ExcelProperty("计算公式") + private String formula; + + @Schema(description = "pc界面是否显示", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("pc界面是否显示") + private Integer isShow; + + @Schema(description = "排序号") + @ExcelProperty("排序号") + private Integer sortNo; + + @Schema(description = "所属部门") + @ExcelProperty("所属部门") + private String systemDepartmentCode; + + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("创建时间") + private LocalDateTime createTime; + + @Schema(description = "备注") + @ExcelProperty("备注") + private String remark; + + @Schema(description = "版本", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("版本") + private Integer version; + +} \ 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/config/controller/vo/ConfigQCSampleMethodParameterSaveReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigQCSampleMethodParameterSaveReqVO.java new file mode 100644 index 0000000..d172f03 --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigQCSampleMethodParameterSaveReqVO.java @@ -0,0 +1,57 @@ +package com.zt.plat.module.qms.business.config.controller.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import java.util.*; +import jakarta.validation.constraints.*; + +@Schema(description = "管理后台 - 质控样检测方法参数配置新增/修改 Request VO") +@Data +public class ConfigQCSampleMethodParameterSaveReqVO { + + @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "26251") + private Long id; + + @Schema(description = "检测方法与质控样类型配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "28109") + @NotNull(message = "检测方法与质控样类型配置ID不能为空") + private Long configQCSampleMethodId; + + @Schema(description = "参数ID,字典表【T_DIC_PRM】", requiredMode = Schema.RequiredMode.REQUIRED, example = "29135") + @NotNull(message = "参数ID,字典表【T_DIC_PRM】不能为空") + private Long dictionaryParameterId; + + @Schema(description = "数据类型,【字典】【jy_sample_data_type】字符串，整数，小数,日期，时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @NotEmpty(message = "数据类型,【字典】【jy_sample_data_type】字符串，整数，小数,日期，时间不能为空") + private String dataType; + + @Schema(description = "小数位") + private Integer decimalPosition; + + @Schema(description = "默认值") + private String defaultValue; + + @Schema(description = "是否允许为空", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "是否允许为空不能为空") + private Integer isNull; + + @Schema(description = "计算公式") + private String formula; + + @Schema(description = "pc界面是否显示", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "pc界面是否显示不能为空") + private Integer isShow; + + @Schema(description = "排序号") + private Integer sortNo; + + @Schema(description = "所属部门") + private String systemDepartmentCode; + + @Schema(description = "备注") + private String remark; + + @Schema(description = "版本", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "版本不能为空") + private Integer version; + +} \ 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/config/dal/dataobject/ConfigQCSampleMethodParameterDO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/dal/dataobject/ConfigQCSampleMethodParameterDO.java new file mode 100644 index 0000000..5dc083f --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/dal/dataobject/ConfigQCSampleMethodParameterDO.java @@ -0,0 +1,95 @@ +package com.zt.plat.module.qms.business.config.dal.dataobject; + +import lombok.*; +import java.util.*; + import java.time.LocalDateTime; + import java.time.LocalDateTime; +import com.baomidou.mybatisplus.annotation.*; +import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO; +/** +* 质控样检测方法参数配置 DO +* +* @author 后台管理 +*/ +@TableName("t_cfg_qc_smp_mthd_prm") +@KeySequence("t_cfg_qc_smp_mthd_prm_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +/** +* 支持业务基类继承：isBusiness=true 时继承 BusinessBaseDO，否则继承 BaseDO +*/ +public class ConfigQCSampleMethodParameterDO extends BusinessBaseDO { + + + + /** + * ID + */ + @TableId(type = IdType.ASSIGN_ID) + private Long id; + /** + * 检测方法与质控样类型配置ID + */ + @TableField("CFG_QC_SMP_MTHD_ID") + private Long configQCSampleMethodId; + /** + * 参数ID,字典表【T_DIC_PRM】 + */ + @TableField("DIC_PRM_ID") + private Long dictionaryParameterId; + /** + * 数据类型,【字典】【jy_sample_data_type】字符串，整数，小数,日期，时间 + */ + @TableField("DAT_TP") + private String dataType; + /** + * 小数位 + */ + @TableField("DEC_POS") + private Integer decimalPosition; + /** + * 默认值 + */ + @TableField("DFT_VAL") + private String defaultValue; + /** + * 是否允许为空 + */ + @TableField("IS_NLL") + private Integer isNull; + /** + * 计算公式 + */ + @TableField("FMU") + private String formula; + /** + * pc界面是否显示 + */ + @TableField("IS_SHW") + private Integer isShow; + /** + * 排序号 + */ + @TableField("SRT_NO") + private Integer sortNo; + /** + * 所属部门 + */ + @TableField("SYS_DEPT_CD") + private String systemDepartmentCode; + /** + * 备注 + */ + @TableField("RMK") + private String remark; + /** + * 版本 + */ + @TableField("VER") + private Integer version; + +} \ 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/config/dal/mapper/ConfigQCSampleMethodParameterMapper.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/dal/mapper/ConfigQCSampleMethodParameterMapper.java new file mode 100644 index 0000000..6cf692a --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/dal/mapper/ConfigQCSampleMethodParameterMapper.java @@ -0,0 +1,38 @@ +package com.zt.plat.module.qms.business.config.dal.mapper; + +import java.util.*; + +import com.zt.plat.framework.common.pojo.PageResult; +import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX; +import com.zt.plat.module.qms.business.config.controller.vo.*; +import com.zt.plat.module.qms.business.config.dal.dataobject.ConfigQCSampleMethodParameterDO; +import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX; +import org.apache.ibatis.annotations.Mapper; + +/** + * 质控样检测方法参数配置 Mapper + * + * @author 后台管理 + */ +@Mapper +public interface ConfigQCSampleMethodParameterMapper extends BaseMapperX { + + default PageResult selectPage(ConfigQCSampleMethodParameterPageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .eqIfPresent(ConfigQCSampleMethodParameterDO::getConfigQCSampleMethodId, reqVO.getConfigQCSampleMethodId()) + .eqIfPresent(ConfigQCSampleMethodParameterDO::getDictionaryParameterId, reqVO.getDictionaryParameterId()) + .eqIfPresent(ConfigQCSampleMethodParameterDO::getDataType, reqVO.getDataType()) + .eqIfPresent(ConfigQCSampleMethodParameterDO::getDecimalPosition, reqVO.getDecimalPosition()) + .eqIfPresent(ConfigQCSampleMethodParameterDO::getDefaultValue, reqVO.getDefaultValue()) + .eqIfPresent(ConfigQCSampleMethodParameterDO::getIsNull, reqVO.getIsNull()) + .eqIfPresent(ConfigQCSampleMethodParameterDO::getFormula, reqVO.getFormula()) + .eqIfPresent(ConfigQCSampleMethodParameterDO::getIsShow, reqVO.getIsShow()) + .eqIfPresent(ConfigQCSampleMethodParameterDO::getSortNo, reqVO.getSortNo()) + .eqIfPresent(ConfigQCSampleMethodParameterDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode()) + .betweenIfPresent(ConfigQCSampleMethodParameterDO::getCreateTime, reqVO.getCreateTime()) + .eqIfPresent(ConfigQCSampleMethodParameterDO::getRemark, reqVO.getRemark()) + .eqIfPresent(ConfigQCSampleMethodParameterDO::getVersion, reqVO.getVersion()) + .orderByDesc(ConfigQCSampleMethodParameterDO::getId)); + } + +} \ 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/config/service/ConfigQCSampleMethodParameterService.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/service/ConfigQCSampleMethodParameterService.java new file mode 100644 index 0000000..49d1898 --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/service/ConfigQCSampleMethodParameterService.java @@ -0,0 +1,62 @@ +package com.zt.plat.module.qms.business.config.service; + +import java.util.*; +import jakarta.validation.*; +import com.zt.plat.framework.common.pojo.PageResult; +import com.zt.plat.module.qms.business.config.controller.vo.*; +import com.zt.plat.module.qms.business.config.dal.dataobject.ConfigQCSampleMethodParameterDO; +import com.zt.plat.framework.common.pojo.PageParam; + +/** + * 质控样检测方法参数配置 Service 接口 + * + * @author 后台管理 + */ +public interface ConfigQCSampleMethodParameterService { + + /** + * 创建质控样检测方法参数配置 + * + * @param createReqVO 创建信息 + * @return 编号 + */ + ConfigQCSampleMethodParameterRespVO createConfigQCSampleMethodParameter(@Valid ConfigQCSampleMethodParameterSaveReqVO createReqVO); + + /** + * 更新质控样检测方法参数配置 + * + * @param updateReqVO 更新信息 + */ + void updateConfigQCSampleMethodParameter(@Valid ConfigQCSampleMethodParameterSaveReqVO updateReqVO); + + /** + * 删除质控样检测方法参数配置 + * + * @param id 编号 + */ + void deleteConfigQCSampleMethodParameter(Long id); + + /** + * 批量删除质控样检测方法参数配置 + * + * @param ids 编号 + */ + void deleteConfigQCSampleMethodParameterListByIds(List ids); + + /** + * 获得质控样检测方法参数配置 + * + * @param id 编号 + * @return 质控样检测方法参数配置 + */ + ConfigQCSampleMethodParameterDO getConfigQCSampleMethodParameter(Long id); + + /** + * 获得质控样检测方法参数配置分页 + * + * @param pageReqVO 分页查询 + * @return 质控样检测方法参数配置分页 + */ + PageResult getConfigQCSampleMethodParameterPage(ConfigQCSampleMethodParameterPageReqVO pageReqVO); + +} \ 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/config/service/ConfigQCSampleMethodParameterServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/service/ConfigQCSampleMethodParameterServiceImpl.java new file mode 100644 index 0000000..e38ec63 --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/service/ConfigQCSampleMethodParameterServiceImpl.java @@ -0,0 +1,91 @@ +package com.zt.plat.module.qms.business.config.service; + +import cn.hutool.core.collection.CollUtil; +import org.springframework.stereotype.Service; +import jakarta.annotation.Resource; +import org.springframework.validation.annotation.Validated; +import org.springframework.transaction.annotation.Transactional; + +import java.util.*; +import com.zt.plat.framework.common.pojo.PageResult; +import com.zt.plat.framework.common.pojo.PageParam; +import com.zt.plat.framework.common.util.object.BeanUtils; +import com.zt.plat.module.qms.business.config.controller.vo.*; +import com.zt.plat.module.qms.business.config.dal.dataobject.ConfigQCSampleMethodParameterDO; +import com.zt.plat.module.qms.business.config.dal.mapper.ConfigQCSampleMethodParameterMapper; + +import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.exception; +import static com.zt.plat.framework.common.util.collection.CollectionUtils.convertList; +import static com.zt.plat.framework.common.util.collection.CollectionUtils.diffList; +import static com.zt.plat.module.qms.enums.ErrorCodeConstants.*; + +/** + * 质控样检测方法参数配置 Service 实现类 + * + * @author 后台管理 + */ +@Service +@Validated +public class ConfigQCSampleMethodParameterServiceImpl implements ConfigQCSampleMethodParameterService { + + @Resource + private ConfigQCSampleMethodParameterMapper configQCSampleMethodParameterMapper; + + @Override + public ConfigQCSampleMethodParameterRespVO createConfigQCSampleMethodParameter(ConfigQCSampleMethodParameterSaveReqVO createReqVO) { + // 插入 + ConfigQCSampleMethodParameterDO configQCSampleMethodParameter = BeanUtils.toBean(createReqVO, ConfigQCSampleMethodParameterDO.class); + configQCSampleMethodParameterMapper.insert(configQCSampleMethodParameter); + // 返回 + return BeanUtils.toBean(configQCSampleMethodParameter, ConfigQCSampleMethodParameterRespVO.class); + } + + @Override + public void updateConfigQCSampleMethodParameter(ConfigQCSampleMethodParameterSaveReqVO updateReqVO) { + // 校验存在 + validateConfigQCSampleMethodParameterExists(updateReqVO.getId()); + // 更新 + ConfigQCSampleMethodParameterDO updateObj = BeanUtils.toBean(updateReqVO, ConfigQCSampleMethodParameterDO.class); + configQCSampleMethodParameterMapper.updateById(updateObj); + } + + @Override + public void deleteConfigQCSampleMethodParameter(Long id) { + // 校验存在 + validateConfigQCSampleMethodParameterExists(id); + // 删除 + configQCSampleMethodParameterMapper.deleteById(id); + } + + @Override + public void deleteConfigQCSampleMethodParameterListByIds(List ids) { + // 校验存在 + validateConfigQCSampleMethodParameterExists(ids); + // 删除 + configQCSampleMethodParameterMapper.deleteByIds(ids); + } + + private void validateConfigQCSampleMethodParameterExists(List ids) { + List list = configQCSampleMethodParameterMapper.selectByIds(ids); + if (CollUtil.isEmpty(list) || list.size() != ids.size()) { + throw exception(CONFIG_QC_SAMPLE_METHOD_PARAMETER_NOT_EXISTS); + } + } + + private void validateConfigQCSampleMethodParameterExists(Long id) { + if (configQCSampleMethodParameterMapper.selectById(id) == null) { + throw exception(CONFIG_QC_SAMPLE_METHOD_PARAMETER_NOT_EXISTS); + } + } + + @Override + public ConfigQCSampleMethodParameterDO getConfigQCSampleMethodParameter(Long id) { + return configQCSampleMethodParameterMapper.selectById(id); + } + + @Override + public PageResult getConfigQCSampleMethodParameterPage(ConfigQCSampleMethodParameterPageReqVO pageReqVO) { + return configQCSampleMethodParameterMapper.selectPage(pageReqVO); + } + +} \ 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/config/dal/mapper/ConfigQCSampleMethodParameterMapper.xml b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/config/dal/mapper/ConfigQCSampleMethodParameterMapper.xml new file mode 100644 index 0000000..7ce7aed --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/config/dal/mapper/ConfigQCSampleMethodParameterMapper.xml @@ -0,0 +1,12 @@ + + + + + + + \ No newline at end of file From a3cd8a0a55f7d7d2c60031b92c74044dff2fb228 Mon Sep 17 00:00:00 2001 From: wxr Date: Thu, 6 Nov 2025 15:16:26 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=88=86=E9=85=8D?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusinessQCCoefficientDataController.java | 12 +- .../BusinessQCManagementDataController.java | 12 +- .../vo/BusinessQCCoefficientDataReqVO.java | 79 +++++++ .../BusinessQCCoefficientDataSaveReqVO.java | 3 +- .../vo/BusinessQCManagementDataReqVO.java | 79 +++++++ .../controller/vo/CreateQcSampleReqVO.java | 4 +- .../BusinessQCCoefficientDataMapper.java | 30 +++ .../BusinessQCManagementDataMapper.java | 25 +++ .../SampleTaskAssignDataSaveOrUpdateCmp.java | 35 +-- .../SampleTaskAssignQCSampleCmp.java | 124 +++++----- .../slot/SampleTaskAssignContext.java | 16 +- .../BusinessQCCoefficientDataService.java | 2 + .../BusinessQCCoefficientDataServiceImpl.java | 5 + .../BusinessQCManagementDataService.java | 2 + .../BusinessQCManagementDataServiceImpl.java | 5 + .../service/SampleTaskAssignServiceImpl.java | 212 ++++++++++++------ .../vo/ConfigQCSampleMethodExtendRespVO.java | 2 - .../vo/ConfigQCSampleMethodPageReqVO.java | 3 - ...igQCSampleMethodParameterExtendRespVO.java | 23 ++ .../vo/ConfigQCSampleMethodRespVO.java | 4 - .../vo/ConfigQCSampleMethodSaveReqVO.java | 3 - .../dataobject/ConfigQCSampleMethodDO.java | 5 - .../mapper/ConfigQCSampleMethodMapper.java | 14 +- .../ConfigQCSampleMethodParameterMapper.java | 27 +++ 24 files changed, 528 insertions(+), 198 deletions(-) create mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessQCCoefficientDataReqVO.java create mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessQCManagementDataReqVO.java create mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigQCSampleMethodParameterExtendRespVO.java diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessQCCoefficientDataController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessQCCoefficientDataController.java index 9963b50..59b1305 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessQCCoefficientDataController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessQCCoefficientDataController.java @@ -47,9 +47,9 @@ public class BusinessQCCoefficientDataController implements BusinessControllerMa return success(businessQCCoefficientDataService.createBusinessQCCoefficientData(createReqVO)); } - @PutMapping("/update") + @PostMapping("/update") @Operation(summary = "更新质控样检测系数任务数据,空白样、标样") - @PreAuthorize("@ss.hasPermission('qms:business-QC-coefficient-data:update')") +// @PreAuthorize("@ss.hasPermission('qms:business-QC-coefficient-data:update')") public CommonResult updateBusinessQCCoefficientData(@Valid @RequestBody BusinessQCCoefficientDataSaveReqVO updateReqVO) { businessQCCoefficientDataService.updateBusinessQCCoefficientData(updateReqVO); return success(true); @@ -90,6 +90,14 @@ public class BusinessQCCoefficientDataController implements BusinessControllerMa return success(BeanUtils.toBean(pageResult, BusinessQCCoefficientDataRespVO.class)); } + @GetMapping("/list") + @Operation(summary = "获得质控样检测系数任务数据,空白样、标样分页") +// @PreAuthorize("@ss.hasPermission('qms:business-QC-coefficient-data:query')") + public CommonResult> getBusinessQCCoefficientDataPage(@Valid BusinessQCCoefficientDataReqVO reqVO) { + List pageResult = businessQCCoefficientDataService.getBusinessQCCoefficientDataList(reqVO); + return success(BeanUtils.toBean(pageResult, BusinessQCCoefficientDataRespVO.class)); + } + @GetMapping("/export-excel") @Operation(summary = "导出质控样检测系数任务数据,空白样、标样 Excel") @PreAuthorize("@ss.hasPermission('qms:business-QC-coefficient-data:export')") diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessQCManagementDataController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessQCManagementDataController.java index 6b5998f..f3e667e 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessQCManagementDataController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessQCManagementDataController.java @@ -47,9 +47,9 @@ public class BusinessQCManagementDataController implements BusinessControllerMar return success(businessQCManagementDataService.createBusinessQCManagementData(createReqVO)); } - @PutMapping("/update") + @PostMapping("/update") @Operation(summary = "更新质控管理样检测任务数据,管理样、标准样") - @PreAuthorize("@ss.hasPermission('qms:business-QC-management-data:update')") +// @PreAuthorize("@ss.hasPermission('qms:business-QC-management-data:update')") public CommonResult updateBusinessQCManagementData(@Valid @RequestBody BusinessQCManagementDataSaveReqVO updateReqVO) { businessQCManagementDataService.updateBusinessQCManagementData(updateReqVO); return success(true); @@ -90,6 +90,14 @@ public class BusinessQCManagementDataController implements BusinessControllerMar return success(BeanUtils.toBean(pageResult, BusinessQCManagementDataRespVO.class)); } + @GetMapping("/list") + @Operation(summary = "获得质控管理样检测任务数据,管理样、标准样列表") +// @PreAuthorize("@ss.hasPermission('qms:business-QC-management-data:query')") + public CommonResult> getBusinessQCManagementDataList(@Valid BusinessQCManagementDataReqVO reqVO) { + List pageResult = businessQCManagementDataService.getBusinessQCManagementDataList(reqVO); + return success(BeanUtils.toBean(pageResult, BusinessQCManagementDataRespVO.class)); + } + @GetMapping("/export-excel") @Operation(summary = "导出质控管理样检测任务数据,管理样、标准样 Excel") @PreAuthorize("@ss.hasPermission('qms:business-QC-management-data:export')") diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessQCCoefficientDataReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessQCCoefficientDataReqVO.java new file mode 100644 index 0000000..cf8ca9d --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessQCCoefficientDataReqVO.java @@ -0,0 +1,79 @@ +package com.zt.plat.module.qms.business.bus.controller.vo; + +import lombok.*; +import java.util.*; +import io.swagger.v3.oas.annotations.media.Schema; +import com.zt.plat.framework.common.pojo.PageParam; +import org.springframework.format.annotation.DateTimeFormat; +import java.time.LocalDateTime; + +import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; + +@Schema(description = "管理后台 - 质控样检测系数任务数据,空白样、标样分页 Request VO") +@Data +public class BusinessQCCoefficientDataReqVO { + + @Schema(description = "样品编号") + private String sampleCode; + + @Schema(description = "样品名称", example = "赵六") + private String sampleName; + + @Schema(description = "检测方法配置ID", example = "31198") + private Long configAssayMethodId; + + @Schema(description = "指派单ID", example = "28147") + private Long businessAssayTaskId; + + @Schema(description = "定值样业务ID", example = "5300") + private Long businessStandardSampleId; + + @Schema(description = "质控类型_ID,字典表【T_DIC_BSN】质控类型：空白样、管理样、标准样、标样", example = "21660") + private Long dictionaryBusinessId; + + @Schema(description = "质控类型_Key,字典表【T_DIC_BSN】质控类型：空白样、管理样、标准样、标样") + private String dictionaryBusinessKey; + + @Schema(description = "检测项目") + private String assayProject; + + @Schema(description = "分析部门ID", example = "12186") + private Long assayDepartmentId; + + @Schema(description = "分析部门名称", example = "芋艿") + private String assayDepartmentName; + + @Schema(description = "分析人") + private String assayOperator; + + @Schema(description = "分配任务时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] assignTaskTime; + + @Schema(description = "是否已分配任务") + private Integer isAssignTasked; + + @Schema(description = "是否已上报") + private Integer isReported; + + @Schema(description = "上报人") + private String reporter; + + @Schema(description = "上报时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] reportTime; + + @Schema(description = "乐观锁", example = "6160") + private Integer updateCount; + + @Schema(description = "所属部门") + private String systemDepartmentCode; + + @Schema(description = "创建时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] createTime; + + @Schema(description = "备注") + private String remark; + +} \ 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/controller/vo/BusinessQCCoefficientDataSaveReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessQCCoefficientDataSaveReqVO.java index 0e15ac3..a02d79e 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessQCCoefficientDataSaveReqVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessQCCoefficientDataSaveReqVO.java @@ -37,8 +37,7 @@ public class BusinessQCCoefficientDataSaveReqVO { @Schema(description = "质控类型_Key,字典表【T_DIC_BSN】质控类型：空白样、管理样、标准样、标样") private String dictionaryBusinessKey; - @Schema(description = "检测项目", requiredMode = Schema.RequiredMode.REQUIRED) - @NotEmpty(message = "检测项目不能为空") + @Schema(description = "检测项目") private String assayProject; @Schema(description = "分析部门ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "12186") diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessQCManagementDataReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessQCManagementDataReqVO.java new file mode 100644 index 0000000..43a2f19 --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessQCManagementDataReqVO.java @@ -0,0 +1,79 @@ +package com.zt.plat.module.qms.business.bus.controller.vo; + +import lombok.*; +import java.util.*; +import io.swagger.v3.oas.annotations.media.Schema; +import com.zt.plat.framework.common.pojo.PageParam; +import org.springframework.format.annotation.DateTimeFormat; +import java.time.LocalDateTime; + +import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; + +@Schema(description = "管理后台 - 质控管理样检测任务数据,管理样、标准样分页 Request VO") +@Data +public class BusinessQCManagementDataReqVO { + + @Schema(description = "样品编号") + private String sampleCode; + + @Schema(description = "样品名称", example = "李四") + private String sampleName; + + @Schema(description = "检测方法配置ID", example = "22240") + private Long configAssayMethodId; + + @Schema(description = "指派单ID", example = "12452") + private Long businessAssayTaskId; + + @Schema(description = "定值样业务ID", example = "29446") + private Long businessStandardSampleId; + + @Schema(description = "质控类型_ID,字典表【T_DIC_BSN】质控类型：空白样、管理样、标准样、标样", example = "512") + private Long dictionaryBusinessId; + + @Schema(description = "质控类型_Key,字典表【T_DIC_BSN】质控类型：空白样、管理样、标准样、标样") + private String dictionaryBusinessKey; + + @Schema(description = "检测项目") + private String assayProject; + + @Schema(description = "分析部门ID", example = "21281") + private Long assayDepartmentId; + + @Schema(description = "分析部门名称", example = "赵六") + private String assayDepartmentName; + + @Schema(description = "分析人") + private String assayOperator; + + @Schema(description = "分配任务时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] assignTaskTime; + + @Schema(description = "是否已分配任务") + private Integer isAssignTasked; + + @Schema(description = "是否已上报") + private Integer isReported; + + @Schema(description = "上报人") + private String reporter; + + @Schema(description = "上报时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] reportTime; + + @Schema(description = "乐观锁", example = "16695") + private Integer updateCount; + + @Schema(description = "所属部门") + private String systemDepartmentCode; + + @Schema(description = "创建时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] createTime; + + @Schema(description = "备注") + private String remark; + +} \ 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/controller/vo/CreateQcSampleReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/CreateQcSampleReqVO.java index 3acaabb..791ac1c 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/CreateQcSampleReqVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/CreateQcSampleReqVO.java @@ -18,8 +18,8 @@ public class CreateQcSampleReqVO { @Schema(description = "定值样业务ID", example = "24895") private Long businessStandardSampleId; - @Schema(description = "质控样分析方法id") - private Long configQCAssayMethodId; + @Schema(description = "质控样配置方法id") + private Long configQCSampleMethodId; @Schema(description = "质控类型_ID,字典表【T_DIC_BSN】质控类型：空白样、管理样、标准样、标样", example = "9549") private Long dictionaryBusinessId; diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessQCCoefficientDataMapper.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessQCCoefficientDataMapper.java index 2342db3..74f2cd5 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessQCCoefficientDataMapper.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessQCCoefficientDataMapper.java @@ -42,4 +42,34 @@ public interface BusinessQCCoefficientDataMapper extends BaseMapperX selectList(BusinessQCCoefficientDataReqVO reqVO) { + return selectList(new LambdaQueryWrapperX() + .eqIfPresent(BusinessQCCoefficientDataDO::getSampleCode, reqVO.getSampleCode()) + .likeIfPresent(BusinessQCCoefficientDataDO::getSampleName, reqVO.getSampleName()) + .eqIfPresent(BusinessQCCoefficientDataDO::getConfigAssayMethodId, reqVO.getConfigAssayMethodId()) + .eqIfPresent(BusinessQCCoefficientDataDO::getBusinessAssayTaskId, reqVO.getBusinessAssayTaskId()) + .eqIfPresent(BusinessQCCoefficientDataDO::getBusinessStandardSampleId, reqVO.getBusinessStandardSampleId()) + .eqIfPresent(BusinessQCCoefficientDataDO::getDictionaryBusinessId, reqVO.getDictionaryBusinessId()) + .eqIfPresent(BusinessQCCoefficientDataDO::getDictionaryBusinessKey, reqVO.getDictionaryBusinessKey()) + .eqIfPresent(BusinessQCCoefficientDataDO::getAssayProject, reqVO.getAssayProject()) + .eqIfPresent(BusinessQCCoefficientDataDO::getAssayDepartmentId, reqVO.getAssayDepartmentId()) + .likeIfPresent(BusinessQCCoefficientDataDO::getAssayDepartmentName, reqVO.getAssayDepartmentName()) + .eqIfPresent(BusinessQCCoefficientDataDO::getAssayOperator, reqVO.getAssayOperator()) + .betweenIfPresent(BusinessQCCoefficientDataDO::getAssignTaskTime, reqVO.getAssignTaskTime()) + .eqIfPresent(BusinessQCCoefficientDataDO::getIsAssignTasked, reqVO.getIsAssignTasked()) + .eqIfPresent(BusinessQCCoefficientDataDO::getIsReported, reqVO.getIsReported()) + .eqIfPresent(BusinessQCCoefficientDataDO::getReporter, reqVO.getReporter()) + .betweenIfPresent(BusinessQCCoefficientDataDO::getReportTime, reqVO.getReportTime()) + .eqIfPresent(BusinessQCCoefficientDataDO::getUpdateCount, reqVO.getUpdateCount()) + .eqIfPresent(BusinessQCCoefficientDataDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode()) + .betweenIfPresent(BusinessQCCoefficientDataDO::getCreateTime, reqVO.getCreateTime()) + .eqIfPresent(BusinessQCCoefficientDataDO::getRemark, reqVO.getRemark()) + .orderByDesc(BusinessQCCoefficientDataDO::getId)); + } + + default List selectByBusinessAssayTaskId(Long businessAssayTaskId) { + return selectList(new LambdaQueryWrapperX() + .eq(BusinessQCCoefficientDataDO::getBusinessAssayTaskId, businessAssayTaskId)); + } + } \ 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/BusinessQCManagementDataMapper.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessQCManagementDataMapper.java index 8b43fe8..d7861f5 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessQCManagementDataMapper.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessQCManagementDataMapper.java @@ -42,4 +42,29 @@ public interface BusinessQCManagementDataMapper extends BaseMapperX selectList(BusinessQCManagementDataReqVO reqVO) { + return selectList(new LambdaQueryWrapperX() + .eqIfPresent(BusinessQCManagementDataDO::getSampleCode, reqVO.getSampleCode()) + .likeIfPresent(BusinessQCManagementDataDO::getSampleName, reqVO.getSampleName()) + .eqIfPresent(BusinessQCManagementDataDO::getConfigAssayMethodId, reqVO.getConfigAssayMethodId()) + .eqIfPresent(BusinessQCManagementDataDO::getBusinessAssayTaskId, reqVO.getBusinessAssayTaskId()) + .eqIfPresent(BusinessQCManagementDataDO::getBusinessStandardSampleId, reqVO.getBusinessStandardSampleId()) + .eqIfPresent(BusinessQCManagementDataDO::getDictionaryBusinessId, reqVO.getDictionaryBusinessId()) + .eqIfPresent(BusinessQCManagementDataDO::getDictionaryBusinessKey, reqVO.getDictionaryBusinessKey()) + .eqIfPresent(BusinessQCManagementDataDO::getAssayProject, reqVO.getAssayProject()) + .eqIfPresent(BusinessQCManagementDataDO::getAssayDepartmentId, reqVO.getAssayDepartmentId()) + .likeIfPresent(BusinessQCManagementDataDO::getAssayDepartmentName, reqVO.getAssayDepartmentName()) + .eqIfPresent(BusinessQCManagementDataDO::getAssayOperator, reqVO.getAssayOperator()) + .betweenIfPresent(BusinessQCManagementDataDO::getAssignTaskTime, reqVO.getAssignTaskTime()) + .eqIfPresent(BusinessQCManagementDataDO::getIsAssignTasked, reqVO.getIsAssignTasked()) + .eqIfPresent(BusinessQCManagementDataDO::getIsReported, reqVO.getIsReported()) + .eqIfPresent(BusinessQCManagementDataDO::getReporter, reqVO.getReporter()) + .betweenIfPresent(BusinessQCManagementDataDO::getReportTime, reqVO.getReportTime()) + .eqIfPresent(BusinessQCManagementDataDO::getUpdateCount, reqVO.getUpdateCount()) + .eqIfPresent(BusinessQCManagementDataDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode()) + .betweenIfPresent(BusinessQCManagementDataDO::getCreateTime, reqVO.getCreateTime()) + .eqIfPresent(BusinessQCManagementDataDO::getRemark, reqVO.getRemark()) + .orderByDesc(BusinessQCManagementDataDO::getId)); + } + } \ 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/liteflow/sample/taskassign/SampleTaskAssignDataSaveOrUpdateCmp.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/liteflow/sample/taskassign/SampleTaskAssignDataSaveOrUpdateCmp.java index 68f601c..c8a6723 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/liteflow/sample/taskassign/SampleTaskAssignDataSaveOrUpdateCmp.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/liteflow/sample/taskassign/SampleTaskAssignDataSaveOrUpdateCmp.java @@ -9,15 +9,13 @@ import cn.hutool.core.collection.CollUtil; import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessAssayTaskDO; import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessAssayTaskDataDO; import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessAssayTaskDetailDO; -import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCDataDO; -import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCParameterDataDO; -import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCProjectDataDO; +import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCCoefficientDataDO; +import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCCoefficientParameterDataDO; import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessAssayTaskDataMapper; import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessAssayTaskDetailMapper; import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessAssayTaskMapper; -import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessQCDataMapper; -import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessQCParameterDataMapper; -import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessQCProjectDataMapper; +import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessQCCoefficientDataMapper; +import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessQCCoefficientParameterDataMapper; import com.zt.plat.module.qms.business.bus.liteflow.slot.SampleTaskAssignContext; import jakarta.annotation.Resource; @@ -34,13 +32,10 @@ public class SampleTaskAssignDataSaveOrUpdateCmp extends NodeComponent { private BusinessAssayTaskDataMapper businessAssayTaskDataMapper; @Resource - private BusinessQCDataMapper businessQCDataMapper; + private BusinessQCCoefficientDataMapper businessQCCoefficientDataMapper; @Resource - private BusinessQCProjectDataMapper businessQCProjectDataMapper; - - @Resource - private BusinessQCParameterDataMapper businessQCParameterDataMapper; + private BusinessQCCoefficientParameterDataMapper businessQCCoefficientParameterDataMapper; @Override public void process() throws Exception { @@ -54,11 +49,9 @@ public class SampleTaskAssignDataSaveOrUpdateCmp extends NodeComponent { List businessAssayTaskDataList = sampleTaskAssignContext.getBusinessAssayTaskDataList(); - List businessQCDataList = sampleTaskAssignContext.getBusinessQCDataList(); + List businessQCCoefficientDataList = sampleTaskAssignContext.getBusinessQCCoefficientDataList(); - List businessQCProjectDataList = sampleTaskAssignContext.getBusinessQCProjectDataList(); - - List businessQCParameterDataList = sampleTaskAssignContext.getBusinessQCParameterDataList(); + List businessQCCoefficientParameterDataList = sampleTaskAssignContext.getBusinessQCCoefficientParameterDataList(); if (CollUtil.isNotEmpty(savebusinessAssayTaskList)) { this.businessAssayTaskMapper.insertBatch(savebusinessAssayTaskList); @@ -76,16 +69,12 @@ public class SampleTaskAssignDataSaveOrUpdateCmp extends NodeComponent { this.businessAssayTaskDataMapper.updateBatch(businessAssayTaskDataList); } - if (CollUtil.isNotEmpty(businessQCDataList)) { - this.businessQCDataMapper.insertBatch(businessQCDataList); + if (CollUtil.isNotEmpty(businessQCCoefficientDataList)) { + this.businessQCCoefficientDataMapper.insertBatch(businessQCCoefficientDataList); } - if (CollUtil.isNotEmpty(businessQCProjectDataList)) { - this.businessQCProjectDataMapper.insertBatch(businessQCProjectDataList); - } - - if (CollUtil.isNotEmpty(businessQCParameterDataList)) { - this.businessQCParameterDataMapper.insertBatch(businessQCParameterDataList); + if (CollUtil.isNotEmpty(businessQCCoefficientParameterDataList)) { + this.businessQCCoefficientParameterDataMapper.insertBatch(businessQCCoefficientParameterDataList); } } diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/liteflow/sample/taskassign/SampleTaskAssignQCSampleCmp.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/liteflow/sample/taskassign/SampleTaskAssignQCSampleCmp.java index c24b657..28217e5 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/liteflow/sample/taskassign/SampleTaskAssignQCSampleCmp.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/liteflow/sample/taskassign/SampleTaskAssignQCSampleCmp.java @@ -1,29 +1,27 @@ package com.zt.plat.module.qms.business.bus.liteflow.sample.taskassign; -import java.time.LocalDateTime; import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; - import org.apache.commons.lang3.StringUtils; import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.yomahub.liteflow.annotation.LiteflowComponent; import com.yomahub.liteflow.core.NodeComponent; import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessAssayTaskDO; -import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCDataDO; -import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCParameterDataDO; -import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCProjectDataDO; -import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessQCDataMapper; +import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCCoefficientDataDO; +import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCCoefficientParameterDataDO; +import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessQCCoefficientDataMapper; +import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessQCCoefficientParameterDataMapper; import com.zt.plat.module.qms.business.bus.liteflow.slot.SampleTaskAssignContext; -import com.zt.plat.module.qms.business.config.controller.vo.ConfigAssayMethodProjectExtendRespVO; import com.zt.plat.module.qms.business.config.controller.vo.ConfigQCSampleMethodExtendRespVO; +import com.zt.plat.module.qms.business.config.controller.vo.ConfigQCSampleMethodParameterExtendRespVO; import com.zt.plat.module.qms.business.config.dal.dataobject.ConfigAssayMethodDO; -import com.zt.plat.module.qms.business.config.dal.dataobject.ConfigAssayMethodProjectParameterDO; import com.zt.plat.module.qms.business.config.dal.mapper.ConfigAssayMethodMapper; import com.zt.plat.module.qms.business.config.dal.mapper.ConfigAssayMethodProjectMapper; import com.zt.plat.module.qms.business.config.dal.mapper.ConfigAssayMethodProjectParameterMapper; import com.zt.plat.module.qms.business.config.dal.mapper.ConfigQCSampleMethodMapper; +import com.zt.plat.module.qms.business.config.dal.mapper.ConfigQCSampleMethodParameterMapper; import com.zt.plat.module.qms.core.code.SequenceUtil; import com.zt.plat.module.qms.enums.QmsCommonConstant; @@ -42,22 +40,27 @@ public class SampleTaskAssignQCSampleCmp extends NodeComponent { @Resource private ConfigQCSampleMethodMapper configQCSampleMethodMapper; + @Resource + private ConfigQCSampleMethodParameterMapper configQCSampleMethodParameterMapper; + @Resource private ConfigAssayMethodProjectMapper configAssayMethodProjectMapper; @Resource private ConfigAssayMethodProjectParameterMapper configAssayMethodProjectParameterMapper; + + @Resource + private BusinessQCCoefficientDataMapper businessQCCoefficientDataMapper; @Resource - private BusinessQCDataMapper businessQCDataMapper; + private BusinessQCCoefficientParameterDataMapper businessQCCoefficientParameterDataMapper; @Override public void process() throws Exception { SampleTaskAssignContext sampleTaskAssignContext = this.getContextBean(SampleTaskAssignContext.class); - List businessQCDataDOList = new ArrayList<>(); - List businessQCProjectDataDOList = new ArrayList<>(); - List businessQCParameterDataDOList = new ArrayList<>(); + List businessQCCoefficientDataDOList = new ArrayList<>(); + List businessQCCoefficientParameterDataDOList = new ArrayList<>(); //分配任务 List businessAssayTaskList = new ArrayList<>(); @@ -73,90 +76,67 @@ public class SampleTaskAssignQCSampleCmp extends NodeComponent { //获取分析方法对应的质控分析配置 List configQCSampleMethodList = configQCSampleMethodMapper.selectByConfigAssayMethodIds(configAssayMethodIdList); - if (configQCSampleMethodList == null) {//如果未配置质控样品方法，则直接返回 + if (CollUtil.isEmpty(configQCSampleMethodList)) {//如果未配置质控样品方法，则直接返回 return; } - //获取质控分析方法id列表 - List configQCAssayMethodIdList = configQCSampleMethodList.stream().map(m -> m.getConfigQCAssayMethodId()).distinct().collect(Collectors.toList()); - //获取质控分析方法 - List configAssayMethodList = configAssayMethodMapper.selectByIds(configQCAssayMethodIdList); - //获取质控分析方法检测项目 - List configAssayMethodProjectList = configAssayMethodProjectMapper.selectByConfigAssayMethodIds(configQCAssayMethodIdList); - //获取质控分析方法检测项目参数 - List configAssayMethodProjectParameterList = configAssayMethodProjectParameterMapper.selectByConfigAssayMethodIds(configQCAssayMethodIdList); + //质控id + List configQCSampleMethodIdList = configQCSampleMethodList.stream().map(m -> m.getId()).collect(Collectors.toList()); + //质控样分析参数 + List configQcSampleMethodParameterList = configQCSampleMethodParameterMapper.selectByConfigQCSampleMethodIds(configQCSampleMethodIdList); //循环分配任务 for (BusinessAssayTaskDO businessAssayTaskDO : businessAssayTaskList) { ConfigQCSampleMethodExtendRespVO configQCSampleMethodExtendRespVO = configQCSampleMethodList.stream().filter(f -> f.getConfigAssayMethodId().equals(businessAssayTaskDO.getConfigAssayMethodId()) && "kby".equals(f.getDictionaryBusinessKey())).findFirst().orElse(null); - ConfigAssayMethodDO configAssayMethodDO = configAssayMethodList.stream().filter(f -> f.getId().equals(configQCSampleMethodExtendRespVO.getConfigQCAssayMethodId())).findFirst().orElse(null); - String assayProject = configAssayMethodProjectList.stream().filter(f -> f.getConfigAssayMethodId().equals(configAssayMethodDO.getId())).map(m -> m.getShowName()).collect(Collectors.joining(",")); + + ConfigAssayMethodDO configAssayMethodDO = configAssayMethodMapper.selectById(businessAssayTaskDO.getConfigAssayMethodId()); //查询下质控数据，如果存在则跳出循环 - List businessQCDataList = businessQCDataMapper.selectByBusinessAssayTaskId(businessAssayTaskDO.getId()); + List businessQCCoefficientDataList = businessQCCoefficientDataMapper.selectByBusinessAssayTaskId(businessAssayTaskDO.getId()); //如果存在则跳出循环 - if (CollUtil.isNotEmpty(businessQCDataList)) { + if (CollUtil.isNotEmpty(businessQCCoefficientDataList)) { break; } //根据默认配置的个数生成空白样 for (int i = 0; i < configQCSampleMethodExtendRespVO.getDefaultCount(); i++) { - BusinessQCDataDO businessQCDataDO = new BusinessQCDataDO(); - businessQCDataDO.setId(IdWorker.getId()); - businessQCDataDO.setBusinessAssayTaskId(businessAssayTaskDO.getId()); - businessQCDataDO.setConfigAssayMethodId(configQCSampleMethodExtendRespVO.getConfigQCAssayMethodId()); - businessQCDataDO.setSampleName(configQCSampleMethodExtendRespVO.getDictionaryBusinessName()); + BusinessQCCoefficientDataDO businessQCCoefficientDataDO = new BusinessQCCoefficientDataDO(); + businessQCCoefficientDataDO.setId(IdWorker.getId()); + businessQCCoefficientDataDO.setBusinessAssayTaskId(businessAssayTaskDO.getId()); + businessQCCoefficientDataDO.setConfigAssayMethodId(configQCSampleMethodExtendRespVO.getConfigAssayMethodId()); + businessQCCoefficientDataDO.setSampleName(configQCSampleMethodExtendRespVO.getDictionaryBusinessName()); if (StringUtils.isNotBlank(configQCSampleMethodExtendRespVO.getCodeRule())) { String codeSample = sequenceUtil.genCode(configQCSampleMethodExtendRespVO.getCodeRule()); - businessQCDataDO.setSampleCode(codeSample); + businessQCCoefficientDataDO.setSampleCode(codeSample); } - businessQCDataDO.setDictionaryBusinessId(configQCSampleMethodExtendRespVO.getDictionaryBusinessId()); - businessQCDataDO.setDictionaryBusinessKey(configQCSampleMethodExtendRespVO.getDictionaryBusinessKey()); - businessQCDataDO.setAssayDepartmentId(configAssayMethodDO.getAssayDepartmentId()); - businessQCDataDO.setAssayDepartmentName(configAssayMethodDO.getAssayDepartmentName()); - businessQCDataDO.setAssayOperator(businessAssayTaskDO.getAssayOperator()); - businessQCDataDO.setAssayProject(assayProject); - businessQCDataDO.setAssignTaskTime(businessAssayTaskDO.getTaskAssignTime()); - businessQCDataDO.setIsAssignTasked(QmsCommonConstant.YES); - businessQCDataDO.setIsReported(QmsCommonConstant.NO); + businessQCCoefficientDataDO.setDictionaryBusinessId(configQCSampleMethodExtendRespVO.getDictionaryBusinessId()); + businessQCCoefficientDataDO.setDictionaryBusinessKey(configQCSampleMethodExtendRespVO.getDictionaryBusinessKey()); + businessQCCoefficientDataDO.setAssayDepartmentId(configAssayMethodDO.getAssayDepartmentId()); + businessQCCoefficientDataDO.setAssayDepartmentName(configAssayMethodDO.getAssayDepartmentName()); + businessQCCoefficientDataDO.setAssayOperator(businessAssayTaskDO.getAssayOperator()); + businessQCCoefficientDataDO.setAssayProject(""); + businessQCCoefficientDataDO.setAssignTaskTime(businessAssayTaskDO.getTaskAssignTime()); + businessQCCoefficientDataDO.setIsAssignTasked(QmsCommonConstant.YES); + businessQCCoefficientDataDO.setIsReported(QmsCommonConstant.NO); - businessQCDataDOList.add(businessQCDataDO); + businessQCCoefficientDataDOList.add(businessQCCoefficientDataDO); - List configAssayMethodProjectExtendRespList = configAssayMethodProjectList.stream().filter(f -> f.getConfigAssayMethodId().equals(configAssayMethodDO.getId())).collect(Collectors.toList()); - for (ConfigAssayMethodProjectExtendRespVO configAssayMethodProjectExtendRespVO : configAssayMethodProjectExtendRespList) { - BusinessQCProjectDataDO businessQCProjectDataDO = new BusinessQCProjectDataDO(); - businessQCProjectDataDO.setId(IdWorker.getId()); - businessQCProjectDataDO.setBusinessQCDataId(businessQCDataDO.getId()); - businessQCProjectDataDO.setConfigAssayMethodProjectId(configAssayMethodProjectExtendRespVO.getId()); - businessQCProjectDataDO.setDictionaryProjectId(configAssayMethodProjectExtendRespVO.getDictionaryProjectId()); - businessQCProjectDataDO.setUsage(QmsCommonConstant.ASSAY_PROJECT_USAGE_QUALITY_CONTROL); - businessQCProjectDataDO.setSymbol("="); - businessQCProjectDataDO.setDataType(configAssayMethodProjectExtendRespVO.getDataType()); - businessQCProjectDataDO.setDecimalPosition(configAssayMethodProjectExtendRespVO.getDecimalPosition()); - businessQCProjectDataDO.setIsEnabled(configAssayMethodProjectExtendRespVO.getIsDefaultEnabled()); - - businessQCProjectDataDOList.add(businessQCProjectDataDO); - - List configAssayMethodProjectParameterDoList = configAssayMethodProjectParameterList.stream().filter(f -> f.getConfigAssayMethodProjectId().equals(configAssayMethodProjectExtendRespVO.getId())).collect(Collectors.toList()); - for (ConfigAssayMethodProjectParameterDO configAssayMethodProjectParameterDO : configAssayMethodProjectParameterDoList) { - BusinessQCParameterDataDO businessQCParameterDataDO = new BusinessQCParameterDataDO(); - businessQCParameterDataDO.setBusinessQCProjectDataId(businessQCProjectDataDO.getId()); - businessQCParameterDataDO.setConfigAssayMethodProjectParameterId(configAssayMethodProjectParameterDO.getId()); - businessQCParameterDataDO.setDictionaryParameterId(configAssayMethodProjectParameterDO.getDictionaryParameterId()); - businessQCParameterDataDO.setDataType(configAssayMethodProjectParameterDO.getDataType()); - businessQCParameterDataDO.setDecimalPosition(configAssayMethodProjectParameterDO.getDecimalPosition()); - - businessQCParameterDataDOList.add(businessQCParameterDataDO); - } + List configQCSampleMethodParameterExtendRespVOs = configQcSampleMethodParameterList.stream().filter(f -> f.getConfigQCSampleMethodId().equals(configQCSampleMethodExtendRespVO.getId())).collect(Collectors.toList()); + for (ConfigQCSampleMethodParameterExtendRespVO configQCSampleMethodParameterExtendRespVO : configQCSampleMethodParameterExtendRespVOs) { + BusinessQCCoefficientParameterDataDO businessQCCoefficientParameterDataDO = new BusinessQCCoefficientParameterDataDO(); + businessQCCoefficientParameterDataDO.setBusinessQCCoefficientDataId(businessQCCoefficientDataDO.getId()); + businessQCCoefficientParameterDataDO.setConfigQCSampleMethodParameterId(configQCSampleMethodParameterExtendRespVO.getId()); + businessQCCoefficientParameterDataDO.setDictionaryParameterId(configQCSampleMethodParameterExtendRespVO.getDictionaryParameterId()); + businessQCCoefficientParameterDataDO.setDataType(configQCSampleMethodParameterExtendRespVO.getDataType()); + businessQCCoefficientParameterDataDO.setDecimalPosition(configQCSampleMethodParameterExtendRespVO.getDecimalPosition()); + businessQCCoefficientParameterDataDO.setValue(configQCSampleMethodParameterExtendRespVO.getDefaultValue()); + businessQCCoefficientParameterDataDOList.add(businessQCCoefficientParameterDataDO); } } - - } - sampleTaskAssignContext.setBusinessQCDataList(businessQCDataDOList); - sampleTaskAssignContext.setBusinessQCProjectDataList(businessQCProjectDataDOList); - sampleTaskAssignContext.setBusinessQCParameterDataList(businessQCParameterDataDOList); + sampleTaskAssignContext.setBusinessQCCoefficientDataList(businessQCCoefficientDataDOList); + sampleTaskAssignContext.setBusinessQCCoefficientParameterDataList(businessQCCoefficientParameterDataDOList); } diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/liteflow/slot/SampleTaskAssignContext.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/liteflow/slot/SampleTaskAssignContext.java index f1b0b5b..8c00403 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/liteflow/slot/SampleTaskAssignContext.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/liteflow/slot/SampleTaskAssignContext.java @@ -8,9 +8,8 @@ import com.zt.plat.framework.security.core.LoginUser; import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessAssayTaskDO; import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessAssayTaskDataDO; import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessAssayTaskDetailDO; -import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCDataDO; -import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCParameterDataDO; -import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCProjectDataDO; +import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCCoefficientDataDO; +import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCCoefficientParameterDataDO; import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSubSampleDO; import com.zt.plat.module.qms.business.bus.liteflow.param.AssignAssayUser; import com.zt.plat.module.qms.business.config.dal.dataobject.ConfigAssayMethodDO; @@ -85,13 +84,10 @@ public class SampleTaskAssignContext { /** 任务指派的明细列表 **/ private List businessAssayTaskDetailList; - /** 质控样品数据 **/ - private List businessQCDataList; + /** 质控样-(空白、标准) **/ + private List businessQCCoefficientDataList; - /** 质控样检测项目数据 **/ - private List businessQCProjectDataList; - - /** 质控样检测项目参数数据 **/ - private List businessQCParameterDataList; + /** 质控样-(空白、标准)检测参数数据 **/ + private List businessQCCoefficientParameterDataList; } diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessQCCoefficientDataService.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessQCCoefficientDataService.java index 7069cf3..dc59a8b 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessQCCoefficientDataService.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessQCCoefficientDataService.java @@ -59,4 +59,6 @@ public interface BusinessQCCoefficientDataService { */ PageResult getBusinessQCCoefficientDataPage(BusinessQCCoefficientDataPageReqVO pageReqVO); + List getBusinessQCCoefficientDataList(BusinessQCCoefficientDataReqVO 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/service/BusinessQCCoefficientDataServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessQCCoefficientDataServiceImpl.java index f0a9e71..339ce33 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessQCCoefficientDataServiceImpl.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessQCCoefficientDataServiceImpl.java @@ -88,4 +88,9 @@ public class BusinessQCCoefficientDataServiceImpl implements BusinessQCCoefficie return businessQCCoefficientDataMapper.selectPage(pageReqVO); } + @Override + public List getBusinessQCCoefficientDataList(BusinessQCCoefficientDataReqVO reqVO) { + return businessQCCoefficientDataMapper.selectList(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/service/BusinessQCManagementDataService.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessQCManagementDataService.java index b65394b..9ab773f 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessQCManagementDataService.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessQCManagementDataService.java @@ -59,4 +59,6 @@ public interface BusinessQCManagementDataService { */ PageResult getBusinessQCManagementDataPage(BusinessQCManagementDataPageReqVO pageReqVO); + List getBusinessQCManagementDataList(BusinessQCManagementDataReqVO 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/service/BusinessQCManagementDataServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessQCManagementDataServiceImpl.java index 8323b04..7601b09 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessQCManagementDataServiceImpl.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessQCManagementDataServiceImpl.java @@ -88,4 +88,9 @@ public class BusinessQCManagementDataServiceImpl implements BusinessQCManagement return businessQCManagementDataMapper.selectPage(pageReqVO); } + @Override + public List getBusinessQCManagementDataList(BusinessQCManagementDataReqVO reqVO) { + return businessQCManagementDataMapper.selectList(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/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 31a5d96..c75fe08 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 @@ -31,7 +31,12 @@ import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessAssayReportDat import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessAssayTaskDO; import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessAssayTaskDataDO; import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessAssayTaskDetailDO; +import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCCoefficientDataDO; +import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCCoefficientParameterDataDO; import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCDataDO; +import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCManagementDataDO; +import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCManagementParameterDataDO; +import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCManagementProjectDataDO; import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCParameterDataDO; import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCProjectDataDO; import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSubSampleDO; @@ -41,7 +46,12 @@ import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessAssayReportDataMap import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessAssayTaskDataMapper; import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessAssayTaskDetailMapper; import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessAssayTaskMapper; +import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessQCCoefficientDataMapper; +import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessQCCoefficientParameterDataMapper; import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessQCDataMapper; +import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessQCManagementDataMapper; +import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessQCManagementParameterDataMapper; +import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessQCManagementProjectDataMapper; import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessQCParameterDataMapper; import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessQCProjectDataMapper; import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessSubSampleMapper; @@ -50,6 +60,8 @@ import com.zt.plat.module.qms.business.bus.liteflow.param.SampleTaskAssignMethod import com.zt.plat.module.qms.business.bus.liteflow.param.SampleTaskAssignSampleParam; import com.zt.plat.module.qms.business.bus.liteflow.slot.SampleTaskAssignContext; import com.zt.plat.module.qms.business.config.controller.vo.ConfigAssayMethodProjectExtendRespVO; +import com.zt.plat.module.qms.business.config.controller.vo.ConfigQCSampleMethodExtendRespVO; +import com.zt.plat.module.qms.business.config.controller.vo.ConfigQCSampleMethodParameterExtendRespVO; import com.zt.plat.module.qms.business.config.controller.vo.ConfigSubSampleMethodExtendRespVO; import com.zt.plat.module.qms.business.config.dal.dataobject.ConfigAssayMethodDO; import com.zt.plat.module.qms.business.config.dal.dataobject.ConfigAssayMethodProjectDO; @@ -57,6 +69,8 @@ import com.zt.plat.module.qms.business.config.dal.dataobject.ConfigAssayMethodPr import com.zt.plat.module.qms.business.config.dal.mapper.ConfigAssayMethodMapper; import com.zt.plat.module.qms.business.config.dal.mapper.ConfigAssayMethodProjectMapper; import com.zt.plat.module.qms.business.config.dal.mapper.ConfigAssayMethodProjectParameterMapper; +import com.zt.plat.module.qms.business.config.dal.mapper.ConfigQCSampleMethodMapper; +import com.zt.plat.module.qms.business.config.dal.mapper.ConfigQCSampleMethodParameterMapper; import com.zt.plat.module.qms.business.config.dal.mapper.ConfigSubSampleMethodMapper; import com.zt.plat.module.qms.business.dic.dal.mapper.DictionaryProjectMapper; import com.zt.plat.module.qms.core.code.SequenceUtil; @@ -121,13 +135,25 @@ public class SampleTaskAssignServiceImpl implements SampleTaskAssignService { private DictionaryProjectMapper dictionaryProjectMapper; @Resource - private BusinessQCDataMapper businessQCDataMapper; + private ConfigQCSampleMethodMapper configQCSampleMethodMapper; @Resource - private BusinessQCProjectDataMapper businessQCProjectDataMapper; + private ConfigQCSampleMethodParameterMapper configQCSampleMethodParameterMapper; @Resource - private BusinessQCParameterDataMapper businessQCParameterDataMapper; + private BusinessQCCoefficientDataMapper businessQCCoefficientDataMapper; + + @Resource + private BusinessQCCoefficientParameterDataMapper businessQCCoefficientParameterDataMapper; + + @Resource + private BusinessQCManagementDataMapper businessQCManagementDataMapper; + + @Resource + private BusinessQCManagementProjectDataMapper businessQCManagementProjectDataMapper; + + @Resource + private BusinessQCManagementParameterDataMapper businessQCManagementParameterDataMapper; @Override public List getAssignUserList() { @@ -455,77 +481,137 @@ public class SampleTaskAssignServiceImpl implements SampleTaskAssignService { @Override @Transactional(rollbackFor = Exception.class) public void createQcSample(CreateQcSampleReqVO req) { - List businessQCProjectDataDOList = new ArrayList<>(); - List businessQCParameterDataDOList = new ArrayList<>(); + List businessQCManagementDataDOList = new ArrayList<>(); + List businessQCManagementProjectDataDOList = new ArrayList<>(); + List businessQCManagementParameterDataDOList = new ArrayList<>(); + + List businessQCCoefficientDataDOList = new ArrayList<>(); + List businessQCCoefficientParameterDataDOList = new ArrayList<>(); //分配任务 BusinessAssayTaskDO businessAssayTaskDO = businessAssayTaskMapper.selectById(req.getBusinessAssayTaskId()); - //分析方法 - ConfigAssayMethodDO configAssayMethodDO = configAssayMethodMapper.selectById(req.getConfigQCAssayMethodId()); - //分析项目 - List configAssayMethodProjectExtendRespList = configAssayMethodProjectMapper.selectByConfigAssayMethodId(req.getConfigQCAssayMethodId()); - //分析项目参数 - List configAssayMethodProjectParameterList = configAssayMethodProjectParameterMapper.selectByConfigAssayMethodProjectId(req.getConfigQCAssayMethodId()); - //分析项目 - String assayProject = configAssayMethodProjectExtendRespList.stream().map(m -> m.getShowName()).collect(Collectors.joining(",")); - BusinessQCDataDO businessQCDataDO = new BusinessQCDataDO(); - businessQCDataDO.setId(IdWorker.getId()); - businessQCDataDO.setBusinessAssayTaskId(req.getBusinessAssayTaskId()); - businessQCDataDO.setConfigAssayMethodId(req.getConfigQCAssayMethodId()); - businessQCDataDO.setSampleName(req.getSampleName()); -// if (StringUtils.isNotBlank(configQCSampleMethodExtendRespVO.getCodeRule())) { -// String codeSample = sequenceUtil.genCode(configQCSampleMethodExtendRespVO.getCodeRule()); -// businessQCDataDO.setSampleCode(codeSample); -// } - if (StringUtils.isNotBlank(req.getSampleCode())) { - businessQCDataDO.setSampleCode(req.getSampleCode()); - } - businessQCDataDO.setBusinessStandardSampleId(req.getBusinessStandardSampleId()); - businessQCDataDO.setDictionaryBusinessId(req.getDictionaryBusinessId()); - businessQCDataDO.setDictionaryBusinessKey(req.getDictionaryBusinessKey()); - businessQCDataDO.setAssayDepartmentId(configAssayMethodDO.getAssayDepartmentId()); - businessQCDataDO.setAssayDepartmentName(configAssayMethodDO.getAssayDepartmentName()); - businessQCDataDO.setAssayOperator(businessAssayTaskDO.getAssayOperator()); - businessQCDataDO.setAssayProject(assayProject); - businessQCDataDO.setAssignTaskTime(businessAssayTaskDO.getTaskAssignTime()); - businessQCDataDO.setIsAssignTasked(QmsCommonConstant.YES); - businessQCDataDO.setIsReported(QmsCommonConstant.NO); - - for (ConfigAssayMethodProjectExtendRespVO configAssayMethodProjectExtendRespVO : configAssayMethodProjectExtendRespList) { - BusinessQCProjectDataDO businessQCProjectDataDO = new BusinessQCProjectDataDO(); - businessQCProjectDataDO.setId(IdWorker.getId()); - businessQCProjectDataDO.setBusinessQCDataId(businessQCDataDO.getId()); - businessQCProjectDataDO.setConfigAssayMethodProjectId(configAssayMethodProjectExtendRespVO.getId()); - businessQCProjectDataDO.setDictionaryProjectId(configAssayMethodProjectExtendRespVO.getDictionaryProjectId()); - businessQCProjectDataDO.setUsage(QmsCommonConstant.ASSAY_PROJECT_USAGE_QUALITY_CONTROL); - businessQCProjectDataDO.setSymbol("="); - businessQCProjectDataDO.setDataType(configAssayMethodProjectExtendRespVO.getDataType()); - businessQCProjectDataDO.setDecimalPosition(configAssayMethodProjectExtendRespVO.getDecimalPosition()); - businessQCProjectDataDO.setIsEnabled(configAssayMethodProjectExtendRespVO.getIsDefaultEnabled()); + //分析方法 + ConfigAssayMethodDO configAssayMethodDO = configAssayMethodMapper.selectById(businessAssayTaskDO.getConfigAssayMethodId()); + + ConfigQCSampleMethodExtendRespVO configQCSampleMethod = configQCSampleMethodMapper.selectByConfigAssayMethodIdAndDictionaryBusinessKey(businessAssayTaskDO.getConfigAssayMethodId(), req.getDictionaryBusinessKey()); + + if ("kby".equals(req.getDictionaryBusinessKey()) || "by".equals(req.getDictionaryBusinessKey())) {//空白样和标样 - businessQCProjectDataDOList.add(businessQCProjectDataDO); + BusinessQCCoefficientDataDO businessQCCoefficientDataDO = new BusinessQCCoefficientDataDO(); + businessQCCoefficientDataDO.setId(IdWorker.getId()); + businessQCCoefficientDataDO.setBusinessAssayTaskId(businessAssayTaskDO.getId()); + businessQCCoefficientDataDO.setConfigAssayMethodId(configQCSampleMethod.getConfigAssayMethodId()); + businessQCCoefficientDataDO.setSampleName(configQCSampleMethod.getDictionaryBusinessName()); + if (StringUtils.isNotBlank(req.getSampleName())) { + businessQCCoefficientDataDO.setSampleName(req.getSampleName()); + } + if (StringUtils.isNotBlank(req.getSampleCode())) { + businessQCCoefficientDataDO.setSampleCode(req.getSampleCode()); + } else { + if (StringUtils.isNotBlank(configQCSampleMethod.getCodeRule())) { + String codeSample = sequenceUtil.genCode(configQCSampleMethod.getCodeRule()); + businessQCCoefficientDataDO.setSampleCode(codeSample); + } + } + businessQCCoefficientDataDO.setDictionaryBusinessId(configQCSampleMethod.getDictionaryBusinessId()); + businessQCCoefficientDataDO.setDictionaryBusinessKey(configQCSampleMethod.getDictionaryBusinessKey()); + businessQCCoefficientDataDO.setAssayDepartmentId(configAssayMethodDO.getAssayDepartmentId()); + businessQCCoefficientDataDO.setAssayDepartmentName(configAssayMethodDO.getAssayDepartmentName()); + businessQCCoefficientDataDO.setAssayOperator(businessAssayTaskDO.getAssayOperator()); + businessQCCoefficientDataDO.setAssayProject(""); + businessQCCoefficientDataDO.setAssignTaskTime(businessAssayTaskDO.getTaskAssignTime()); + businessQCCoefficientDataDO.setIsAssignTasked(QmsCommonConstant.YES); + businessQCCoefficientDataDO.setIsReported(QmsCommonConstant.NO); - List configAssayMethodProjectParameterDoList = configAssayMethodProjectParameterList.stream().filter(f -> f.getConfigAssayMethodProjectId().equals(configAssayMethodProjectExtendRespVO.getId())).collect(Collectors.toList()); - for (ConfigAssayMethodProjectParameterDO configAssayMethodProjectParameterDO : configAssayMethodProjectParameterDoList) { - BusinessQCParameterDataDO businessQCParameterDataDO = new BusinessQCParameterDataDO(); - businessQCParameterDataDO.setBusinessQCProjectDataId(businessQCProjectDataDO.getId()); - businessQCParameterDataDO.setConfigAssayMethodProjectParameterId(configAssayMethodProjectParameterDO.getId()); - businessQCParameterDataDO.setDictionaryParameterId(configAssayMethodProjectParameterDO.getDictionaryParameterId()); - businessQCParameterDataDO.setDataType(configAssayMethodProjectParameterDO.getDataType()); - businessQCParameterDataDO.setDecimalPosition(configAssayMethodProjectParameterDO.getDecimalPosition()); + businessQCCoefficientDataDOList.add(businessQCCoefficientDataDO); + + List configQCSampleMethodParameterExtendRespVOs = configQCSampleMethodParameterMapper.selectByConfigQCSampleMethodId(configQCSampleMethod.getId()); + for (ConfigQCSampleMethodParameterExtendRespVO configQCSampleMethodParameterExtendRespVO : configQCSampleMethodParameterExtendRespVOs) { + BusinessQCCoefficientParameterDataDO businessQCCoefficientParameterDataDO = new BusinessQCCoefficientParameterDataDO(); + businessQCCoefficientParameterDataDO.setBusinessQCCoefficientDataId(businessQCCoefficientDataDO.getId()); + businessQCCoefficientParameterDataDO.setConfigQCSampleMethodParameterId(configQCSampleMethodParameterExtendRespVO.getId()); + businessQCCoefficientParameterDataDO.setDictionaryParameterId(configQCSampleMethodParameterExtendRespVO.getDictionaryParameterId()); + businessQCCoefficientParameterDataDO.setDataType(configQCSampleMethodParameterExtendRespVO.getDataType()); + businessQCCoefficientParameterDataDO.setDecimalPosition(configQCSampleMethodParameterExtendRespVO.getDecimalPosition()); + businessQCCoefficientParameterDataDO.setValue(configQCSampleMethodParameterExtendRespVO.getDefaultValue()); + + businessQCCoefficientParameterDataDOList.add(businessQCCoefficientParameterDataDO); + } + + } else {//管理样与标准样 + //分析项目 + List configAssayMethodProjectExtendRespList = configAssayMethodProjectMapper.selectByConfigAssayMethodId(businessAssayTaskDO.getConfigAssayMethodId()); + //分析项目参数 + List configAssayMethodProjectParameterList = configAssayMethodProjectParameterMapper.selectByConfigAssayMethodProjectId(businessAssayTaskDO.getConfigAssayMethodId()); + //分析项目 + String assayProject = configAssayMethodProjectExtendRespList.stream().map(m -> m.getShowName()).collect(Collectors.joining(",")); + + BusinessQCManagementDataDO businessQCManagementDataDO = new BusinessQCManagementDataDO(); + businessQCManagementDataDO.setId(IdWorker.getId()); + businessQCManagementDataDO.setBusinessAssayTaskId(req.getBusinessAssayTaskId()); + businessQCManagementDataDO.setConfigAssayMethodId(businessAssayTaskDO.getConfigAssayMethodId()); + businessQCManagementDataDO.setSampleName(req.getSampleName()); + if (StringUtils.isNotBlank(req.getSampleCode())) { + businessQCManagementDataDO.setSampleCode(req.getSampleCode()); + } + businessQCManagementDataDO.setBusinessStandardSampleId(req.getBusinessStandardSampleId()); + businessQCManagementDataDO.setDictionaryBusinessId(req.getDictionaryBusinessId()); + businessQCManagementDataDO.setDictionaryBusinessKey(req.getDictionaryBusinessKey()); + businessQCManagementDataDO.setAssayDepartmentId(configAssayMethodDO.getAssayDepartmentId()); + businessQCManagementDataDO.setAssayDepartmentName(configAssayMethodDO.getAssayDepartmentName()); + businessQCManagementDataDO.setAssayOperator(businessAssayTaskDO.getAssayOperator()); + businessQCManagementDataDO.setAssayProject(assayProject); + businessQCManagementDataDO.setAssignTaskTime(businessAssayTaskDO.getTaskAssignTime()); + businessQCManagementDataDO.setIsAssignTasked(QmsCommonConstant.YES); + businessQCManagementDataDO.setIsReported(QmsCommonConstant.NO); + + businessQCManagementDataDOList.add(businessQCManagementDataDO); + + for (ConfigAssayMethodProjectExtendRespVO configAssayMethodProjectExtendRespVO : configAssayMethodProjectExtendRespList) { + BusinessQCManagementProjectDataDO businessQCManagementProjectDataDO = new BusinessQCManagementProjectDataDO(); + businessQCManagementProjectDataDO.setId(IdWorker.getId()); + businessQCManagementProjectDataDO.setBusinessQCManagementDataId(businessQCManagementDataDO.getId()); + businessQCManagementProjectDataDO.setConfigAssayMethodProjectId(configAssayMethodProjectExtendRespVO.getId()); + businessQCManagementProjectDataDO.setDictionaryProjectId(configAssayMethodProjectExtendRespVO.getDictionaryProjectId()); + businessQCManagementProjectDataDO.setUsage(QmsCommonConstant.ASSAY_PROJECT_USAGE_QUALITY_CONTROL); + businessQCManagementProjectDataDO.setSymbol("="); + businessQCManagementProjectDataDO.setDataType(configAssayMethodProjectExtendRespVO.getDataType()); + businessQCManagementProjectDataDO.setDecimalPosition(configAssayMethodProjectExtendRespVO.getDecimalPosition()); + businessQCManagementProjectDataDO.setIsEnabled(configAssayMethodProjectExtendRespVO.getIsDefaultEnabled()); + + businessQCManagementProjectDataDOList.add(businessQCManagementProjectDataDO); + + List configAssayMethodProjectParameterDoList = configAssayMethodProjectParameterList.stream().filter(f -> f.getConfigAssayMethodProjectId().equals(configAssayMethodProjectExtendRespVO.getId())).collect(Collectors.toList()); + for (ConfigAssayMethodProjectParameterDO configAssayMethodProjectParameterDO : configAssayMethodProjectParameterDoList) { + BusinessQCManagementParameterDataDO businessQCManagementParameterDataDO = new BusinessQCManagementParameterDataDO(); + businessQCManagementParameterDataDO.setBusinessQCManagementProjectDataId(businessQCManagementProjectDataDO.getId()); + businessQCManagementParameterDataDO.setConfigAssayMethodProjectParameterId(configAssayMethodProjectParameterDO.getId()); + businessQCManagementParameterDataDO.setDictionaryParameterId(configAssayMethodProjectParameterDO.getDictionaryParameterId()); + businessQCManagementParameterDataDO.setDataType(configAssayMethodProjectParameterDO.getDataType()); + businessQCManagementParameterDataDO.setDecimalPosition(configAssayMethodProjectParameterDO.getDecimalPosition()); + + businessQCManagementParameterDataDOList.add(businessQCManagementParameterDataDO); + } - businessQCParameterDataDOList.add(businessQCParameterDataDO); } } - - businessQCDataMapper.insert(businessQCDataDO); - if (CollUtil.isNotEmpty(businessQCProjectDataDOList)) { - businessQCProjectDataMapper.insertBatch(businessQCProjectDataDOList); + + if (CollUtil.isNotEmpty(businessQCManagementDataDOList)) { + businessQCManagementDataMapper.insertBatch(businessQCManagementDataDOList); } - if (CollUtil.isNotEmpty(businessQCParameterDataDOList)) { - businessQCParameterDataMapper.insertBatch(businessQCParameterDataDOList); + if (CollUtil.isNotEmpty(businessQCManagementProjectDataDOList)) { + businessQCManagementProjectDataMapper.insertBatch(businessQCManagementProjectDataDOList); + } + if (CollUtil.isNotEmpty(businessQCManagementParameterDataDOList)) { + businessQCManagementParameterDataMapper.insertBatch(businessQCManagementParameterDataDOList); + } + if (CollUtil.isNotEmpty(businessQCCoefficientDataDOList)) { + businessQCCoefficientDataMapper.insertBatch(businessQCCoefficientDataDOList); + } + if (CollUtil.isNotEmpty(businessQCCoefficientParameterDataDOList)) { + businessQCCoefficientParameterDataMapper.insertBatch(businessQCCoefficientParameterDataDOList); } } } diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigQCSampleMethodExtendRespVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigQCSampleMethodExtendRespVO.java index b2fb1fd..277078a 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigQCSampleMethodExtendRespVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigQCSampleMethodExtendRespVO.java @@ -8,6 +8,4 @@ public class ConfigQCSampleMethodExtendRespVO extends ConfigQCSampleMethodRespVO private String dictionaryBusinessName; private String configAssayMethodName; - - private String configQCAssayMethodName; } diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigQCSampleMethodPageReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigQCSampleMethodPageReqVO.java index 031712a..8fca9c6 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigQCSampleMethodPageReqVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigQCSampleMethodPageReqVO.java @@ -22,9 +22,6 @@ public class ConfigQCSampleMethodPageReqVO extends PageParam { @Schema(description = "质控类型_Key,字典表【T_DIC_BSN】质控类型：空白样、管理样、标准样、标样") private String dictionaryBusinessKey; - @Schema(description = "质控样检测方法配置ID", example = "17090") - private Long configQCAssayMethodId; - @Schema(description = "编码规则") private String codeRule; diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigQCSampleMethodParameterExtendRespVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigQCSampleMethodParameterExtendRespVO.java new file mode 100644 index 0000000..df03866 --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigQCSampleMethodParameterExtendRespVO.java @@ -0,0 +1,23 @@ +package com.zt.plat.module.qms.business.config.controller.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +@Data +public class ConfigQCSampleMethodParameterExtendRespVO extends ConfigQCSampleMethodParameterRespVO { + + @Schema(description = "参数序号") + private Integer dictionaryParameterNo; + + @Schema(description = "名称", example = "王五") + private String dictionaryParameterName; + + @Schema(description = "键值") + private String dictionaryParameterKey; + + @Schema(description = "检测单位ID,UNT表", example = "20894") + private Long dictionaryParameterUnitId; + + @Schema(description = "单位") + private String dictionaryParameterUnit; +} diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigQCSampleMethodRespVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigQCSampleMethodRespVO.java index 2dcd8e0..2cd38fa 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigQCSampleMethodRespVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigQCSampleMethodRespVO.java @@ -28,10 +28,6 @@ public class ConfigQCSampleMethodRespVO { @ExcelProperty("质控类型_Key,字典表【T_DIC_BSN】质控类型：空白样、管理样、标准样、标样") private String dictionaryBusinessKey; - @Schema(description = "质控样检测方法配置ID", example = "17090") - @ExcelProperty("质控样检测方法配置ID") - private Long configQCAssayMethodId; - @Schema(description = "编码规则", requiredMode = Schema.RequiredMode.REQUIRED) @ExcelProperty("编码规则") private String codeRule; diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigQCSampleMethodSaveReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigQCSampleMethodSaveReqVO.java index 2d02bd4..f70d690 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigQCSampleMethodSaveReqVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigQCSampleMethodSaveReqVO.java @@ -23,9 +23,6 @@ public class ConfigQCSampleMethodSaveReqVO { @Schema(description = "质控类型_Key,字典表【T_DIC_BSN】质控类型：空白样、管理样、标准样、标样") private String dictionaryBusinessKey; - @Schema(description = "质控样检测方法配置ID", example = "17090") - private Long configQCAssayMethodId; - @Schema(description = "编码规则", requiredMode = Schema.RequiredMode.REQUIRED) @NotEmpty(message = "编码规则不能为空") private String codeRule; diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/dal/dataobject/ConfigQCSampleMethodDO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/dal/dataobject/ConfigQCSampleMethodDO.java index 5d80113..4c768c0 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/dal/dataobject/ConfigQCSampleMethodDO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/dal/dataobject/ConfigQCSampleMethodDO.java @@ -47,11 +47,6 @@ public class ConfigQCSampleMethodDO extends BusinessBaseDO { @TableField("DIC_BSN_KY") private String dictionaryBusinessKey; /** - * 质控样检测方法配置ID - */ - @TableField("CFG_QC_ASY_MTHD_ID") - private Long configQCAssayMethodId; - /** * 编码规则 */ @TableField("CD_RUL") diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/dal/mapper/ConfigQCSampleMethodMapper.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/dal/mapper/ConfigQCSampleMethodMapper.java index aeb8f52..f42831e 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/dal/mapper/ConfigQCSampleMethodMapper.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/dal/mapper/ConfigQCSampleMethodMapper.java @@ -26,7 +26,6 @@ public interface ConfigQCSampleMethodMapper extends BaseMapperX selectByConfigAssayMethodId(Long configAssayMethodId) { return selectJoinList(ConfigQCSampleMethodExtendRespVO.class, new MPJLambdaWrapperX() .leftJoin(DictionaryBusinessDO.class, DictionaryBusinessDO::getId, ConfigQCSampleMethodDO::getDictionaryBusinessId) - .leftJoin(ConfigAssayMethodDO.class, ConfigAssayMethodDO::getId, ConfigQCSampleMethodDO::getConfigQCAssayMethodId) .selectAll(ConfigQCSampleMethodDO.class) .selectAs(DictionaryBusinessDO::getName, ConfigQCSampleMethodExtendRespVO::getDictionaryBusinessName) - .selectAs(ConfigAssayMethodDO::getName, ConfigQCSampleMethodExtendRespVO::getConfigQCAssayMethodName) .eq(ConfigQCSampleMethodDO::getConfigAssayMethodId, configAssayMethodId)); } @@ -54,11 +51,18 @@ public interface ConfigQCSampleMethodMapper extends BaseMapperX selectByConfigAssayMethodIds(List configAssayMethodIds) { return selectJoinList(ConfigQCSampleMethodExtendRespVO.class, new MPJLambdaWrapperX() .leftJoin(DictionaryBusinessDO.class, DictionaryBusinessDO::getId, ConfigQCSampleMethodDO::getDictionaryBusinessId) - .leftJoin(ConfigAssayMethodDO.class, ConfigAssayMethodDO::getId, ConfigQCSampleMethodDO::getConfigQCAssayMethodId) .selectAll(ConfigQCSampleMethodDO.class) .selectAs(DictionaryBusinessDO::getName, ConfigQCSampleMethodExtendRespVO::getDictionaryBusinessName) - .selectAs(ConfigAssayMethodDO::getName, ConfigQCSampleMethodExtendRespVO::getConfigQCAssayMethodName) .in(ConfigQCSampleMethodDO::getConfigAssayMethodId, configAssayMethodIds)); } + + default ConfigQCSampleMethodExtendRespVO selectByConfigAssayMethodIdAndDictionaryBusinessKey(Long configAssayMethodId, String dictionaryBusinessKey) { + return selectJoinOne(ConfigQCSampleMethodExtendRespVO.class, new MPJLambdaWrapperX() + .leftJoin(DictionaryBusinessDO.class, DictionaryBusinessDO::getId, ConfigQCSampleMethodDO::getDictionaryBusinessId) + .selectAll(ConfigQCSampleMethodDO.class) + .selectAs(DictionaryBusinessDO::getName, ConfigQCSampleMethodExtendRespVO::getDictionaryBusinessName) + .eq(ConfigQCSampleMethodDO::getConfigAssayMethodId, configAssayMethodId) + .eq(ConfigQCSampleMethodDO::getDictionaryBusinessKey, dictionaryBusinessKey)); + } } \ 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/config/dal/mapper/ConfigQCSampleMethodParameterMapper.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/dal/mapper/ConfigQCSampleMethodParameterMapper.java index 6cf692a..4917cc9 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/dal/mapper/ConfigQCSampleMethodParameterMapper.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/dal/mapper/ConfigQCSampleMethodParameterMapper.java @@ -4,8 +4,10 @@ import java.util.*; 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.config.controller.vo.*; import com.zt.plat.module.qms.business.config.dal.dataobject.ConfigQCSampleMethodParameterDO; +import com.zt.plat.module.qms.business.dic.dal.dataobject.DictionaryParameterDO; import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX; import org.apache.ibatis.annotations.Mapper; @@ -34,5 +36,30 @@ public interface ConfigQCSampleMethodParameterMapper extends BaseMapperX selectByConfigQCSampleMethodId(Long configQCSampleMethodId) { + return selectJoinList(ConfigQCSampleMethodParameterExtendRespVO.class, new MPJLambdaWrapperX() + .leftJoin(DictionaryParameterDO.class, DictionaryParameterDO::getId, ConfigQCSampleMethodParameterDO::getDictionaryParameterId) + .selectAll(ConfigQCSampleMethodParameterDO.class) + .selectAs(DictionaryParameterDO::getKey, ConfigQCSampleMethodParameterExtendRespVO::getDictionaryParameterKey) + .selectAs(DictionaryParameterDO::getName, ConfigQCSampleMethodParameterExtendRespVO::getDictionaryParameterName) + .selectAs(DictionaryParameterDO::getNo, ConfigQCSampleMethodParameterExtendRespVO::getDictionaryParameterNo) + .selectAs(DictionaryParameterDO::getUnitId, ConfigQCSampleMethodParameterExtendRespVO::getDictionaryParameterUnitId) + .selectAs(DictionaryParameterDO::getUnit, ConfigQCSampleMethodParameterExtendRespVO::getDictionaryParameterUnit) + .eq(ConfigQCSampleMethodParameterDO::getConfigQCSampleMethodId, configQCSampleMethodId)); + } + + default List selectByConfigQCSampleMethodIds(List configQCSampleMethodIds) { + return selectJoinList(ConfigQCSampleMethodParameterExtendRespVO.class, new MPJLambdaWrapperX() + .leftJoin(DictionaryParameterDO.class, DictionaryParameterDO::getId, ConfigQCSampleMethodParameterDO::getDictionaryParameterId) + .selectAll(ConfigQCSampleMethodParameterDO.class) + .selectAs(DictionaryParameterDO::getKey, ConfigQCSampleMethodParameterExtendRespVO::getDictionaryParameterKey) + .selectAs(DictionaryParameterDO::getName, ConfigQCSampleMethodParameterExtendRespVO::getDictionaryParameterName) + .selectAs(DictionaryParameterDO::getNo, ConfigQCSampleMethodParameterExtendRespVO::getDictionaryParameterNo) + .selectAs(DictionaryParameterDO::getUnitId, ConfigQCSampleMethodParameterExtendRespVO::getDictionaryParameterUnitId) + .selectAs(DictionaryParameterDO::getUnit, ConfigQCSampleMethodParameterExtendRespVO::getDictionaryParameterUnit) + .in(ConfigQCSampleMethodParameterDO::getConfigQCSampleMethodId, configQCSampleMethodIds)); + } + } \ No newline at end of file