Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java

@@ -935,7 +935,7 @@ public class DemoController {
             paramDTO.setCustomerId(customerId);
             paramDTO.setDateId(formDTO.getDateId());
             originProjectCategoryDailyService.extractProjectCategory(paramDTO);
-            log.error(String.format("/data/stats/demo/extractProjectCategory,fact_origin_project_category_daily表抽取完毕,customerId:%s", customerId));
+            log.warn(String.format("/data/stats/demo/extractProjectCategory,fact_origin_project_category_daily表抽取完毕,customerId:%s", customerId));
         }
         return new Result();
     }

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

@@ -197,7 +197,7 @@ public class ScreenProjectSettleServiceImpl implements ScreenProjectSettleServic
 			}
 		}
 
-		log.error(String.format("/data/stats/demo/project-test,screen_project_**表抽取完毕,customerId:%s", param.getCustomerId()));
+		log.warn(String.format("/data/stats/demo/project-test,screen_project_**表抽取完毕,customerId:%s", param.getCustomerId()));
 	}
 
 	/**

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectCategoryOrgDailyServiceImpl.java

@@ -567,4 +567,4 @@ public class ScreenProjectCategoryOrgDailyServiceImpl extends BaseServiceImpl<Sc
         }while (row > NumConstant.ZERO && row == NumConstant.ONE_THOUSAND);
     }
 
-}
+}