基础数据上报部分Bug修改，先锋模范数据bug修改

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

@@ -386,6 +386,7 @@
         where sd.del_flag = '0'
         and sd.type_key in ( 'street_party', 'community_party' )
         and sd.id not in (SELECT t.DEPT_ID FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.DEL_FLAG  = '0')
+        and ei.`GRID_ID`  not in (SELECT t.DEPT_ID FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.DEL_FLAG  = '0')
         and DATE_FORMAT(ei.CREATED_TIME, '%Y-%m-%d') <= DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d')
         group by sd.id;
     </select>

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

@@ -1021,9 +1021,9 @@ union all
                                     PARTY_GOOD_TIMES) as publishIssueTotal,
                             0 as topicTotal,
                             0 as publishTopicTotal,
-                            sum(USER_TOITEM_TIMES+PARTY_TOITEM_TIMES) as shiftProjectTotal,
+                            sum(PARTY_TOITEM_TIMES) as shiftProjectTotal,
                             sum(PARTY_TOITEM_TIMES) as publishShiftProjectTotal,
-                            sum(USER_FINISH_TIMES+PARTY_FINISH_TIMES) as resolvedProjectTotal,
+                            sum(PARTY_FINISH_TIMES) as resolvedProjectTotal,
                             sum(PARTY_FINISH_TIMES) as publishResolvedProjectTotal
                 from esua_epdc_analysis.epdc_dept_event_person_time ed
                 where GRID_ID is not null
@@ -1122,9 +1122,9 @@ UNION ALL
                                     PARTY_GOOD_TIMES) as publishIssueTotal,
                             0 as topicTotal,
                             0 as publishTopicTotal,
-                            sum(USER_TOITEM_TIMES+PARTY_TOITEM_TIMES) as shiftProjectTotal,
+                            sum(PARTY_TOITEM_TIMES) as shiftProjectTotal,
                             sum(PARTY_TOITEM_TIMES) as publishShiftProjectTotal,
-                            sum(USER_FINISH_TIMES+PARTY_FINISH_TIMES) as resolvedProjectTotal,
+                            sum(PARTY_FINISH_TIMES) as resolvedProjectTotal,
                             sum(PARTY_FINISH_TIMES) as publishResolvedProjectTotal
                 from esua_epdc_analysis.epdc_dept_event_person_time ed
                 where GRID_ID is not null
@@ -1225,9 +1225,9 @@ union all
                                     PARTY_GOOD_TIMES) as publishIssueTotal,
                             0 as topicTotal,
                             0 as publishTopicTotal,
-                            sum(USER_TOITEM_TIMES+PARTY_TOITEM_TIMES) as shiftProjectTotal,
+                            sum(PARTY_TOITEM_TIMES) as shiftProjectTotal,
                             sum(PARTY_TOITEM_TIMES) as publishShiftProjectTotal,
-                            sum(USER_FINISH_TIMES+PARTY_FINISH_TIMES) as resolvedProjectTotal,
+                            sum(PARTY_FINISH_TIMES) as resolvedProjectTotal,
                             sum(PARTY_FINISH_TIMES) as publishResolvedProjectTotal
                 from esua_epdc_analysis.epdc_dept_event_person_time ed
                 where GRID_ID is not null