网格活跃度统计查询，源数据改查screen_project_data表，这个表平阴的是三个街道和小程序数据都有

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/evaluationindex/EvaluationIndexDao.java

@@ -21,6 +21,8 @@ import com.epmet.dataaggre.dto.datastats.result.GovrnRatioResultDTO;
 import com.epmet.dataaggre.dto.evaluationindex.ScreenCustomerAgencyDTO;
 import com.epmet.dataaggre.dto.evaluationindex.ScreenCustomerGridDTO;
 import com.epmet.dataaggre.dto.evaluationindex.ScreenGovernRankDataDailyDTO;
+import com.epmet.dataaggre.dto.govorg.form.GridLivelyFormDTO;
+import com.epmet.dataaggre.dto.govorg.result.GridDateIdResultDTO;
 import com.epmet.dataaggre.dto.govproject.form.ProjectCategoryTotalFormDTO;
 import com.epmet.dataaggre.dto.govproject.result.ProjectCategoryTotalResultDTO;
 import org.apache.ibatis.annotations.Mapper;
@@ -111,4 +113,9 @@ public interface EvaluationIndexDao {
      */
     List<ProjectCategoryTotalResultDTO> projectCategoryList(ProjectCategoryTotalFormDTO formDTO);
 
+    /**
+     * @Description 查询直属下级组织下网格在查询时间段内存在创建项目记录，一个网格一天一条
+     * @author sun
+     */
+    List<GridDateIdResultDTO> getGridProejctToProjectMain(GridLivelyFormDTO formDTO);
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/EvaluationIndexService.java

@@ -6,6 +6,8 @@ import com.epmet.dataaggre.dto.evaluationindex.ScreenAgencyOrGridListDTO;
 import com.epmet.dataaggre.dto.evaluationindex.ScreenCustomerAgencyDTO;
 import com.epmet.dataaggre.dto.evaluationindex.ScreenCustomerGridDTO;
 import com.epmet.dataaggre.dto.evaluationindex.ScreenGovernRankDataDailyDTO;
+import com.epmet.dataaggre.dto.govorg.form.GridLivelyFormDTO;
+import com.epmet.dataaggre.dto.govorg.result.GridDateIdResultDTO;
 import com.epmet.dataaggre.dto.govproject.form.ProjectCategoryTotalFormDTO;
 import com.epmet.dataaggre.dto.govproject.result.ProjectCategoryTotalResultDTO;
 
@@ -93,4 +95,10 @@ public interface EvaluationIndexService {
      * @author sun
      */
     List<ProjectCategoryTotalResultDTO> projectCategoryList(ProjectCategoryTotalFormDTO formDTO);
+
+    /**
+     * @Description 查询直属下级组织下网格在查询时间段内存在创建项目记录，一个网格一天一条
+     * @author sun
+     */
+    List<GridDateIdResultDTO> getGridProejctToProjectMain(GridLivelyFormDTO formDTO);
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/impl/EvaluationIndexServiceImpl.java

@@ -11,6 +11,8 @@ import com.epmet.dataaggre.dto.evaluationindex.ScreenAgencyOrGridListDTO;
 import com.epmet.dataaggre.dto.evaluationindex.ScreenCustomerAgencyDTO;
 import com.epmet.dataaggre.dto.evaluationindex.ScreenCustomerGridDTO;
 import com.epmet.dataaggre.dto.evaluationindex.ScreenGovernRankDataDailyDTO;
+import com.epmet.dataaggre.dto.govorg.form.GridLivelyFormDTO;
+import com.epmet.dataaggre.dto.govorg.result.GridDateIdResultDTO;
 import com.epmet.dataaggre.dto.govproject.form.ProjectCategoryTotalFormDTO;
 import com.epmet.dataaggre.dto.govproject.result.ProjectCategoryTotalResultDTO;
 import com.epmet.dataaggre.service.evaluationindex.EvaluationIndexService;
@@ -217,4 +219,13 @@ public class EvaluationIndexServiceImpl implements EvaluationIndexService {
         return evaluationIndexDao.projectCategoryList(formDTO);
     }
 
+    /**
+     * @Description 查询直属下级组织下网格在查询时间段内存在创建项目记录，一个网格一天一条
+     * @author sun
+     */
+    @Override
+    public List<GridDateIdResultDTO> getGridProejctToProjectMain(GridLivelyFormDTO formDTO) {
+        return evaluationIndexDao.getGridProejctToProjectMain(formDTO);
+    }
+
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java

@@ -34,6 +34,7 @@ import com.epmet.dataaggre.excel.GridLivelyExcel;
 import com.epmet.dataaggre.service.commonservice.AreaCodeService;
 import com.epmet.dataaggre.service.datastats.DataStatsService;
 import com.epmet.dataaggre.service.epmetuser.EpmetUserService;
+import com.epmet.dataaggre.service.evaluationindex.EvaluationIndexService;
 import com.epmet.dataaggre.service.govorg.GovOrgService;
 import com.epmet.dataaggre.service.opercrm.CustomerRelation;
 import com.epmet.dto.result.UploadImgResultDTO;
@@ -88,6 +89,8 @@ public class GovOrgServiceImpl implements GovOrgService {
     private DataStatsService dataStatsService;
     @Autowired
     private OssFeignClient ossFeignClient;
+    @Autowired
+    private EvaluationIndexService evaluationIndexService;
 
     /**
      * @param staffId
@@ -694,8 +697,10 @@ public class GovOrgServiceImpl implements GovOrgService {
         List<GridDateIdResultDTO> workList = epmetUserService.getGridDateRoutineWorkList(formDTO);
         /*//3.查询直属下级组织下网格在查询时间段内存在上报事件(直接立项)数的网格，一天一条
         List<GridDateIdResultDTO> projectList = dataStatsService.getGridDateProjectIncrList(formDTO);*/
-        //3.查询直属下级组织下网格在查询时间段内存在创建项目记录，一个网格一天一条
-        List<GridDateIdResultDTO> projectList = dataStatsService.getGridProejctToProjectMain(formDTO);
+        /*//3.查询直属下级组织下网格在查询时间段内存在创建项目记录，一个网格一天一条
+        List<GridDateIdResultDTO> projectList = dataStatsService.getGridProejctToProjectMain(formDTO);*/
+        //3.查询直属下级组织下网格在查询时间段内存在创建项目记录，一个网格一天一条[改查screen_project_data表，因为平阴三个街道和小程序的数据都在这个表有]
+        List<GridDateIdResultDTO> projectList = evaluationIndexService.getGridProejctToProjectMain(formDTO);
         //4.汇总数据，一个网格一天只记录一条数据，这条数据可能是例行工作的也可能是上报事件的，也可能某一天两个数都有，但只记录一条
         Set<String> map = workList.stream().map(o -> o.getGridId() + o.getDateId()).collect(Collectors.toSet());
         projectList.stream().filter(pro -> !map.contains(pro.getGridId() + pro.getDateId())).forEach(p -> workList.add(p));

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/evaluationindex/EvaluationIndexDao.xml

@@ -196,4 +196,20 @@
         ORDER BY project_total DESC
     </select>
 
+    <select id="getGridProejctToProjectMain" resultType="com.epmet.dataaggre.dto.govorg.result.GridDateIdResultDTO">
+        SELECT
+            org_id gridId,
+            DATE_FORMAT(project_create_time, "%Y%m%d") dateId,
+            all_parent_ids pids
+        FROM
+            screen_project_data
+        WHERE
+            del_flag = '0'
+        AND org_type = 'grid'
+        AND DATE_FORMAT(created_time, "%Y%m%d") <![CDATA[ >= ]]> #{startTime}
+        AND DATE_FORMAT(created_time, "%Y%m%d") <![CDATA[ <= ]]> #{endTime}
+        AND all_parent_ids LIKE CONCAT('%', #{agencyId}, '%')
+        GROUP BY org_id, DATE_FORMAT(project_create_time, "%Y%m%d")
+    </select>
+
 </mapper>