项目数据抽取到大屏 多余代码注释掉

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

@@ -361,13 +361,11 @@ public interface FactOriginProjectMainDailyService extends BaseService<FactOrigi
      * @param customerId
      * @param rows
      * @param dateId
-     * @param exceedLimit               超期上线
-     * @param about2exceedLimit         即将超期参数
      * @return java.util.List<com.epmet.dto.screen.ScreenProjectDataDTO>
      * @author wangc
      * @date 2021.03.04 22:56
      */
-    List<ScreenProjectDataDTO> initNewScreenProjectData(String customerId,Integer rows ,String dateId,Integer exceedLimit,Integer about2exceedLimit);
+    List<ScreenProjectDataDTO> initNewScreenProjectData(String customerId,Integer rows ,String dateId);
 
     void computerIfExceed(List<ScreenProjectDataDTO> list,Integer exceedLimit,Integer about2exceedLimit);
 

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

@@ -20,7 +20,6 @@ package com.epmet.service.evaluationindex.extract.todata.impl;
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.NumConstant;
-import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.DataSourceConstant;
 import com.epmet.constant.OrgTypeConstant;
@@ -470,19 +469,12 @@ public class FactOriginProjectMainDailyServiceImpl extends BaseServiceImpl<FactO
      * @param customerId
      * @param rows
      * @param dateId
-     * @param exceedLimit               超期上线
-     * @param about2exceedLimit         即将超期参数
      * @return java.util.List<com.epmet.dto.screen.ScreenProjectDataDTO>
      * @author wangc
      * @date 2021.03.04 22:56
      */
     @Override
-    public List<ScreenProjectDataDTO> initNewScreenProjectData(String customerId,Integer rows , String dateId,Integer exceedLimit,Integer about2exceedLimit) {
+    public List<ScreenProjectDataDTO> initNewScreenProjectData(String customerId,Integer rows , String dateId) {
-        boolean ifBeforeYesterday = true;
-        int beforeDate = Integer.parseInt(DateUtils.getBeforeNDay(NumConstant.ONE));
-        if(beforeDate > Integer.parseInt(dateId)){
-            ifBeforeYesterday = false;
-        }
         List<ScreenProjectDataDTO> projects = baseDao.initNewScreenProjectData(customerId, rows <= NumConstant.ZERO ? "" : dateId, dateId);
         projects.forEach(project -> {
             if (ProjectConstant.CLOSED_CASE.equals(project.getProjectStatusCode())) {

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

@@ -1,7 +1,5 @@
 package com.epmet.service.evaluationindex.extract.toscreen.impl;
 
-import com.epmet.commons.tools.constant.NumConstant;
-import com.epmet.dto.project.result.ProjectExceedParamsResultDTO;
 import com.epmet.dto.screen.ScreenProjectDataDTO;
 import com.epmet.dto.screen.ScreenProjectImgDataDTO;
 import com.epmet.dto.screen.ScreenProjectProcessAttachmentDTO;
@@ -71,27 +69,9 @@ public class ScreenProjectSettleServiceImpl implements ScreenProjectSettleServic
 	public void extractScreenData(ScreenCentralZoneDataFormDTO param) {
 		//screen_project_data表是否存在此客户数据
 		int rows = targetDbService.checkIfExisted(param.getCustomerId());
-		//查找客户项目超期参数
+
-		List<ProjectExceedParamsResultDTO> exceedParams = projectService.getProjectExceedParams(param.getCustomerId());
-		Integer exceedLimit = NumConstant.FIVE;
-		Integer about2ExceedLimit = NumConstant.FIVE;
-
-
-		if(!CollectionUtils.isEmpty(exceedParams)){
-			for(ProjectExceedParamsResultDTO ex :exceedParams){
-				if(null != ex.getDefaultExceedLimit()){
-					exceedLimit = null == ex.getExceedLimit() ? ex.getDefaultExceedLimit() : ex.getExceedLimit();
-				}
-				if(null != ex.getDefaultAbout2ExceedLimit()){
-					about2ExceedLimit = null == ex.getAbout2ExceedLimit() ? ex.getDefaultAbout2ExceedLimit() : ex.getDefaultAbout2ExceedLimit();
-				}
-			}
-		}
-		//因为即将超期提醒时间(天)就是即将超期期限，在表中存储的是超期前多少天
-		//所以这里要换算成滞留日
-		about2ExceedLimit = exceedLimit >= about2ExceedLimit ? exceedLimit - about2ExceedLimit : exceedLimit;
 		List<ScreenProjectDataDTO> metaData =
-				originMainService.initNewScreenProjectData(param.getCustomerId(), rows , param.getDateId(),exceedLimit,about2ExceedLimit);
+				originMainService.initNewScreenProjectData(param.getCustomerId(), rows , param.getDateId());
 
 		if(!CollectionUtils.isEmpty(metaData)) {
 			// 查询项目信息
@@ -137,7 +117,8 @@ public class ScreenProjectSettleServiceImpl implements ScreenProjectSettleServic
 
 		//重新计算orientData的级别 有现成的方法 fact_origin_project_org_period_daily
 //		originMainService.computerIfExceed(orientData, exceedLimit,about2ExceedLimit);
-		originMainService.setProjectLevel(orientData, param.getCustomerId());
+		//todo 与上面重复处理 暂时注释掉
+		//originMainService.setProjectLevel(orientData, param.getCustomerId());
 		processService.updateProjectCloseTime(metaData);
 		//更新结案时间和结案状态
 		processService.updateProjectStatus(orientData,param.getDateId(),param.getCustomerId());