diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcGongkaike/controller/KcGongkaikeController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcGongkaike/controller/KcGongkaikeController.java index 9064c37b..61b943c3 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcGongkaike/controller/KcGongkaikeController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcGongkaike/controller/KcGongkaikeController.java @@ -20,6 +20,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.slf4j.Slf4j; +import org.jeecg.modules.kc.kcSysConfig.entity.KcSysConfig; +import org.jeecg.modules.kc.kcSysConfig.service.IKcSysConfigService; import org.jeecgframework.poi.excel.ExcelImportUtil; import org.jeecgframework.poi.excel.def.NormalExcelConstants; import org.jeecgframework.poi.excel.entity.ExportParams; @@ -50,7 +52,9 @@ import org.apache.shiro.authz.annotation.RequiresPermissions; public class KcGongkaikeController extends JeecgController { @Autowired private IKcGongkaikeService kcGongkaikeService; - + + @Autowired + private IKcSysConfigService kcSysConfigService; /** * 分页列表查询 * @@ -177,7 +181,10 @@ public class KcGongkaikeController extends JeecgController queryWrapper = QueryGenerator.initQueryWrapper(kcGongkaike, req.getParameterMap()); + queryWrapper.ge("rq",kcSysConfig.getBxqkssj()); + queryWrapper.le("rq",kcSysConfig.getBxqjssj()); Page page = new Page(pageNo, pageSize); IPage pageList = kcGongkaikeService.getIndexList(page, queryWrapper); return Result.OK(pageList); diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcGongkaikelog/controller/KcGongkaikelogController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcGongkaikelog/controller/KcGongkaikelogController.java index 6af1fd85..c4d7d0fd 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcGongkaikelog/controller/KcGongkaikelogController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcGongkaikelog/controller/KcGongkaikelogController.java @@ -20,6 +20,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.slf4j.Slf4j; +import org.jeecg.modules.kc.kcSysConfig.entity.KcSysConfig; +import org.jeecg.modules.kc.kcSysConfig.service.IKcSysConfigService; import org.jeecgframework.poi.excel.ExcelImportUtil; import org.jeecgframework.poi.excel.def.NormalExcelConstants; import org.jeecgframework.poi.excel.entity.ExportParams; @@ -50,7 +52,6 @@ import org.apache.shiro.authz.annotation.RequiresPermissions; public class KcGongkaikelogController extends JeecgController { @Autowired private IKcGongkaikelogService kcGongkaikelogService; - /** * 分页列表查询 * @@ -72,6 +73,20 @@ public class KcGongkaikelogController extends JeecgController pageList = kcGongkaikelogService.page(page, queryWrapper); return Result.OK(pageList); } + + + @ApiOperation(value="kc_gongkaikelog-分页列表查询", notes="kc_gongkaikelog-分页列表查询") + @GetMapping(value = "/listIndex") + public Result> listIndex(KcGongkaikelog kcGongkaikelog, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(kcGongkaikelog, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = kcGongkaikelogService.page(page, queryWrapper); + return Result.OK(pageList); + } /** * 添加