产品推送接口

指标数据统计规则修改

epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenPublicDataServiceImpl.java

@@ -254,13 +254,13 @@ public class ScreenPublicDataServiceImpl extends BaseServiceImpl<ScreenPublicDat
     @Override
     public Result getGovernrankdata(String yearMonth) {
         // 如果统计月份为空，则统计上个月的数据
-        yearMonth = StringUtils.isEmpty(yearMonth) ? DateUtils.formatYearMonth(DateUtils.addDateMonths(new Date(),-1)) : yearMonth.replace("-", "");
+        yearMonth = StringUtils.isEmpty(yearMonth) ? DateUtils.formatYearMonthNoSplit(DateUtils.addDateMonths(new Date(),-1)) : yearMonth.replace("-", "");
         List<GovernrankdataResultDTO> list = baseDao.getGovernrankdata(yearMonth);
         // 将list转换为json格式
         if(list != null && list.size()>0){
             GovernrankdataDTO result = new GovernrankdataDTO();
             result.setDataList(list);
-            result.setMonthId(yearMonth.replace("-",""));
+            result.setMonthId(yearMonth);
             String json = JSONObject.toJSONString(result);
             String body = epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_COLL_GOVERN_RANK, json);
             log.info(body);

epdc-cloud-analysis-pc/src/main/resources/mapper/screen/ScreenIndexDataDao.xml

@@ -506,7 +506,10 @@
         IFNULL(tm2.closedProjectRatioFm, 0) AS closedProjectRatioFm,
         IFNULL(IF( d.TYPE_KEY = 'street_party', tm1.handleProjectRatioFz, 0),0) handleProjectRatioFz,
         IFNULL(IF( d.TYPE_KEY = 'street_party', tm1.handleProjectRatioFm, 0),0) handleProjectRatioFm,
-        IF( d.TYPE_KEY = 'street_party', IFNULL(tm1.handleProjectRatio,0.0000),0.0000) AS handleProjectRatio
+        IF( d.TYPE_KEY = 'street_party', IFNULL(tm1.handleProjectRatio,0.0000),0.0000) AS handleProjectRatio,
+        IFNULL(tm1.satisfactionRatio, 0.000) AS satisfactionRatio,
+        IFNULL(tm1.satisfactionRatioFz, 0) AS satisfactionRatioFz,
+        IFNULL(tm1.satisfactionRatioFm, 0) AS satisfactionRatioFm
         FROM esua_epdc_admin.sys_dept d
         LEFT JOIN
         (SELECT
@@ -592,7 +595,10 @@
         IFNULL(tm2.closedProjectRatioFm, 0) AS closedProjectRatioFm,
         IFNULL(tm1.handleProjectRatioFz,0) handleProjectRatioFz,
         IFNULL(tm1.handleProjectRatioFm,0) handleProjectRatioFm,
-        IFNULL(tm1.handleProjectRatio,0.0000) AS handleProjectRatio
+        IFNULL(tm1.handleProjectRatio,0.0000) AS handleProjectRatio,
+        IFNULL(tm1.satisfactionRatio, 0.000) AS satisfactionRatio,
+        IFNULL(tm1.satisfactionRatioFz, 0) AS satisfactionRatioFz,
+        IFNULL(tm1.satisfactionRatioFm, 0) AS satisfactionRatioFm
         FROM esua_epdc_admin.sys_dept d
         LEFT JOIN
         (SELECT