diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/SampleProjectResultDetailRespVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/SampleProjectResultDetailRespVO.java index b8c5eaf4..95086304 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/SampleProjectResultDetailRespVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/SampleProjectResultDetailRespVO.java @@ -72,6 +72,9 @@ public class SampleProjectResultDetailRespVO { @Schema(description = "方法检出下限值") private String minimumLimitValue; + + @Schema(description = "是否不参与超差判定", requiredMode = Schema.RequiredMode.REQUIRED) + private Integer isNotAssessment; @Schema(description = "样品名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三") 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 00318831..541478d2 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,6 +31,7 @@ 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.BusinessAssayTaskParameterDataDO; 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.BusinessQCManagementDataDO; @@ -46,6 +47,7 @@ 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.BusinessAssayTaskParameterDataMapper; 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.BusinessQCManagementDataMapper; @@ -105,6 +107,9 @@ public class SampleTaskAssignServiceImpl implements SampleTaskAssignService { @Resource private BusinessAssayTaskMapper businessAssayTaskMapper; + @Resource + private BusinessAssayTaskParameterDataMapper businessAssayTaskParameterDataMapper; + @Resource private BusinessAssayTaskDetailMapper businessAssayTaskDetailMapper; @@ -317,6 +322,8 @@ public class SampleTaskAssignServiceImpl implements SampleTaskAssignService { //需要更新的分析任务 List updateBusinessAssayTaskDataDOList = new ArrayList<>(); + //需要更新的分析任务参数 + List updateBusinessAssayTaskParameterDataDOList = new ArrayList<>(); //需要更新的分析任务检测项目 List updateBusinessAssayProjectDataDOList = new ArrayList<>(); //需要更新的分析任务检测项目参数 @@ -330,6 +337,8 @@ public class SampleTaskAssignServiceImpl implements SampleTaskAssignService { //需要新建的分析任务 List saveBusinessAssayTaskDataDOList = new ArrayList<>(); + //需要新建的分析任务参数 + List saveBusinessAssayTaskParameterDataDOList = new ArrayList<>(); //需要新建的分析任务检测项目 List saveBusinessAssayProjectDataDOList = new ArrayList<>(); //需要新建的分析任务检测项目参数 @@ -343,6 +352,8 @@ public class SampleTaskAssignServiceImpl implements SampleTaskAssignService { //需要删除的分析任务 List removeAssayTaskDataIdList = new ArrayList<>(); + //需要删除的分析任务参数 + List removeAssayTaskParameterDataIdList = new ArrayList<>(); //需要删除的分析任务检测项目 List removeAssayProjectIdList = new ArrayList<>(); //需要删除的分析任务检测项目参数 @@ -368,6 +379,9 @@ public class SampleTaskAssignServiceImpl implements SampleTaskAssignService { } List businessAssayTaskDataIdList = businessAssayTaskDataDOList.stream().map(m -> m.getId()).collect(Collectors.toList()); + //查询检测任务的参数 + List businessAssayTaskParameterDataList = businessAssayTaskParameterDataMapper.selectExtendByBusinessAssayTaskDataIds(businessAssayTaskDataIdList); + //查询检测任务的检测项目 List businessAssayProjectDataList = businessAssayProjectDataMapper.selectByBusinessAssayTaskDataIds(businessAssayTaskDataIdList); List businessAssayProjectDataIdList = businessAssayProjectDataList.stream().map(m -> m.getId()).collect(Collectors.toList()); @@ -382,6 +396,8 @@ public class SampleTaskAssignServiceImpl implements SampleTaskAssignService { //查询要变更的分析方法配置 List configAssayMethodDOList = configAssayMethodMapper.selectByIds(changeConfigAssayMethodIdList); + //查询要变更的分析方法参数配置 + List configAssayMethodParameterDOList = configAssayMethodParameterMapper.selectByConfigAssayMethodIds(changeConfigAssayMethodIdList); //分析方法检测项目配置 List configAssayMethodProjectList = configAssayMethodProjectMapper.selectByConfigAssayMethodIds(changeConfigAssayMethodIdList); //分析方法检测项目参数配置 @@ -702,6 +718,10 @@ public class SampleTaskAssignServiceImpl implements SampleTaskAssignService { if (removeAssayTaskDataIdList.size() > 0) { businessAssayTaskDataMapper.deleteByIds(removeAssayTaskDataIdList); } + if (removeAssayTaskParameterDataIdList.size() > 0) { + businessAssayTaskParameterDataMapper.deleteByIds(removeAssayTaskParameterDataIdList); + } + if (removeAssayProjectIdList.size() > 0) { businessAssayProjectDataMapper.deleteByIds(removeAssayProjectIdList); } @@ -722,6 +742,9 @@ public class SampleTaskAssignServiceImpl implements SampleTaskAssignService { if (updateBusinessAssayReportDataDOList.size() > 0) { businessAssayReportDataMapper.updateBatch(updateBusinessAssayReportDataDOList); } + if (updateBusinessAssayTaskParameterDataDOList.size() > 0) { + businessAssayTaskParameterDataMapper.updateBatch(updateBusinessAssayTaskParameterDataDOList); + } if (updateBusinessAssayTaskDataDOList.size() > 0) { businessAssayTaskDataMapper.updateBatch(updateBusinessAssayTaskDataDOList); @@ -746,6 +769,10 @@ public class SampleTaskAssignServiceImpl implements SampleTaskAssignService { if (saveBusinessAssayTaskDataDOList.size() > 0) { businessAssayTaskDataMapper.insertBatch(saveBusinessAssayTaskDataDOList); } + if (saveBusinessAssayTaskParameterDataDOList.size() > 0) { + businessAssayTaskParameterDataMapper.insertBatch(saveBusinessAssayTaskParameterDataDOList); + } + if (saveBusinessAssayProjectDataDOList.size() > 0) { businessAssayProjectDataMapper.insertBatch(saveBusinessAssayProjectDataDOList); } diff --git a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/SampleResultQueryMapper.xml b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/SampleResultQueryMapper.xml index 36a1eab5..fa49e55d 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/SampleResultQueryMapper.xml +++ b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/SampleResultQueryMapper.xml @@ -81,6 +81,7 @@ tbapd.COEF AS coefficient, tbapd.VAL_AFT AS valueAfter, tbapd.MIN_LIM_VAL AS minimumLimitValue, + tbapd.IS_NT_ASMT AS isNotAssessment, tbatd.ASY_OPTR AS assayOperator, tbatd.RPT_TM AS reportTime, tbatd.RPTR AS reporter,