Merge branch 'dev_screen_data_2.0' into dev_temp

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

@@ -1,6 +1,7 @@
 package com.epmet.service.evaluationindex.extract.toscreen.impl;
 
 import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.constant.IndexCalConstant;
 import com.epmet.constant.OrgTypeConstant;
 import com.epmet.dto.extract.result.OrgStatisticsResultDTO;
 import com.epmet.dto.stats.user.FactRegUserAgencyMonthlyDTO;
@@ -122,6 +123,7 @@ public class OrgRankExtractServiceImpl implements OrgRankExtractService {
 				}
 			}));
 		}
+		screenOrgRankDataService.delAndSaveRankData(customerId, OrgTypeConstant.GRID, monthId, IndexCalConstant.DELETE_SIZE, list);
 	}
 
 	@Override
@@ -189,6 +191,7 @@ public class OrgRankExtractServiceImpl implements OrgRankExtractService {
 				}
 			}));
 		}
+		screenOrgRankDataService.delAndSaveRankData(customerId, OrgTypeConstant.AGENCY, monthId, IndexCalConstant.DELETE_SIZE, list);
 	}
 
 	@Override
@@ -256,6 +259,7 @@ public class OrgRankExtractServiceImpl implements OrgRankExtractService {
 				}
 			}));
 		}
+		screenOrgRankDataService.delAndSaveRankData(customerId, OrgTypeConstant.AGENCY, monthId, IndexCalConstant.DELETE_SIZE, list);
 	}
 
 	@Override
@@ -323,5 +327,6 @@ public class OrgRankExtractServiceImpl implements OrgRankExtractService {
 				}
 			}));
 		}
+		screenOrgRankDataService.delAndSaveRankData(customerId, OrgTypeConstant.AGENCY, monthId, IndexCalConstant.DELETE_SIZE, list);
 	}
 }