| | |
|---|
| | | TProjectProposal projectProposal = projectProposalService.getById(experimentDispatch.getProposalId()); |
|---|
| | | if(Objects.nonNull(projectProposal)){ |
|---|
| | | experimentDispatch.setProjectName(projectProposal.getProjectName()); |
|---|
| | | experimentDispatch.setProjectCode(projectProposal.getProjectCode()); |
|---|
| | | } |
|---|
| | | } |
|---|
| | | samplingRecordVO.setExperimentDispatch(experimentDispatch); |
|---|
| | |
|---|
| | | @DeleteMapping(value = "/open/t-sampling-record/deleteById") |
|---|
| | | public R<Boolean> deleteById(@RequestParam String id) { |
|---|
| | | // 删除取样操作记录 |
|---|
| | | samplingRecordOperationService.remove(Wrappers.lambdaQuery(TSamplingRecordOperation.class).eq(TSamplingRecordOperation::getSamplingId, id)); |
|---|
| | | return R.ok(samplingRecordService.removeById(id)); |
|---|
| | | TSamplingRecord samplingRecord = samplingRecordService.getById(id); |
|---|
| | | if (Objects.nonNull(samplingRecord)) { |
|---|
| | | samplingRecordOperationService.remove(Wrappers.lambdaQuery(TSamplingRecordOperation.class) |
|---|
| | | .eq(TSamplingRecordOperation::getSamplingId, id)); |
|---|
| | | samplingRecordService.removeById(id); |
|---|
| | | } else { |
|---|
| | | samplingRecordOperationService.removeById(id); |
|---|
| | | } |
|---|
| | | return R.ok(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** |
|---|
