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-03 23:31:40 +08:00
parent e36b899c48
commit 71ccb76e73
2 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,6 +13,7 @@ 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.dto.ExperimentReviewDTO;
import org.jeecg.modules.database.dto.NasaDataRecordPage; import org.jeecg.modules.database.dto.NasaDataRecordPage;
import org.jeecg.modules.database.entity.*; import org.jeecg.modules.database.entity.*;
import org.jeecg.modules.database.service.*; import org.jeecg.modules.database.service.*;
@@ -39,6 +40,8 @@ public class LocalDatabaseController extends JeecgController<LocalDatabase, ILoc
private INasaDataRecordService nasaDataRecordService; private INasaDataRecordService nasaDataRecordService;
@Autowired @Autowired
private IHistoricalDatabaseService historicalDatabaseService; private IHistoricalDatabaseService historicalDatabaseService;
@Autowired
private IExperimentReviewService experimentReviewService;
/** /**
* 分页列表查询 * 分页列表查询
@@ -59,6 +62,10 @@ public class LocalDatabaseController extends JeecgController<LocalDatabase, ILoc
QueryWrapper<LocalDatabase> queryWrapper = QueryGenerator.initQueryWrapper(localDatabase, req.getParameterMap()); QueryWrapper<LocalDatabase> queryWrapper = QueryGenerator.initQueryWrapper(localDatabase, req.getParameterMap());
Page<LocalDatabase> page = new Page<LocalDatabase>(pageNo, pageSize); Page<LocalDatabase> page = new Page<LocalDatabase>(pageNo, pageSize);
IPage<LocalDatabase> pageList = localDatabaseService.page(page, queryWrapper); IPage<LocalDatabase> pageList = localDatabaseService.page(page, queryWrapper);
pageList.getRecords().forEach(ex -> {
List<ExperimentReviewDTO> experimentReviewList = experimentReviewService.getByExperimentId(ex.getExperimentId());
ex.setExperimentReviewList(experimentReviewList);
});
return Result.OK(pageList); return Result.OK(pageList);
} }

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

@@ -6,11 +6,13 @@ import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import org.jeecg.modules.database.dto.ExperimentReviewDTO;
import org.jeecgframework.poi.excel.annotation.Excel; import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;
import java.util.List;
/** /**
* @Description: 当期数据库记录 * @Description: 当期数据库记录
@@ -140,4 +142,11 @@ public class LocalDatabase implements Serializable {
@Schema(description = "样品型号") @Schema(description = "样品型号")
private String sampleModel; private String sampleModel;
@TableField(exist = false)
private List<ExperimentReviewDTO> ExperimentReviewList;
@TableField(exist = false)
private ExperimentReview ExperimentReview;
} }