大屏基础接口bug修改

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenBaseReportDataDao.java

@@ -120,6 +120,15 @@ public interface ScreenBaseReportDataDao extends BaseDao<ScreenBaseReportDataFor
      **/
     List<GridIssueResultDTO> selectGridIssue(@Param("customId")String customId);
 
+/**
+     * @Description  网格议题数据  - 当日新增议题转项目数
+     * @Author songyunpeng
+     * @Date  2021/6/25
+     * @Param [customId]
+     * @return java.util.List<com.elink.esua.epdc.dto.screen.result.CommunityGroupTotalResultDTO>
+     **/
+    List<GridIssueResultDTO> selectGridIssueShiftProjectIncr();
+
 
     /**
      * @Description  组织议题数据
@@ -130,6 +139,15 @@ public interface ScreenBaseReportDataDao extends BaseDao<ScreenBaseReportDataFor
      **/
     List<CommunityIssueResultDTO> selectAgencyIssue(@Param("customId")String customId);
 
+ /**
+     * @Description  组织议题数据 - 当日新增议题转项目数
+     * @Author songyunpeng
+     * @Date  2021/6/25
+     * @Param [customId]
+     * @return java.util.List<com.elink.esua.epdc.dto.screen.result.CommunityGroupTotalResultDTO>
+     **/
+    List<CommunityIssueResultDTO> selectAgencyIssueShiftProjectIncr();
+
 
     /**
      * @Description  网格注册用户数据

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenBaseReportDataServiceImpl.java

@@ -115,6 +115,15 @@ public class ScreenBaseReportDataServiceImpl extends BaseServiceImpl<ScreenBaseR
     @Override
     public Result selectGridIssue() {
         List<GridIssueResultDTO> gridIssueResultDTOS = baseDao.selectGridIssue(customerId);
+        //由于数据量大，字段单独处理
+        List<GridIssueResultDTO> shiftProjectIncrs = baseDao.selectGridIssueShiftProjectIncr();
+        for (GridIssueResultDTO gridIssueResultDTO : gridIssueResultDTOS) {
+            for (GridIssueResultDTO shiftProjectIncr : shiftProjectIncrs) {
+                if(gridIssueResultDTO.getGridId().equals(shiftProjectIncr.getGridId()) ){
+                    gridIssueResultDTO.setShiftProjectIncr(shiftProjectIncr.getShiftProjectIncr());
+                }
+            }
+        }
         String dataJson = ScreenDataUtils.getScreenDateJson(gridIssueResultDTOS,true);
         // 数据上报
         epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_BASE_REPORT_GRID_ISSUE, dataJson);
@@ -123,6 +132,15 @@ public class ScreenBaseReportDataServiceImpl extends BaseServiceImpl<ScreenBaseR
     @Override
     public Result selectAgencyIssue() {
         List<CommunityIssueResultDTO> communityIssueResultDTOS = baseDao.selectAgencyIssue(customerId);
+        //由于数据量大，字段单独处理
+        List<CommunityIssueResultDTO> shiftProjectIncrs = baseDao.selectAgencyIssueShiftProjectIncr();
+        for (CommunityIssueResultDTO gridIssueResultDTO : communityIssueResultDTOS) {
+            for (CommunityIssueResultDTO shiftProjectIncr : shiftProjectIncrs) {
+                if(gridIssueResultDTO.getAgencyId().equals(shiftProjectIncr.getAgencyId()) ){
+                    gridIssueResultDTO.setShiftProjectIncr(shiftProjectIncr.getShiftProjectIncr());
+                }
+            }
+        }
         String dataJson = ScreenDataUtils.getScreenDateJson(communityIssueResultDTOS,true);
         // 数据上报
         epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_BASE_REPORT_AGENCY_ISSUE, dataJson);

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml

@@ -21,6 +21,7 @@
         <result property="allCategoryName" column="allCategoryName"/>
         <result property="closeCaseTime" column="closeCaseTime"/>
         <result property="projectLevel" column="projectLevel"/>
+        <result property="satisfactionScore" column="satisfactionScore"/>
         <collection property="projectImgUrl" ofType="java.lang.String">
             <result property="projectImgUrl" column="projectImgUrl"/>
         </collection>