修改时间区间搜索范围

ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/DlUserServiceImpl.java

@@ -34,18 +34,9 @@ public class DlUserServiceImpl implements DlUserService {
                     .like("user_telephone",bo.getText());
             });
         if (bo.getStartTime() != null)
-            queryWrapper.and(dlUserQueryWrapper -> {
-                dlUserQueryWrapper.apply("end_time >= STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')",bo.getStartTime())
-                    .or()
-                    .apply("start_time >= STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')",bo.getStartTime());
-
-            });
+            queryWrapper.apply("end_time >= STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')",bo.getStartTime());
         if (bo.getEndTime() != null)
-            queryWrapper.and(dlUserQueryWrapper -> {
-                dlUserQueryWrapper.apply("end_time <= STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')",bo.getEndTime())
-                    .or()
-                    .apply("start_time <= STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')",bo.getEndTime());
-            });
+            queryWrapper.apply("end_time <= STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')",bo.getEndTime());
         queryWrapper.eq("deleted","0");
         List<DlUser> dlUsers = dlUserMapper.selectList(queryWrapper);
         List<DlUserListVo> vos = new ArrayList<>();

ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/PlanServiceImpl.java

@@ -306,17 +306,9 @@ public class PlanServiceImpl implements PlanService {
                     .like("commercial_name",bo.getText());
             });
         if (bo.getStartTime() != null)
-            planQueryWrapper.and(planQueryWrapper1 -> {
-                planQueryWrapper1.apply("plan_start_time >= STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')",bo.getStartTime())
-                    .or()
-                    .apply("plan_create_time >= STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')",bo.getStartTime());
-            });
+            planQueryWrapper.apply("plan_start_time >= STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')",bo.getStartTime());
         if (bo.getEndTime() != null)
-            planQueryWrapper.and(planQueryWrapper1 -> {
-                planQueryWrapper1.apply("plan_end_time <= STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')",bo.getEndTime())
-                    .or()
-                    .apply("plan_create_time <= STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')",bo.getEndTime());
-            });
+            planQueryWrapper.apply("plan_end_time <= STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')",bo.getEndTime());
         planQueryWrapper.eq("deleted","0");
         List<Plan> plans = planMapper.selectList(planQueryWrapper);
         List<PlanManageListVo> vos = new ArrayList<>();
@@ -372,17 +364,9 @@ public class PlanServiceImpl implements PlanService {
                     .like("principal_telephone",bo.getText());
             });
         if (bo.getStartTime() != null)
-            planQueryWrapper.and(planQueryWrapper1 -> {
-                planQueryWrapper1.apply("plan_start_time >= STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')",bo.getStartTime())
-                    .or()
-                    .apply("plan_create_time >= STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')",bo.getStartTime());
-            });
+            planQueryWrapper.apply("plan_start_time >= STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')",bo.getStartTime());
         if (bo.getEndTime() != null)
-            planQueryWrapper.and(planQueryWrapper1 -> {
-                planQueryWrapper1.apply("plan_end_time <= STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')",bo.getEndTime())
-                    .or()
-                    .apply("plan_create_time <= STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')",bo.getEndTime());
-            });
+            planQueryWrapper.apply("plan_end_time <= STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')",bo.getEndTime());
         planQueryWrapper.eq("deleted","0");
         List<Plan> plans = planMapper.selectList(planQueryWrapper);
         List<PlanPushListVo> vos = new ArrayList<>();