组织项目统计,网格员项目统计

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java

@@ -27,6 +27,7 @@ import com.epmet.commons.tools.redis.common.bean.BuildingInfoCache;
 import com.epmet.commons.tools.redis.common.bean.GridInfoCache;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.commons.tools.utils.HttpClientManager;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dataaggre.constant.DataSourceConstant;
@@ -1158,6 +1159,11 @@ public class GovOrgServiceImpl implements GovOrgService {
             }
             formDTO.setAgencyId(staffInfo.getAgencyId());
         }
+        if (StringUtils.isEmpty(formDTO.getStartDate()) && StringUtils.isEmpty(formDTO.getEndDate())) {
+            //当前日期前一天
+            String dateId = DateUtils.format(DateUtils.addDateDays(new Date(), NumConstant.ONE_NEG), DateUtils.DATE_PATTERN_YYYYMMDD);
+            formDTO.setEndDate(dateId);
+        }
         CustomerAgencyEntity agencyEntity = customerAgencyDao.selectById(formDTO.getAgencyId());
         PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize());
         long total = 0;
@@ -1266,6 +1272,11 @@ public class GovOrgServiceImpl implements GovOrgService {
             formDTO.setOrgId(staffInfo.getAgencyId());
             formDTO.setOrgType(OrgConstant.AGENCY);
         }
+        if (StringUtils.isEmpty(formDTO.getStartDate()) && StringUtils.isEmpty(formDTO.getEndDate())) {
+            //当前日期前一天
+            String dateId = DateUtils.format(DateUtils.addDateDays(new Date(), NumConstant.ONE_NEG), DateUtils.DATE_PATTERN_YYYYMMDD);
+            formDTO.setEndDate(dateId);
+        }
         if (OrgConstant.AGENCY.contains(formDTO.getOrgType())) {
             //获取当前组织的所有下级组织ID（包含本级）
             List<String> agencyIds = customerAgencyDao.getSubAgencyList(formDTO.getOrgId());