修改bug
This commit is contained in:
parent
cd15cb29e8
commit
df83a1d155
|
@ -20,6 +20,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
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.ExcelImportUtil;
|
||||||
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
|
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
|
||||||
import org.jeecgframework.poi.excel.entity.ExportParams;
|
import org.jeecgframework.poi.excel.entity.ExportParams;
|
||||||
|
@ -51,6 +53,8 @@ public class KcGongkaikeController extends JeecgController<KcGongkaike, IKcGongk
|
||||||
@Autowired
|
@Autowired
|
||||||
private IKcGongkaikeService kcGongkaikeService;
|
private IKcGongkaikeService kcGongkaikeService;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private IKcSysConfigService kcSysConfigService;
|
||||||
/**
|
/**
|
||||||
* 分页列表查询
|
* 分页列表查询
|
||||||
*
|
*
|
||||||
|
@ -177,7 +181,10 @@ public class KcGongkaikeController extends JeecgController<KcGongkaike, IKcGongk
|
||||||
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
||||||
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
||||||
HttpServletRequest req) {
|
HttpServletRequest req) {
|
||||||
|
KcSysConfig kcSysConfig = kcSysConfigService.getById("1");
|
||||||
QueryWrapper<KcGongkaike> queryWrapper = QueryGenerator.initQueryWrapper(kcGongkaike, req.getParameterMap());
|
QueryWrapper<KcGongkaike> queryWrapper = QueryGenerator.initQueryWrapper(kcGongkaike, req.getParameterMap());
|
||||||
|
queryWrapper.ge("rq",kcSysConfig.getBxqkssj());
|
||||||
|
queryWrapper.le("rq",kcSysConfig.getBxqjssj());
|
||||||
Page<KcGongkaike> page = new Page<KcGongkaike>(pageNo, pageSize);
|
Page<KcGongkaike> page = new Page<KcGongkaike>(pageNo, pageSize);
|
||||||
IPage<KcGongkaike> pageList = kcGongkaikeService.getIndexList(page, queryWrapper);
|
IPage<KcGongkaike> pageList = kcGongkaikeService.getIndexList(page, queryWrapper);
|
||||||
return Result.OK(pageList);
|
return Result.OK(pageList);
|
||||||
|
|
|
@ -20,6 +20,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
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.ExcelImportUtil;
|
||||||
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
|
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
|
||||||
import org.jeecgframework.poi.excel.entity.ExportParams;
|
import org.jeecgframework.poi.excel.entity.ExportParams;
|
||||||
|
@ -50,7 +52,6 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
|
||||||
public class KcGongkaikelogController extends JeecgController<KcGongkaikelog, IKcGongkaikelogService> {
|
public class KcGongkaikelogController extends JeecgController<KcGongkaikelog, IKcGongkaikelogService> {
|
||||||
@Autowired
|
@Autowired
|
||||||
private IKcGongkaikelogService kcGongkaikelogService;
|
private IKcGongkaikelogService kcGongkaikelogService;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 分页列表查询
|
* 分页列表查询
|
||||||
*
|
*
|
||||||
|
@ -73,6 +74,20 @@ public class KcGongkaikelogController extends JeecgController<KcGongkaikelog, IK
|
||||||
return Result.OK(pageList);
|
return Result.OK(pageList);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ApiOperation(value="kc_gongkaikelog-分页列表查询", notes="kc_gongkaikelog-分页列表查询")
|
||||||
|
@GetMapping(value = "/listIndex")
|
||||||
|
public Result<IPage<KcGongkaikelog>> listIndex(KcGongkaikelog kcGongkaikelog,
|
||||||
|
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
||||||
|
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
||||||
|
HttpServletRequest req) {
|
||||||
|
|
||||||
|
QueryWrapper<KcGongkaikelog> queryWrapper = QueryGenerator.initQueryWrapper(kcGongkaikelog, req.getParameterMap());
|
||||||
|
Page<KcGongkaikelog> page = new Page<KcGongkaikelog>(pageNo, pageSize);
|
||||||
|
IPage<KcGongkaikelog> pageList = kcGongkaikelogService.page(page, queryWrapper);
|
||||||
|
return Result.OK(pageList);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 添加
|
* 添加
|
||||||
*
|
*
|
||||||
|
|
Loading…
Reference in New Issue