zgty/zt-qms
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

超差判定添加主样配置id查询

Browse Source
This commit is contained in:
王兴荣
2026-01-07 10:50:54 +08:00
parent 68831680fd
commit 2b59974442
7 changed files with 41 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleAnalysisAuditServiceImpl.java
View File

@@ -690,8 +690,8 @@ public class SampleAnalysisAuditServiceImpl implements SampleAnalysisAuditServic
Long dictionaryProjectId = businessAssayProjectDataDOEntry.getKey();
List<BusinessAssayProjectDataDO> val1 = businessAssayProjectDataDOEntry.getValue();
BusinessAssayProjectDataDO businessAssayProjectDataDO = val1.get(0);
List<ConfigAssayMethodProjectAssessmentDO> configAssayMethodProjectAssessmentDOList = configAssayMethodProjectAssessmentMapper.selectList(new LambdaQueryWrapperX<ConfigAssayMethodProjectAssessmentDO>().eq(ConfigAssayMethodProjectAssessmentDO::getConfigAssayMethodId, businessAssayTaskDataDO.getConfigAssayMethodId()).eq(ConfigAssayMethodProjectAssessmentDO::getConfigAssayMethodProjectId, businessAssayProjectDataDO.getConfigAssayMethodProjectId()));
List<ConfigAssayMethodProjectAssessmentDO> configAssayMethodProjectAssessmentDOList = configAssayMethodProjectAssessmentMapper.selectByConfigBaseSampleIdAndConfigAssayMethodIdAndConfigAssayMethodProjectId(configSubSampleMethodDO.getConfigBaseSampleId(), businessAssayTaskDataDO.getConfigAssayMethodId(), businessAssayProjectDataDO.getConfigAssayMethodProjectId());
//查询判定结果数据
BusinessSubSampleAssessmentProjectDO businessSubSampleAssessmentProjectDO = businessSubSampleAssessmentProjectMapper.selectByBusinessSubSampleIdAndConfigAssayMethodIdAndConfigAssayMethodProjectId(businessSubSampleId, businessAssayTaskDataDO.getConfigAssayMethodId(), businessAssayProjectDataDO.getConfigAssayMethodProjectId());
if (businessSubSampleAssessmentProjectDO == null) {
@@ -1205,9 +1205,10 @@ public class SampleAnalysisAuditServiceImpl implements SampleAnalysisAuditServic
//设置判定值
businessSubSampleAssessmentProjectDO.setAssessmentValue(representativeValue.toPlainString());
List<ConfigAssayMethodProjectAssessmentDO> configAssayMethodProjectAssessmentDOList = configAssayMethodProjectAssessmentMapper.selectList(new LambdaQueryWrapperX<ConfigAssayMethodProjectAssessmentDO>()
.eq(ConfigAssayMethodProjectAssessmentDO::getConfigAssayMethodId, businessSubSampleAssessmentProjectDO.getConfigAssayMethodId())
.eq(ConfigAssayMethodProjectAssessmentDO::getConfigAssayMethodProjectId, businessSubSampleAssessmentProjectDO.getConfigAssayMethodProjectId()));
// List<ConfigAssayMethodProjectAssessmentDO> configAssayMethodProjectAssessmentDOList = configAssayMethodProjectAssessmentMapper.selectList(new LambdaQueryWrapperX<ConfigAssayMethodProjectAssessmentDO>()
// .eq(ConfigAssayMethodProjectAssessmentDO::getConfigAssayMethodId, businessSubSampleAssessmentProjectDO.getConfigAssayMethodId())
// .eq(ConfigAssayMethodProjectAssessmentDO::getConfigAssayMethodProjectId, businessSubSampleAssessmentProjectDO.getConfigAssayMethodProjectId()));
List<ConfigAssayMethodProjectAssessmentDO> configAssayMethodProjectAssessmentDOList = configAssayMethodProjectAssessmentMapper.selectByConfigBaseSampleIdAndConfigAssayMethodIdAndConfigAssayMethodProjectId(configSubSampleMethodDO.getConfigBaseSampleId(), businessSubSampleAssessmentProjectDO.getConfigAssayMethodId(), businessSubSampleAssessmentProjectDO.getConfigAssayMethodProjectId());
// 查找匹配的允差规则
ConfigAssayMethodProjectAssessmentDO matchedRule = findMatchingRule(configAssayMethodProjectAssessmentDOList, representativeValue);

3
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigAssayMethodProjectAssessmentPageReqVO.java
View File

@@ -13,6 +13,9 @@ import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH
@Data
public class ConfigAssayMethodProjectAssessmentPageReqVO extends PageParam {
@Schema(description = "主样配置ID", example = "30107")
private Long configBaseSampleId;
@Schema(description = "检测方法配置ID", example = "18120")
private Long configAssayMethodId;

4
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigAssayMethodProjectAssessmentRespVO.java
View File

@@ -16,6 +16,10 @@ public class ConfigAssayMethodProjectAssessmentRespVO {
@ExcelProperty("ID")
private Long id;
@Schema(description = "主样配置ID", example = "30107")
@ExcelProperty("主样配置ID")
private Long configBaseSampleId;
@Schema(description = "检测方法配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "18120")
@ExcelProperty("检测方法配置ID")
private Long configAssayMethodId;

3
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigAssayMethodProjectAssessmentSaveReqVO.java
View File

@@ -12,6 +12,9 @@ public class ConfigAssayMethodProjectAssessmentSaveReqVO {
@Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "912")
private Long id;
@Schema(description = "主样配置ID", example = "30107")
private Long configBaseSampleId;
@Schema(description = "检测方法配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "18120")
@NotNull(message = "检测方法配置ID不能为空")
private Long configAssayMethodId;

5
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/dal/dataobject/ConfigAssayMethodProjectAssessmentDO.java
View File

@@ -32,6 +32,11 @@ public class ConfigAssayMethodProjectAssessmentDO extends BusinessBaseDO {
@TableId(type = IdType.ASSIGN_ID)
private Long id;
/**
* 主样配置ID
*/
@TableField("CFG_BSE_SMP_ID")
private Long configBaseSampleId;
/**
* 检测方法配置ID
*/
@TableField("CFG_ASY_MTHD_ID")

17
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/dal/mapper/ConfigAssayMethodProjectAssessmentMapper.java
View File

@@ -19,6 +19,7 @@ public interface ConfigAssayMethodProjectAssessmentMapper extends BaseMapperX<Co
default PageResult<ConfigAssayMethodProjectAssessmentDO> selectPage(ConfigAssayMethodProjectAssessmentPageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<ConfigAssayMethodProjectAssessmentDO>()
.eqIfPresent(ConfigAssayMethodProjectAssessmentDO::getConfigBaseSampleId, reqVO.getConfigBaseSampleId())
.eqIfPresent(ConfigAssayMethodProjectAssessmentDO::getConfigAssayMethodId, reqVO.getConfigAssayMethodId())
.eqIfPresent(ConfigAssayMethodProjectAssessmentDO::getConfigAssayMethodProjectId, reqVO.getConfigAssayMethodProjectId())
.eqIfPresent(ConfigAssayMethodProjectAssessmentDO::getDictionaryProjectId, reqVO.getDictionaryProjectId())
@@ -37,5 +38,21 @@ public interface ConfigAssayMethodProjectAssessmentMapper extends BaseMapperX<Co
.eqIfPresent(ConfigAssayMethodProjectAssessmentDO::getVersion, reqVO.getVersion())
.orderByDesc(ConfigAssayMethodProjectAssessmentDO::getId));
}
default List<ConfigAssayMethodProjectAssessmentDO> selectByConfigBaseSampleIdsAndConfigAssayMethodIdAndConfigAssayMethodProjectId(Long configBaseSampleIdList, Long configAssayMethodId, Long configAssayMethodProjectId) {
return selectList(new LambdaQueryWrapperX<ConfigAssayMethodProjectAssessmentDO>()
.inIfPresent(ConfigAssayMethodProjectAssessmentDO::getConfigBaseSampleId, configBaseSampleIdList)
.eqIfPresent(ConfigAssayMethodProjectAssessmentDO::getConfigAssayMethodId, configAssayMethodId)
.eqIfPresent(ConfigAssayMethodProjectAssessmentDO::getConfigAssayMethodProjectId, configAssayMethodProjectId)
.orderByDesc(ConfigAssayMethodProjectAssessmentDO::getId));
}
default List<ConfigAssayMethodProjectAssessmentDO> selectByConfigBaseSampleIdAndConfigAssayMethodIdAndConfigAssayMethodProjectId(Long configBaseSampleId, Long configAssayMethodId, Long configAssayMethodProjectId) {
return selectList(new LambdaQueryWrapperX<ConfigAssayMethodProjectAssessmentDO>()
.eqIfPresent(ConfigAssayMethodProjectAssessmentDO::getConfigBaseSampleId, configBaseSampleId)
.eqIfPresent(ConfigAssayMethodProjectAssessmentDO::getConfigAssayMethodId, configAssayMethodId)
.eqIfPresent(ConfigAssayMethodProjectAssessmentDO::getConfigAssayMethodProjectId, configAssayMethodProjectId)
.orderByDesc(ConfigAssayMethodProjectAssessmentDO::getId));
}
}

3
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/dal/mapper/ConfigSubSampleMethodMapper.java
View File

@@ -55,7 +55,10 @@ public interface ConfigSubSampleMethodMapper extends BaseMapperX<ConfigSubSample
default ConfigSubSampleMethodExtendRespVO selectByConfigSubSampleIdAndConfigAssayMethodId(Long configSubSampleId, Long configAssayMethodId) {
return selectJoinOne(ConfigSubSampleMethodExtendRespVO.class, new MPJLambdaWrapperX<ConfigSubSampleMethodDO>()
.leftJoin(ConfigSubSampleParentMethodDO.class, ConfigSubSampleParentMethodDO::getId, ConfigSubSampleMethodDO::getConfigSubSampleParentMethodId)
.leftJoin(ConfigSubSampleDO.class, ConfigSubSampleDO::getId, ConfigSubSampleMethodDO::getConfigSubSampleId)
.selectAll(ConfigSubSampleMethodDO.class)
.selectAs(ConfigSubSampleDO::getConfigBaseSampleId, ConfigSubSampleMethodExtendRespVO::getConfigBaseSampleId)
.selectAs(ConfigSubSampleDO::getConfigSubSampleParentId, ConfigSubSampleMethodExtendRespVO::getConfigSubSampleParentId)
.selectAs(ConfigSubSampleParentMethodDO::getConfigAssayMethodId, ConfigSubSampleMethodExtendRespVO::getConfigAssayMethodId)
.selectAs(ConfigSubSampleParentMethodDO::getIsDefaultUse, ConfigSubSampleMethodExtendRespVO::getIsDefaultUse)
.eq(ConfigSubSampleMethodDO::getConfigSubSampleId, configSubSampleId)