physical3/physical-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
ls
2025-07-01 18:03:12 +08:00
parent 6320f07ac2
commit 838d5a26e2
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentReviewController.java
View File

@@ -8,6 +8,7 @@ import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.jeecg.common.api.vo.Result; import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog; import org.jeecg.common.aspect.annotation.AutoLog;
@@ -85,14 +86,16 @@ public class ExperimentReviewController extends JeecgController<ExperimentReview
@Operation(summary = "试验评定结果-通过试验id查询") @Operation(summary = "试验评定结果-通过试验id查询")
@GetMapping(value = "/queryByExperimentId") @GetMapping(value = "/queryByExperimentId")
public Result<Experiment> queryByExperimentId(@RequestParam(name = "experimentId", required = true) String experimentId, public Result<Experiment> queryByExperimentId(@RequestParam(name = "experimentId", required = true) String experimentId,
@RequestParam(name = "sampleId", required = true) String sampleId) { @RequestParam(name = "sampleId", required = false) String sampleId) {
Experiment experiment = experimentService.getById(experimentId); Experiment experiment = experimentService.getById(experimentId);
if (null == experiment) { if (null == experiment) {
return Result.error("未找到试验数据"); return Result.error("未找到试验数据");
} }
List<ExperimentReviewDTO> experimentReviewList = experimentReviewService.getByExperimentId(experimentId); List<ExperimentReviewDTO> experimentReviewList = experimentReviewService.getByExperimentId(experimentId);
ExperimentReview experimentReview = experimentReviewService.getBySampleId(experimentId, sampleId); if (StringUtils.isNotBlank(sampleId)) {
experiment.setExperimentReview(experimentReview); ExperimentReview experimentReview = experimentReviewService.getBySampleId(experimentId, sampleId);
experiment.setExperimentReview(experimentReview);
}
experiment.setExperimentReviewList(experimentReviewList); experiment.setExperimentReviewList(experimentReviewList);
return Result.OK(experiment); return Result.OK(experiment);