议题详情修改

epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/checkVoteFormDTO.java → epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/CheckVoteFormDTO.java

@@ -9,7 +9,7 @@ import java.io.Serializable;
  * 校验是否投票——表决中
  */
 @Data
-public class checkVoteFormDTO implements Serializable {
+public class CheckVoteFormDTO implements Serializable {
 
     private static final long serialVersionUID = -2170063271034172650L;
     /**

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

@@ -0,0 +1,20 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * 校验是否投票——表决中
+ */
+@Data
+public class JoinVoteResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 4968824773812104403L;
+    /**
+     * 是否参与投票     已投票：true，未投票：false
+     */
+    private Boolean joinVote;
+
+}

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

@@ -0,0 +1,20 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * 议题处理进展
+ */
+@Data
+public class ProjectIdResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -7842831208204103490L;
+    /**
+     * 项目id
+     */
+    private String projectId;
+
+}

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueProjectRelationController.java

@@ -26,6 +26,8 @@ import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.dto.IssueProjectRelationDTO;
+import com.epmet.dto.form.IssueIdFormDTO;
+import com.epmet.dto.result.ProjectIdResultDTO;
 import com.epmet.excel.IssueProjectRelationExcel;
 import com.epmet.service.IssueProjectRelationService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -91,4 +93,14 @@ public class IssueProjectRelationController {
         ExcelUtils.exportExcelToTarget(response, null, list, IssueProjectRelationExcel.class);
     }
 
+    /**
+     * @Description  获取项目Id
+     * @param issueId
+     * @author zxc
+     */
+    @PostMapping("selectprojectid")
+    public Result<ProjectIdResultDTO> selectProjectId(@RequestBody IssueIdFormDTO issueId){
+        return new Result<ProjectIdResultDTO>().ok(issueProjectRelationService.selectProjectId(issueId));
+    }
+
 }

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueVoteDetailController.java

@@ -17,7 +17,6 @@
 
 package com.epmet.controller;
 
-import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ExcelUtils;
 import com.epmet.commons.tools.utils.Result;
@@ -27,7 +26,9 @@ import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.dto.IssueVoteDetailDTO;
+import com.epmet.dto.form.CheckVoteFormDTO;
 import com.epmet.dto.form.VoteFormDTO;
+import com.epmet.dto.result.JoinVoteResultDTO;
 import com.epmet.excel.IssueVoteDetailExcel;
 import com.epmet.service.IssueVoteDetailService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -104,4 +105,14 @@ public class IssueVoteDetailController {
         return new Result();
     }
 
+    /**
+     * @Description  校验是否投票
+     * @param checkVoteFormDTO
+     * @author zxc
+     */
+    @PostMapping("joinvote")
+    public Result<JoinVoteResultDTO> joinVote(@RequestBody CheckVoteFormDTO checkVoteFormDTO){
+        return new Result<JoinVoteResultDTO>().ok(issueVoteDetailService.joinVote(checkVoteFormDTO));
+    }
+
 }

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

@@ -20,7 +20,10 @@ package com.epmet.service;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.IssueProjectRelationDTO;
+import com.epmet.dto.form.IssueIdFormDTO;
+import com.epmet.dto.result.ProjectIdResultDTO;
 import com.epmet.entity.IssueProjectRelationEntity;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
 import java.util.Map;
@@ -101,4 +104,11 @@ public interface IssueProjectRelationService extends BaseService<IssueProjectRel
      * @date 2020.05.14 18:26
     **/
     String getProjectByIssueId(String issueId);
+
+    /**
+     * @Description  获取项目Id
+     * @param issueId
+     * @author zxc
+     */
+    ProjectIdResultDTO selectProjectId(IssueIdFormDTO issueId);
 }

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

@@ -20,7 +20,9 @@ package com.epmet.service;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.IssueVoteDetailDTO;
+import com.epmet.dto.form.CheckVoteFormDTO;
 import com.epmet.dto.form.VoteFormDTO;
+import com.epmet.dto.result.JoinVoteResultDTO;
 import com.epmet.entity.IssueVoteDetailEntity;
 
 import java.util.List;
@@ -100,4 +102,11 @@ public interface IssueVoteDetailService extends BaseService<IssueVoteDetailEntit
      * @author zxc
      */
     void vote(VoteFormDTO formDTO);
+
+    /**
+     * @Description  校验是否投票
+     * @param checkVoteFormDTO
+     * @author zxc
+     */
+    JoinVoteResultDTO joinVote(CheckVoteFormDTO checkVoteFormDTO);
 }

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

@@ -25,6 +25,8 @@ import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.IssueProjectRelationDao;
 import com.epmet.dto.IssueProjectRelationDTO;
+import com.epmet.dto.form.IssueIdFormDTO;
+import com.epmet.dto.result.ProjectIdResultDTO;
 import com.epmet.entity.IssueProjectRelationEntity;
 import com.epmet.redis.IssueProjectRelationRedis;
 import com.epmet.service.IssueProjectRelationService;
@@ -113,4 +115,17 @@ public class IssueProjectRelationServiceImpl extends BaseServiceImpl<IssueProjec
         return StringUtils.isBlank(issueId) ? null : baseDao.selectProjectIdByIssueId(issueId);
     }
 
+    /**
+     * @Description  获取项目Id
+     * @param issueId
+     * @author zxc
+     */
+    @Override
+    public ProjectIdResultDTO selectProjectId(IssueIdFormDTO issueId) {
+        ProjectIdResultDTO resultDTO = new ProjectIdResultDTO();
+        String projectId = baseDao.selectProjectIdByIssueId(issueId.getIssueId());
+        resultDTO.setProjectId(projectId);
+        return resultDTO;
+    }
+
 }

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

@@ -20,6 +20,7 @@ package com.epmet.service.impl;
 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.NumConstant;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
@@ -27,7 +28,9 @@ import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.IssueVoteDetailDao;
 import com.epmet.dto.IssueVoteDetailDTO;
+import com.epmet.dto.form.CheckVoteFormDTO;
 import com.epmet.dto.form.VoteFormDTO;
+import com.epmet.dto.result.JoinVoteResultDTO;
 import com.epmet.entity.IssueVoteDetailEntity;
 import com.epmet.redis.IssueVoteDetailRedis;
 import com.epmet.service.IssueVoteDetailService;
@@ -123,4 +126,24 @@ public class IssueVoteDetailServiceImpl extends BaseServiceImpl<IssueVoteDetailD
         }
     }
 
+    /**
+     * @Description  校验是否投票
+     * @param checkVoteFormDTO
+     * @author zxc
+     */
+    @Override
+    public JoinVoteResultDTO joinVote(CheckVoteFormDTO checkVoteFormDTO) {
+        JoinVoteResultDTO resultDTO = new JoinVoteResultDTO();
+        VoteFormDTO formDTO = new VoteFormDTO();
+        formDTO.setIssueId(checkVoteFormDTO.getIssueId());
+        formDTO.setCreatedBy(checkVoteFormDTO.getUserId());
+        Integer checkoutVoteCount = baseDao.checkoutVote(formDTO);
+        if (checkoutVoteCount > NumConstant.ZERO){
+            resultDTO.setJoinVote(true);
+        }else {
+            resultDTO.setJoinVote(false);
+        }
+        return resultDTO;
+    }
+
 }

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectIdFormDTO.java

@@ -0,0 +1,20 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Description 项目Id
+ * @Author zxc
+ */
+@Data
+public class ProjectIdFormDTO implements Serializable {
+    private static final long serialVersionUID = 2887479755214503489L;
+
+    @NotBlank(message = "项目id不能为空")
+    private String projectId;
+
+}
+

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectDetailCheckResultDTO.java

@@ -0,0 +1,20 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * 查询某用户是否加入过小组
+ */
+@Data
+public class ProjectDetailCheckResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 5710008005124934826L;
+    /**
+     * 项目状态    eg:已结案：true，未结案：false
+     */
+    private Boolean projectStatus;
+
+}

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectProcessController.java

@@ -27,6 +27,8 @@ import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.dto.ProjectProcessDTO;
 import com.epmet.dto.form.ProcessProjectIdFormDTO;
+import com.epmet.dto.form.ProjectIdFormDTO;
+import com.epmet.dto.result.ProjectDetailCheckResultDTO;
 import com.epmet.dto.result.ProjectProcessListResultDTO;
 import com.epmet.excel.ProjectProcessExcel;
 import com.epmet.service.ProjectProcessService;
@@ -93,9 +95,26 @@ public class ProjectProcessController {
         ExcelUtils.exportExcelToTarget(response, null, list, ProjectProcessExcel.class);
     }
 
+    /**
+     * @Description  议题处理进展——已转项目
+     * @param formDTO
+     * @author zxc
+     */
     @PostMapping("projectprocesslist")
     public Result<List<ProjectProcessListResultDTO>> projectProcessList(@RequestBody ProcessProjectIdFormDTO formDTO){
+        ValidatorUtils.validateEntity(formDTO);
         return new Result<List<ProjectProcessListResultDTO>>().ok(projectProcessService.projectProcessList(formDTO));
     }
 
+    /**
+     * @Description  校验项目是否已结案
+     * @param projectIdFormDTO
+     * @author zxc
+     */
+    @PostMapping("checkprojectclose")
+    public Result<ProjectDetailCheckResultDTO> checkProjectClose(@RequestBody ProjectIdFormDTO projectIdFormDTO){
+        ValidatorUtils.validateEntity(projectIdFormDTO);
+        return new Result<ProjectDetailCheckResultDTO>().ok(projectProcessService.checkProjectClose(projectIdFormDTO));
+    }
+
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectProcessDao.java

@@ -19,6 +19,7 @@ package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.form.ProcessProjectIdFormDTO;
+import com.epmet.dto.form.ProjectIdFormDTO;
 import com.epmet.dto.result.ProcesslistResultDTO;
 import com.epmet.dto.result.ProjectProcessListResultDTO;
 import com.epmet.entity.ProjectProcessEntity;
@@ -59,4 +60,11 @@ public interface ProjectProcessDao extends BaseDao<ProjectProcessEntity> {
      * @author zxc
      */
     List<ProjectProcessListResultDTO> projectProcessList(ProcessProjectIdFormDTO formDTO);
+
+    /**
+     * @Description  校验项目是否已结案
+     * @param projectIdFormDTO
+     * @author zxc
+     */
+    Integer checkProjectClose(ProjectIdFormDTO projectIdFormDTO);
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectProcessService.java

@@ -22,10 +22,7 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.dto.ProjectProcessDTO;
 import com.epmet.dto.form.*;
-import com.epmet.dto.result.DepartmentResultDTO;
-import com.epmet.dto.result.ProcesslistResultDTO;
-import com.epmet.dto.result.ProjectProcessListResultDTO;
-import com.epmet.dto.result.ReturnListResultDTO;
+import com.epmet.dto.result.*;
 import com.epmet.entity.ProjectProcessEntity;
 import org.springframework.web.bind.annotation.RequestBody;
 
@@ -132,4 +129,11 @@ public interface ProjectProcessService extends BaseService<ProjectProcessEntity>
      */
     List<ProjectProcessListResultDTO> projectProcessList(ProcessProjectIdFormDTO formDTO);
 
+    /**
+     * @Description  校验项目是否已结案
+     * @param projectIdFormDTO
+     * @author zxc
+     */
+    ProjectDetailCheckResultDTO checkProjectClose(ProjectIdFormDTO projectIdFormDTO);
+
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java

@@ -251,4 +251,21 @@ public class ProjectProcessServiceImpl extends BaseServiceImpl<ProjectProcessDao
         return baseDao.projectProcessList(formDTO);
     }
 
+    /**
+     * @Description  校验项目是否已结案
+     * @param projectIdFormDTO
+     * @author zxc
+     */
+    @Override
+    public ProjectDetailCheckResultDTO checkProjectClose(ProjectIdFormDTO projectIdFormDTO) {
+        ProjectDetailCheckResultDTO resultDTO = new ProjectDetailCheckResultDTO();
+        Integer projectCloseCount = baseDao.checkProjectClose(projectIdFormDTO);
+        if (projectCloseCount==NumConstant.ZERO){
+            resultDTO.setProjectStatus(false);
+        }else {
+            resultDTO.setProjectStatus(true);
+        }
+        return resultDTO;
+    }
+
 }

epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectProcessDao.xml

@@ -47,4 +47,16 @@
             ORDER BY created_time DESC
     </select>
 
+    <!-- 校验项目是否已结案 -->
+    <select id="checkProjectClose" parameterType="com.epmet.dto.form.ProjectIdFormDTO" resultType="integer">
+        SELECT
+            COUNT(*) AS closedCount
+        FROM
+            project_process
+        WHERE
+            del_flag = 0
+            AND operation = "close"
+            AND project_id = #{projectId}
+    </select>
+
 </mapper>

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

@@ -45,5 +45,20 @@ public class IssueDetailResultDTO implements Serializable {
      */
     private String issueInitiator;
 
+    /**
+     * 项目状态    已结案：true，未结案：false
+     */
+    private Boolean projectStatus;
+
+    /**
+     * 投票状态    已投票：true，未投票：false
+     */
+    private Boolean joinVote;
+
+    /**
+     * 项目Id，issue状态=“shift_status”时，projectId有值，其他情况为空字符串
+     */
+    private String projectId = "";
+
 
 }

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

@@ -0,0 +1,20 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * 校验是否投票——表决中
+ */
+@Data
+public class JoinVoteResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 4968824773812104403L;
+    /**
+     * 是否参与投票     已投票：true，未投票：false
+     */
+    private Boolean joinVote;
+
+}

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

@@ -0,0 +1,19 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * 查询某用户是否加入过小组
+ */
+@Data
+public class ProjectDetailCheckResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 5710008005124934826L;
+    /**
+     * 项目状态    eg:已结案：true，未结案：false
+     */
+    private Boolean projectStatus;
+}

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

@@ -0,0 +1,20 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * 议题处理进展
+ */
+@Data
+public class ProjectIdResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -7842831208204103490L;
+    /**
+     * 项目id
+     */
+    private String projectId;
+
+}

epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/constat/HallConstat.java

@@ -11,4 +11,19 @@ public interface HallConstat {
      */
     String SELECT_USERINFO_EXCEPTION = "获取用户昵称、头像失败";
 
+    /**
+     * 已转项目——议题
+     */
+    String SHIFT_PROJECT = "shift_project";
+
+    /**
+     * 表决中——议题
+     */
+    String VOTING = "voting";
+
+    /**
+     * 已关闭——议题
+     */
+    String CLOSED = "closed";
+
 }

epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueController.java

@@ -41,9 +41,9 @@ public class IssueController {
      */
     @PostMapping(value = "/detail")
     @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_DETAIL)
-    public Result<IssueDetailResultDTO> detail(@RequestBody IssueDetailFormDTO issueDetail){
+    public Result<IssueDetailResultDTO> detail(@LoginUser TokenDto tokenDto,@RequestBody IssueDetailFormDTO issueDetail){
         ValidatorUtils.validateEntity(issueDetail);
-        return new Result<IssueDetailResultDTO>().ok(issueService.detail(issueDetail));
+        return new Result<IssueDetailResultDTO>().ok(issueService.detail(tokenDto,issueDetail));
     }
 
     /**

epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/GovIssueFeignClient.java

@@ -2,6 +2,7 @@ package com.epmet.feign;
 
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.form.CheckVoteFormDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
 import com.epmet.feign.fallback.GovIssueFeignClientFallBack;
@@ -121,4 +122,21 @@ public interface GovIssueFeignClient {
     @PostMapping("/gov/issue/issueprocess/processlist")
     Result<List<ProcessListResultDTO>> processList(@RequestBody IssueIdFormDTO issueId);
 
+
+    /**
+     * @Description  校验是否投票
+     * @param checkVoteFormDTO
+     * @author zxc
+     */
+    @PostMapping("/gov/issue/issuevotedetail/joinvote")
+    Result<JoinVoteResultDTO> joinVote(@RequestBody CheckVoteFormDTO checkVoteFormDTO);
+
+    /**
+     * @Description  获取projectId
+     * @param issueIdFormDTO
+     * @author zxc
+     */
+    @PostMapping("/gov/issue/issueprojectrelation/selectprojectid")
+    Result<ProjectIdResultDTO> selectProjectId(@RequestBody IssueIdFormDTO issueIdFormDTO);
+
 }

epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/GovProjectFeignClient.java

@@ -4,7 +4,9 @@ import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.form.ProjectEvaluateFormDTO;
 import com.epmet.dto.form.ProjectEvaluationListFormDTO;
+import com.epmet.dto.form.ProjectIdFormDTO;
 import com.epmet.dto.form.ProjectInitEvaluationFormDTO;
+import com.epmet.dto.result.ProjectDetailCheckResultDTO;
 import com.epmet.dto.result.ProjectEvaluationListResultDTO;
 import com.epmet.dto.result.ProjectInitEvaluationResultDTO;
 import com.epmet.feign.fallback.GovProjectFeignClientFallBack;
@@ -46,4 +48,12 @@ public interface GovProjectFeignClient {
      */
     @PostMapping("/gov/project/projectsatisfactiondetail/projectevaluationlist")
     Result<List<ProjectEvaluationListResultDTO>> projectEvaluationList(ProjectEvaluationListFormDTO formDTO);
+
+    /**
+     * @Description  校验项目是否已结案
+     * @param projectIdFormDTO
+     * @author zxc
+     */
+    @PostMapping("/gov/project/projectprocess/checkprojectclose")
+    Result<ProjectDetailCheckResultDTO> checkProjectClose(@RequestBody ProjectIdFormDTO projectIdFormDTO);
 }

epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/fallback/GovIssueFeignClientFallBack.java

@@ -3,6 +3,7 @@ package com.epmet.feign.fallback;
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.form.CheckVoteFormDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
 import com.epmet.feign.GovIssueFeignClient;
@@ -76,4 +77,14 @@ public class GovIssueFeignClientFallBack implements GovIssueFeignClient {
     public Result<List<ProcessListResultDTO>> processList(IssueIdFormDTO issueId) {
         return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "processList", issueId);
     }
+
+    @Override
+    public Result<JoinVoteResultDTO> joinVote(CheckVoteFormDTO checkVoteFormDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "joinVote", checkVoteFormDTO);
+    }
+
+    @Override
+    public Result<ProjectIdResultDTO> selectProjectId(IssueIdFormDTO issueIdFormDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "selectProjectId", issueIdFormDTO);
+    }
 }

epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/fallback/GovProjectFeignClientFallBack.java

@@ -5,7 +5,9 @@ import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.form.ProjectEvaluateFormDTO;
 import com.epmet.dto.form.ProjectEvaluationListFormDTO;
+import com.epmet.dto.form.ProjectIdFormDTO;
 import com.epmet.dto.form.ProjectInitEvaluationFormDTO;
+import com.epmet.dto.result.ProjectDetailCheckResultDTO;
 import com.epmet.dto.result.ProjectEvaluationListResultDTO;
 import com.epmet.dto.result.ProjectInitEvaluationResultDTO;
 import com.epmet.feign.GovProjectFeignClient;
@@ -34,4 +36,9 @@ public class GovProjectFeignClientFallBack implements GovProjectFeignClient {
     public Result<List<ProjectEvaluationListResultDTO>> projectEvaluationList(ProjectEvaluationListFormDTO formDTO) {
         return ModuleUtils.feignConError(ServiceConstant.GOV_PROJECT_SERVER, "projectEvaluationList", formDTO);
     }
+
+    @Override
+    public Result<ProjectDetailCheckResultDTO> checkProjectClose(ProjectIdFormDTO projectIdFormDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_PROJECT_SERVER, "checkProjectClose", projectIdFormDTO);
+    }
 }

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

@@ -20,7 +20,7 @@ public interface IssueService {
      * @author zxc
      * @date 2020/5/11 10:04
      */
-    IssueDetailResultDTO detail(IssueDetailFormDTO issueDetail);
+    IssueDetailResultDTO detail(TokenDto tokenDto,IssueDetailFormDTO issueDetail);
 
     /**
      * @Description  议题表决折线图

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

@@ -6,6 +6,7 @@ import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.constat.HallConstat;
+import com.epmet.dto.form.CheckVoteFormDTO;
 import com.epmet.dto.TopicInfoDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
@@ -45,7 +46,7 @@ public class IssueServiceImpl implements IssueService {
      * @date 2020/5/11 10:04
      */
     @Override
-    public IssueDetailResultDTO detail(IssueDetailFormDTO issueDetail) {
+    public IssueDetailResultDTO detail(TokenDto tokenDto,IssueDetailFormDTO issueDetail) {
         IssueDetailResultDTO issueDetailResult = new IssueDetailResultDTO();
         //议题信息
         Result<IssueResultDTO> issueResultDTOResult = govIssueFeignClient.detail(issueDetail);
@@ -87,6 +88,26 @@ public class IssueServiceImpl implements IssueService {
                 issueDetailResult.setTopicInfo(topicInfoDTOResult);
             }
         }
+        //判断是否投票
+        CheckVoteFormDTO formDTO = new CheckVoteFormDTO();
+        formDTO.setIssueId(issueDetail.getIssueId());
+        formDTO.setUserId(tokenDto.getUserId());
+        JoinVoteResultDTO data = govIssueFeignClient.joinVote(formDTO).getData();
+        issueDetailResult.setJoinVote(data.getJoinVote());
+        if (issueDetailResult.getIssueStatus().equals(HallConstat.SHIFT_PROJECT)){
+            //校验项目是否结案
+            IssueIdFormDTO issueId = new IssueIdFormDTO();
+            issueId.setIssueId(issueDetail.getIssueId());
+            ProjectIdResultDTO projectId = govIssueFeignClient.selectProjectId(issueId).getData();
+            ProjectIdFormDTO projectIdFormDTO = new ProjectIdFormDTO();
+            projectIdFormDTO.setProjectId(projectId.getProjectId());
+            ProjectDetailCheckResultDTO projectDetailCheck = govProjectFeignClient.checkProjectClose(projectIdFormDTO).getData();
+            issueDetailResult.setProjectStatus(projectDetailCheck.getProjectStatus());
+            issueDetailResult.setProjectId(projectId.getProjectId());
+        } else if (issueDetailResult.getIssueStatus().equals(HallConstat.CLOSED)){
+            //已关闭议题，无需判断
+            issueDetailResult.setProjectStatus(true);
+        }
         return issueDetailResult;
     }