问题分布的问题

tuoheng-admin/src/main/java/com/tuoheng/admin/controller/QuestionController.java

@@ -39,10 +39,6 @@ public class QuestionController {
      */
     @GetMapping("/page")
     public JsonResult<IPage<Question>> page(QuestionQuery questionQuery) {
-        if(ObjectUtil.isNotEmpty(questionQuery.getStartTime()) && ObjectUtil.isNotEmpty(questionQuery.getEndTime())){
-            questionQuery.setStartTime(questionQuery.getStartTime()+" 00:00:00");
-            questionQuery.setEndTime(questionQuery.getEndTime()+" 59:59:59");
-        }
         return JsonResult.success(questionService.queryPage(questionQuery));
     }
 
@@ -110,10 +106,6 @@ public class QuestionController {
      */
     @GetMapping("/distributed")
     public JsonResult distributed(QuestionQuery questionQuery) {
-        if(ObjectUtil.isNotEmpty(questionQuery.getStartTime()) && ObjectUtil.isNotEmpty(questionQuery.getEndTime())){
-            questionQuery.setStartTime(questionQuery.getStartTime()+" 00:00:00");
-            questionQuery.setEndTime(questionQuery.getEndTime()+" 23:59:59");
-        }
         return JsonResult.success(questionService.distributed(questionQuery));
     }
 

tuoheng-admin/src/main/java/com/tuoheng/admin/service/impl/QuestionServiceImpl.java

@@ -75,6 +75,8 @@ public class QuestionServiceImpl extends BaseServiceImpl<QuestionMapper, Questio
                     //.eq(Question::getTenantId, ShiroUtils.getTenantId())
                     .eq(Question::getMark, MarkTypeEnum.VALID.getCode()).orderByDesc(Question::getCreateTime);
             if(ObjectUtil.isNotEmpty(query.getStartTime()) && ObjectUtil.isNotEmpty(query.getEndTime())){
+                query.setStartTime(query.getStartTime()+" 00:00:00");
+                query.setEndTime(query.getEndTime()+" 59:59:59");
                 questionLambdaQueryWrapper.between(Question::getCreateTime, dateformat.parse(query.getStartTime()), dateformat.parse(query.getEndTime()));
             }
             pageData  = questionMapper.selectPage(page, questionLambdaQueryWrapper);
@@ -109,6 +111,8 @@ public class QuestionServiceImpl extends BaseServiceImpl<QuestionMapper, Questio
                     //.eq(Question::getTenantId, ShiroUtils.getTenantId())
                     .eq(Question::getMark, MarkTypeEnum.VALID.getCode()).orderByDesc(Question::getCreateTime);
             if(ObjectUtil.isNotEmpty(query.getStartTime()) && ObjectUtil.isNotEmpty(query.getEndTime())){
+                query.setStartTime(query.getStartTime()+" 00:00:00");
+                query.setEndTime(query.getEndTime()+" 23:59:59");
                 questionLambdaQueryWrapper.between(Question::getCreateTime, dateformat.parse(query.getStartTime()), dateformat.parse(query.getEndTime()));
             }
             return questionMapper.selectList(questionLambdaQueryWrapper);