新增截止时间筛选

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserGridOpiningServiceImpl.java

@@ -67,11 +67,15 @@ public class MetaUserGridOpiningServiceImpl extends BaseServiceImpl<MetaUserGrid
             deptIdList.add(item.getGridId());
         }
         params.put("deptIdList",deptIdList);
-        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
-        Calendar c = Calendar.getInstance();
-        c.add(Calendar.DATE, -1);
-        Date createdTime = c.getTime();
-        params.put("createdTime",format.format(createdTime));
+        String createdTime = (String) params.get("createdTime");
+        if(StringUtils.isBlank(createdTime)){
+            SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+            Calendar c = Calendar.getInstance();
+            c.add(Calendar.DATE, -1);
+            Date time = c.getTime();
+            createdTime = format.format(time);
+            params.put("createdTime",createdTime);
+        }
         List<MetaUserGridOpiningEntity> metaUserGridOpiningEntityList = baseDao.pageselectListPage(params);
         return getPageData(metaUserGridOpiningEntityList,page.getTotal(), MetaUserGridOpiningDTO.class);
     }