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

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/mq/ProjectChangedCustomListener.java

@@ -2,7 +2,6 @@ package com.epmet.mq;
 
 import com.alibaba.fastjson.JSON;
 import com.epmet.commons.rocketmq.messages.ProjectChangedMQMsg;
-import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.distributedlock.DistributedLock;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.redis.RedisKeys;
@@ -12,8 +11,6 @@ import com.epmet.dto.extract.form.ExtractOriginFormDTO;
 import com.epmet.service.evaluationindex.extract.todata.FactOriginExtractService;
 import com.epmet.service.evaluationindex.extract.toscreen.ScreenExtractService;
 import com.epmet.util.DimIdGenerator;
-import com.google.common.cache.Cache;
-import com.google.common.cache.CacheBuilder;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyContext;
@@ -23,7 +20,6 @@ import org.apache.rocketmq.common.message.MessageExt;
 import org.redisson.api.RLock;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.data.redis.core.RedisTemplate;
 
 import javax.annotation.PreDestroy;
 import java.util.Date;
@@ -119,11 +115,12 @@ public class ProjectChangedCustomListener implements MessageListenerConcurrently
             extractOriginFormDTO.setDateId(dateId);
             Future<?> aBoolean = SpringContextUtils.getBean(FactOriginExtractService.class).submitProjectRelationData(extractOriginFormDTO,null);
             try {
-                aBoolean.get();
+                Object o = aBoolean.get();
+                log.info("submitProjectRelationData result:{}",o);
             } catch (InterruptedException e) {
-                e.printStackTrace();
+                log.error("submitProjectRelationData tread InterruptedException",e);
             } catch (ExecutionException e) {
-                e.printStackTrace();
+                log.error("submitProjectRelationData tread ExecutionException",e);
             }
             if (aBoolean.isDone()){
                 // 指标库，实时数据只更新:【screen_project_data】

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/CustomerStaffGridDao.xml

@@ -16,7 +16,7 @@
                 grid.PIDS gridPids
             FROM
                 customer_staff_grid sg
-                LEFT JOIN customer_grid grid ON grid.id = sg.grid_id
+                LEFT JOIN customer_grid grid ON grid.id = sg.grid_id AND grid.DEL_FLAG = '0'
             WHERE
                 sg.del_flag = '0'
 

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/partymember/PartyMemberDao.xml

@@ -10,7 +10,11 @@
             GRID_ID,
             USER_ID,
             ID_CARD,
-            STR_TO_DATE( SUBSTRING( ID_CARD, 7, 8 ),'%Y%m%d') AS birthday
+            (
+                case when LENGTH(ID_CARD)=15 then STR_TO_DATE( concat('19',SUBSTRING( ID_CARD, 7, 6 )),'%Y%m%d')
+                else STR_TO_DATE( SUBSTRING( ID_CARD, 7, 8 ),'%Y%m%d')
+                end
+            )as birthday
         FROM
             partymember_info
         WHERE

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/user/UserDao.xml

@@ -588,18 +588,19 @@
           AND sr.CUSTOMER_ID = #{customerId}
     </select>
     <select id="selectUserByRoleKey" resultType="com.epmet.dto.user.result.CustomerStaffDTO">
-       SELECT DISTINCT
+       SELECT
-            s.USER_ID,
             s.*,
             gsr.ROLE_NAME
         FROM
             customer_staff s
-            LEFT JOIN staff_role sr ON sr.STAFF_ID = s.USER_ID
+            LEFT JOIN staff_role sr ON sr.STAFF_ID = s.USER_ID AND sr.DEL_FLAG = '0'
             AND sr.CUSTOMER_ID = s.CUSTOMER_ID
-            LEFT JOIN gov_staff_role gsr ON gsr.ID = sr.ROLE_ID
+            LEFT JOIN gov_staff_role gsr ON gsr.ID = sr.ROLE_ID AND gsr.DEL_FLAG = '0'
         WHERE
             s.del_flag = '0'
+            AND gsr.CUSTOMER_ID = #{customerId}
             AND gsr.ROLE_KEY = #{roleKey}
+            GROUP BY s.USER_ID
     </select>
     <select id="selectLastStaffPatrolList" resultType="com.epmet.dto.user.result.StatsStaffPatrolRecordDailyDTO">
         SELECT