Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_group_act_notice

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/TopicInfoDTO.java

@@ -40,4 +40,9 @@ public class TopicInfoDTO implements Serializable {
      */
     private Long publishedTime = 0L;
 
+    /**
+     * 小组类型(ordinary:楼院小组  branch:支部小组)
+     */
+    private String groupType;
+
 }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java

@@ -1369,6 +1369,21 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
             topicInfo.setTopicImgs(attachmentUrls);
         }
         //话题发起人
+        if("branch".equals(topicInfo.getGroupType())){//支部小组话题发起人显示真实姓名
+            List<String> userIdList = new ArrayList<>();
+            userIdList.add(topicInfo.getPublishedUser());
+            Result<List<UserBaseInfoResultDTO>> result = epmetUserOpenFeignClient.queryUserBaseInfo(userIdList);
+            if (!result.success()) {
+                throw new RenException("调用user服务，获取用户基础数据失败");
+            }
+            List<UserBaseInfoResultDTO> resultDTOList = result.getData();
+            resultDTOList.forEach(re->{
+                if(topicInfo.getPublishedUser().equals(re.getUserId())){
+                    //话题发起人
+                    topicInfo.setPublishedUser(re.getRealName() == null ? "" : re.getRealName());
+                }
+            });
+        } else {
             IssueInitiatorFormDTO issueInitiator = new IssueInitiatorFormDTO();
             issueInitiator.setUserId(topicInfo.getPublishedUser());
             Result<IssueInitiatorResultDTO> r = epmetUserFeignClient.selectIssueInitiator(issueInitiator);
@@ -1381,6 +1396,8 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
                     topicInfo.setPublishedUser(issueInitiatorResult.getIssueInitiator());
                 }
             }
+        }
+
         return topicInfo;
     }
 

epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml

@@ -378,15 +378,18 @@
     <!-- 根据topicId查询话题信息 （议题详情——话题信息） -->
     <select id="selectDetail" parameterType="com.epmet.resi.group.dto.topic.form.TopicInfoFormDTO" resultType="com.epmet.resi.group.dto.topic.TopicInfoDTO">
         SELECT
-            id AS topicId,
-            topic_content AS topicContent,
-            created_by AS publishedUser,
-            UNIX_TIMESTAMP( created_time ) AS publishedTime
+            rt.id AS topicId,
+            rt.topic_content AS topicContent,
+            rt.created_by AS publishedUser,
+            UNIX_TIMESTAMP(rt.created_time) AS publishedTime,
+            rg.group_type AS groupType
         FROM
-            resi_topic
+            resi_topic rt
+        LEFT JOIN resi_group rg ON rt.group_id = rg.id
         WHERE
-            id = #{topicId}
-            AND del_flag = 0
+            rt.del_flag = '0'
+        AND rg.del_flag = '0'
+        AND rt.id = #{topicId}
     </select>
 
     <!-- 通过topicId查询话题所在组的网格Id和客户Id -->

epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/TopicInfoDTO.java

@@ -40,4 +40,10 @@ public class TopicInfoDTO implements Serializable {
      */
     private Long publishedTime;
 
+    /**
+     * 小组类型(ordinary:楼院小组  branch:支部小组)
+     */
+    private String groupType;
+
+
 }

epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/IssueInitiatorResultDTO.java

@@ -16,5 +16,9 @@ public class IssueInitiatorResultDTO implements Serializable {
      * 议题发起人（山东路168-尹女士）
      */
     private String issueInitiator;
+    /**
+     * 议题发起人真实姓名
+     */
+    private String realUserName;
 
 }

epmet-module/resi-hall/resi-hall-server/pom.xml

@@ -51,6 +51,12 @@
             <version>2.0.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>epmet-user-client</artifactId>
+            <version>2.0.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>

epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java

@@ -45,6 +45,8 @@ public class IssueServiceImpl implements IssueService {
     private GovIssueOpenFeignClient govIssueOpenFeignClient;
     @Autowired
     private LoginUserUtil loginUserUtil;
+    @Autowired
+    private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
 
     /**
      * @param issueDetail
@@ -62,13 +64,7 @@ public class IssueServiceImpl implements IssueService {
             return issueDetailResult;
         }
         BeanUtils.copyProperties(issueResult, issueDetailResult);
-        //话题发起人
-        IssueInitiatorFormDTO initiatorFormDTO = new IssueInitiatorFormDTO();
-        initiatorFormDTO.setUserId(issueResult.getUserId());
-        if (!StringUtils.isBlank(issueResult.getUserId())) {
-            IssueInitiatorResultDTO initiatorResult = userFeignClient.selectIssueInitiator(initiatorFormDTO).getData();
-            issueDetailResult.setIssueInitiator(initiatorResult == null ? HallConstat.NULL_CHARACTER_STRING : initiatorResult.getIssueInitiator());
-        }
+
         //网格名称
         BelongGridNameFormDTO belongGridName = new BelongGridNameFormDTO();
         belongGridName.setGridId(issueResult.getGridId());
@@ -79,10 +75,35 @@ public class IssueServiceImpl implements IssueService {
         //话题信息
         TopicInfoFormDTO topicInfoFormDTO = new TopicInfoFormDTO();
         topicInfoFormDTO.setTopicId(issueResult.getTopicId());
+        TopicInfoDTO topicInfoDTOResult = new TopicInfoDTO();
         if (!StringUtils.isBlank(issueResult.getTopicId())) {
-            TopicInfoDTO topicInfoDTOResult = resiGroupFeignClient.selectDetail(topicInfoFormDTO).getData();
+            topicInfoDTOResult = resiGroupFeignClient.selectDetail(topicInfoFormDTO).getData();
             issueDetailResult.setTopicInfo(topicInfoDTOResult == null ? new TopicInfoDTO() : topicInfoDTOResult);
         }
+        if("branch".equals(topicInfoDTOResult.getGroupType())){//支部小组话题发起人显示真实姓名
+            List<String> userIdList = new ArrayList<>();
+            userIdList.add(issueResult.getUserId());
+            Result<List<UserBaseInfoResultDTO>> result = epmetUserOpenFeignClient.queryUserBaseInfo(userIdList);
+            if (!result.success()) {
+                throw new RenException("调用user服务，获取用户基础数据失败");
+            }
+            List<UserBaseInfoResultDTO> resultDTOList = result.getData();
+            resultDTOList.forEach(re->{
+                if(issueResult.getUserId().equals(re.getUserId())){
+                    //话题发起人
+                    issueDetailResult.setIssueInitiator(re.getRealName() == null ? "" : re.getRealName());
+                }
+            });
+        } else {
+            //话题发起人
+            IssueInitiatorFormDTO initiatorFormDTO = new IssueInitiatorFormDTO();
+            initiatorFormDTO.setUserId(issueResult.getUserId());
+            if (!StringUtils.isBlank(issueResult.getUserId())) {
+                IssueInitiatorResultDTO initiatorResult = userFeignClient.selectIssueInitiator(initiatorFormDTO).getData();
+                issueDetailResult.setIssueInitiator(initiatorResult == null ? HallConstat.NULL_CHARACTER_STRING : initiatorResult.getIssueInitiator());
+            }
+        }
+
         //判断是否投票
         CheckVoteFormDTO formDTO = new CheckVoteFormDTO();
         formDTO.setIssueId(issueDetail.getIssueId());

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IssueInitiatorResultDTO.java

@@ -16,5 +16,9 @@ public class IssueInitiatorResultDTO implements Serializable {
      * 议题发起人（山东路168-尹女士）
      */
     private String issueInitiator;
+    /**
+     * 议题发起人真实姓名
+     */
+    private String realUserName;
 
 }

epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml

@@ -146,9 +146,16 @@
                 '先生'
             WHEN uw.sex = '2' THEN
                 '女士'
-                    ELSE '先生/女士'
+            ELSE
+                '先生/女士'
             END
-                ) AS issueInitiator
+            ) AS issueInitiator,
+            CONCAT(
+                uri.street,
+                '-',
+                uri.surname,
+                uriNAME
+            ) AS realUserName
         FROM
             user_resi_info uri
             LEFT JOIN user_wechat uw ON uw.user_id = uri.user_id