[add] 项目列表查询添加签订日期范围查询

src/main/java/vion/dto/StoreDTO.java

@@ -46,6 +46,10 @@ public class StoreDTO extends BaseDTO {
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date estDate;
     private Date estDate;
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date estDateStart;
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date estDateEnd;
     /** 主合同id */
     /** 主合同id */
     private Long masterContract;
     private Long masterContract;
     /** 维保状态 */
     /** 维保状态 */

src/main/java/vion/service/impl/StoreServiceImpl.java

@@ -111,6 +111,7 @@ public class StoreServiceImpl extends MPJBaseServiceImpl<StoreMapper, Store> imp
                 .in(ObjUtil.isNotNull(data.getMainUser()), Store::getId, storeIdListByMainUser)
                 .in(ObjUtil.isNotNull(data.getMainUser()), Store::getId, storeIdListByMainUser)
                 .gt(ObjUtil.isNotNull(estDate), Store::getEstDate, estDate)
                 .gt(ObjUtil.isNotNull(estDate), Store::getEstDate, estDate)
                 .in(ArrayUtil.isNotEmpty(data.getIds()), Store::getId, data.getIds())
                 .in(ArrayUtil.isNotEmpty(data.getIds()), Store::getId, data.getIds())
+                .between(ArrayUtil.isAllNotNull(data.getEstDateStart(), data.getEstDateEnd()), Store::getEstDate, data.getEstDateStart(), data.getEstDateEnd())
                 .page(page);
                 .page(page);
         // todo 缓存
         // todo 缓存
         List<Account> accountList = accountService.list();
         List<Account> accountList = accountService.list();