Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into develop

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/IndexOriginExtractService.java

@@ -10,7 +10,7 @@ import com.epmet.dto.extract.form.ExtractIndexFormDTO;
  */
 public interface IndexOriginExtractService {
     /**
-     * desc：从统计库对象抽取指标数据
+     * desc：[月]从统计库对象抽取指标数据
      *
      * @param formDTO
      */

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

@@ -471,6 +471,12 @@ public class ScreenProjectCategoryOrgDailyServiceImpl extends BaseServiceImpl<Sc
                 result.forEach(r -> {
                     r.setOrgType(level);
                     r.setDateId(dateId);
+                    // 这么写的目的是：防止把孔村，锦水，榆山的 orgType 赋值成 区县级别
+                    if (level.equals(ScreenConstant.DISTRICT)){
+                        if (r.getOrgId().equals(PingYinConstant.KONG_CUN_AGENCY_ID) || r.getOrgId().equals(PingYinConstant.YU_SHAN_AGENCY_ID) || r.getOrgId().equals(PingYinConstant.JIN_SHUI_AGENCY_ID)){
+                            r.setOrgType(ScreenConstant.STREET);
+                        }
+                    }
                 });
             }
         }