yangjun
/
dbsd_kczx_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改bug

This commit is contained in:
yangjun 2023-08-25 22:09:20 +08:00
parent cd15cb29e8
commit df83a1d155
2 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcGongkaike/controller/KcGongkaikeController.java
View File

@ -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<KcGongkaike, IKcGongkaikeService> {
@Autowired
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="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
KcSysConfig kcSysConfig = kcSysConfigService.getById("1");
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);
IPage<KcGongkaike> pageList = kcGongkaikeService.getIndexList(page, queryWrapper);
return Result.OK(pageList);

17
jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcGongkaikelog/controller/KcGongkaikelogController.java
View File

@ -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<KcGongkaikelog, IKcGongkaikelogService> {
@Autowired
private IKcGongkaikelogService kcGongkaikelogService;
/**
* 分页列表查询
*
@ -72,6 +73,20 @@ public class KcGongkaikelogController extends JeecgController<KcGongkaikelog, IK
IPage<KcGongkaikelog> pageList = kcGongkaikelogService.page(page, queryWrapper);
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);
}
/**
* 添加