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-26 17:29:15 +08:00
parent 5b9a47918b
commit 951d6d45d0
3 changed files with 31 additions and 0 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/SampleProjectResultDetailRespVO.java
View File

@@ -73,6 +73,9 @@ public class SampleProjectResultDetailRespVO {
@Schema(description = "方法检出下限值") @Schema(description = "方法检出下限值")
private String minimumLimitValue; private String minimumLimitValue;
@Schema(description = "是否不参与超差判定", requiredMode = Schema.RequiredMode.REQUIRED)
private Integer isNotAssessment;
@Schema(description = "样品名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三") @Schema(description = "样品名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三")
private String sampleName; private String sampleName;

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

@@ -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.BusinessAssayTaskDO;
import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessAssayTaskDataDO; 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.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.BusinessQCCoefficientDataDO;
import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCCoefficientParameterDataDO; import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCCoefficientParameterDataDO;
import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessQCManagementDataDO; 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.BusinessAssayTaskDataMapper;
import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessAssayTaskDetailMapper; 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.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.BusinessQCCoefficientDataMapper;
import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessQCCoefficientParameterDataMapper; import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessQCCoefficientParameterDataMapper;
import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessQCManagementDataMapper; import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessQCManagementDataMapper;
@@ -105,6 +107,9 @@ public class SampleTaskAssignServiceImpl implements SampleTaskAssignService {
@Resource @Resource
private BusinessAssayTaskMapper businessAssayTaskMapper; private BusinessAssayTaskMapper businessAssayTaskMapper;
@Resource
private BusinessAssayTaskParameterDataMapper businessAssayTaskParameterDataMapper;
@Resource @Resource
private BusinessAssayTaskDetailMapper businessAssayTaskDetailMapper; private BusinessAssayTaskDetailMapper businessAssayTaskDetailMapper;
@@ -317,6 +322,8 @@ public class SampleTaskAssignServiceImpl implements SampleTaskAssignService {
//需要更新的分析任务 //需要更新的分析任务
List<BusinessAssayTaskDataDO> updateBusinessAssayTaskDataDOList = new ArrayList<>(); List<BusinessAssayTaskDataDO> updateBusinessAssayTaskDataDOList = new ArrayList<>();
//需要更新的分析任务参数
List<BusinessAssayTaskParameterDataDO> updateBusinessAssayTaskParameterDataDOList = new ArrayList<>();
//需要更新的分析任务检测项目 //需要更新的分析任务检测项目
List<BusinessAssayProjectDataDO> updateBusinessAssayProjectDataDOList = new ArrayList<>(); List<BusinessAssayProjectDataDO> updateBusinessAssayProjectDataDOList = new ArrayList<>();
//需要更新的分析任务检测项目参数 //需要更新的分析任务检测项目参数
@@ -330,6 +337,8 @@ public class SampleTaskAssignServiceImpl implements SampleTaskAssignService {
//需要新建的分析任务 //需要新建的分析任务
List<BusinessAssayTaskDataDO> saveBusinessAssayTaskDataDOList = new ArrayList<>(); List<BusinessAssayTaskDataDO> saveBusinessAssayTaskDataDOList = new ArrayList<>();
//需要新建的分析任务参数
List<BusinessAssayTaskParameterDataDO> saveBusinessAssayTaskParameterDataDOList = new ArrayList<>();
//需要新建的分析任务检测项目 //需要新建的分析任务检测项目
List<BusinessAssayProjectDataDO> saveBusinessAssayProjectDataDOList = new ArrayList<>(); List<BusinessAssayProjectDataDO> saveBusinessAssayProjectDataDOList = new ArrayList<>();
//需要新建的分析任务检测项目参数 //需要新建的分析任务检测项目参数
@@ -343,6 +352,8 @@ public class SampleTaskAssignServiceImpl implements SampleTaskAssignService {
//需要删除的分析任务 //需要删除的分析任务
List<Long> removeAssayTaskDataIdList = new ArrayList<>(); List<Long> removeAssayTaskDataIdList = new ArrayList<>();
//需要删除的分析任务参数
List<Long> removeAssayTaskParameterDataIdList = new ArrayList<>();
//需要删除的分析任务检测项目 //需要删除的分析任务检测项目
List<Long> removeAssayProjectIdList = new ArrayList<>(); List<Long> removeAssayProjectIdList = new ArrayList<>();
//需要删除的分析任务检测项目参数 //需要删除的分析任务检测项目参数
@@ -368,6 +379,9 @@ public class SampleTaskAssignServiceImpl implements SampleTaskAssignService {
} }
List<Long> businessAssayTaskDataIdList = businessAssayTaskDataDOList.stream().map(m -> m.getId()).collect(Collectors.toList()); List<Long> businessAssayTaskDataIdList = businessAssayTaskDataDOList.stream().map(m -> m.getId()).collect(Collectors.toList());
//查询检测任务的参数
List<BusinessAssayTaskParameterDataExtendRespVO> businessAssayTaskParameterDataList = businessAssayTaskParameterDataMapper.selectExtendByBusinessAssayTaskDataIds(businessAssayTaskDataIdList);
//查询检测任务的检测项目 //查询检测任务的检测项目
List<BusinessAssayProjectDataExtendRespVO> businessAssayProjectDataList = businessAssayProjectDataMapper.selectByBusinessAssayTaskDataIds(businessAssayTaskDataIdList); List<BusinessAssayProjectDataExtendRespVO> businessAssayProjectDataList = businessAssayProjectDataMapper.selectByBusinessAssayTaskDataIds(businessAssayTaskDataIdList);
List<Long> businessAssayProjectDataIdList = businessAssayProjectDataList.stream().map(m -> m.getId()).collect(Collectors.toList()); List<Long> businessAssayProjectDataIdList = businessAssayProjectDataList.stream().map(m -> m.getId()).collect(Collectors.toList());
@@ -382,6 +396,8 @@ public class SampleTaskAssignServiceImpl implements SampleTaskAssignService {
//查询要变更的分析方法配置 //查询要变更的分析方法配置
List<ConfigAssayMethodDO> configAssayMethodDOList = configAssayMethodMapper.selectByIds(changeConfigAssayMethodIdList); List<ConfigAssayMethodDO> configAssayMethodDOList = configAssayMethodMapper.selectByIds(changeConfigAssayMethodIdList);
//查询要变更的分析方法参数配置
List<ConfigAssayMethodParameterDO> configAssayMethodParameterDOList = configAssayMethodParameterMapper.selectByConfigAssayMethodIds(changeConfigAssayMethodIdList);
//分析方法检测项目配置 //分析方法检测项目配置
List<ConfigAssayMethodProjectExtendRespVO> configAssayMethodProjectList = configAssayMethodProjectMapper.selectByConfigAssayMethodIds(changeConfigAssayMethodIdList); List<ConfigAssayMethodProjectExtendRespVO> configAssayMethodProjectList = configAssayMethodProjectMapper.selectByConfigAssayMethodIds(changeConfigAssayMethodIdList);
//分析方法检测项目参数配置 //分析方法检测项目参数配置
@@ -702,6 +718,10 @@ public class SampleTaskAssignServiceImpl implements SampleTaskAssignService {
if (removeAssayTaskDataIdList.size() > 0) { if (removeAssayTaskDataIdList.size() > 0) {
businessAssayTaskDataMapper.deleteByIds(removeAssayTaskDataIdList); businessAssayTaskDataMapper.deleteByIds(removeAssayTaskDataIdList);
} }
if (removeAssayTaskParameterDataIdList.size() > 0) {
businessAssayTaskParameterDataMapper.deleteByIds(removeAssayTaskParameterDataIdList);
}
if (removeAssayProjectIdList.size() > 0) { if (removeAssayProjectIdList.size() > 0) {
businessAssayProjectDataMapper.deleteByIds(removeAssayProjectIdList); businessAssayProjectDataMapper.deleteByIds(removeAssayProjectIdList);
} }
@@ -722,6 +742,9 @@ public class SampleTaskAssignServiceImpl implements SampleTaskAssignService {
if (updateBusinessAssayReportDataDOList.size() > 0) { if (updateBusinessAssayReportDataDOList.size() > 0) {
businessAssayReportDataMapper.updateBatch(updateBusinessAssayReportDataDOList); businessAssayReportDataMapper.updateBatch(updateBusinessAssayReportDataDOList);
} }
if (updateBusinessAssayTaskParameterDataDOList.size() > 0) {
businessAssayTaskParameterDataMapper.updateBatch(updateBusinessAssayTaskParameterDataDOList);
}
if (updateBusinessAssayTaskDataDOList.size() > 0) { if (updateBusinessAssayTaskDataDOList.size() > 0) {
businessAssayTaskDataMapper.updateBatch(updateBusinessAssayTaskDataDOList); businessAssayTaskDataMapper.updateBatch(updateBusinessAssayTaskDataDOList);
@@ -746,6 +769,10 @@ public class SampleTaskAssignServiceImpl implements SampleTaskAssignService {
if (saveBusinessAssayTaskDataDOList.size() > 0) { if (saveBusinessAssayTaskDataDOList.size() > 0) {
businessAssayTaskDataMapper.insertBatch(saveBusinessAssayTaskDataDOList); businessAssayTaskDataMapper.insertBatch(saveBusinessAssayTaskDataDOList);
} }
if (saveBusinessAssayTaskParameterDataDOList.size() > 0) {
businessAssayTaskParameterDataMapper.insertBatch(saveBusinessAssayTaskParameterDataDOList);
}
if (saveBusinessAssayProjectDataDOList.size() > 0) { if (saveBusinessAssayProjectDataDOList.size() > 0) {
businessAssayProjectDataMapper.insertBatch(saveBusinessAssayProjectDataDOList); businessAssayProjectDataMapper.insertBatch(saveBusinessAssayProjectDataDOList);
} }

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

@@ -81,6 +81,7 @@
tbapd.COEF AS coefficient, tbapd.COEF AS coefficient,
tbapd.VAL_AFT AS valueAfter, tbapd.VAL_AFT AS valueAfter,
tbapd.MIN_LIM_VAL AS minimumLimitValue, tbapd.MIN_LIM_VAL AS minimumLimitValue,
tbapd.IS_NT_ASMT AS isNotAssessment,
tbatd.ASY_OPTR AS assayOperator, tbatd.ASY_OPTR AS assayOperator,
tbatd.RPT_TM AS reportTime, tbatd.RPT_TM AS reportTime,
tbatd.RPTR AS reporter, tbatd.RPTR AS reporter,