Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/IndexOriginExtractServiceImpl.java

@@ -80,6 +80,8 @@ public class IndexOriginExtractServiceImpl implements IndexOriginExtractService
 
 
     private void submitJob(ExtractIndexFormDTO param) {
+        CountDownLatch countDownLatch = new CountDownLatch(2);
+        long start = System.currentTimeMillis();
         final String customerId = param.getCustomerId();
         final String monthId = param.getMonthId();
         threadPool.submit(() -> {
@@ -87,6 +89,8 @@ public class IndexOriginExtractServiceImpl implements IndexOriginExtractService
                 calCpcIndexService.calCpcPartyAbility(customerId, monthId);
             } catch (Exception e) {
                 log.error("抽取【党员相关数据】发生异常,参数:" + JSON.toJSONString(param), e);
+            }finally {
+                countDownLatch.countDown();
             }
         });
         threadPool.submit(() -> {
@@ -123,6 +127,14 @@ public class IndexOriginExtractServiceImpl implements IndexOriginExtractService
             }catch (Exception e){
                 log.error("抽取【全区治理能力-全区党建能力-服务能力】发生异常,参数:" + JSON.toJSONString(param), e);
             }
+            countDownLatch.countDown();
         });
+
+        try {
+            countDownLatch.await();
+        } catch (InterruptedException e) {
+            log.error("indexOriginExtractAll countDownLatch exception", e);
+        }
+        log.warn("indexOriginExtractAll执行完毕======总耗时:{}ms，customerId:{}",System.currentTimeMillis()-start, param.getCustomerId());
     }
 }

epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/ExUserDao.xml

@@ -33,7 +33,7 @@
 
         </trim>
         WHERE 1=1
-        <foreach collection="list" item="item" open="AND(  " separator=" OR " index="index" close=")">
+        <foreach collection="list" item="item" open="AND (  " separator=" OR " index="index" close=")">
             (qx_user_id = #{item.qxUserId} )
         </foreach>
     </update>