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

委托登记添加委托来源查询条件

Browse Source
This commit is contained in:
王兴荣
2025-10-31 08:57:11 +08:00
parent 4c9a4959c8
commit 7221f6bf1b
4 changed files with 167 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -151,4 +151,7 @@ public class BusinessSampleEntrustRegistrationPageReqVO extends PageParam {
@Schema(description = "备注") @Schema(description = "备注")
private String remark; private String remark;
//====================扩展字段======================
@Schema(description = "委托来源名称")
private String configEntrustSourceName;
} }

1
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSampleEntrustRegistrationMapper.java
View File

@@ -72,6 +72,7 @@ public interface BusinessSampleEntrustRegistrationMapper extends BaseMapperX<Bus
.betweenIfPresent(BusinessSampleEntrustRegistrationDO::getCreateTime, reqVO.getCreateTime()) .betweenIfPresent(BusinessSampleEntrustRegistrationDO::getCreateTime, reqVO.getCreateTime())
.eqIfPresent(BusinessSampleEntrustRegistrationDO::getUpdateCount, reqVO.getUpdateCount()) .eqIfPresent(BusinessSampleEntrustRegistrationDO::getUpdateCount, reqVO.getUpdateCount())
.eqIfPresent(BusinessSampleEntrustRegistrationDO::getRemark, reqVO.getRemark()) .eqIfPresent(BusinessSampleEntrustRegistrationDO::getRemark, reqVO.getRemark())
.eqIfPresent(ConfigEntrustSourceDO::getName, reqVO.getConfigEntrustSourceName())
.orderByDesc(BusinessSampleEntrustRegistrationDO::getId)); .orderByDesc(BusinessSampleEntrustRegistrationDO::getId));
} }

144
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/liteflow/sample/entrust/SampleEntrustGenSampleDataCmp.java
View File

File diff suppressed because it is too large Load Diff

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

@@ -2,9 +2,14 @@ package com.zt.plat.module.qms.business.config.dal.mapper;
import com.zt.plat.framework.common.pojo.PageResult; 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.LambdaQueryWrapperX;
import com.zt.plat.framework.mybatis.core.query.MPJLambdaWrapperX;
import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX; import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX;
import com.zt.plat.module.qms.business.config.controller.vo.MaterialAssayStandardMethodPageReqVO; import com.zt.plat.module.qms.business.config.controller.vo.MaterialAssayStandardMethodPageReqVO;
import com.zt.plat.module.qms.business.config.dal.dataobject.MaterialAssayStandardDO;
import com.zt.plat.module.qms.business.config.dal.dataobject.MaterialAssayStandardDetailDO;
import com.zt.plat.module.qms.business.config.dal.dataobject.MaterialAssayStandardMethodDO; import com.zt.plat.module.qms.business.config.dal.dataobject.MaterialAssayStandardMethodDO;
import com.zt.plat.module.qms.enums.QmsCommonConstant;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
/** /**
@@ -30,4 +35,19 @@ public interface MaterialAssayStandardMethodMapper extends BaseMapperX<MaterialA
.orderByDesc(MaterialAssayStandardMethodDO::getId)); .orderByDesc(MaterialAssayStandardMethodDO::getId));
} }
/**
* 根据样品大类id和检测项目id获取对应的默认检测方法
* @param baseSampleId 样品大类id
* @param dictionaryProjectId 检测项目id
* @return
*/
default MaterialAssayStandardMethodDO selectByBaseSampleIdAndDictionaryProjectId(Long baseSampleId, Long dictionaryProjectId) {
return selectJoinOne(MaterialAssayStandardMethodDO.class, new MPJLambdaWrapperX<MaterialAssayStandardMethodDO>()
.leftJoin(MaterialAssayStandardDetailDO.class, MaterialAssayStandardDetailDO::getId, MaterialAssayStandardMethodDO::getMaterialAssayStandardDetailId)
.leftJoin(MaterialAssayStandardDO.class, MaterialAssayStandardDO::getId, MaterialAssayStandardDetailDO::getMaterialAssayStandardId)
.eq(MaterialAssayStandardDO::getBaseSampleId, baseSampleId)
.eq(MaterialAssayStandardDetailDO::getDictionaryProjectId, dictionaryProjectId)
.eq(MaterialAssayStandardMethodDO::getIsDefault, QmsCommonConstant.YES));
}
} }