diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/LocalDatabaseController.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/LocalDatabaseController.java index acad5ea..ae93f22 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/LocalDatabaseController.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/LocalDatabaseController.java @@ -13,6 +13,7 @@ import org.jeecg.common.api.vo.Result; import org.jeecg.common.aspect.annotation.AutoLog; import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.modules.database.dto.ExperimentReviewDTO; import org.jeecg.modules.database.dto.NasaDataRecordPage; import org.jeecg.modules.database.entity.*; import org.jeecg.modules.database.service.*; @@ -39,6 +40,8 @@ public class LocalDatabaseController extends JeecgController queryWrapper = QueryGenerator.initQueryWrapper(localDatabase, req.getParameterMap()); Page page = new Page(pageNo, pageSize); IPage pageList = localDatabaseService.page(page, queryWrapper); + pageList.getRecords().forEach(ex -> { + List experimentReviewList = experimentReviewService.getByExperimentId(ex.getExperimentId()); + ex.setExperimentReviewList(experimentReviewList); + }); return Result.OK(pageList); } diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/LocalDatabase.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/LocalDatabase.java index a0ae571..8dbacd4 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/LocalDatabase.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/LocalDatabase.java @@ -6,11 +6,13 @@ import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import org.jeecg.modules.database.dto.ExperimentReviewDTO; import org.jeecgframework.poi.excel.annotation.Excel; import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; import java.util.Date; +import java.util.List; /** * @Description: 当期数据库记录 @@ -140,4 +142,11 @@ public class LocalDatabase implements Serializable { @Schema(description = "样品型号") private String sampleModel; + + + @TableField(exist = false) + private List ExperimentReviewList; + @TableField(exist = false) + private ExperimentReview ExperimentReview; + }