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

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

@@ -30,8 +30,9 @@ public class VoteFormDTO implements Serializable {
 
     /**
      * 当 sourceType = issue 时，是直接创建议题，无需加入小组即可表决
+     * 默认为resi_topic
      */
-    private String sourceType;
+    private String sourceType = "resi_topic";
 
 
 }

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

@@ -26,6 +26,7 @@ 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.IssueApplicationDTO;
 import com.epmet.dto.IssueApplicationHistoryDTO;
 import com.epmet.dto.form.ApplicationDetailWorkFormDTO;
 import com.epmet.dto.form.ApplicationHistoryWorkFormDTO;
@@ -37,6 +38,7 @@ 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 com.epmet.service.IssueApplicationService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -62,6 +64,8 @@ public class IssueApplicationHistoryServiceImpl extends BaseServiceImpl<IssueApp
     private ResiGroupOpenFeignClient resiGroupOpenFeignClient;
     @Autowired
     private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
+    @Autowired
+    private IssueApplicationService issueApplicationService;
 
     @Override
     public PageData<IssueApplicationHistoryDTO> page(Map<String, Object> params) {
@@ -136,6 +140,8 @@ public class IssueApplicationHistoryServiceImpl extends BaseServiceImpl<IssueApp
     public ApplicationDetailWorkResultDTO applicationDetailWork(ApplicationDetailWorkFormDTO applicationDetailWorkFormDTO) {
         ApplicationDetailFormDTO formDTO = new ApplicationDetailFormDTO();
         formDTO.setIssueApplicationId(applicationDetailWorkFormDTO.getIssueApplicationId());
+        IssueApplicationDTO issueApplicationDTO = issueApplicationService.get(applicationDetailWorkFormDTO.getIssueApplicationId());
+        formDTO.setTopicIdIsNull(StringUtils.isBlank(issueApplicationDTO.getTopicId()));
         Result<ApplicationDetailCopyResultDTO> result = resiGroupOpenFeignClient.applicationDetail(formDTO);
         if (!result.success()){
             throw new RenException("工作端查询待审核||已驳回 申请详情失败......");

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/ApplicationDetailFormDTO.java

@@ -21,4 +21,9 @@ public class ApplicationDetailFormDTO implements Serializable {
      */
     @NotBlank(message = "issueApplicationId不能为空",groups = {ApplicationDetail.class})
     private String issueApplicationId;
+
+    /**
+     * 话题ID是否为空
+     */
+    private Boolean topicIdIsNull;
 }

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

@@ -73,6 +73,7 @@ public class GroupIssueServiceImpl implements GroupIssueService {
         List<String> userIds = new ArrayList<>();
         ApplicationDetailResultDTO data = result.getData();
         userIds.add(data.getUserId());
+        if (!applicationDetailFormDTO.getTopicIdIsNull()){
             TopicInfoResultDTO topicInfoResultDTO = resiGroupDao.selectTopicInfo(data.getTopicId());
             userIds.add(topicInfoResultDTO.getTopicUserId());
             // 查询小组类别
@@ -94,20 +95,6 @@ public class GroupIssueServiceImpl implements GroupIssueService {
                     topicInfoResultDTO.setTopicPublishMobile(u.getMobile());
                 }
             });
-        /*Result<List<UserBaseInfoResultDTO>> listResult = epmetUserOpenFeignClient.queryUserBaseInfo(userIds);
-        if (!listResult.success()){
-            throw new RenException("查询话题创建者，议题创建者失败......");
-        }
-        listResult.getData().forEach(user -> {
-            if (user.getUserId().equals(data.getUserId())){
-                data.setIssuePublisher(user.getStreet().concat("-").concat(user.getSurname()).concat(getMrOrMs(user.getGender())));
-                data.setIssuePublisherMobile(user.getMobile());
-            }
-            if (user.getUserId().equals(topicInfoResultDTO.getTopicUserId())){
-                topicInfoResultDTO.setPublishedUser(user.getStreet().concat("-").concat(user.getSurname()).concat(getMrOrMs(user.getGender())));
-                topicInfoResultDTO.setTopicPublishMobile(user.getMobile());
-            }
-        });*/
             List<String> gridIds = new ArrayList<>();
             gridIds.add(data.getGridId());
             Result<List<AllGridsByUserIdResultDTO>> gridListByGridIds = govOrgOpenFeignClient.getGridListByGridIds(gridIds);
@@ -120,6 +107,7 @@ public class GroupIssueServiceImpl implements GroupIssueService {
                 }
             });
             data.setTopicInfo(topicInfoResultDTO);
+        }
         return ConvertUtils.sourceToTarget(data,ApplicationDetailCopyResultDTO.class);
     }