Merge remote-tracking branch 'origin/dev_issue_category' into dev_temp

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

@@ -144,6 +144,9 @@ public class ScreenProjectCategoryGridDailyServiceImpl extends BaseServiceImpl<S
     @Override
     public void extractProjectCategoryData(String customerId, String dateId) {
         List<ScreenProjectCategoryGridDailyDTO> listDTO= factOriginProjectCategoryDailyService.selectListProjectCategoryGridDailyDTO(customerId);
+        listDTO.forEach(dto->{
+            dto.setDateId(dateId);
+        });
         boolean insertRes=insertBatch(ConvertUtils.sourceToTarget(listDTO, ScreenProjectCategoryGridDailyEntity.class));
         log.info("insertRes is {}",insertRes);
     }

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

@@ -43,7 +43,7 @@
             SELECT
                 c.CUSTOMER_ID,
                 left(c.CATEGORY_CODE, 4) as CATEGORY_CODE,
-                c.`LEVEL`,
+                '1'as `LEVEL`,
                 p.GRID_ID,
                 p.AGENCY_ID AS PID,
                 P.PIDS,