update
This commit is contained in:
@@ -88,9 +88,12 @@ public class ExperimentController extends JeecgController<Experiment, IExperimen
|
||||
// 自定义duoXuan字段的查询规则为:LIKE_WITH_OR
|
||||
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.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);
|
||||
pageList.getRecords().forEach(v -> experimentService.fetchExperimentDetail(v));
|
||||
return Result.OK(pageList);
|
||||
|
||||
Reference in New Issue
Block a user