修改【灵山-便民服务-社区服务次数（公共服务）】大屏：柱状图统计

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/LingshanPublicServiceTimeStatsRstDTO.java

@@ -21,7 +21,7 @@ public class LingshanPublicServiceTimeStatsRstDTO {
     private String orgName;
     private String orgIdPath;
     /**
-     * 服务总次数，包括完成了和没完成的
+     * 服务总次数
      */
     private int serveTimes = 0;
 
@@ -29,10 +29,11 @@ public class LingshanPublicServiceTimeStatsRstDTO {
      * 满意的次数
      */
     private int satisfactionTimes = 0;
+
     /**
-     * 完成了多少次
+     * 评价次数
      */
-    private int completedTimes = 0;
+    private int feedbackTimes = 0;
 
     /**
      * 满意率，分子，还是用浮点数吧，精确一点

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcServiceRecordV2ServiceImpl.java

@@ -321,10 +321,10 @@ public class IcServiceRecordV2ServiceImpl extends BaseServiceImpl<IcServiceRecor
                 if (eOrgIdPath.contains(so.getOrgIdPath())) {
                     // 说明这条数据，是这个子级组织下的数据
                     so.setServeTimes(so.getServeTimes() + e.getServeTimes());
-                    so.setCompletedTimes(so.getCompletedTimes() + e.getCompletedTimes());
+                    so.setFeedbackTimes(so.getFeedbackTimes() + e.getFeedbackTimes());
                     so.setSatisfactionTimes(so.getSatisfactionTimes() + e.getSatisfactionTimes());
 
-                    double satisfactionRate = so.getSatisfactionTimes() * 100.0 / so.getCompletedTimes();
+                    double satisfactionRate = so.getSatisfactionTimes() * 100.0 / so.getFeedbackTimes();
                     so.setSatisfactionRate(new BigDecimal(satisfactionRate).setScale(2, BigDecimal.ROUND_HALF_UP));
                 }
             }

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceRecordV2Dao.xml

@@ -51,7 +51,7 @@
              , ss.OBJECT_TYPE                                                   orgType
              , ss.OBJECT_ID_PATH                                                orgIdPath
              , count(ss.ID)                                                     serveTimes
-             , count(sf.SATISFACTION)                                           completedTimes
+             , count(sf.SATISFACTION)                                           feedbackTimes
              , count(sf.SATISFACTION != 'bad' or null)                          satisfactionTimes
         from ic_service_record_v2 s
                  inner join ic_service_scope_v2 ss on (ss.DEL_FLAG = 0 and s.ID = ss.SERVICE_RECORD_ID)