隐患问题清单 app查询日期条件调整

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/question/controller/QuestionController.java

@@ -47,12 +47,12 @@ public class QuestionController extends BaseController {
     @RequiresPermissions("question:list")
     @GetMapping("/list")
     public TableDataInfo<Question> list(QuestionPageDto query) {
-        if (ObjectUtil.isNotNull(query.getSubmitTime())) {
-            Date[] range = {
-                query.getSubmitTime(), query.getSubmitTime()
-            } ;
-            query.setSubmitRange(range);
-        }
+//        if (ObjectUtil.isNotNull(query.getSubmitTime())) {
+//            Date[] range = {
+//                query.getSubmitTime(), query.getSubmitTime()
+//            } ;
+//            query.setSubmitRange(range);
+//        }
 
         return questionService.selectPage(query);
     }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/question/dto/QuestionPageDto.java

@@ -21,9 +21,9 @@ public class QuestionPageDto extends PageDto<QuestionPageVo> {
     @ApiModelProperty(value = "整改状态")
     private Integer reformStatus;
 
-    @ApiModelProperty(value = "提交日期范围，与submitTime二选一，优先submitTime")
+    @ApiModelProperty(value = "提交日期范围")
     private Date[] submitRange;
 
-    @ApiModelProperty(value = "提交日期，与submitRange二选一，优先submitTime")
+    @ApiModelProperty(value = "整改日期")
     private Date submitTime;
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/question/service/impl/QuestionServiceImpl.java

@@ -86,6 +86,13 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
             Date end = DateUtil.endOfDay(query.getSubmitRange()[1]);
             wrapper.between(Question::getSubmitTime, start, end);
         }
+        if(ObjectUtil.isNotNull(query.getSubmitTime())){
+            Date start = DateUtil.beginOfDay(query.getSubmitTime());
+            wrapper.ge(Question::getReformDeadline,start);
+
+            Date end = DateUtil.endOfDay(query.getSubmitTime());
+            wrapper.le(Question::getSubmitTime,end);
+        }
         if (ObjectUtil.isNotEmpty(query.getSearchKey())) {
             wrapper.and(w ->
                     w.like(Question::getCheckContent, query.getSearchKey()).or().like(Question::getSrcTaskName, query.getSearchKey())