diff --git a/physical-launcher/src/main/resources/application-release.yml b/physical-launcher/src/main/resources/application-release.yml index ef5797e..d9b94f6 100644 --- a/physical-launcher/src/main/resources/application-release.yml +++ b/physical-launcher/src/main/resources/application-release.yml @@ -208,7 +208,7 @@ minidao: base-package: org.jeecg.modules.jmreport.*,org.jeecg.modules.drag.* jeecg: template: - path: E:\physical\templates + path: E:\physical-boot\templates # 平台上线安全配置 firewall: # 数据源安全 (开启后,Online报表和图表的数据源为必填) diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentController.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentController.java index 2be2e26..91547d6 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentController.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentController.java @@ -15,6 +15,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.common.system.query.QueryRuleEnum; import org.jeecg.common.system.util.JwtUtil; import org.jeecg.modules.database.constant.ExperimentStatus; import org.jeecg.modules.database.entity.*; @@ -25,8 +26,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; -import java.util.Arrays; -import java.util.List; +import java.util.*; /** * @Description: 试验管理 @@ -83,7 +83,10 @@ public class ExperimentController extends JeecgController> queryPageList(Experiment experiment, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(experiment, req.getParameterMap()); + Map customeRuleMap = new HashMap<>(); + // 自定义duoXuan字段的查询规则为:LIKE_WITH_OR + customeRuleMap.put("startDate", QueryRuleEnum.RIGHT_LIKE); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(experiment, req.getParameterMap(), customeRuleMap); Page page = new Page<>(pageNo, pageSize); IPage pageList = experimentService.page(page, queryWrapper); pageList.getRecords().forEach(v -> experimentService.fetchExperimentDetail(v)); @@ -118,7 +121,6 @@ public class ExperimentController extends JeecgController