修改resi/hall/issue/detail方法，新增返参attitude

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

@@ -17,4 +17,8 @@ public class JoinVoteResultDTO implements Serializable {
      */
     private Boolean joinVote;
 
+    /**
+     * 态度 - opposition（反对）support（赞成） 如果已投票，此列有值
+     */
+    private String attitude;
 }

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

@@ -17,16 +17,16 @@
 
 package com.epmet.service.impl;
 
-import com.alibaba.fastjson.JSONArray;
 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.constant.NumConstant;
+import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 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.constant.FieldConstant;
 import com.epmet.constant.IssueConstant;
 import com.epmet.dao.IssueDao;
 import com.epmet.dao.IssueVoteDetailDao;
@@ -179,11 +179,24 @@ public class IssueVoteDetailServiceImpl extends BaseServiceImpl<IssueVoteDetailD
         checkTopicPublisher.setTopicId(issueDTO.getSourceId());
         CheckTopicPublisherResultDTO publisherResult = resiGroupFeignClient.checkTopicPublisher(checkTopicPublisher).getData();
         //校验是否投过票
-        Integer checkoutVoteCount = baseDao.checkoutVote(formDTO);
+        /*Integer checkoutVoteCount = baseDao.checkoutVote(formDTO);
         if (checkoutVoteCount > NumConstant.ZERO || issuePublisher > NumConstant.ZERO || publisherResult.getCheckTopicPublisher() > NumConstant.ZERO){
             resultDTO.setJoinVote(true);
         }else {
             resultDTO.setJoinVote(false);
+        }*/
+        IssueVoteDetailDTO issueVoteDetailDTO=baseDao.selectUserIssueDet(checkVoteFormDTO.getUserId(),checkVoteFormDTO.getIssueId());
+        if(null!=issueVoteDetailDTO){
+            resultDTO.setJoinVote(true);
+            resultDTO.setAttitude(issueVoteDetailDTO.getAttitude());
+            return resultDTO;
+        }
+        if (issuePublisher > NumConstant.ZERO || publisherResult.getCheckTopicPublisher() > NumConstant.ZERO){
+            resultDTO.setJoinVote(true);
+            resultDTO.setAttitude(StrConstant.EPMETY_STR);
+        }else {
+            resultDTO.setJoinVote(false);
+            resultDTO.setAttitude(StrConstant.EPMETY_STR);
         }
         return resultDTO;
     }

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

@@ -69,4 +69,9 @@ public class IssueDetailResultDTO implements Serializable {
      *  true已发表过想法，false未发表想法
      */
     private Boolean publishIdeaFlag;
+
+    /**
+     * 态度 - opposition（反对）support（赞成）
+     */
+    private String attitude;
 }

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

@@ -17,4 +17,8 @@ public class JoinVoteResultDTO implements Serializable {
      */
     private Boolean joinVote;
 
+    /**
+     * 态度 - opposition（反对）support（赞成） 如果已投票，此列有值
+     */
+    private String attitude;
 }

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

@@ -87,8 +87,14 @@ public class IssueServiceImpl implements IssueService {
         CheckVoteFormDTO formDTO = new CheckVoteFormDTO();
         formDTO.setIssueId(issueDetail.getIssueId());
         formDTO.setUserId(tokenDto.getUserId());
-        JoinVoteResultDTO data = govIssueFeignClient.joinVote(formDTO).getData();
-        issueDetailResult.setJoinVote(data.getJoinVote());
+        Result<JoinVoteResultDTO> joinVoteResultDTOResult=govIssueFeignClient.joinVote(formDTO);
+        if(joinVoteResultDTOResult.success()&&null!=joinVoteResultDTOResult.getData()){
+            issueDetailResult.setJoinVote(joinVoteResultDTOResult.getData().getJoinVote());
+            issueDetailResult.setAttitude(joinVoteResultDTOResult.getData().getAttitude());
+        }else{
+            issueDetailResult.setJoinVote(false);
+            issueDetailResult.setAttitude(StrConstant.EPMETY_STR);
+        }
         if (issueDetailResult.getIssueStatus().equals(HallConstat.SHIFT_PROJECT)){
             //校验项目是否结案
             IssueIdFormDTO issueId = new IssueIdFormDTO();