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-01-20 16:00:42 +08:00
parent 866a755f57
commit 9dfcab88be
1 changed files with 5 additions and 2 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/ExperimentController.java
View File

@@ -88,9 +88,12 @@ public class ExperimentController extends JeecgController<Experiment, IExperimen
// 自定义duoXuan字段的查询规则为：LIKE_WITH_OR // 自定义duoXuan字段的查询规则为：LIKE_WITH_OR
customeRuleMap.put("startDate", QueryRuleEnum.RIGHT_LIKE); customeRuleMap.put("startDate", QueryRuleEnum.RIGHT_LIKE);
QueryWrapper<Experiment> queryWrapper = QueryGenerator.initQueryWrapper(experiment, req.getParameterMap(), customeRuleMap); Map<String, String[]> parameterMap = req.getParameterMap();
QueryWrapper<Experiment> queryWrapper = QueryGenerator.initQueryWrapper(experiment, parameterMap, customeRuleMap);
Page<Experiment> page = new Page<>(pageNo, pageSize); Page<Experiment> page = new Page<>(pageNo, pageSize);
page.addOrder(OrderItem.asc("index_no")); if (!parameterMap.containsKey("column") || StringUtils.isBlank(parameterMap.get("column")[0])) {
page.addOrder(OrderItem.asc("index_no"));
}
IPage<Experiment> pageList = experimentService.page(page, queryWrapper); IPage<Experiment> pageList = experimentService.page(page, queryWrapper);
pageList.getRecords().forEach(v -> experimentService.fetchExperimentDetail(v)); pageList.getRecords().forEach(v -> experimentService.fetchExperimentDetail(v));
return Result.OK(pageList); return Result.OK(pageList);