界面展示：问题解决总数 ：计算方式变更

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

@@ -281,10 +281,10 @@
                 sd.id AS gridId,
                 sd.pid,
                 sd.pids,
-                IFNULL(
+                IFNULL ((
-                    (
+                    IFNULL( topic.topicResolvedCount, 0 ) + IFNULL( topic.topicUnResolvedCount, 0 ) + IFNULL( issue.issueResolvedCount, 0 ) + IFNULL( issue.issueUnResolvedCount, 0 )
-                        IFNULL( item.issueProjectResolvedCount, 0 ) + IFNULL( item.issueProjectUnResolvedCount, 0 ) + 0 + 0
+                    + IFNULL( item.issueProjectResolvedCount, 0 ) + IFNULL( item.issueProjectUnResolvedCount, 0 ) + 0 + 0
-                    ), 0 ) AS problemResolvedCount,
+                ), 0 ) AS problemResolvedCount,
 
                 IFNULL( topic.topicResolvedCount, 0 ) AS topicResolvedCount,
                 IFNULL( topic.topicUnResolvedCount, 0 ) AS topicUnResolvedCount,
@@ -524,7 +524,8 @@
                 SELECT
                     sd.pids,
                     IFNULL ((
-                        IFNULL( item.issueProjectResolvedCount, 0 ) + IFNULL( item.issueProjectUnResolvedCount, 0 ) + 0 + 0
+						IFNULL( topic.topicResolvedCount, 0 ) + IFNULL( topic.topicUnResolvedCount, 0 ) + IFNULL( issue.issueResolvedCount, 0 ) + IFNULL( issue.issueUnResolvedCount, 0 )
+                        + IFNULL( item.issueProjectResolvedCount, 0 ) + IFNULL( item.issueProjectUnResolvedCount, 0 ) + 0 + 0
                     ), 0 ) AS problemResolvedCount,
 
                     IFNULL( topic.topicResolvedCount, 0 ) AS topicResolvedCount,