修改bug
This commit is contained in:
parent
904379bda2
commit
def6527662
|
@ -317,6 +317,15 @@ public class KcEvaluationController extends JeecgController<KcEvaluation, IKcEva
|
||||||
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
||||||
HttpServletRequest req) {
|
HttpServletRequest req) {
|
||||||
Page<KcEvaluation> page = new Page<KcEvaluation>(pageNo, pageSize);
|
Page<KcEvaluation> page = new Page<KcEvaluation>(pageNo, pageSize);
|
||||||
|
String xnxq = kcEvaluation.getXnxq();
|
||||||
|
if(org.apache.commons.lang3.StringUtils.isNotBlank(xnxq)){
|
||||||
|
QueryWrapper<KcXqxnHistory> kcXqxnHistoryQueryWrapper = new QueryWrapper<>();
|
||||||
|
kcXqxnHistoryQueryWrapper.eq("title",xnxq);
|
||||||
|
kcXqxnHistoryQueryWrapper.last("limit 1");
|
||||||
|
KcXqxnHistory kcXqxnHistory =kcXqxnHistoryService.getOne(kcXqxnHistoryQueryWrapper);
|
||||||
|
kcEvaluation.setStartTime(DateUtil.format(kcXqxnHistory.getStartTime(),"yyyy-MM-dd"));
|
||||||
|
kcEvaluation.setEndTime(DateUtil.format(kcXqxnHistory.getEndTime(),"yyyy-MM-dd"));
|
||||||
|
}
|
||||||
IPage<KcEvaluation> pageList = kcEvaluationService.getPkmxbList(page, kcEvaluation);
|
IPage<KcEvaluation> pageList = kcEvaluationService.getPkmxbList(page, kcEvaluation);
|
||||||
return Result.OK(pageList);
|
return Result.OK(pageList);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue