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-06-24 22:42:56 +08:00
parent a84d24380a
commit c168cfa22d
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,7 +13,6 @@ import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog; import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.database.constant.ExperimentReviewProcessType;
import org.jeecg.modules.database.dto.ExperimentReviewDTO; import org.jeecg.modules.database.dto.ExperimentReviewDTO;
import org.jeecg.modules.database.entity.*; import org.jeecg.modules.database.entity.*;
import org.jeecg.modules.database.service.*; import org.jeecg.modules.database.service.*;
@@ -54,8 +53,7 @@ public class ExperimentReviewController extends JeecgController<ExperimentReview
//@AutoLog(value = "试验评定结果-分页列表查询") //@AutoLog(value = "试验评定结果-分页列表查询")
@Operation(summary = "试验评定列表-分页列表查询") @Operation(summary = "试验评定列表-分页列表查询")
@GetMapping(value = "/list") @GetMapping(value = "/list")
public Result<IPage<Experiment>> queryPageList(Experiment experiment, public Result<IPage<Experiment>> queryPageList(Experiment experiment, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) { HttpServletRequest req) {
QueryWrapper<Experiment> queryWrapper = QueryGenerator.initQueryWrapper(experiment, req.getParameterMap()); QueryWrapper<Experiment> queryWrapper = QueryGenerator.initQueryWrapper(experiment, req.getParameterMap());
@@ -84,6 +82,19 @@ public class ExperimentReviewController extends JeecgController<ExperimentReview
return Result.OK(review); return Result.OK(review);
} }
@Operation(summary = "试验评定结果-通过试验id查询")
@GetMapping(value = "/queryByExperimentId")
public Result<Experiment> queryByExperimentId(@RequestParam(name = "experimentId", required = true) String experimentId) {
Experiment experiment = experimentService.getById(experimentId);
List<ExperimentReviewDTO> experimentReviewList = experimentReviewService.getByExperimentId(experimentId);
experiment.setExperimentReviewList(experimentReviewList);
if (experiment == null) {
return Result.error("未找到对应数据");
}
return Result.OK(experiment);
}
/** /**
* 编辑 * 编辑
* *