自动上报处理
This commit is contained in:
@@ -1531,7 +1531,7 @@ public class SampleAnalysisAuditServiceImpl implements SampleAnalysisAuditServic
|
|||||||
|
|
||||||
|
|
||||||
//如果为自动上报
|
//如果为自动上报
|
||||||
if (QmsCommonConstant.AUTOMATIC.equals(configSubSampleMethodDO.getResultTreatmentWay()) && QmsCommonConstant.ASMT_PENDING_REPORT.equals(businessSubSampleAssessmentDO.getReportedStatus())) {
|
if (configSubSampleMethodDO != null && QmsCommonConstant.AUTOMATIC.equals(configSubSampleMethodDO.getResultTreatmentWay()) && QmsCommonConstant.ASMT_PENDING_REPORT.equals(businessSubSampleAssessmentDO.getReportedStatus())) {
|
||||||
automaticBusinessSubSampleAssessmentList.add(businessSubSampleAssessmentDO);
|
automaticBusinessSubSampleAssessmentList.add(businessSubSampleAssessmentDO);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1734,7 +1734,7 @@ public class SampleAnalysisAuditServiceImpl implements SampleAnalysisAuditServic
|
|||||||
.set(BusinessSubSampleAssessmentProjectDO::getReportTime, LocalDateTime.now())
|
.set(BusinessSubSampleAssessmentProjectDO::getReportTime, LocalDateTime.now())
|
||||||
.in(BusinessSubSampleAssessmentProjectDO::getId, businessSubSampleAssessmentIdList));
|
.in(BusinessSubSampleAssessmentProjectDO::getId, businessSubSampleAssessmentIdList));
|
||||||
|
|
||||||
if (QmsCommonConstant.AUTOMATIC.equals(configSubSampleParentMethodDO.getResultTreatmentWay())) {
|
if (configSubSampleParentMethodDO != null && QmsCommonConstant.AUTOMATIC.equals(configSubSampleParentMethodDO.getResultTreatmentWay())) {
|
||||||
automaticBusinessSubParentSampleIdAndRetestCounts.add(new BusinessSubParentSampleIdAndRetestCount(businessSubParentSampleDO.getId(), retestCount));
|
automaticBusinessSubParentSampleIdAndRetestCounts.add(new BusinessSubParentSampleIdAndRetestCount(businessSubParentSampleDO.getId(), retestCount));
|
||||||
BatchResultDataReportingReqVO batchResultDataReportingReqVO = new BatchResultDataReportingReqVO();
|
BatchResultDataReportingReqVO batchResultDataReportingReqVO = new BatchResultDataReportingReqVO();
|
||||||
batchResultDataReportingReqVO.setBusinessSubParentSampleIdAndRetestCounts(automaticBusinessSubParentSampleIdAndRetestCounts);
|
batchResultDataReportingReqVO.setBusinessSubParentSampleIdAndRetestCounts(automaticBusinessSubParentSampleIdAndRetestCounts);
|
||||||
|
|||||||
Reference in New Issue
Block a user