Merge remote-tracking branch 'origin/dev_pyscreen' into dev_pyscreen

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

@@ -132,6 +132,8 @@ public class ScreenProjectDataServiceImpl extends BaseServiceImpl<ScreenProjectD
         param.getDataList().forEach(item -> {
             String projectStatusCode = item.getProjectStatusCode();
 
+            //2021.3.8  epmet中，调用方传level，这边不再计算
+            if(item.getProjectLevel() == null){
                 //todo 动态获取超时时间
                 //如果结案 结案时间立项时间；
                 if ("closed_case".equals(projectStatusCode)) {
@@ -171,6 +173,7 @@ public class ScreenProjectDataServiceImpl extends BaseServiceImpl<ScreenProjectD
                         e.printStackTrace();
                     }
                 }
+            }
             //先删除该projectId对应的旧数据
             QueryWrapper<ScreenProjectDataEntity> deleteWrapper = new QueryWrapper<>();
             deleteWrapper.eq(StringUtils.isNotBlank(item.getProjectId()), "project_id", item.getProjectId())