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

修改bug

This commit is contained in:
yangjun 2024-01-08 08:23:11 +08:00
parent 6cbc7151fb
commit 18db0b5056
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,6 +9,8 @@ import java.io.UnsupportedEncodingException;
import java.net.URLDecoder; import java.net.URLDecoder;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang3.StringUtils;
import org.jeecg.common.api.vo.Result; import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.oConvertUtils; import org.jeecg.common.util.oConvertUtils;
@ -22,6 +24,8 @@ import lombok.extern.slf4j.Slf4j;
import org.jeecg.modules.kc.kcSysConfig.entity.KcSysConfig; import org.jeecg.modules.kc.kcSysConfig.entity.KcSysConfig;
import org.jeecg.modules.kc.kcSysConfig.service.IKcSysConfigService; import org.jeecg.modules.kc.kcSysConfig.service.IKcSysConfigService;
import org.jeecg.modules.kc.kcXqxnHistory.entity.KcXqxnHistory;
import org.jeecg.modules.kc.kcXqxnHistory.service.IKcXqxnHistoryService;
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;
@ -55,6 +59,9 @@ public class KcGongkaikeController extends JeecgController<KcGongkaike, IKcGongk
@Autowired @Autowired
private IKcSysConfigService kcSysConfigService; private IKcSysConfigService kcSysConfigService;
@Autowired
private IKcXqxnHistoryService kcXqxnHistoryService;
/** /**
* 分页列表查询 * 分页列表查询
* *
@ -181,10 +188,18 @@ 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"); String xnxq = kcGongkaike.getXnxq();
QueryWrapper<KcGongkaike> queryWrapper = QueryGenerator.initQueryWrapper(kcGongkaike, req.getParameterMap()); QueryWrapper<KcGongkaike> queryWrapper = QueryGenerator.initQueryWrapper(kcGongkaike, req.getParameterMap());
queryWrapper.ge("rq",kcSysConfig.getBxqkssj()); if(StringUtils.isEmpty(xnxq)){
queryWrapper.le("rq",kcSysConfig.getBxqjssj()); KcSysConfig kcSysConfig = kcSysConfigService.getById("1");
queryWrapper.ge("rq",kcSysConfig.getBxqkssj());
queryWrapper.le("rq",kcSysConfig.getBxqjssj());
}else{QueryWrapper<KcXqxnHistory> kcXqxnHistoryQueryWrapper = new QueryWrapper<>();
kcXqxnHistoryQueryWrapper.eq("title",xnxq);
KcXqxnHistory KcXqxnHistory = kcXqxnHistoryService.getOne(kcXqxnHistoryQueryWrapper);queryWrapper.ge("rq",KcXqxnHistory.getStartTime());
queryWrapper.le("rq",KcXqxnHistory.getEndTime());
}
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);

2
jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcGongkaike/entity/KcGongkaike.java
View File

@ -116,5 +116,7 @@ public class KcGongkaike implements Serializable {
@TableField(exist = false) @TableField(exist = false)
private String logcount; private String logcount;
@TableField(exist = false)
private String xnxq;
} }