大屏基础接口bug修改

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CommunityGroupTotalResultDTO.java

@@ -19,7 +19,7 @@ public class CommunityGroupTotalResultDTO implements Serializable {
     /**
      * 客户Id
      */
-    private String customId;
+    private String customerId;
 
     /**
      * 机关id:网格所属的组织id

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CommunityHotTopicResultDTO.java

@@ -14,12 +14,10 @@ public class CommunityHotTopicResultDTO implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-
-
     /**
      * 客户Id
      */
-    private String customId;
+    private String customerId;
 
     /**
      * 机关id:网格所属的组织id

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CommunityIssueResultDTO.java

@@ -19,7 +19,7 @@ public class CommunityIssueResultDTO implements Serializable {
     /**
      * 客户Id
      */
-    private String customId;
+    private String customerId;
 
     /**
      * 机关id:网格所属的组织id

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CommunityProjectResultDTO.java

@@ -19,7 +19,7 @@ public class CommunityProjectResultDTO implements Serializable {
     /**
      * 客户Id
      */
-    private String customId;
+    private String customerId;
 
     /**
      * 机关id:网格所属的组织id

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CommunityTopicIssueResultDTO.java

@@ -19,7 +19,7 @@ public class CommunityTopicIssueResultDTO implements Serializable {
     /**
      * 客户Id
      */
-    private String customId;
+    private String customerId;
 
     /**
      * 机关id:网格所属的组织id

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CommunityTopicStatusResultDTO.java

@@ -19,7 +19,7 @@ public class CommunityTopicStatusResultDTO implements Serializable {
     /**
      * 客户Id
      */
-    private String customId;
+    private String customerId;
 
     /**
      * 机关id:网格所属的组织id

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/CommunityUserResultDTO.java

@@ -19,7 +19,7 @@ public class CommunityUserResultDTO implements Serializable {
     /**
      * 客户Id
      */
-    private String customId;
+    private String customerId;
 
     /**
      * 机关id:网格所属的组织id

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridGridProjectResultDTO.java

@@ -19,7 +19,7 @@ public class GridGridProjectResultDTO implements Serializable {
     /**
      * 客户Id
      */
-    private String customId;
+    private String customerId;
 
     /**
      * 机关id:网格所属的组织id

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridGroupTotalResultDTO.java

@@ -19,7 +19,7 @@ public class GridGroupTotalResultDTO implements Serializable {
     /**
      * 客户Id
      */
-    private String customId;
+    private String customerId;
 
     /**
      * 机关id:网格所属的组织id

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridHotTopicResultDTO.java

@@ -19,7 +19,7 @@ public class GridHotTopicResultDTO implements Serializable {
     /**
      * 客户Id
      */
-    private String customId;
+    private String customerId;
 
     /**
      * 机关id:网格所属的组织id
@@ -29,7 +29,7 @@ public class GridHotTopicResultDTO implements Serializable {
     /**
      * 网格ID
      */
-    private String grid;
+    private String gridId;
 
     /**
      * 日期ID

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridIssueResultDTO.java

@@ -19,7 +19,7 @@ public class GridIssueResultDTO implements Serializable {
     /**
      * 客户Id
      */
-    private String customId;
+    private String customerId;
 
     /**
      * 机关id:网格所属的组织id

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridTopicIssueResultDTO.java

@@ -19,7 +19,7 @@ public class GridTopicIssueResultDTO implements Serializable {
     /**
      * 客户Id
      */
-    private String customId;
+    private String customerId;
 
     /**
      * 机关id:网格所属的组织id

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridTopicStatusResultDTO.java

@@ -19,7 +19,7 @@ public class GridTopicStatusResultDTO implements Serializable {
     /**
      * 客户Id
      */
-    private String customId;
+    private String customerId;
 
     /**
      * 机关id:网格所属的组织id

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridUserResultDTO.java

@@ -19,7 +19,7 @@ public class GridUserResultDTO implements Serializable {
     /**
      * 客户Id
      */
-    private String customId;
+    private String customerId;
 
     /**
      * 机关id:网格所属的组织id

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/UploadProjectInfoDTO.java

@@ -108,4 +108,11 @@ public class UploadProjectInfoDTO  implements Serializable {
      */
     private String projectLevel;
 
+    /**
+     * 满意度得分
+     */
+    private Integer satisfactionScore;
+
+
+
 }

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

@@ -24,7 +24,7 @@ public class ScreenBaseReportDataServiceImpl extends BaseServiceImpl<ScreenBaseR
     @Autowired
     private EpmetUtils epmetUtils;
 
-    @Value("epmet.config.customerId")
+    @Value("${epmet.config.customerId}")
     private String customerId;
 
     @Override
@@ -89,8 +89,8 @@ public class ScreenBaseReportDataServiceImpl extends BaseServiceImpl<ScreenBaseR
 
     @Override
     public Result selectCommunityGroupTotalList() {
-        List<CommunityTopicIssueResultDTO> communityTopicIssueResultDTOS = baseDao.selectCommunityTopicIssueList(customerId);
-        String dataJson = ScreenDataUtils.getScreenDateJson(communityTopicIssueResultDTOS,true);
+        List<CommunityGroupTotalResultDTO> communityGroupTotalResultDTOS = baseDao.selectCommunityGroupTotalList(customerId);
+        String dataJson = ScreenDataUtils.getScreenDateJson(communityGroupTotalResultDTOS,true);
         // 数据上报
         epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_BASE_REPORT_AGENCY_GROUP_TOTAL, dataJson);
         return new Result();

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

@@ -49,7 +49,11 @@
                when t1.ITEM_STATE = 10 then 3
                when t1.ITEM_STATE = 0 and (select COUNT(1) from esua_epdc_events.epdc_item_handle_process where DEL_FLAG ='0' and ITEM_ID = t1.ID) = 1 then 1
                when (t1.ITEM_STATE = 0 or t1.ITEM_STATE = 5) and (select COUNT(1) from esua_epdc_events.epdc_item_handle_process where DEL_FLAG ='0' and ITEM_ID = t1.ID) > 1 then 2
-               else '' end as projectLevel
+               else '' end as projectLevel,
+            case t1.EVALUATION_SCORE
+                when 0 then 60
+                when 2 then 100
+            else 80 end as satisfactionScore
         from (select * from(select * from esua_epdc_events.epdc_item where DEL_FLAG = '0'
         and GRID_ID not in ( SELECT t.`dept_id`
                                     FROM `esua_epdc_admin`.`sys_dept_config` t

esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/screen/ScreenBaseReportDataPushTaskImpl.java

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Component;
  * @Author：syp
  * @Date：2021/6/25 15:19
  */
-@Component("screenIndexDataPushTask")
+@Component("screenBaseReportDataPushTask")
 public class ScreenBaseReportDataPushTaskImpl implements ScreenIndexDataPushTask {
 
     private final Logger logger = LoggerFactory.getLogger(getClass());