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

方法变更修改

Browse Source
This commit is contained in:
王兴荣
2026-02-02 17:54:20 +08:00
parent e9259122b7
commit a8330ade63
5 changed files with 527 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,6 +17,8 @@ public class AssayMethodProjectRespVO {
private String dictionaryProjectShowName; private String dictionaryProjectShowName;
private String assayType;
private Long configAssayMethodId; private Long configAssayMethodId;
private String configAssayMethodName; private String configAssayMethodName;

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

File diff suppressed because it is too large Load Diff

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

@@ -20,4 +20,7 @@ public class ConfigAssayMethodProjectExtendRespVO extends ConfigAssayMethodProje
@Schema(description = "显示名称") @Schema(description = "显示名称")
private String showName; private String showName;
@Schema(description = "分析类型 单杯-single_cup、双杯-double_cup、平行-single_parallel")
private String assayType;
} }

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

@@ -97,5 +97,18 @@ public interface ConfigSubSampleMethodMapper extends BaseMapperX<ConfigSubSample
.selectAs(ConfigSubSampleParentMethodDO::getIsDefaultUse, ConfigSubSampleMethodExtendRespVO::getIsDefaultUse) .selectAs(ConfigSubSampleParentMethodDO::getIsDefaultUse, ConfigSubSampleMethodExtendRespVO::getIsDefaultUse)
.in(ConfigSubSampleMethodDO::getConfigSubSampleId, configSubSampleIds)); .in(ConfigSubSampleMethodDO::getConfigSubSampleId, configSubSampleIds));
} }
default List<ConfigSubSampleMethodExtendRespVO> selectByBaseSampleId(Long baseSampleId) {
return selectJoinList(ConfigSubSampleMethodExtendRespVO.class, new MPJLambdaWrapperX<ConfigSubSampleMethodDO>()
.leftJoin(ConfigSubSampleParentMethodDO.class, ConfigSubSampleParentMethodDO::getId, ConfigSubSampleMethodDO::getConfigSubSampleParentMethodId)
.leftJoin(ConfigSubSampleDO.class, ConfigSubSampleDO::getId, ConfigSubSampleMethodDO::getConfigSubSampleId)
.selectAll(ConfigSubSampleMethodDO.class)
.selectAs(ConfigSubSampleParentMethodDO::getConfigAssayMethodId, ConfigSubSampleMethodExtendRespVO::getConfigAssayMethodId)
.selectAs(ConfigSubSampleParentMethodDO::getIsDefaultUse, ConfigSubSampleMethodExtendRespVO::getIsDefaultUse)
.selectAs(ConfigSubSampleDO::getConfigSubSampleParentId, ConfigSubSampleMethodExtendRespVO::getConfigSubSampleParentId)
.selectAs(ConfigSubSampleDO::getConfigBaseSampleId, ConfigSubSampleMethodExtendRespVO::getConfigBaseSampleId)
.selectAs(ConfigSubSampleDO::getBaseSampleId, ConfigSubSampleMethodExtendRespVO::getBaseSampleId)
.eq(ConfigSubSampleDO::getBaseSampleId, baseSampleId));
}
} }

2
zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayProjectDataMapper.xml
View File

@@ -15,6 +15,7 @@
tdp.NAME AS dictionaryProjectName, tdp.NAME AS dictionaryProjectName,
tdp.SMPL_NAME AS dictionaryProjectSimpleName, tdp.SMPL_NAME AS dictionaryProjectSimpleName,
tdp.SHW_NAME AS dictionaryProjectShowName, tdp.SHW_NAME AS dictionaryProjectShowName,
tbatd.ASY_TP AS assayType,
tbatd.CFG_ASY_MTHD_ID AS configAssayMethodId, tbatd.CFG_ASY_MTHD_ID AS configAssayMethodId,
tcam.NAME AS configAssayMethodName, tcam.NAME AS configAssayMethodName,
tcam.MTHD_NAME_CTGR AS configAssayMethodNameAndCategory, tcam.MTHD_NAME_CTGR AS configAssayMethodNameAndCategory,
@@ -44,6 +45,7 @@
tdp.NAME, tdp.NAME,
tdp.SMPL_NAME, tdp.SMPL_NAME,
tdp.SHW_NAME, tdp.SHW_NAME,
tbatd.ASY_TP,
tbatd.CFG_ASY_MTHD_ID, tbatd.CFG_ASY_MTHD_ID,
tcam.NAME, tcam.NAME,
tcam.MTHD_NAME_CTGR, tcam.MTHD_NAME_CTGR,