diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/controller/KcEvaluationController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/controller/KcEvaluationController.java index f49d964e..08e264a3 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/controller/KcEvaluationController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/controller/KcEvaluationController.java @@ -317,6 +317,15 @@ public class KcEvaluationController extends JeecgController page = new Page(pageNo, pageSize); + String xnxq = kcEvaluation.getXnxq(); + if(org.apache.commons.lang3.StringUtils.isNotBlank(xnxq)){ + QueryWrapper 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 pageList = kcEvaluationService.getPkmxbList(page, kcEvaluation); return Result.OK(pageList); }