Merge remote-tracking branch 'origin/dev_issue_audit' into dev_temp

# Conflicts:
#	epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java
#	epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java

epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/ApplicationDetailWorkFormDTO.java

@@ -0,0 +1,22 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/11/18 下午5:52
+ */
+@Data
+public class ApplicationDetailWorkFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 2611468185891863016L;
+
+    public interface ApplicationDetailWork{}
+
+    @NotBlank(message = "issueApplicationId不能为空",groups = {ApplicationDetailWork.class})
+    private String issueApplicationId;
+
+}

epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/ApplicationHistoryWorkFormDTO.java

@@ -0,0 +1,21 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/11/19 下午2:05
+ */
+@Data
+public class ApplicationHistoryWorkFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -1609931427461117171L;
+
+    public interface ApplicationHistoryWork{}
+
+    @NotBlank(message = "议题ID不能为空",groups = {ApplicationHistoryWork.class})
+    private String issueId;
+}

epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ApplicationDetailWorkResultDTO.java

@@ -0,0 +1,62 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/11/18 下午5:51
+ */
+@Data
+public class ApplicationDetailWorkResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 7351552491300420108L;
+
+    /**
+     * 申请ID
+     */
+    private String issueApplicationId;
+
+    /**
+     * 议题标题
+     */
+    private String issueTitle;
+
+    /**
+     * 所属网格名称
+     */
+    private String gridName;
+
+    /**
+     * 议题发起人
+     */
+    private String issuePublisher;
+
+    /**
+     * 话题相关信息
+     */
+    private TopicInfoWorkResultDTO topicInfo;
+
+    /**
+     * 议题建议
+     */
+    private String issueSuggestion;
+
+    /**
+     * 议题发起人电话
+     */
+    private String issuePublisherMobile;
+
+
+
+    public ApplicationDetailWorkResultDTO() {
+        this.issueApplicationId = "";
+        this.issueTitle = "";
+        this.gridName = "";
+        this.issuePublisher = "";
+        this.topicInfo = new TopicInfoWorkResultDTO();
+        this.issuePublisherMobile = "";
+        this.issueSuggestion = "";
+    }
+}

epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ApplicationHistoryWorkResultDTO.java

@@ -0,0 +1,53 @@
+package com.epmet.dto.result;
+
+import com.epmet.commons.tools.constant.NumConstant;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/11/19 下午2:08
+ */
+@Data
+public class ApplicationHistoryWorkResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 6310909348304378438L;
+
+    /**
+     * 审核历史表id
+     */
+    private String historyId;
+
+    /**
+     * under_auditing:待审核； approved:已通过， rejected:已驳回
+     */
+    private String actionType;
+
+    /**
+     * 操作时间戳
+     */
+    private Long operateTime;
+
+    /**
+     *  驳回理由或者审核通过理由
+     */
+    private String reason;
+
+    /**
+     * 工作人员姓名
+     */
+    private String staffName;
+
+    @JsonIgnore
+    private String userId;
+
+    public ApplicationHistoryWorkResultDTO() {
+        this.historyId = "";
+        this.actionType = "";
+        this.operateTime = NumConstant.ZERO_L;
+        this.reason = "";
+        this.staffName = "";
+    }
+}

epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/TopicInfoWorkResultDTO.java

@@ -0,0 +1,61 @@
+package com.epmet.dto.result;
+
+import com.epmet.commons.tools.constant.NumConstant;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/11/17 10:14 上午
+ */
+@Data
+public class TopicInfoWorkResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -3445869627210569553L;
+
+    /**
+     * 话题id
+     */
+    private String topicId;
+
+    /**
+     * 话题发表人昵称
+     */
+    private String publishedUser;
+
+    /**
+     * 话题发表时间戳
+     */
+    private Long publishedTime;
+
+    /**
+     * 话题内容
+     */
+    private String topicContent;
+
+    /**
+     * 话题图片集合
+     */
+    private List<String> topicImgs;
+
+    /**
+     * 话题发表人电话
+     */
+    private String topicPublishMobile;
+
+    @JsonIgnore
+    private String topicUserId;
+
+    public TopicInfoWorkResultDTO() {
+        this.topicId = "";
+        this.publishedUser = "";
+        this.publishedTime = NumConstant.ZERO_L;
+        this.topicContent = "";
+        this.topicImgs = new ArrayList<>();
+        this.topicPublishMobile = "";
+    }
+}

epmet-module/gov-issue/gov-issue-server/pom.xml

@@ -90,6 +90,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/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueAuditController.java

@@ -2,10 +2,14 @@ package com.epmet.controller;
 
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.dto.form.ApplicationDetailWorkFormDTO;
+import com.epmet.dto.form.ApplicationHistoryWorkFormDTO;
 import com.epmet.constant.IssueConstant;
 import com.epmet.dto.form.IssueAppQueryFormDTO;
 import com.epmet.dto.form.IssueApplicationIdFormDTO;
+import com.epmet.dto.result.ApplicationDetailWorkResultDTO;
 import com.epmet.dto.result.ApplicationHistoryResDTO;
+import com.epmet.dto.result.ApplicationHistoryWorkResultDTO;
 import com.epmet.dto.result.IssueApplicationResDTO;
 import com.epmet.service.IssueApplicationHistoryService;
 import com.epmet.service.IssueApplicationService;
@@ -34,6 +38,8 @@ public class IssueAuditController {
     /**
      * @param formDTO
      * @author yinzuomei
+     * @description 待审核|| 已驳回 列表
+     * @Date 2020/11/18 17:28
      * @description 待审核列表
      * @Date 2020/11/18 17:28
      **/
@@ -48,7 +54,7 @@ public class IssueAuditController {
      * @param formDTO
      * @author yinzuomei
      * @description 已驳回 列表
-     * @Date 2020/11/18 17:28 
+     * @Date 2020/11/18 17:28
      **/
     @PostMapping("rejectedlist")
     public Result<List<IssueApplicationResDTO>> queryRejectedList(@RequestBody IssueAppQueryFormDTO formDTO) {
@@ -81,4 +87,28 @@ public class IssueAuditController {
         ValidatorUtils.validateEntity(formDTO);
         return new Result<List<ApplicationHistoryResDTO>>().ok(issueApplicationHistoryService.queryByIssueApplicationId(formDTO.getIssueApplicationId()));
     }
+
+    /**
+     * @Description  待审核||已驳回 申请详情 
+     * @Param applicationDetailWorkFormDTO
+     * @author zxc
+     * @date 2020/11/19 下午2:26
+     */
+    @PostMapping("applicationdetail")
+    public Result<ApplicationDetailWorkResultDTO> applicationDetailWork(@RequestBody ApplicationDetailWorkFormDTO applicationDetailWorkFormDTO){
+        ValidatorUtils.validateEntity(applicationDetailWorkFormDTO, ApplicationDetailWorkFormDTO.ApplicationDetailWork.class);
+        return new Result<ApplicationDetailWorkResultDTO>().ok(issueApplicationHistoryService.applicationDetailWork(applicationDetailWorkFormDTO));
+    }
+
+    /**
+     * @Description  议题详情- 根据issueId查询审核历史
+     * @Param applicationHistoryWorkFormDTO
+     * @author zxc
+     * @date 2020/11/19 下午2:26
+     */
+    @PostMapping("issueaudithistory")
+    public Result<List<ApplicationHistoryWorkResultDTO>> applicationHistoryWork(@RequestBody ApplicationHistoryWorkFormDTO applicationHistoryWorkFormDTO){
+        ValidatorUtils.validateEntity(applicationHistoryWorkFormDTO,ApplicationHistoryWorkFormDTO.ApplicationHistoryWork.class);
+        return new Result<List<ApplicationHistoryWorkResultDTO>>().ok(issueApplicationHistoryService.applicationHistoryWork(applicationHistoryWorkFormDTO));
+    }
 }

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueApplicationHistoryDao.java

@@ -19,8 +19,10 @@ package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.result.ApplicationHistoryResDTO;
+import com.epmet.dto.result.ApplicationHistoryWorkResultDTO;
 import com.epmet.entity.IssueApplicationHistoryEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -40,4 +42,12 @@ public interface IssueApplicationHistoryDao extends BaseDao<IssueApplicationHist
      * @Date 2020/11/18 16:59
      **/
     List<ApplicationHistoryResDTO> selectListByIssueApplicationId(String issueApplicationId);
+
+    /**
+     * @Description  查询议题审核历史
+     * @Param issueId
+     * @author zxc
+     * @date 2020/11/20 上午9:39
+     */
+    List<ApplicationHistoryWorkResultDTO> applicationHistoryWork(@Param("issueId")String issueId);
 }

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueApplicationHistoryService.java

@@ -20,7 +20,11 @@ package com.epmet.service;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.IssueApplicationHistoryDTO;
+import com.epmet.dto.form.ApplicationDetailWorkFormDTO;
+import com.epmet.dto.form.ApplicationHistoryWorkFormDTO;
+import com.epmet.dto.result.ApplicationDetailWorkResultDTO;
 import com.epmet.dto.result.ApplicationHistoryResDTO;
+import com.epmet.dto.result.ApplicationHistoryWorkResultDTO;
 import com.epmet.entity.IssueApplicationHistoryEntity;
 
 import java.util.List;
@@ -101,4 +105,20 @@ public interface IssueApplicationHistoryService extends BaseService<IssueApplica
      * @Date 2020/11/18 16:57
      **/
     List<ApplicationHistoryResDTO> queryByIssueApplicationId(String issueApplicationId);
+
+    /**
+     * @Description  待审核||已驳回 申请详情 
+     * @Param applicationDetailWorkFormDTO
+     * @author zxc
+     * @date 2020/11/19 下午2:26
+     */
+    ApplicationDetailWorkResultDTO applicationDetailWork(ApplicationDetailWorkFormDTO applicationDetailWorkFormDTO);
+
+    /**
+     * @Description  议题详情- 根据issueId查询审核历史
+     * @Param applicationHistoryWorkFormDTO
+     * @author zxc
+     * @date 2020/11/19 下午2:26
+     */
+    List<ApplicationHistoryWorkResultDTO> applicationHistoryWork(ApplicationHistoryWorkFormDTO applicationHistoryWorkFormDTO);
 }

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueApplicationHistoryServiceImpl.java

@@ -21,20 +21,32 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.utils.Result;
 import com.epmet.dao.IssueApplicationHistoryDao;
 import com.epmet.dto.IssueApplicationHistoryDTO;
-import com.epmet.dto.result.ApplicationHistoryResDTO;
+import com.epmet.dto.form.ApplicationDetailWorkFormDTO;
+import com.epmet.dto.form.ApplicationHistoryWorkFormDTO;
+import com.epmet.dto.result.*;
 import com.epmet.entity.IssueApplicationHistoryEntity;
+import com.epmet.feign.EpmetUserOpenFeignClient;
+import com.epmet.resi.group.dto.group.form.ApplicationDetailFormDTO;
+import com.epmet.resi.group.dto.group.result.ApplicationDetailCopyResultDTO;
+import com.epmet.resi.group.feign.ResiGroupOpenFeignClient;
 import com.epmet.service.IssueApplicationHistoryService;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 话题转议题审核历史表
@@ -45,6 +57,11 @@ import java.util.Map;
 @Service
 public class IssueApplicationHistoryServiceImpl extends BaseServiceImpl<IssueApplicationHistoryDao, IssueApplicationHistoryEntity> implements IssueApplicationHistoryService {
 
+    @Autowired
+    private ResiGroupOpenFeignClient resiGroupOpenFeignClient;
+    @Autowired
+    private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
+
     @Override
     public PageData<IssueApplicationHistoryDTO> page(Map<String, Object> params) {
         IPage<IssueApplicationHistoryEntity> page = baseDao.selectPage(
@@ -108,4 +125,48 @@ public class IssueApplicationHistoryServiceImpl extends BaseServiceImpl<IssueApp
         return baseDao.selectListByIssueApplicationId(issueApplicationId);
     }
 
+    /**
+     * @Description  待审核||已驳回 申请详情 
+     * @Param applicationDetailWorkFormDTO
+     * @author zxc
+     * @date 2020/11/19 下午2:26
+     */
+    @Override
+    public ApplicationDetailWorkResultDTO applicationDetailWork(ApplicationDetailWorkFormDTO applicationDetailWorkFormDTO) {
+        ApplicationDetailFormDTO formDTO = new ApplicationDetailFormDTO();
+        formDTO.setIssueApplicationId(applicationDetailWorkFormDTO.getIssueApplicationId());
+        Result<ApplicationDetailCopyResultDTO> result = resiGroupOpenFeignClient.applicationDetail(formDTO);
+        if (!result.success()){
+            throw new RenException("工作端查询待审核||已驳回 申请详情失败......");
+        }
+        if (null == result.getData()){
+            return new ApplicationDetailWorkResultDTO();
+        }
+        ApplicationDetailWorkResultDTO applicationDetailWorkResultDTO = ConvertUtils.sourceToTarget(result.getData(), ApplicationDetailWorkResultDTO.class);
+        TopicInfoWorkResultDTO topicInfoWorkResultDTO = ConvertUtils.sourceToTarget(result.getData().getTopicInfo(), TopicInfoWorkResultDTO.class);
+        applicationDetailWorkResultDTO.setTopicInfo(topicInfoWorkResultDTO);
+        return applicationDetailWorkResultDTO;
+    }
+
+    /**
+     * @Description  议题详情- 根据issueId查询审核历史
+     * @Param applicationHistoryWorkFormDTO
+     * @author zxc
+     * @date 2020/11/19 下午2:26
+     */
+    @Override
+    public List<ApplicationHistoryWorkResultDTO> applicationHistoryWork(ApplicationHistoryWorkFormDTO applicationHistoryWorkFormDTO) {
+        List<ApplicationHistoryWorkResultDTO> result = baseDao.applicationHistoryWork(applicationHistoryWorkFormDTO.getIssueId());
+        if (CollectionUtils.isEmpty(result)){
+            return new ArrayList<>();
+        }
+        List<String> userIds = result.stream().map(m -> m.getUserId()).collect(Collectors.toList());
+        Result<List<UserBaseInfoResultDTO>> listResult = epmetUserOpenFeignClient.queryUserBaseInfo(userIds);
+        if (!listResult.success()){
+            throw new RenException("议题审核历史查询用户基本信息失败......");
+        }
+        result.forEach(r -> listResult.getData().stream().filter(u -> r.getUserId().equals(u.getUserId())).forEach(u -> r.setStaffName(u.getRealName())));
+        return result;
+    }
+
 }

epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueApplicationHistoryDao.xml

@@ -19,4 +19,19 @@
                 iah.CREATED_TIME DESC
     </select>
 
+    <!-- 查询议题审核历史 -->
+    <select id="applicationHistoryWork" resultType="com.epmet.dto.result.ApplicationHistoryWorkResultDTO">
+        SELECT
+            iah.ID AS historyId,
+            iah.ACTION_TYPE,
+            UNIX_TIMESTAMP(iah.CREATED_TIME) AS operateTime,
+            iah.REASON,
+            iah.CREATED_BY AS userId
+        FROM issue_application_history iah
+        LEFT JOIN issue_application ia ON ia.ID = iah.ISSUE_APPLICATION_ID
+        WHERE iah.DEL_FLAG = '0'
+          AND ia.DEL_FLAG = '0'
+          AND ia.ISSUE_ID = #{issueId}
+    </select>
+
 </mapper>

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/ApplicationDetailCopyResultDTO.java

@@ -33,8 +33,16 @@ public class ApplicationDetailCopyResultDTO implements Serializable {
      */
     private String issuePublisher;
 
+    /**
+     * 议题建议
+     */
     private String issueSuggestion;
 
+    /**
+     * 议题发起人电话
+     */
+    private String issuePublisherMobile;
+
     /**
      * 话题相关信息
      */
@@ -47,5 +55,6 @@ public class ApplicationDetailCopyResultDTO implements Serializable {
         this.issueSuggestion = "";
         this.issuePublisher = "";
         this.topicInfo = new TopicInfoResultDTO();
+        this.issuePublisherMobile = "";
     }
 }

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/ApplicationDetailResultDTO.java

@@ -38,8 +38,16 @@ public class ApplicationDetailResultDTO implements Serializable {
      */
     private TopicInfoResultDTO topicInfo;
 
+    /**
+     * 议题建议
+     */
     private String issueSuggestion;
 
+    /**
+     * 议题发起人电话
+     */
+    private String issuePublisherMobile;
+
     private String gridId;
 
     private String topicId;
@@ -52,5 +60,7 @@ public class ApplicationDetailResultDTO implements Serializable {
         this.gridName = "";
         this.issuePublisher = "";
         this.topicInfo = new TopicInfoResultDTO();
+        this.issueSuggestion = "";
+        this.issuePublisherMobile = "";
     }
 }

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/TopicInfoResultDTO.java

@@ -42,6 +42,11 @@ public class TopicInfoResultDTO implements Serializable {
      */
     private List<String> topicImgs;
 
+    /**
+     * 话题发表人电话
+     */
+    private String topicPublishMobile;
+
     @JsonIgnore
     private String topicUserId;
 
@@ -51,5 +56,6 @@ public class TopicInfoResultDTO implements Serializable {
         this.publishedTime = NumConstant.ZERO_L;
         this.topicContent = "";
         this.topicImgs = new ArrayList<>();
+        this.topicPublishMobile = "";
     }
 }

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java

@@ -2,7 +2,9 @@ package com.epmet.resi.group.feign;
 
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.resi.group.dto.group.form.ApplicationDetailFormDTO;
 import com.epmet.resi.group.dto.group.form.GroupInfoFormDTO;
+import com.epmet.resi.group.dto.group.result.ApplicationDetailCopyResultDTO;
 import com.epmet.resi.group.dto.group.result.GroupInfoResultDTO;
 import com.epmet.resi.group.dto.topic.MyCreateTopicsFormDTO;
 import com.epmet.resi.group.dto.topic.form.CustomerPageFormDTO;
@@ -138,3 +140,13 @@ public interface ResiGroupOpenFeignClient {
     @PostMapping("resi/group/topic/myparttopic")
     Result<MyPartIssueResultDTO> selectMyPartTopic(@RequestBody MyPartIssueFormDTO myPartIssueFormDTO);
 }
+
+    /**
+     * @Description  待审核||已驳回 申请详情
+     * @Param applicationDetailFormDTO
+     * @author zxc
+     * @date 2020/11/17 10:45 上午
+     */
+    @PostMapping("resi/group/groupissue/applicationdetail")
+    Result<ApplicationDetailCopyResultDTO> applicationDetail(@RequestBody ApplicationDetailFormDTO applicationDetailFormDTO);
+    }

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java

@@ -11,7 +11,9 @@ import com.epmet.resi.group.dto.group.result.GroupEditionDetailResultDTO;
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.resi.group.dto.group.form.ApplicationDetailFormDTO;
 import com.epmet.resi.group.dto.group.form.GroupInfoFormDTO;
+import com.epmet.resi.group.dto.group.result.ApplicationDetailCopyResultDTO;
 import com.epmet.resi.group.dto.group.result.GroupInfoResultDTO;
 import com.epmet.resi.group.dto.topic.MyCreateTopicsFormDTO;
 import com.epmet.resi.group.dto.topic.form.CustomerPageFormDTO;
@@ -93,4 +95,9 @@ public class ResiGroupOpenFeignClientFallback implements ResiGroupOpenFeignClien
     public Result<MyPartIssueResultDTO> selectMyPartTopic(MyPartIssueFormDTO myPartIssueFormDTO) {
         return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "selectMyPartTopic", myPartIssueFormDTO);
     }
+
+    @Override
+    public Result<ApplicationDetailCopyResultDTO> applicationDetail(ApplicationDetailFormDTO applicationDetailFormDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "applicationDetail", applicationDetailFormDTO);
+    }
 }

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

@@ -80,9 +80,11 @@ public class GroupIssueServiceImpl implements GroupIssueService {
         listResult.getData().forEach(user -> {
             if (user.getUserId().equals(data.getUserId())){
                 data.setIssuePublisher(user.getDistrict().concat("-").concat(user.getSurname()).concat(getMrOrMs(user.getGender())));
+                data.setIssuePublisherMobile(user.getMobile());
             }
             if (user.getUserId().equals(topicInfoResultDTO.getTopicUserId())){
                 topicInfoResultDTO.setPublishedUser(user.getDistrict().concat("-").concat(user.getSurname()).concat(getMrOrMs(user.getGender())));
+                topicInfoResultDTO.setTopicPublishMobile(user.getMobile());
             }
         });
         List<String> gridIds = new ArrayList<>();