修改时间范围查询（政策法规与月度对表）

purchase-admin/src/main/java/com/ozs/web/controller/base/BasePolicyController.java

@@ -71,11 +71,8 @@ public class BasePolicyController extends BaseController {
 //            lw.like(BasePolicy::getName,vo.getName());
             lw.in(BasePolicy::getEsId,ids);
         }
-        if(!ObjectUtils.isEmpty(vo.getStartTime())){
-            lw.ge(BasePolicy::getReleaseTime,vo.getStartTime());
-        }
-        if(!ObjectUtils.isEmpty(vo.getStartTime())){
-            lw.le(BasePolicy::getReleaseTime,vo.getEntTime());
+        if(!ObjectUtils.isEmpty(vo.getStartTime()) && !ObjectUtils.isEmpty(vo.getStartTime())){
+            lw.between(BasePolicy::getReleaseTime,vo.getStartTime(),vo.getEntTime());
         }
         IPage<BasePolicy> page = basePolicyService.page(new Page<>(vo.getPageNum(), vo.getPageSize()), lw);
         return success(page);

purchase-admin/src/main/java/com/ozs/web/controller/plan/MonthlyReconciliationController.java

@@ -64,12 +64,10 @@ public class MonthlyReconciliationController extends BaseController {
         if (!StringUtils.isBlank(vo.getPurchaseServices())) {
             lw.eq(MonthlyReconciliation::getPurchaseServices, vo.getPurchaseServices());
         }
-//        if(!ObjectUtils.isEmpty(vo.getStartTime())){
-//            lw.ge(BaseNotice::getReleaseTime,vo.getStartTime());
-//        }
-//        if(!ObjectUtils.isEmpty(vo.getStartTime())){
-//            lw.le(BaseNotice::getReleaseTime,vo.getEntTime());
-//        }
+        if(!ObjectUtils.isEmpty(vo.getStartTime()) && !ObjectUtils.isEmpty(vo.getStartTime())){
+            lw.between(MonthlyReconciliation::getPlanDemandSubTime,vo.getStartTime(),vo.getEntTime());
+        }
+
         IPage<MonthlyReconciliation> page = monthlyReconciliationService.page(new Page<>(vo.getPageNum(), vo.getPageSize()), lw);
         if (!ObjectUtils.isEmpty(page.getRecords())) {
             page.setRecords(page.getRecords().stream().map(dto -> {