Merge remote-tracking branch 'remotes/origin/dev_update_event' into 烟台master

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectDataDao.xml

@@ -240,28 +240,20 @@
             FROM
                 screen_project_process spp
             WHERE
-                ( spp.CUSTOMER_ID = '2fe0065f70ca0e23ce4c26fca5f1d933' OR spp.CUSTOMER_ID = '44876154d10d7cb7affd92000f84f833' OR spp.CUSTOMER_ID = '46c55cb862d6d5e6d05d2ab61a1cc07e' )
+                (( spp.CUSTOMER_ID = '2fe0065f70ca0e23ce4c26fca5f1d933' OR spp.CUSTOMER_ID = '44876154d10d7cb7affd92000f84f833' OR spp.CUSTOMER_ID = '46c55cb862d6d5e6d05d2ab61a1cc07e' )
-                AND OPERATION = 'closed_case' UNION ALL
+                AND OPERATION = 'closed_case')
-            SELECT
+                OR
-                spp.CUSTOMER_ID,
+                (( spp.CUSTOMER_ID != '2fe0065f70ca0e23ce4c26fca5f1d933' AND spp.CUSTOMER_ID != '44876154d10d7cb7affd92000f84f833' AND spp.CUSTOMER_ID != '46c55cb862d6d5e6d05d2ab61a1cc07e' )
-                PROJECT_ID,
+                AND OPERATION = 'close')
-                HANDLER_ID,
+                <if test='null != customerId and "" != customerId'>
-                HANDLER_TYPE,
+                    AND spp.CUSTOMER_ID = #{customerId}
-                ORG_ID_PATH
+                </if>
-            FROM
+                <if test='null != projectIds and projectIds.size()>0'>
-                screen_project_process spp
+                    <foreach collection="projectIds" item="projectId" open="AND (" separator=" OR " close=" )">
-            WHERE
+                       spp.PROJECT_ID = #{projectId}
-                ( spp.CUSTOMER_ID != '2fe0065f70ca0e23ce4c26fca5f1d933' AND spp.CUSTOMER_ID != '44876154d10d7cb7affd92000f84f833' AND spp.CUSTOMER_ID != '46c55cb862d6d5e6d05d2ab61a1cc07e' )
+                    </foreach>
-                AND OPERATION = 'close'
+                </if>
             ) b ON a.PROJECT_ID = b.PROJECT_ID
-            <if test='null != customerId and "" != customerId'>
-                AND b.CUSTOMER_ID = #{customerId}
-            </if>
-            <if test='null != projectIds and projectIds.size()>0'>
-                <foreach collection="projectIds" item="projectId" open="AND (" separator=" OR " close=" )">
-                   b.PROJECT_ID = #{projectId}
-                </foreach>
-            </if>
             LEFT JOIN screen_customer_agency c ON b.HANDLER_ID = c.AGENCY_ID
             WHERE a.DEL_FLAG = '0'
             AND a.CATEGORY_CODE IS NOT NULL

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BaseDisputeProcessServiceImpl.java

@@ -83,7 +83,7 @@ public class BaseDisputeProcessServiceImpl extends BaseServiceImpl<BaseDisputePr
         List<EventInfoResultDTO> list = result.getData();
         saveEvent(formDTO, deptMap, userMap, list);
         //分批次循环
-        while (CollectionUtils.isNotEmpty(list)) {
+        while (CollectionUtils.isNotEmpty(list) && list.size() == formDTO.getPageSize()) {
             formDTO.setPageNo(formDTO.getPageNo() + NumConstant.ONE);
             result = dataStatisticalOpenFeignClient.getEventInfo(formDTO);
             list = result.getData();