Merge remote-tracking branch 'origin/dev_pyscreenv2' into dev_temp

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectMainDailyServiceImpl.java

@@ -385,13 +385,13 @@ public class FactOriginProjectMainDailyServiceImpl extends BaseServiceImpl<FactO
      */
     @Override
     public List<ScreenProjectDataDTO> initNewScreenProjectData(String customerId,Integer rows , String dateId,Integer exceedLimit,Integer about2exceedLimit) {
-        boolean ifYesterday = true;
+        boolean ifBeforeYesterday = true;
-        if(!StringUtils.equals(DateUtils.getBeforeNDay(NumConstant.ONE),dateId)){
+        if(Integer.parseInt(DateUtils.getBeforeNDay(NumConstant.ONE)) > Integer.parseInt(dateId)){
-            ifYesterday = false;
+            ifBeforeYesterday = false;
         }
-        List<ScreenProjectDataDTO> projects = baseDao.initNewScreenProjectData(customerId, rows == NumConstant.ZERO && ifYesterday ? "" : dateId, dateId);
+        List<ScreenProjectDataDTO> projects = baseDao.initNewScreenProjectData(customerId, rows <= NumConstant.ZERO ? "" : dateId, dateId);
         //如果不是昨天立项
-        if(!CollectionUtils.isEmpty(projects) && !ifYesterday)
+        if(!CollectionUtils.isEmpty(projects) && !ifBeforeYesterday)
             computerIfExceed(projects,exceedLimit,about2exceedLimit);
 
         return projects;