Merge remote-tracking branch 'remotes/origin/dev_screen_data_2.0' into dev_temp

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenUserServiceImpl.java

@@ -4,7 +4,6 @@ import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.constant.DataSourceConstant;
 import com.epmet.datareport.constant.FactConstant;
-import com.epmet.datareport.dao.evaluationindex.screen.ScreenEventDataDao;
 import com.epmet.datareport.dao.evaluationindex.screen.ScreenPartyUserRankDataDao;
 import com.epmet.datareport.service.evaluationindex.screen.ScreenUserService;
 import com.epmet.evaluationindex.screen.dto.form.PartIndexScroeRankFormDTO;
@@ -34,6 +33,7 @@ public class ScreenUserServiceImpl implements ScreenUserService {
      * @author sun
      */
     @Override
+    @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true)
     public List<UserPointRankListResultDTO> userPointRank(UserPointRankFormDTO formDTO) {
         //1.参数校验
         if (!FactConstant.AGENCY.equals(formDTO.getOrgType()) && !FactConstant.GRID.equals(formDTO.getOrgType())) {
@@ -49,6 +49,7 @@ public class ScreenUserServiceImpl implements ScreenUserService {
      * @author sun
      */
     @Override
+    @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true)
     public List<PartIndexScroeRankResultDTO> partIndexScroeRank(PartIndexScroeRankFormDTO formDTO) {
         //1.参数校验
         if (!FactConstant.AGENCY.equals(formDTO.getOrgType()) && !FactConstant.GRID.equals(formDTO.getOrgType())) {

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectLogDailyDao.xml

@@ -281,6 +281,7 @@
             ) fl ON fm.ID = fl.PROJECT_ID
                 WHERE  fm.CUSTOMER_ID = #{customerId}
                   AND fm.MONTH_ID = #{monthId}
+                  AND fm.PROJECT_STATUS = 'closed'
             ) a
         GROUP BY
             GRID_ID
@@ -317,6 +318,7 @@
             ) fl ON fm.ID = fl.PROJECT_ID
                 WHERE  fm.CUSTOMER_ID = #{customerId}
                     AND fm.MONTH_ID = #{monthId}
+                  AND fm.PROJECT_STATUS = 'closed'
             ) a
         GROUP BY
             AGENCY_ID