产品推送接口

1、议题转项目率计算规则修改

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

@@ -241,10 +241,11 @@
                 count(et.IS_PARTY_MEMBER = '1' OR NULL) partyToItemNum,
                 count(et.IS_PARTY_MEMBER = '0' OR NULL) userToItemNum
             FROM
-                esua_epdc_events.epdc_item et
+                esua_epdc_events.epdc_issue et
             WHERE
                 et.DEL_FLAG = '0'
                 AND date_format( et.CREATED_TIME, '%Y-%m' ) = #{yearMonth, jdbcType=VARCHAR}
+                AND et.`ISSUE_STATE` = 4
                 GROUP BY et.GRID_ID
         ) ite ON ite.GRID_ID = sd.ID
         LEFT JOIN (
@@ -433,20 +434,21 @@
             IFNULL(itemCount.itemCloseNum, 0) resolveProjectCount,
             IFNULL(ROUND((IFNULL(itemCount.itemSatisfiedNum,0) * 0.6 + IFNULL(itemCount.itemVeryNum,0))
 				/ IFNULL(itemCount.itemCloseAndScoreNum,0),4),0) * 100 satisfactionRatio,
-            ROUND(IFNULL(IFNULL(itemCount.itemNum,0) / IFNULL(issueCount.issueNum,0),0),4) * 100 issueToProjectRatio,
+            ROUND(IFNULL(IFNULL(issueCount.thisMonthIssueToItemCount,0) / IFNULL(issueCount.issueNum,0),0),4) * 100 issueToProjectRatio,
             IFNULL(itemCount.selfSolveProjectNum,0) selfSolveProjectCount,
             0 AS transferRightRatio,
             0 AS transferRightRatioFz,
             0 AS transferRightRatioFm,
             IFNULL(itemCount.itemSatisfiedNum,0) * 0.6 + IFNULL(itemCount.itemVeryNum,0) satisfactionRatioFz,
             IFNULL(itemCount.itemCloseAndScoreNum,0) satisfactionRatioFm,
-            IFNULL(itemCount.itemNum,0) issueToProjectRatioFz,
+            IFNULL(issueCount.thisMonthIssueToItemCount,0) issueToProjectRatioFz,
             IFNULL(issueCount.issueNum,0) issueToProjectRatioFm
         from esua_epdc_admin.sys_dept sd
         left join (
             select
                 mei.GRID_ID DEPT_ID ,
-                count(*) issueNum
+                count(*) issueNum,
+                CASE WHEN mei.`ISSUE_STATE` = 4 THEN SUM(1) ELSE SUM(0) END AS thisMonthIssueToItemCount
             from esua_epdc_events.epdc_issue mei
             where mei.DEL_FLAG = '0'
             and date_format(mei.CREATED_TIME, '%Y-%m' ) = #{yearMonth, jdbcType=VARCHAR}