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

# Conflicts:
#	epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java
#	epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java

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

@@ -0,0 +1,32 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * 满意度评价列表——已关闭
+ */
+@Data
+public class EvaluationListFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 议题Id
+     */
+    private String IssueId;
+
+    /**
+     * 页码
+     */
+    private Integer pageNo;
+
+    /**
+     * 每页数量
+     */
+    private Integer pageSize;
+
+
+}

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

@@ -0,0 +1,22 @@
+package com.epmet.dto.form;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description userId集合
+ * @Author yinzuomei
+ * @Date 2020/4/7 18:20
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class UserResiInfoListFormDTO implements Serializable {
+	private static final long serialVersionUID = -4454561042197166135L;
+
+	private List<String> userIdList;
+}

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

@@ -0,0 +1,47 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * 满意度评价列表——已关闭
+ */
+@Data
+public class EvaluationListResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -1L;
+
+    /**
+     * 评价用户Id
+     */
+    private String userId;
+
+    /**
+     * 评价用户（山东路168-尹女士）
+     */
+    private String userNickName;
+
+    /**
+     * 满意度 - 不满意:bad、基本满意:good、非常满意:perfect
+     */
+    private String satisfaction;
+
+    /**
+     * 评价时间
+     */
+    private Long evaluateTime;
+
+    /**
+     * 评价内容
+     */
+    private String evaluateContent;
+
+    /**
+     * 用户头像
+     */
+    private String userHeadPhoto;
+
+
+}

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

@@ -0,0 +1,64 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description 用户注册信息返参DTO
+ * @Author yinzuomei
+ * @Date 2020/4/7 18:45
+ */
+@Data
+public class UserResiInfoResultDTO implements Serializable {
+
+	/**
+	 * 唯一标识
+	 */
+	private String id;
+
+	/**
+	 * 用户Id(主键) user.id
+	 */
+	private String userId;
+
+	/**
+	 * 手机号(注册手机号)
+	 */
+	private String regMobile;
+
+	/**
+	 * 姓氏
+	 */
+	private String surname;
+
+	/**
+	 * 名称
+	 */
+	private String name;
+
+	/**
+	 * 街道
+	 */
+	private String street;
+
+	/**
+	 * 小区名称
+	 */
+	private String district;
+
+	/**
+	 * 楼栋单元
+	 */
+	private String buildingAddress;
+
+	/**
+	 * 用户显示名称
+	 */
+	private String showName;
+
+	/**
+	 * 用户头像
+	 */
+	private String headPhoto;
+}

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/constant/IssueConstant.java

@@ -52,4 +52,6 @@ public interface IssueConstant {
     String ISSUE_AGENCY = "agency";
     String ISSUE_DEPT = "dept";
     String ISSUE_GRID = "grid";
+
+    String SELECT_USERINFO_EXCEPTION = "获取用户昵称、头像失败";
 }

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

@@ -6,14 +6,20 @@ import com.epmet.commons.tools.enums.RequirePermissionEnum;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
-import com.epmet.dto.form.CloseIssueFormDTO;
+import com.epmet.dto.form.*;
+import com.epmet.dto.result.DepartmentStaffListResultDTO;
+import com.epmet.dto.result.EvaluationListResultDTO;
+import com.epmet.dto.result.VotingTrendResultDTO;
 import com.epmet.service.IssueService;
+import com.epmet.service.IssueVoteStatisticalService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description 政府端-基层治理-议题管理
  * @Author yinzuomei
@@ -25,6 +31,8 @@ public class IssueManageController {
 
     @Autowired
     private IssueService issueService;
+    @Autowired
+    private IssueVoteStatisticalService issueVoteStatisticalService;
 
     /**
      * @param formDTO
@@ -39,5 +47,38 @@ public class IssueManageController {
         issueService.closeIssue(formDTO);
         return new Result();
     }
+
+    /**
+     * @param formDTO
+     * @return
+     * @Author sun
+     * @Description 议题管理-部门人员选择
+     **/
+    @PostMapping("departmentstafflist")
+    @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_SHIFT_PROJECT)
+    public Result<DepartmentStaffListResultDTO> departmentStaffList(@LoginUser TokenDto tokenDTO, @RequestBody DepartmentStaffListFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO);
+        return new Result<DepartmentStaffListResultDTO>().ok(issueService.departmentStaffList(formDTO));
+    }
+
+    /**
+     * @Description  详情折线图
+     * @param issueId
+     * @author zxc
+     */
+    @PostMapping("votingtrend")
+    public Result<VotingTrendResultDTO> votingTrend(@RequestBody IssueIdFormDTO issueId){
+        return new Result<VotingTrendResultDTO>().ok(issueVoteStatisticalService.votingTrend(issueId));
+    }
+
+    /**
+     * @Description  满意度评价列表——已关闭
+     * @param formDTO
+     * @author zxc
+     */
+    @PostMapping("evaluationlist")
+    public Result<List<EvaluationListResultDTO>> evaluationList(@RequestBody EvaluationListFormDTO formDTO){
+        return new Result<List<EvaluationListResultDTO>>().ok(issueVoteStatisticalService.evaluationList(formDTO));
+    }
 }
 

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

@@ -27,7 +27,9 @@ import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.dto.IssueSatisfactionDetailDTO;
 import com.epmet.dto.form.EvaluateFormDTO;
+import com.epmet.dto.form.EvaluationListFormDTO;
 import com.epmet.dto.form.InitEvaluationFormDTO;
+import com.epmet.dto.result.EvaluationListResultDTO;
 import com.epmet.dto.result.InitEvaluationResultDTO;
 import com.epmet.excel.IssueSatisfactionDetailExcel;
 import com.epmet.service.IssueSatisfactionDetailService;
@@ -105,7 +107,7 @@ public class IssueSatisfactionDetailController {
     }
 
     /**
-     * @Description  提交满意度评价
+     * @Description  提交满意度评价——已关闭
      * @param formDTO
      * @author zxc
      */
@@ -115,4 +117,14 @@ public class IssueSatisfactionDetailController {
         return new Result();
     }
 
+    /**
+     * @Description  满意度评价列表——已关闭
+     * @param formDTO
+     * @author zxc
+     */
+    @PostMapping("evaluationlist")
+    public Result<List<EvaluationListResultDTO>> evaluationList(@RequestBody EvaluationListFormDTO formDTO){
+        return new Result<List<EvaluationListResultDTO>>().ok(issueSatisfactionDetailService.evaluationList(formDTO));
+    }
+
 }

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

@@ -19,10 +19,14 @@ package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.EvaluateInfoDTO;
+import com.epmet.dto.form.EvaluationListFormDTO;
 import com.epmet.dto.form.InitEvaluationFormDTO;
+import com.epmet.dto.result.EvaluationListResultDTO;
 import com.epmet.entity.IssueSatisfactionDetailEntity;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 议题满意度调查记录表
  *
@@ -39,4 +43,11 @@ public interface IssueSatisfactionDetailDao extends BaseDao<IssueSatisfactionDet
      */
     EvaluateInfoDTO checkSatisfaction(InitEvaluationFormDTO formDTO);
 
+    /**
+     * @Description  满意度评价列表——已关闭
+     * @param formDTO
+     * @author zxc
+     */
+    List<EvaluationListResultDTO> evaluationList(EvaluationListFormDTO formDTO);
+
 }

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java

@@ -0,0 +1,32 @@
+package com.epmet.feign;
+
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.form.UserResiInfoListFormDTO;
+import com.epmet.dto.result.UserResiInfoResultDTO;
+import com.epmet.feign.fallback.EpmetUserFeignClientFallBack;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
+
+/**
+ * @author zxc
+ * @dscription
+ * @date 2020/5/11 10:32
+ */
+//url = "localhost:8087"
+@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserFeignClientFallBack.class)
+public interface EpmetUserFeignClient {
+
+	/**
+	 * @Description  查询评价人和评价人头像
+	 * @param formDTO
+	 * @author zxc
+	 */
+	@PostMapping("/epmetuser/userresiinfo/getuserresiinfolist")
+	Result<List<UserResiInfoResultDTO>> getUserResiInfoList(@RequestBody UserResiInfoListFormDTO formDTO);
+
+
+}

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java

@@ -5,8 +5,10 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.CustomerGridDTO;
 import com.epmet.dto.form.CustomerGridFormDTO;
 import com.epmet.dto.result.AgencyGridResultDTO;
+import com.epmet.dto.result.DepartmentStaffListResultDTO;
 import com.epmet.feign.fallback.GovOrgFeignClientFallBack;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 
 /**
@@ -24,4 +26,13 @@ public interface GovOrgFeignClient {
      **/
     @PostMapping("/gov/org/customergrid/getcustomergridbygridid")
     Result<AgencyGridResultDTO> getAgencyAndGrid(AgencyGridResultDTO agencyGridResultDTO);
+
+    /**
+     * @param agencyId
+     * @return
+     * @Author sun
+     * @Description 查询组织下人员,组织下部门人员,组织下网格人员列表信息
+     **/
+    @PostMapping(value = "/gov/org/customeragency/departmentstafflist/{agencyId}")
+    Result<DepartmentStaffListResultDTO> departmentStaffList(@PathVariable("agencyId") String agencyId);
 }

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java

@@ -0,0 +1,24 @@
+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.UserResiInfoListFormDTO;
+import com.epmet.dto.result.UserResiInfoResultDTO;
+import com.epmet.feign.EpmetUserFeignClient;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @Auther zxc
+ * @Create 2020-05-11 10:33
+ */
+@Component
+public class EpmetUserFeignClientFallBack implements EpmetUserFeignClient {
+
+    @Override
+    public Result<List<UserResiInfoResultDTO>> getUserResiInfoList(UserResiInfoListFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getUserResiInfoList", formDTO);
+    }
+}

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java

@@ -4,6 +4,7 @@ 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.result.AgencyGridResultDTO;
+import com.epmet.dto.result.DepartmentStaffListResultDTO;
 import com.epmet.feign.GovOrgFeignClient;
 import org.springframework.stereotype.Component;
 
@@ -13,8 +14,14 @@ import org.springframework.stereotype.Component;
  */
 @Component
 public class GovOrgFeignClientFallBack implements GovOrgFeignClient {
+
     @Override
     public Result<AgencyGridResultDTO> getAgencyAndGrid(AgencyGridResultDTO agencyGridResultDTO) {
         return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getagencyandgrid", agencyGridResultDTO);
     }
+
+    @Override
+    public Result<DepartmentStaffListResultDTO> departmentStaffList(String agencyId) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "departmentStaffList", agencyId);
+    }
 }

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

@@ -21,9 +21,12 @@ import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.IssueSatisfactionDetailDTO;
 import com.epmet.dto.form.EvaluateFormDTO;
+import com.epmet.dto.form.EvaluationListFormDTO;
 import com.epmet.dto.form.InitEvaluationFormDTO;
+import com.epmet.dto.result.EvaluationListResultDTO;
 import com.epmet.dto.result.InitEvaluationResultDTO;
 import com.epmet.entity.IssueSatisfactionDetailEntity;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
 import java.util.Map;
@@ -97,16 +100,23 @@ public interface IssueSatisfactionDetailService extends BaseService<IssueSatisfa
     void delete(String[] ids);
 
     /**
-     * @Description   满意度评价初始化
+     * @Description   满意度评价初始化——已关闭
      * @param formDTO
      * @author zxc
      */
     InitEvaluationResultDTO initEvaluation(InitEvaluationFormDTO formDTO);
 
     /**
-     * @Description  提交满意度评价
+     * @Description  提交满意度评价——已关闭
      * @param formDTO
      * @author zxc
      */
     void evaluate(EvaluateFormDTO formDTO);
+
+    /**
+     * @Description  满意度评价列表——已关闭
+     * @param formDTO
+     * @author zxc
+     */
+    List<EvaluationListResultDTO> evaluationList(@RequestBody EvaluationListFormDTO formDTO);
 }

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

@@ -2,7 +2,9 @@ package com.epmet.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.dto.form.CloseIssueFormDTO;
+import com.epmet.dto.form.DepartmentStaffListFormDTO;
 import com.epmet.dto.form.IssueDetailFormDTO;
+import com.epmet.dto.result.DepartmentStaffListResultDTO;
 import com.epmet.dto.result.GridVotingIssueCountResultDTO;
 import com.epmet.dto.result.IssueResultDTO;
 import com.epmet.entity.IssueEntity;
@@ -31,6 +33,13 @@ public interface IssueService extends BaseService<IssueEntity> {
      **/
     void closeIssue(CloseIssueFormDTO formDTO);
 
+    /**
+     * @param formDTO
+     * @return
+     * @Author sun
+     * @Description 议题管理-部门人员选择
+     **/
+    DepartmentStaffListResultDTO departmentStaffList(DepartmentStaffListFormDTO formDTO);
     /**
      * @param gridIdList
      * @return java.util.List<com.epmet.dto.result.GridVotingIssueCountResultDTO>

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

@@ -21,10 +21,13 @@ import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.dto.IssueVoteStatisticalDTO;
+import com.epmet.dto.form.EvaluationListFormDTO;
 import com.epmet.dto.form.IssueIdFormDTO;
+import com.epmet.dto.result.EvaluationListResultDTO;
 import com.epmet.dto.result.VoteResultDTO;
 import com.epmet.dto.result.VotingTrendResultDTO;
 import com.epmet.entity.IssueVoteStatisticalEntity;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
 import java.util.Map;
@@ -111,4 +114,11 @@ public interface IssueVoteStatisticalService extends BaseService<IssueVoteStatis
      * @author zxc
      */
     VotingTrendResultDTO votingTrend(IssueIdFormDTO issueId);
+
+    /**
+     * @Description  满意度评价列表——已关闭
+     * @param formDTO
+     * @author zxc
+     */
+    List<EvaluationListResultDTO> evaluationList(EvaluationListFormDTO formDTO);
 }

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

@@ -20,6 +20,8 @@ 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;
 import com.epmet.commons.tools.utils.ConvertUtils;
@@ -28,7 +30,9 @@ import com.epmet.dao.IssueSatisfactionDetailDao;
 import com.epmet.dto.EvaluateInfoDTO;
 import com.epmet.dto.IssueSatisfactionDetailDTO;
 import com.epmet.dto.form.EvaluateFormDTO;
+import com.epmet.dto.form.EvaluationListFormDTO;
 import com.epmet.dto.form.InitEvaluationFormDTO;
+import com.epmet.dto.result.EvaluationListResultDTO;
 import com.epmet.dto.result.InitEvaluationResultDTO;
 import com.epmet.entity.IssueSatisfactionDetailEntity;
 import com.epmet.redis.IssueSatisfactionDetailRedis;
@@ -130,7 +134,7 @@ public class IssueSatisfactionDetailServiceImpl extends BaseServiceImpl<IssueSat
     }
 
     /**
-     * @Description  提交满意度评价
+     * @Description  提交满意度评价——已关闭
      * @param formDTO
      * @author zxc
      */
@@ -143,9 +147,19 @@ public class IssueSatisfactionDetailServiceImpl extends BaseServiceImpl<IssueSat
         BeanUtils.copyProperties(formDTO,initEvaluation);
         EvaluateInfoDTO evaluateInfoDTO = baseDao.checkSatisfaction(initEvaluation);
         if (evaluateInfoDTO!=null){
-            throw new RenException("您已评价！");
+            throw new RenException(EpmetErrorCode.ALREADY_EVALUATE.getMsg());
         }
         baseDao.insert(entity);
     }
 
+    /**
+     * @Description  满意度评价列表——已关闭
+     * @param formDTO
+     * @author zxc
+     */
+    @Override
+    public List<EvaluationListResultDTO> evaluationList(EvaluationListFormDTO formDTO) {
+        return baseDao.evaluationList(formDTO);
+    }
+
 }

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

@@ -11,9 +11,11 @@ import com.epmet.constant.UserMessageConstant;
 import com.epmet.dao.IssueDao;
 import com.epmet.dao.IssueProcessDao;
 import com.epmet.dto.form.CloseIssueFormDTO;
+import com.epmet.dto.form.DepartmentStaffListFormDTO;
 import com.epmet.dto.form.IssueDetailFormDTO;
 import com.epmet.dto.form.UserMessageFormDTO;
 import com.epmet.dto.result.AgencyGridResultDTO;
+import com.epmet.dto.result.DepartmentStaffListResultDTO;
 import com.epmet.dto.result.GridVotingIssueCountResultDTO;
 import com.epmet.dto.result.IssueResultDTO;
 import com.epmet.entity.IssueEntity;
@@ -154,4 +156,17 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
         msgList.add(msgDTO);
         return messageFeignClient.saveUserMessageList(msgList);
     }
+
+    /**
+     * @param formDTO
+     * @return
+     * @Author sun
+     * @Description 议题管理-部门人员选择
+     **/
+    @Override
+    public DepartmentStaffListResultDTO departmentStaffList(DepartmentStaffListFormDTO formDTO) {
+        //1:调用gov-org服务，分别查询组织下人员，组织下部门人员，组织下网格人员列表信息
+        Result<DepartmentStaffListResultDTO> resultDTOResult = govOrgFeignClient.departmentStaffList(formDTO.getAgencyId());
+        return resultDTOResult.getData();
+    }
 }

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

@@ -119,7 +119,7 @@ public class IssueVoteDetailServiceImpl extends BaseServiceImpl<IssueVoteDetailD
         if (checkoutVoteCount==0){
             baseDao.insert(entity);
         }else {
-            throw new RenException("You've voted, please don't repeat the operation!");
+            throw new RenException(EpmetErrorCode.ALREADY_VOTE.getMsg());
         }
     }
 

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

@@ -20,17 +20,26 @@ 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.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.constant.IssueConstant;
+import com.epmet.dao.IssueSatisfactionDetailDao;
 import com.epmet.dao.IssueVoteStatisticalDao;
 import com.epmet.dto.IssueVoteStatisticalDTO;
 import com.epmet.dto.PolyLineDTO;
+import com.epmet.dto.form.EvaluationListFormDTO;
 import com.epmet.dto.form.IssueIdFormDTO;
+import com.epmet.dto.form.UserResiInfoListFormDTO;
+import com.epmet.dto.result.EvaluationListResultDTO;
+import com.epmet.dto.result.UserResiInfoResultDTO;
 import com.epmet.dto.result.VoteResultDTO;
 import com.epmet.dto.result.VotingTrendResultDTO;
 import com.epmet.entity.IssueVoteStatisticalEntity;
+import com.epmet.feign.EpmetUserFeignClient;
 import com.epmet.redis.IssueVoteStatisticalRedis;
 import com.epmet.service.IssueVoteStatisticalService;
 import org.apache.commons.lang3.StringUtils;
@@ -38,9 +47,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 议题表决统计表
@@ -55,6 +66,10 @@ public class IssueVoteStatisticalServiceImpl extends BaseServiceImpl<IssueVoteSt
     private IssueVoteStatisticalRedis issueVoteStatisticalRedis;
     @Autowired
     private IssueVoteStatisticalDao issueVoteStatisticalDao;
+    @Autowired
+    private IssueSatisfactionDetailDao issueSatisfactionDetailDao;
+    @Autowired
+    private EpmetUserFeignClient userFeignClient;
 
     @Override
     public PageData<IssueVoteStatisticalDTO> page(Map<String, Object> params) {
@@ -145,4 +160,35 @@ public class IssueVoteStatisticalServiceImpl extends BaseServiceImpl<IssueVoteSt
         return votingTrendResultDTO;
     }
 
+    /**
+     * @Description  满意度评价列表——已关闭
+     * @param formDTO
+     * @author zxc
+     */
+    @Override
+    public List<EvaluationListResultDTO> evaluationList(EvaluationListFormDTO formDTO) {
+        int pageIndex = (formDTO.getPageNo() - NumConstant.ONE) * formDTO.getPageSize();
+        formDTO.setPageNo(pageIndex);
+        List<EvaluationListResultDTO> data = issueSatisfactionDetailDao.evaluationList(formDTO);
+        if (data.size()==NumConstant.ZERO||data==null){
+            return new ArrayList<>();
+        }
+        //获取头像和昵称   eg:山东路168号-周先生
+        List<String> userIds = data.stream().map(EvaluationListResultDTO::getUserId).collect(Collectors.toList());
+        UserResiInfoListFormDTO userResiInfo = new UserResiInfoListFormDTO();
+        userResiInfo.setUserIdList(userIds);
+        List<UserResiInfoResultDTO> userResiInfoList = userFeignClient.getUserResiInfoList(userResiInfo).getData();
+        if (null == userResiInfoList || userResiInfoList.size() < NumConstant.ONE) {
+            throw new RenException(IssueConstant.SELECT_USERINFO_EXCEPTION);
+        }
+        List<EvaluationListResultDTO> resultList = data.stream().flatMap(evaluation -> userResiInfoList.stream().filter(user ->
+                evaluation.getUserId().equals(user.getUserId())).map(userInfo -> {
+            EvaluationListResultDTO resultDTO = ConvertUtils.sourceToTarget(evaluation, EvaluationListResultDTO.class);
+            resultDTO.setUserNickName(null == userInfo.getShowName() ? "" : userInfo.getShowName());
+            resultDTO.setUserHeadPhoto(null == userInfo.getHeadPhoto() ? "" : userInfo.getHeadPhoto());
+            return resultDTO;
+        })).collect(Collectors.toList());
+        return resultList;
+    }
+
 }

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

@@ -29,4 +29,20 @@
             AND created_by = #{userId}
     </select>
 
+    <!-- 满意度评价列表——已关闭 -->
+    <select id="evaluationList" parameterType="com.epmet.dto.form.EvaluationListFormDTO" resultType="com.epmet.dto.result.EvaluationListResultDTO">
+        SELECT
+            created_by AS userId,
+            satisfaction AS satisfaction,
+            UNIX_TIMESTAMP( created_time ) AS evaluateTime,
+            COMMENT AS evaluateContent
+        FROM
+            issue_satisfaction_detail
+        WHERE
+            del_flag = 0
+            AND issue_id = #{issueId}
+        ORDER BY created_time DESC
+        LIMIT #{pageNo},#{pageSize}
+    </select>
+
 </mapper>

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/DepartmentStaffListFormDTO.java

@@ -0,0 +1,20 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Description 项目跟踪-部门人员选择-接口入参
+ * @Author sun
+ */
+@Data
+public class DepartmentStaffListFormDTO implements Serializable {
+    private static final long serialVersionUID = 4859779755214502427L;
+
+    @NotBlank(message = "机关组织Id不能为空")
+    private String agencyId;
+
+}
+

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/CustomerStaffListResultDTO.java

@@ -0,0 +1,45 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+
+/**
+ * 工作人员信息及角色
+ *
+ * @author sun
+ */
+@Data
+public class CustomerStaffListResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 工作人员信息集合
+     */
+    private List<StaffListResultDTO> staffList;
+    /**
+     * 工作人员角色集合
+     */
+    private List<CustomerStaffRoleResultDTO> roleList;
+
+}

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/CustomerStaffRoleResultDTO.java

@@ -0,0 +1,48 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+ * 工作人员角色
+ *
+ * @author sun
+ */
+@Data
+public class CustomerStaffRoleResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 工作人员Id
+     */
+    private String staffId = "";
+    /**
+     * 人员角色Key
+     */
+    private String roleKey = "";
+    /**
+     * 人员角色名称
+     */
+    private String roleName = "";
+
+}

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/DepartmentStaffListResultDTO.java

@@ -0,0 +1,51 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+
+/**
+ * 项目跟踪-部门人员选择-接口返参
+ *
+ * @author sun
+ */
+@Data
+public class DepartmentStaffListResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 组织下工作人员信息
+     */
+    private List<StaffListResultDTO> agencyStaffList;
+
+    /**
+     * 部门人员选择-组织下部门及人员列表
+     */
+    private List<DeptListResultDTO> departmentList;
+
+    /**
+     * 部门人员选择-组织下网格及人员列表
+     */
+    private List<GridListResultDTO> gridList;
+
+}

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/DeptListResultDTO.java

@@ -0,0 +1,49 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+
+/**
+ * 部门人员选择-组织下部门及人员列表
+ *
+ * @author sun
+ */
+@Data
+public class DeptListResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 部门Id
+     */
+    private String departmentId;
+    /**
+     * 部门名称
+     */
+    private String departmentName;
+    /**
+     * 部门下人员集合
+     */
+    private List<StaffListResultDTO> departmentStaffList;
+
+}

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GridListResultDTO.java

@@ -0,0 +1,49 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+
+/**
+ * 部门人员选择-组织下网格及人员列表
+ *
+ * @author sun
+ */
+@Data
+public class GridListResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 网格Id
+     */
+    private String gridId;
+    /**
+     * 网格名称
+     */
+    private String gridName;
+    /**
+     * 网格下工作人员集合
+     */
+    private List<StaffListResultDTO> gridStaffList;
+
+}

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/StaffListResultDTO.java

@@ -0,0 +1,36 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @dscription 工作人员信息
+ * @author sun
+ */
+@Data
+public class StaffListResultDTO implements Serializable {
+
+	private static final long serialVersionUID = 5957826616179876849L;
+	/**
+	 * 人员Id
+	 */
+	private String staffId;
+	/**
+	 * 人员名称
+	 */
+	private String staffName;
+	/**
+	 * 人员头像
+	 */
+	private String staffHeadPhoto;
+	/**
+	 * 性别
+	 */
+	private String gender;
+	/**
+	 * 角色名称(机关领导、部门领导、网格长)
+	 */
+	private String roleName;
+
+}

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/CustomerAgencyConstant.java

@@ -38,4 +38,17 @@ public interface CustomerAgencyConstant {
 	 * 组织信息查询失败
 	 */
 	String SELECT_EXCEPTION = "根据组织ID未查询到机构组织信息";
+
+	/**
+	 * 工作人员角色-单位领导
+	 */
+	String AGENCY_LEADER = "agency_leader";
+	/**
+	 * 工作人员角色-部门领导
+	 */
+	String DEPT_LEADER = "dept_leader";
+	/**
+	 * 工作人员角色-网格长
+	 */
+	String GRID_MANAGER = "grid_manager";
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java

@@ -28,6 +28,7 @@ import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.CustomerAgencyDTO;
 import com.epmet.dto.form.StaffOrgFormDTO;
 import com.epmet.dto.result.AgencyGridResultDTO;
+import com.epmet.dto.result.DepartmentStaffListResultDTO;
 import com.epmet.dto.result.StaffOrgsResultDTO;
 import com.epmet.excel.CustomerAgencyExcel;
 import com.epmet.service.CustomerAgencyService;
@@ -117,4 +118,15 @@ public class CustomerAgencyController {
         return new Result<AgencyGridResultDTO>().ok(customerAgencyService.getAgencyAndGrid(agencyGridResultDTO));
     }
 
+    /**
+     * @param agencyId
+     * @return
+     * @Author sun
+     * @Description 查询组织下人员,组织下部门人员,组织下网格人员列表信息
+     **/
+    @PostMapping("departmentstafflist/{agencyId}")
+    public Result<DepartmentStaffListResultDTO> departmentStaffList(@PathVariable("agencyId") String agencyId) {
+        return new Result<DepartmentStaffListResultDTO>().ok(customerAgencyService.departmentStaffList(agencyId));
+    }
+
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java

@@ -18,10 +18,11 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
-import com.epmet.dto.*;
+import com.epmet.dto.CustomerGridDTO;
+import com.epmet.dto.UserIdAndPidDTO;
+import com.epmet.dto.UserIdDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
-import com.epmet.dto.result.CustomerGridForStrangerResultDTO;
 import com.epmet.entity.CustomerGridEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -160,4 +161,10 @@ public interface CustomerGridDao extends BaseDao<CustomerGridEntity> {
      * @date 2020/5/11 18:50
      */
     BelongGridNameResultDTO getGridNameByGridId(BelongGridNameFormDTO formDTO);
+
+    /**
+     * @Description 根据组织机关Id查询机关下网格列表
+     * @author sun
+     */
+    List<GridListResultDTO> selectGridList(@Param("agencyId") String agencyId);
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffAgencyDao.java

@@ -20,6 +20,7 @@ package com.epmet.dao;
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.CustomerStaffAgencyDTO;
 import com.epmet.dto.form.CustomerGridFormDTO;
+import com.epmet.dto.result.StaffListResultDTO;
 import com.epmet.entity.CustomerStaffAgencyEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -68,4 +69,10 @@ public interface CustomerStaffAgencyDao extends BaseDao<CustomerStaffAgencyEntit
 	 * @Date 2020.04.26 16:33
 	 **/
 	List<String> getSelectableStaffsForDept(@Param("departmentId") String departmentId);
+
+	/**
+	 * 查询组织下人员列表
+	 * @Author sun
+	 */
+	List<StaffListResultDTO> selectAgencyStaffList(@Param("agencyId") String agencyId);
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffDepartmentDao.java

@@ -19,6 +19,7 @@ package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.CustomerStaffDepartmentDTO;
+import com.epmet.dto.result.ParentListResultDTO;
 import com.epmet.entity.CustomerStaffDepartmentEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -58,4 +59,11 @@ public interface CustomerStaffDepartmentDao extends BaseDao<CustomerStaffDepartm
      * @Date 2020.04.27 16:54
      **/
     void updateByDeptIdAndUserId(CustomerStaffDepartmentDTO staffDepartmentDTO);
+
+    /**
+     *
+     * @Author sun
+     * @Description 遍历查询每个部门下人员
+     */
+    List<CustomerStaffDepartmentDTO> selectDeptStaffs(@Param("deptIdList") List<String> deptIdList);
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffGridDao.java

@@ -19,6 +19,7 @@ package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.CustomerGridDTO;
+import com.epmet.dto.CustomerStaffDepartmentDTO;
 import com.epmet.dto.CustomerStaffGridDTO;
 import com.epmet.dto.form.LatestGridFormDTO;
 import com.epmet.entity.CustomerStaffGridEntity;
@@ -82,4 +83,11 @@ public interface CustomerStaffGridDao extends BaseDao<CustomerStaffGridEntity> {
      * @Author sun
      */
     List<CustomerStaffGridDTO> selectByGridId(@Param("gridId")String gridId);
+
+    /**
+     *
+     * @Author sun
+     * @Description 遍历查询每个部门下人员
+     */
+    List<CustomerStaffGridDTO> selectGridStaffs(@Param("gridIdList") List<String> gridIdList);
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java

@@ -22,6 +22,7 @@ import com.epmet.dto.CustomerStaffGridDTO;
 import com.epmet.dto.StaffGridListDTO;
 import com.epmet.feign.fallback.EpmetUserFeignClientFallBack;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
@@ -159,4 +160,13 @@ public interface EpmetUserFeignClient {
      **/
     @PostMapping("/epmetuser/staffrole/getcustomerstaffroles")
 	Result<StaffRolesResultDTO> getCustomerStaffRoles(CommonUserFormDTO commonUserFormDTO);
+
+	/**
+	 * @param staffIdList
+	 * @return
+	 * @Author sun
+	 * @Description 根据staffId集合查询工作人员基础信息
+	 **/
+    @PostMapping(value = "/epmetuser/customerstaff/getcustomerstafflist", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
+	Result<CustomerStaffListResultDTO> getCustomerStaffList(List<String> staffIdList);
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java

@@ -101,4 +101,9 @@ public class EpmetUserFeignClientFallBack implements EpmetUserFeignClient {
     public Result<StaffRolesResultDTO> getCustomerStaffRoles(CommonUserFormDTO commonUserFormDTO) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getCustomerStaffRoles", commonUserFormDTO);
     }
+
+    @Override
+    public Result<CustomerStaffListResultDTO> getCustomerStaffList(List<String> staffIdList) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getCustomerStaffList", staffIdList);
+    }
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java

@@ -23,6 +23,7 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.CustomerAgencyDTO;
 import com.epmet.dto.form.StaffOrgFormDTO;
 import com.epmet.dto.result.AgencyGridResultDTO;
+import com.epmet.dto.result.DepartmentStaffListResultDTO;
 import com.epmet.dto.result.StaffOrgsResultDTO;
 import com.epmet.entity.CustomerAgencyEntity;
 
@@ -113,4 +114,12 @@ public interface CustomerAgencyService extends BaseService<CustomerAgencyEntity>
      * @Description 根据组织Id、网格Id查询组织、网格名称
      **/
     AgencyGridResultDTO getAgencyAndGrid(AgencyGridResultDTO agencyGridResultDTO);
+
+    /**
+     * @param agencyId
+     * @return
+     * @Author sun
+     * @Description 查询组织下人员,组织下部门人员,组织下网格人员列表信息
+     **/
+    DepartmentStaffListResultDTO departmentStaffList(String agencyId);
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java

@@ -27,16 +27,14 @@ import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.CustomerAgencyConstant;
 import com.epmet.constant.CustomerGridConstant;
-import com.epmet.dao.CustomerAgencyDao;
-import com.epmet.dao.CustomerGridDao;
-import com.epmet.dto.CustomerAgencyDTO;
-import com.epmet.dto.CustomerDTO;
+import com.epmet.dao.*;
+import com.epmet.dto.*;
 import com.epmet.dto.form.CustomerFormDTO;
 import com.epmet.dto.form.StaffOrgFormDTO;
-import com.epmet.dto.result.AgencyGridResultDTO;
-import com.epmet.dto.result.StaffOrgsResultDTO;
+import com.epmet.dto.result.*;
 import com.epmet.entity.CustomerAgencyEntity;
 import com.epmet.entity.CustomerGridEntity;
+import com.epmet.feign.EpmetUserFeignClient;
 import com.epmet.feign.OperCrmFeignClient;
 import com.epmet.redis.CustomerAgencyRedis;
 import com.epmet.service.CustomerAgencyService;
@@ -47,9 +45,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 机关单位信息表
@@ -67,6 +64,17 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
     private OperCrmFeignClient operCrmFeignClient;
     @Autowired
     private CustomerGridDao customerGridDao;
+    @Autowired
+    private CustomerStaffAgencyDao customerStaffAgencyDao;
+    @Autowired
+    private CustomerDepartmentDao customerDepartmentDao;
+    @Autowired
+    private CustomerStaffDepartmentDao customerStaffDepartmentDao;
+    @Autowired
+    private CustomerStaffGridDao customerStaffGridDao;
+    @Autowired
+    private EpmetUserFeignClient epmetUserFeignClient;
+
     @Override
     public PageData<CustomerAgencyDTO> page(Map<String, Object> params) {
         IPage<CustomerAgencyEntity> page = baseDao.selectPage(
@@ -167,4 +175,127 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
         return agencyGridResultDTO;
     }
 
+    /**
+     * @param agencyId
+     * @return
+     * @Author sun
+     * @Description 查询组织下人员,组织下部门人员,组织下网格人员列表信息
+     **/
+    @Override
+    public DepartmentStaffListResultDTO departmentStaffList(String agencyId) {
+        //根据组织Id查询该组织的工作人员列表；该组织的部门列表、部门下人员(带部门领导角色)列表；该组织的网格列表、网格下人员(带网格长角色)列表。人员都不做去重处理。
+        DepartmentStaffListResultDTO resultDTO = new DepartmentStaffListResultDTO();
+        //1:根据组织Id查询该组织下工作人员列表
+        List<StaffListResultDTO> agencyStaffList = customerStaffAgencyDao.selectAgencyStaffList(agencyId);
+        //2:根据组织Id查询该组织下部门、人员列表
+        //2.1:查询组织下部门列表
+        List<DepartmentListResultDTO> listDept = customerDepartmentDao.selectDepartmentList(agencyId);
+        List<DeptListResultDTO> departmentList = ConvertUtils.sourceToTarget(listDept, DeptListResultDTO.class);
+        //2.2:查询每一个部门下人员列表
+        List<String> deptIdList = departmentList.stream().map(DeptListResultDTO::getDepartmentId).collect(Collectors.toList());
+        List<CustomerStaffDepartmentDTO> deptStaffs  = customerStaffDepartmentDao.selectDeptStaffs(deptIdList);
+        departmentList.forEach(dept->{
+            List<StaffListResultDTO> departmentStaffList = new ArrayList<>();
+            deptStaffs.forEach(ds->{
+                if(dept.getDepartmentId().equals(ds.getDepartmentId())){
+                    StaffListResultDTO sf = new StaffListResultDTO();
+                    sf.setStaffId(ds.getUserId());
+                    departmentStaffList.add(sf);
+                }
+            });
+            dept.setDepartmentStaffList(departmentStaffList);
+        });
+        //3:根据组织Id查询该组织下网格、人员列表
+        //3.1:查询组织下网格列表
+        List<GridListResultDTO> gridList = customerGridDao.selectGridList(agencyId);
+        //3.2:查询每一个网格下人员列表
+        List<String> gridIdList = gridList.stream().map(GridListResultDTO::getGridId).collect(Collectors.toList());
+        List<CustomerStaffGridDTO> gridStaffs  = customerStaffGridDao.selectGridStaffs(gridIdList);
+        gridList.forEach(grid->{
+            List<StaffListResultDTO> gridStaffList = new ArrayList<>();
+            gridStaffs.forEach(gs->{
+                if(grid.getGridId().equals(gs.getGridId())){
+                    StaffListResultDTO sf = new StaffListResultDTO();
+                    sf.setStaffId(gs.getUserId());
+                    gridStaffList.add(sf);
+                }
+            });
+            grid.setGridStaffList(gridStaffList);
+        });
+        //4:汇总组织下人员、组织下部门下人员、组织下网格下人员Id集合，调用epmet-user服务查询工作人员基本信息
+        List<String> staffIdList1 = agencyStaffList.stream().map(StaffListResultDTO::getStaffId).collect(Collectors.toList());
+        List<String> staffIdList2 = deptStaffs.stream().map(CustomerStaffDepartmentDTO::getUserId).collect(Collectors.toList());
+        List<String> staffIdList3 = gridStaffs.stream().map(CustomerStaffGridDTO::getUserId).collect(Collectors.toList());
+        List<String> staffIdList = new ArrayList<>();
+        staffIdList.addAll(staffIdList1); staffIdList.addAll(staffIdList2); staffIdList.addAll(staffIdList3);
+        staffIdList = new ArrayList<String>(new LinkedHashSet<>(staffIdList));
+        Result<CustomerStaffListResultDTO> userList = epmetUserFeignClient.getCustomerStaffList(staffIdList);
+        //5:循环数据，将人员数据放到对应数据结构下
+        CustomerStaffListResultDTO dto = userList.getData();
+        List<StaffListResultDTO> staffList = dto.getStaffList();
+        List<CustomerStaffRoleResultDTO> roleList = dto.getRoleList();
+        //有时间再优化成jdk8的遍历方式
+        //5.1装载组织下人员数据
+        for(StaffListResultDTO sf : agencyStaffList){
+            //人员信息
+            for(StaffListResultDTO stf : staffList){
+                if(sf.getStaffId().equals(stf.getStaffId())){
+                    sf = ConvertUtils.sourceToTarget(stf, StaffListResultDTO.class);
+                    break;
+                }
+            }
+            //人员角色信息
+            for(CustomerStaffRoleResultDTO role : roleList){
+                if(sf.getStaffId().equals(role.getStaffId())&&CustomerAgencyConstant.AGENCY_LEADER.equals(role.getRoleKey())){
+                    sf.setRoleName(role.getRoleName());
+                    break;
+                }
+            }
+        }
+        //5.2装载组织下部门下人员数据
+        for(DeptListResultDTO dept : departmentList){
+            List<StaffListResultDTO> departmentStaffList = dept.getDepartmentStaffList();
+            for(StaffListResultDTO ds : departmentStaffList){
+                //人员信息
+                for(StaffListResultDTO stf : staffList){
+                    if(ds.getStaffId().equals(stf.getStaffId())){
+                        ds = ConvertUtils.sourceToTarget(stf, StaffListResultDTO.class);
+                        break;
+                    }
+                }
+                //人员角色信息
+                for(CustomerStaffRoleResultDTO role : roleList){
+                    if(ds.getStaffId().equals(role.getStaffId())&&CustomerAgencyConstant.DEPT_LEADER.equals(role.getRoleKey())){
+                        ds.setRoleName(role.getRoleName());
+                        break;
+                    }
+                }
+            }
+        }
+        //5.3装载组织下网格下人员数据
+        for(GridListResultDTO grid : gridList){
+            List<StaffListResultDTO> gridStaffList = grid.getGridStaffList();
+            for(StaffListResultDTO gs : gridStaffList){
+                //人员信息
+                for(StaffListResultDTO stf : staffList){
+                    if(gs.getStaffId().equals(stf.getStaffId())){
+                        gs = ConvertUtils.sourceToTarget(stf, StaffListResultDTO.class);
+                        break;
+                    }
+                }
+                //人员角色信息
+                for(CustomerStaffRoleResultDTO role : roleList){
+                    if(gs.getStaffId().equals(role.getStaffId())&&CustomerAgencyConstant.GRID_MANAGER.equals(role.getRoleKey())){
+                        gs.setRoleName(role.getRoleName());
+                        break;
+                    }
+                }
+            }
+        }
+        resultDTO.setAgencyStaffList(agencyStaffList);
+        resultDTO.setDepartmentList(departmentList);
+        resultDTO.setGridList(gridList);
+        return resultDTO;
+    }
+
 }

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml

@@ -285,4 +285,14 @@
             AND cg.del_flag = 0
     </select>
 
+    <select id="selectGridList" resultType="com.epmet.dto.result.GridListResultDTO">
+        SELECT
+            id AS "gridId",
+            grid_name AS "gridName"
+        FROM customer_grid
+        WHERE del_flag = '0'
+        AND pid = #{agencyId}
+        ORDER BY created_time DESC
+    </select>
+
 </mapper>

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffAgencyDao.xml

@@ -95,6 +95,14 @@
         DEPARTMENT_ID = #{departmentId} )
     </select>
 
-
+    <select id="selectAgencyStaffList" resultType="com.epmet.dto.result.StaffListResultDTO">
+         SELECT
+            user_id AS "staffId"
+        FROM
+            customer_staff_agency
+        WHERE
+            del_flag = '0'
+          AND agency_id =#{agencyId}
+    </select>
 
 </mapper>

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffDepartmentDao.xml

@@ -14,6 +14,20 @@
 
     </select>
 
+    <select id="selectDeptStaffs" resultType="com.epmet.dto.CustomerStaffDepartmentDTO">
+        SELECT
+            department_id,
+            user_id
+        FROM
+            customer_staff_department
+        WHERE
+            del_flag = '0'
+        AND
+        <foreach item="departmentId" collection="deptIdList" open="(" separator="or" close=")">
+            department_id = #{departmentId}
+        </foreach>
+    </select>
+
     <!-- 修改部门人数 -->
     <update id="updateDepartmentStaffCount">
         UPDATE

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffGridDao.xml

@@ -63,6 +63,20 @@
         AND csg.grid_id = #{gridId}
     </select>
 
+    <select id="selectGridStaffs" resultType="com.epmet.dto.CustomerStaffGridDTO">
+        SELECT
+            grid_id,
+            user_id
+        FROM
+            customer_staff_grid
+        WHERE
+            del_flag = '0'
+        AND
+        <foreach item="gridId" collection="gridIdList" open="(" separator="or" close=")">
+            grid_id = #{gridId}
+        </foreach>
+    </select>
+
     <!-- 批量插入网格工作人员 -->
     <insert id="insertBatch" parameterType="java.util.List">
         insert into customer_staff_grid

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

@@ -63,6 +63,11 @@ public class ProjectDTO implements Serializable {
      */
 	private String status;
 
+	/**
+	 * 结案说明
+	 */
+	private String publicReply;
+
     /**
      * 结案状态：已解决 resolved，未解决 unresolved
      */

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

@@ -84,7 +84,7 @@ public class ProjectStaffDTO implements Serializable {
 	private String departmentName;
 
     /**
-     * 是否处理：未处理unhandle，已处理handle
+     * 是否处理：未处理unhandled，已处理handle
      */
 	private String isHandle;
 

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

@@ -1,7 +1,9 @@
 package com.epmet.dto.form;
 
 import lombok.Data;
+import org.hibernate.validator.constraints.Length;
 
+import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 
 /**
@@ -13,6 +15,10 @@ import java.io.Serializable;
 public class ProjectClosedFromDTO implements Serializable {
 
 	private static final long serialVersionUID = -7383213527369892832L;
+	/**
+	 * 用户Id
+	 */
+	private String userId;
 	/**
 	 * 项目Id
 	 */
@@ -24,9 +30,20 @@ public class ProjectClosedFromDTO implements Serializable {
 	/**
 	 * 公开答复内容
 	 */
+	@NotBlank(message = "结案说明不能为空")
+	@Length(max = 1000, message = "结案说明不能超过1000个字符")
 	private String publicReply;
 	/**
 	 * 内部备注内容
 	 */
+	@Length(max = 1000, message = "内部备注不能超过1000个字符")
 	private String internalRemark;
+	/**
+	 * 项目人员关联表ID
+	 */
+	private String projectStaffId;
+	/**
+	 * 部门名
+	 */
+	private String departmentName;
 }

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

@@ -0,0 +1,37 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * 提交满意度评价——已转项目
+ */
+@Data
+public class ProjectEvaluateFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 议题Id
+     */
+    private String projectId;
+
+    /**
+     * 满意度 - 不满意:bad、基本满意:good、非常满意:perfect
+     */
+    private String satisfaction;
+
+    /**
+     * 评价内容
+     */
+    private String comment;
+
+    /**
+     * 用户ID
+     */
+    private String userId;
+
+
+}

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

@@ -0,0 +1,32 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * 满意度评价列表——已转项目
+ */
+@Data
+public class ProjectEvaluationListFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 议题Id
+     */
+    private String projectId;
+
+    /**
+     * 页码
+     */
+    private Integer pageNo;
+
+    /**
+     * 每页数量
+     */
+    private Integer pageSize;
+
+
+}

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

@@ -0,0 +1,27 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * 满意度评价初始化
+ */
+@Data
+public class ProjectInitEvaluationFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 项目Id
+     */
+    private String projectId;
+
+    /**
+     * 创建人
+     */
+    private String userId;
+
+
+}

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

@@ -1,7 +1,9 @@
 package com.epmet.dto.form;
 
 import lombok.Data;
+import org.hibernate.validator.constraints.Length;
 
+import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 
 /**
@@ -13,6 +15,10 @@ import java.io.Serializable;
 public class ReturnFromDTO implements Serializable {
 
 	private static final long serialVersionUID = -8747667324909671154L;
+	/**
+	 * 用户Id
+	 */
+	private String userId;
 	/**
 	 * 项目Id
 	 */
@@ -24,9 +30,20 @@ public class ReturnFromDTO implements Serializable {
 	/**
 	 * 公开答复内容
 	 */
+	@Length(max = 1000, message = "公开答复不能超过1000个字符")
 	private String publicReply;
 	/**
 	 * 内部流转意见
 	 */
+	@NotBlank(message = "内部备注不能为空")
+	@Length(max = 1000, message = "内部备注不能超过1000个字符")
 	private String internalRemark;
+	/**
+	 * 项目人员关联表ID
+	 */
+	private String projectStaffId;
+	/**
+	 * 部门名
+	 */
+	private String departmentName;
 }

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

@@ -22,6 +22,14 @@ public class CreatedListResultDTO implements Serializable {
 	 * 项目标题
 	 */
 	private String projectTitle;
+	/**
+	 * 项目状态
+	 */
+	private String projectStatus;
+	/**
+	 * 结案说明
+	 */
+	private String publicReply;
 	/**
 	 * 项目创建时间
 	 */

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

@@ -22,6 +22,14 @@ public class InvolvedListResultDTO implements Serializable {
 	 * 项目标题
 	 */
 	private String projectTitle;
+	/**
+	 * 项目状态
+	 */
+	private String projectStatus;
+	/**
+	 * 结案说明
+	 */
+	private String publicReply;
 	/**
 	 * 创建时间
 	 */

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

@@ -3,6 +3,7 @@ package com.epmet.dto.result;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * @author zhaoqifeng
@@ -45,5 +46,9 @@ public class ProjectDetailResultDTO implements Serializable {
 	 * 处理状态(是否由我处理)
 	 */
 	private Boolean processable;
+	/**
+	 * 当前跟进部门
+	 */
+	private List<String> departmentNameList;
 
 }

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

@@ -0,0 +1,25 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * 项目满意度评价信息
+ */
+@Data
+public class ProjectEvaluateInfoResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -3699103790181586654L;
+
+    /**
+     * 评价内容
+     */
+    private String evaluateContent;
+
+    /**
+     * 满意度 - 不满意:bad、基本满意:good、非常满意:perfect
+     */
+    private String satisfaction;
+}

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

@@ -0,0 +1,47 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * 满意度评价列表——已关闭
+ */
+@Data
+public class ProjectEvaluationListResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -1L;
+
+    /**
+     * 评价用户Id
+     */
+    private String userId;
+
+    /**
+     * 评价用户（山东路168-尹女士）
+     */
+    private String userNickName;
+
+    /**
+     * 满意度 - 不满意:bad、基本满意:good、非常满意:perfect
+     */
+    private String satisfaction;
+
+    /**
+     * 评价时间
+     */
+    private Long evaluateTime;
+
+    /**
+     * 评价内容
+     */
+    private String evaluateContent;
+
+    /**
+     * 用户头像
+     */
+    private String userHeadPhoto;
+
+
+}

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

@@ -0,0 +1,28 @@
+package com.epmet.dto.result;
+
+import com.epmet.dto.form.ProjectEvaluateFormDTO;
+import com.epmet.dto.form.ProjectInitEvaluationFormDTO;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * 满意度评价初始化
+ */
+@Data
+public class ProjectInitEvaluationResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -1L;
+
+    /**
+     * 评价状态：true已评价，false未评价
+     */
+    private Boolean status;
+
+    /**
+     * 评价信息
+     */
+    private ProjectEvaluateInfoResultDTO evaluateInfo;
+
+}

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

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

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

@@ -26,6 +26,11 @@ 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.ProjectSatisfactionDetailDTO;
+import com.epmet.dto.form.ProjectEvaluateFormDTO;
+import com.epmet.dto.form.ProjectEvaluationListFormDTO;
+import com.epmet.dto.form.ProjectInitEvaluationFormDTO;
+import com.epmet.dto.result.ProjectEvaluationListResultDTO;
+import com.epmet.dto.result.ProjectInitEvaluationResultDTO;
 import com.epmet.excel.ProjectSatisfactionDetailExcel;
 import com.epmet.service.ProjectSatisfactionDetailService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -91,4 +96,35 @@ public class ProjectSatisfactionDetailController {
         ExcelUtils.exportExcelToTarget(response, null, list, ProjectSatisfactionDetailExcel.class);
     }
 
+    /**
+     * @Description  提交满意度评价初始化——已转项目
+     * @param formDTO
+     * @author zxc
+     */
+    @PostMapping("projectinitevaluation")
+    public Result<ProjectInitEvaluationResultDTO> projectInitEvaluation(@RequestBody ProjectInitEvaluationFormDTO formDTO){
+        return new Result<ProjectInitEvaluationResultDTO>().ok(projectSatisfactionDetailService.projectInitEvaluation(formDTO));
+    }
+
+    /**
+     * @Description  提交满意度评价——已转项目
+     * @param projectEvaluate
+     * @author zxc
+     */
+    @PostMapping("projectevaluate")
+    public Result projectEvaluate(@RequestBody ProjectEvaluateFormDTO projectEvaluate){
+        projectSatisfactionDetailService.projectEvaluate(projectEvaluate);
+        return new Result();
+    }
+
+    /**
+     * @Description  满意度评价列表——已转项目
+     * @param formDTO
+     * @author zxc
+     */
+    @PostMapping("projectevaluationlist")
+    public Result<List<ProjectEvaluationListResultDTO>> projectEvaluationList(@RequestBody ProjectEvaluationListFormDTO formDTO){
+        return new Result<List<ProjectEvaluationListResultDTO>>().ok(projectSatisfactionDetailService.projectEvaluationList(formDTO));
+    }
+
 }

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

@@ -10,6 +10,7 @@ import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
 import com.epmet.service.ProjectProcessService;
 import com.epmet.service.ProjectSatisfactionDetailService;
+import com.epmet.service.ProjectStaffService;
 import com.epmet.service.ProjectTraceService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -37,6 +38,9 @@ public class ProjectTraceController {
 	@Autowired
 	private ProjectSatisfactionDetailService projectSatisfactionDetailService;
 
+	@Autowired
+	private ProjectStaffService projectStaffService;
+
 	/**
 	 * 待处理项目列表
 	 *
@@ -166,5 +170,18 @@ public class ProjectTraceController {
 		ValidatorUtils.validateEntity(formDTO);
 		return new Result<List<EvaluationListResultDTO>>().ok(projectSatisfactionDetailService.evaluationList(formDTO));
 	}
+
+	/**
+	 * @param formDTO
+	 * @return
+	 * @Author sun
+	 * @Description 项目跟踪-部门人员选择
+	 **/
+	@PostMapping("departmentstafflist")
+	@RequirePermission(requirePermission = RequirePermissionEnum.WORK_PROJECT_TRACE_TRANSFER)
+	public Result<DepartmentStaffListResultDTO> departmentStaffList(@LoginUser TokenDto tokenDTO, @RequestBody DepartmentStaffListFormDTO formDTO) {
+		ValidatorUtils.validateEntity(formDTO);
+		return new Result<DepartmentStaffListResultDTO>().ok(projectStaffService.departmentStaffList(formDTO));
+	}
 }
 

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

@@ -41,4 +41,6 @@ public interface ProjectProcessDao extends BaseDao<ProjectProcessEntity> {
      * @Description 根据项目Id查询项目处理进展列表
      **/
     List<ProcesslistResultDTO> getProcessListByProjectId(@Param("projectId") String projectId);
+
+    List<ProjectProcessEntity> selectReturnableList(@Param("projectId") String projectId);
 }

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

@@ -18,7 +18,11 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.form.ProjectEvaluationListFormDTO;
+import com.epmet.dto.form.ProjectInitEvaluationFormDTO;
+import com.epmet.dto.result.ProjectEvaluateInfoResultDTO;
 import com.epmet.dto.result.EvaluationListResultDTO;
+import com.epmet.dto.result.ProjectEvaluationListResultDTO;
 import com.epmet.entity.ProjectSatisfactionDetailEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -41,4 +45,19 @@ public interface ProjectSatisfactionDetailDao extends BaseDao<ProjectSatisfactio
      * @Description 根据项目Id查询项目评价列表数据
      **/
     List<EvaluationListResultDTO> getEvaluationListByProjectId(@Param("projectId") String projectId);
+
+    /**
+     * @Description  满意度评价初始化——已转项目
+     * @param projectEvaluateFormDTO
+     * @author zxc
+     */
+    ProjectEvaluateInfoResultDTO checkProjectSatisfaction(ProjectInitEvaluationFormDTO projectEvaluateFormDTO);
+
+    /**
+     * @Description  满意度评价列表——已转项目
+     * @param formDTO
+     * @author zxc
+     */
+    List<ProjectEvaluationListResultDTO> projectEvaluationList(ProjectEvaluationListFormDTO formDTO);
+
 }

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

@@ -22,6 +22,7 @@ import com.epmet.dto.ProjectStaffDTO;
 import com.epmet.dto.result.DepartmentResultDTO;
 import com.epmet.entity.ProjectStaffEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -43,5 +44,14 @@ public interface ProjectStaffDao extends BaseDao<ProjectStaffEntity> {
 	 * @date 2020/5/12 16:40
 	 */
 	List<DepartmentResultDTO> selectDepartmentNameList(ProjectStaffDTO dto);
+	
+	/**
+	 * 获取节点处理人信息
+	 * @author zhaoqifeng
+	 * @date 2020/5/13 15:08
+	 * @param processId
+	 * @return com.epmet.dto.ProjectStaffDTO
+	 */
+	ProjectStaffDTO selectProjectStaffInfo(@Param("processId") String processId);
 
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectProcessEntity.java

@@ -43,11 +43,6 @@ public class ProjectProcessEntity extends BaseEpmetEntity {
      */
 	private String projectId;
 
-	/**
-	 * 项目处理进展ID
-	 */
-	private String processId;
-
 	/**
 	 * 部门名
 	 */

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectStaffEntity.java

@@ -79,7 +79,7 @@ public class ProjectStaffEntity extends BaseEpmetEntity {
 	private String departmentName;
 
     /**
-     * 是否处理：未处理unhandle，已处理handle
+     * 是否处理：未处理unhandled，已处理handle
      */
 	private String isHandle;
 

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java

@@ -2,7 +2,9 @@ package com.epmet.feign;
 
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.form.StaffsInAgencyFromDTO;
 import com.epmet.dto.form.UserResiInfoListFormDTO;
+import com.epmet.dto.result.StaffInfoResultDTO;
 import com.epmet.dto.result.UserResiInfoResultDTO;
 import com.epmet.feign.fallback.EpmetUserFeignClientFallBack;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -26,4 +28,12 @@ public interface EpmetUserFeignClient {
      **/
     @PostMapping("/epmetuser/userresiinfo/getuserresiinfolist")
     Result<List<UserResiInfoResultDTO>> getUserResiInfoList(@RequestBody UserResiInfoListFormDTO userResiInfoListFormDTO);
+
+    /**
+     * 工作人员列表
+     * @param fromDTO
+     * @return
+     */
+    @PostMapping("/epmetuser/customerstaff/stafflist")
+    Result<List<StaffInfoResultDTO>> getStaffList(@RequestBody StaffsInAgencyFromDTO fromDTO);
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java

@@ -2,8 +2,14 @@ package com.epmet.feign;
 
 
 import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.CustomerAgencyDTO;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.result.DepartmentStaffListResultDTO;
 import com.epmet.feign.fallback.GovOrgFeignClientFallBack;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
 
 
 /**
@@ -13,5 +19,20 @@ import org.springframework.cloud.openfeign.FeignClient;
 @FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallback = GovOrgFeignClientFallBack.class)
 public interface GovOrgFeignClient {
 
+	/**
+	 * 根据Id查询agency
+	 * @param agencyId
+	 * @return
+	 */
+	@PostMapping("/gov/org/agency/agencybyid/{agencyId}")
+	Result<CustomerAgencyDTO> getAgencyById(@PathVariable("agencyId") String agencyId);
+    /**
+     * @param agencyId
+     * @return
+     * @Author sun
+     * @Description 查询组织下人员,组织下部门人员,组织下网格人员列表信息
+     **/
+    @PostMapping(value = "/gov/org/customeragency/departmentstafflist/{agencyId}")
+    Result<DepartmentStaffListResultDTO> departmentStaffList(@PathVariable("agencyId") String agencyId);
 
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java

@@ -3,7 +3,9 @@ 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.StaffsInAgencyFromDTO;
 import com.epmet.dto.form.UserResiInfoListFormDTO;
+import com.epmet.dto.result.StaffInfoResultDTO;
 import com.epmet.dto.result.UserResiInfoResultDTO;
 import com.epmet.feign.EpmetUserFeignClient;
 import org.springframework.stereotype.Component;
@@ -21,4 +23,9 @@ public class EpmetUserFeignClientFallBack implements EpmetUserFeignClient {
     public Result<List<UserResiInfoResultDTO>> getUserResiInfoList(UserResiInfoListFormDTO userResiInfoListFormDTO) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getUserResiInfoList", userResiInfoListFormDTO);
     }
+
+    @Override
+    public Result<List<StaffInfoResultDTO>> getStaffList(StaffsInAgencyFromDTO fromDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getStaffList", fromDTO);
+    }
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java

@@ -1,5 +1,13 @@
 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.CustomerAgencyDTO;
+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.result.DepartmentStaffListResultDTO;
 import com.epmet.feign.GovOrgFeignClient;
 import org.springframework.stereotype.Component;
 
@@ -10,4 +18,12 @@ import org.springframework.stereotype.Component;
 @Component
 public class GovOrgFeignClientFallBack implements GovOrgFeignClient {
 
+	@Override
+	public Result<CustomerAgencyDTO> getAgencyById(String agencyId) {
+		return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getAgencyById", agencyId);
+	}
+    @Override
+    public Result<DepartmentStaffListResultDTO> departmentStaffList(String agencyId) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "departmentStaffList", agencyId);
+    }
 }

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

@@ -21,7 +21,9 @@ import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.ProjectProcessDTO;
 import com.epmet.dto.form.ProcessListFormDTO;
+import com.epmet.dto.form.ReturnListFromDTO;
 import com.epmet.dto.result.ProcesslistResultDTO;
+import com.epmet.dto.result.ReturnListResultDTO;
 import com.epmet.entity.ProjectProcessEntity;
 
 import java.util.List;
@@ -102,4 +104,13 @@ public interface ProjectProcessService extends BaseService<ProjectProcessEntity>
      * @Description 项目跟踪-项目处理进展列表
      **/
     List<ProcesslistResultDTO> progressList(ProcessListFormDTO formDTO);
+
+    /**
+     * 可退回节点列表
+     * @author zhaoqifeng
+     * @date 2020/5/13 13:42
+     * @param fromDTO
+     * @return java.util.List<com.epmet.dto.result.ReturnListResultDTO>
+     */
+    List<ReturnListResultDTO> getReturnableList(ReturnListFromDTO fromDTO);
 }

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

@@ -21,8 +21,14 @@ import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.ProjectSatisfactionDetailDTO;
 import com.epmet.dto.form.EvaluationListFormDTO;
+import com.epmet.dto.form.ProjectEvaluationListFormDTO;
 import com.epmet.dto.result.EvaluationListResultDTO;
+import com.epmet.dto.form.ProjectEvaluateFormDTO;
+import com.epmet.dto.form.ProjectInitEvaluationFormDTO;
+import com.epmet.dto.result.ProjectEvaluationListResultDTO;
+import com.epmet.dto.result.ProjectInitEvaluationResultDTO;
 import com.epmet.entity.ProjectSatisfactionDetailEntity;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
 import java.util.Map;
@@ -102,4 +108,25 @@ public interface ProjectSatisfactionDetailService extends BaseService<ProjectSat
      * @Description 项目跟踪-项目满意度评价列表
      **/
     List<EvaluationListResultDTO> evaluationList(EvaluationListFormDTO formDTO);
+
+    /**
+     * @Description  满意度评价初始化——已转项目
+     * @param projectInitEvaluation
+     * @author zxc
+     */
+    ProjectInitEvaluationResultDTO projectInitEvaluation(ProjectInitEvaluationFormDTO projectInitEvaluation);
+
+    /**
+     * @Description  提交满意度评价——已转项目
+     * @param projectEvaluate
+     * @author zxc
+     */
+    void projectEvaluate(ProjectEvaluateFormDTO projectEvaluate);
+
+    /**
+     * @Description  满意度评价列表——已转项目
+     * @param formDTO
+     * @author zxc
+     */
+    List<ProjectEvaluationListResultDTO> projectEvaluationList(@RequestBody ProjectEvaluationListFormDTO formDTO);
 }

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

@@ -21,8 +21,10 @@ import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.dto.ProjectDTO;
+import com.epmet.dto.form.ProjectClosedFromDTO;
 import com.epmet.dto.form.ProjectDetailFromDTO;
 import com.epmet.dto.form.ProjectListFromDTO;
+import com.epmet.dto.form.ReturnFromDTO;
 import com.epmet.dto.result.CreatedListResultDTO;
 import com.epmet.dto.result.InvolvedListResultDTO;
 import com.epmet.dto.result.PendProjectListResultDTO;
@@ -139,4 +141,22 @@ public interface ProjectService extends BaseService<ProjectEntity> {
 	 * @date 2020/5/12 15:13
 	 */
 	ProjectDetailResultDTO getProjectDetail(ProjectDetailFromDTO fromDTO);
+
+	/**
+	 * 项目结案
+	 * @author zhaoqifeng
+	 * @date 2020/5/13 9:54
+	 * @param fromDTO 参数
+	 * @return void
+	 */
+	void closed(ProjectClosedFromDTO fromDTO);
+
+	/**
+	 * 项目退回
+	 * @author zhaoqifeng
+	 * @date 2020/5/13 14:35
+	 * @param fromDTO 参数
+	 * @return void
+	 */
+	void projectReturn(ReturnFromDTO fromDTO);
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectStaffService.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.ProjectStaffDTO;
+import com.epmet.dto.form.DepartmentStaffListFormDTO;
 import com.epmet.dto.result.DepartmentResultDTO;
+import com.epmet.entity.ProjectProcessEntity;
+import com.epmet.dto.result.DepartmentStaffListResultDTO;
 import com.epmet.entity.ProjectStaffEntity;
 
 import java.util.List;
@@ -103,4 +106,21 @@ public interface ProjectStaffService extends BaseService<ProjectStaffEntity> {
      * @date 2020/5/12 16:40
      */
     List<DepartmentResultDTO> getDepartmentNameList(ProjectStaffDTO dto);
+
+    /**
+     * 获取节点处理人信息
+     * @author zhaoqifeng
+     * @date 2020/5/13 15:06
+     * @param projectProcessId 项目处理进展ID
+     * @return com.epmet.dto.ProjectStaffDTO
+     */
+    ProjectStaffDTO getProjectStaffInfo(String projectProcessId);
+
+    /**
+     * @param formDTO
+     * @return
+     * @Author sun
+     * @Description 项目跟踪-部门人员选择
+     **/
+    DepartmentStaffListResultDTO departmentStaffList(DepartmentStaffListFormDTO formDTO);
 }

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

@@ -23,21 +23,31 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
 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.ProjectProcessDao;
 import com.epmet.dao.ProjectStaffDao;
+import com.epmet.dto.CustomerAgencyDTO;
 import com.epmet.dto.ProjectProcessDTO;
 import com.epmet.dto.form.ProcessListFormDTO;
+import com.epmet.dto.form.ReturnListFromDTO;
+import com.epmet.dto.form.StaffsInAgencyFromDTO;
 import com.epmet.dto.result.ProcesslistResultDTO;
+import com.epmet.dto.result.ReturnListResultDTO;
+import com.epmet.dto.result.StaffInfoResultDTO;
+import com.epmet.entity.ProjectEntity;
 import com.epmet.entity.ProjectProcessEntity;
+import com.epmet.feign.EpmetUserFeignClient;
 import com.epmet.feign.GovOrgFeignClient;
 import com.epmet.redis.ProjectProcessRedis;
 import com.epmet.service.ProjectProcessService;
+import com.epmet.service.ProjectService;
 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 java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 项目处理进展表
@@ -54,6 +64,10 @@ public class ProjectProcessServiceImpl extends BaseServiceImpl<ProjectProcessDao
     private ProjectStaffDao projectStaffDao;
     @Autowired
     private GovOrgFeignClient govOrgFeignClient;
+    @Autowired
+    private EpmetUserFeignClient epmetUserFeignClient;
+    @Autowired
+    private ProjectService projectService;
 
     @Override
     public PageData<ProjectProcessDTO> page(Map<String, Object> params) {
@@ -119,4 +133,29 @@ public class ProjectProcessServiceImpl extends BaseServiceImpl<ProjectProcessDao
         return  baseDao.getProcessListByProjectId(formDTO.getProjectId());
     }
 
+    @Override
+    public List<ReturnListResultDTO> getReturnableList(ReturnListFromDTO fromDTO) {
+        List<ProjectProcessEntity> list = baseDao.selectReturnableList(fromDTO.getProjectId());
+        //遍历获取所有的userId
+        List<String> userIds = list.stream().map(ProjectProcessEntity::getStaffId).collect(Collectors.toList());
+        //获取项目信息
+        ProjectEntity projectEntity = projectService.selectById(fromDTO.getProjectId());
+        //获取组织信息
+        Result<CustomerAgencyDTO> customerAgency = govOrgFeignClient.getAgencyById(projectEntity.getAgencyId());
+        //获取人员信息
+        StaffsInAgencyFromDTO  staffsInAgencyFromDTO = new StaffsInAgencyFromDTO();
+        staffsInAgencyFromDTO.setCustomerId(customerAgency.getData().getCustomerId());
+        staffsInAgencyFromDTO.setStaffList(userIds);
+        List<StaffInfoResultDTO> staffList = epmetUserFeignClient.getStaffList(staffsInAgencyFromDTO).getData();
+        //合成返回值
+        List<ReturnListResultDTO> resultList =
+                list.stream().flatMap(process -> staffList.stream().filter(staff -> process.getStaffId().equals(staff.getStaffId())).map(userInfo ->{
+                    ReturnListResultDTO resultDTO = new ReturnListResultDTO();
+                    resultDTO.setProjectProcessId(process.getId());
+                    resultDTO.setProcessor(process.getDepartmentName().concat("-").concat(userInfo.getStaffName()));
+                    return resultDTO;
+                })).collect(Collectors.toList());
+        return resultList;
+    }
+
 }

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

@@ -20,6 +20,8 @@ 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.exception.EpmetErrorCode;
+import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.exception.RenException;
@@ -28,15 +30,14 @@ import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.constant.ProjectConstant;
 import com.epmet.dao.ProjectSatisfactionDetailDao;
 import com.epmet.dto.ProjectSatisfactionDetailDTO;
-import com.epmet.dto.form.EvaluationListFormDTO;
-import com.epmet.dto.form.UserResiInfoListFormDTO;
-import com.epmet.dto.result.EvaluationListResultDTO;
-import com.epmet.dto.result.UserResiInfoResultDTO;
+import com.epmet.dto.form.*;
+import com.epmet.dto.result.*;
 import com.epmet.entity.ProjectSatisfactionDetailEntity;
 import com.epmet.feign.EpmetUserFeignClient;
 import com.epmet.redis.ProjectSatisfactionDetailRedis;
 import com.epmet.service.ProjectSatisfactionDetailService;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -147,4 +148,58 @@ public class ProjectSatisfactionDetailServiceImpl extends BaseServiceImpl<Projec
         return resultList;
     }
 
+    /**
+     * @Description  满意度评价初始化——已转项目
+     * @param projectInitEvaluation
+     * @author zxc
+     */
+    @Override
+    public ProjectInitEvaluationResultDTO projectInitEvaluation(ProjectInitEvaluationFormDTO projectInitEvaluation) {
+        ProjectInitEvaluationResultDTO resultDTO = new ProjectInitEvaluationResultDTO();
+        ProjectEvaluateInfoResultDTO checkProjectSatisfaction = baseDao.checkProjectSatisfaction(projectInitEvaluation);
+        if (checkProjectSatisfaction!=null){
+            resultDTO.setStatus(true);//已评价
+            resultDTO.setEvaluateInfo(checkProjectSatisfaction);
+        }else {
+            resultDTO.setStatus(false);
+            ProjectEvaluateInfoResultDTO evaluateInfo = new ProjectEvaluateInfoResultDTO();
+            evaluateInfo.setEvaluateContent("");
+            evaluateInfo.setSatisfaction("");
+            resultDTO.setEvaluateInfo(evaluateInfo);
+        }
+        return resultDTO;
+    }
+
+    /**
+     * @Description  提交满意度评价——已转项目
+     * @param formDTO
+     * @author zxc
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void projectEvaluate(ProjectEvaluateFormDTO formDTO) {
+        ProjectSatisfactionDetailEntity entity = new ProjectSatisfactionDetailEntity();
+        BeanUtils.copyProperties(formDTO,entity);
+        //校验是否评价
+        ProjectInitEvaluationFormDTO projectInitEvaluation = new ProjectInitEvaluationFormDTO();
+        BeanUtils.copyProperties(formDTO,projectInitEvaluation);
+        ProjectEvaluateInfoResultDTO resultDTO = baseDao.checkProjectSatisfaction(projectInitEvaluation);
+        if (resultDTO!=null){
+            throw new RenException(EpmetErrorCode.ALREADY_EVALUATE.getMsg());
+        }
+        baseDao.insert(entity);
+    }
+
+    /**
+     * @Description  满意度评价列表——已转项目
+     * @param formDTO
+     * @author zxc
+     */
+    @Override
+    public List<ProjectEvaluationListResultDTO> projectEvaluationList(ProjectEvaluationListFormDTO formDTO) {
+        int pageIndex = (formDTO.getPageNo() - NumConstant.ONE) * formDTO.getPageSize();
+        formDTO.setPageNo(pageIndex);
+        return baseDao.projectEvaluationList(formDTO);
+    }
+
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.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.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.constant.FieldConstant;
@@ -30,14 +31,15 @@ import com.epmet.dao.ProjectDao;
 import com.epmet.dto.CustomerProjectParameterDTO;
 import com.epmet.dto.ProjectDTO;
 import com.epmet.dto.ProjectStaffDTO;
-import com.epmet.dto.form.ProjectDetailFromDTO;
-import com.epmet.dto.form.ProjectListFromDTO;
-import com.epmet.dto.form.WorkDayFormDTO;
+import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
 import com.epmet.entity.ProjectEntity;
+import com.epmet.entity.ProjectProcessEntity;
+import com.epmet.entity.ProjectStaffEntity;
 import com.epmet.feign.CommonFeignClient;
 import com.epmet.redis.ProjectRedis;
 import com.epmet.service.CustomerProjectParameterService;
+import com.epmet.service.ProjectProcessService;
 import com.epmet.service.ProjectService;
 import com.epmet.service.ProjectStaffService;
 import org.apache.commons.lang3.StringUtils;
@@ -65,6 +67,8 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 	private CommonFeignClient commonFeignClient;
 	@Autowired
 	private ProjectStaffService projectStaffService;
+	@Autowired
+	private ProjectProcessService projectProcessService;
 
 	private final static String ONE_DAY = "<1";
 
@@ -124,6 +128,10 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 	public List<PendProjectListResultDTO> getPendProjectList(ProjectListFromDTO fromDTO) {
 		List<PendProjectListResultDTO> list = new ArrayList<>();
 
+		//查询条件
+		int pageIndex = (fromDTO.getPageNo() - NumConstant.ONE) * fromDTO.getPageSize();
+		fromDTO.setPageNo(pageIndex);
+
 		List<ProjectDTO> projectList = baseDao.selectPendList(fromDTO);
 		//获取客户定制的可滞留天数
 		Integer finalDays = getDays(fromDTO);
@@ -149,6 +157,11 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 	@Override
 	public List<CreatedListResultDTO> getCreatedList(ProjectListFromDTO fromDTO) {
 		List<CreatedListResultDTO> list = new ArrayList<>();
+
+		//查询条件
+		int pageIndex = (fromDTO.getPageNo() - NumConstant.ONE) * fromDTO.getPageSize();
+		fromDTO.setPageNo(pageIndex);
+
 		List<ProjectDTO> projectList = baseDao.selectCreatedList(fromDTO);
 		//获取客户定制的可滞留天数
 		Integer finalDays = getDays(fromDTO);
@@ -156,6 +169,8 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 			CreatedListResultDTO created = new CreatedListResultDTO();
 			created.setProjectId(p.getId());
 			created.setProjectTitle(p.getTitle());
+			created.setProjectStatus(p.getStatus());
+			created.setPublicReply(p.getPublicReply());
 			created.setProjectTime(p.getCreatedTime().getTime());
 			String detentionDays = getDetentionDays(p);
 			if (!ONE_DAY.equals(detentionDays) && Integer.parseInt(detentionDays) > finalDays) {
@@ -181,6 +196,11 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 	@Override
 	public List<InvolvedListResultDTO> getInvolvedList(ProjectListFromDTO fromDTO) {
 		List<InvolvedListResultDTO> list = new ArrayList<>();
+
+		//查询条件
+		int pageIndex = (fromDTO.getPageNo() - NumConstant.ONE) * fromDTO.getPageSize();
+		fromDTO.setPageNo(pageIndex);
+
 		List<ProjectDTO> projectList = baseDao.selectCreatedList(fromDTO);
 		//获取客户定制的可滞留天数
 		Integer finalDays = getDays(fromDTO);
@@ -188,6 +208,8 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 			InvolvedListResultDTO involved = new InvolvedListResultDTO();
 			involved.setProjectId(p.getId());
 			involved.setProjectTitle(p.getTitle());
+			involved.setProjectStatus(p.getStatus());
+			involved.setPublicReply(p.getPublicReply());
 			involved.setProjectTime(p.getCreatedTime().getTime());
 			String detentionDays = getDetentionDays(p);
 			if (!ONE_DAY.equals(detentionDays) && Integer.parseInt(detentionDays) > finalDays) {
@@ -228,13 +250,84 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 			}
 		}
 
+		//获取当前跟进部门
+		List<String> departmentNameList = new ArrayList<>();
+		if (ProjectConstant.CLOSED.equals(resultDTO.getProjectStatus())) {
+			//项目已结案，跟进部门为空
+			resultDTO.setDepartmentNameList(departmentNameList);
+		} else {
+			//项目未结案，找出所有跟进部门
+			ProjectDTO projectDTO = new ProjectDTO();
+			projectDTO.setId(fromDTO.getProjectId());
+			departmentNameList = baseDao.selectDepartmentNameList(projectDTO);
+			resultDTO.setDepartmentNameList(departmentNameList);
+		}
+
 		return resultDTO;
 	}
 
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public void closed(ProjectClosedFromDTO fromDTO) {
+		//更新项目表状态
+		ProjectEntity projectEntity = baseDao.selectById(fromDTO.getProjectId());
+		projectEntity.setStatus(ProjectConstant.CLOSED);
+		projectEntity.setClosedStatus(fromDTO.getClosedStatus());
+		baseDao.updateById(projectEntity);
+
+		//更新项目关联表
+		ProjectStaffEntity projectStaffEntity = new ProjectStaffEntity();
+		projectStaffEntity.setId(fromDTO.getProjectStaffId());
+		projectStaffEntity.setIsHandle(ProjectConstant.HANDLE);
+		projectStaffService.updateById(projectStaffEntity);
+
+		//结案记录加入项目进展表
+		ProjectProcessEntity projectProcessEntity = new ProjectProcessEntity();
+		projectProcessEntity.setProjectId(fromDTO.getProjectId());
+		projectProcessEntity.setDepartmentName(fromDTO.getDepartmentName());
+		projectProcessEntity.setEndTime(new Date());
+		projectProcessEntity.setOperation(ProjectConstant.OPERATION_CLOSE);
+		projectProcessEntity.setOperationName(ProjectConstant.OPERATION_CLOSE_NAME);
+		projectProcessEntity.setPublicReply(fromDTO.getPublicReply());
+		projectProcessEntity.setInternalRemark(fromDTO.getInternalRemark());
+		projectProcessEntity.setStaffId(fromDTO.getUserId());
+		projectProcessEntity.setCostWorkdays(getDetentionDays(ConvertUtils.sourceToTarget(projectEntity, ProjectDTO.class)));
+		projectProcessService.insert(projectProcessEntity);
+	}
+
+	@Override
+	public void projectReturn(ReturnFromDTO fromDTO) {
+		//更新项目关联表
+		ProjectStaffEntity projectStaffEntity = new ProjectStaffEntity();
+		projectStaffEntity.setId(fromDTO.getProjectStaffId());
+		projectStaffEntity.setIsHandle(ProjectConstant.HANDLE);
+		projectStaffService.updateById(projectStaffEntity);
+
+		//结案记录加入项目进展表
+		ProjectProcessEntity projectProcessEntity = new ProjectProcessEntity();
+		projectProcessEntity.setProjectId(fromDTO.getProjectId());
+		projectProcessEntity.setDepartmentName(fromDTO.getDepartmentName());
+		projectProcessEntity.setOperation(ProjectConstant.OPERATION_RETURN);
+		projectProcessEntity.setOperationName(ProjectConstant.OPERATION_RETURN_NAME);
+		projectProcessEntity.setPublicReply(fromDTO.getPublicReply());
+		projectProcessEntity.setInternalRemark(fromDTO.getInternalRemark());
+		projectProcessEntity.setStaffId(fromDTO.getUserId());
+		projectProcessService.insert(projectProcessEntity);
+
+		//将人员关系添加到项目关联表
+		ProjectStaffDTO projectStaffDTO = projectStaffService.getProjectStaffInfo(fromDTO.getProjectProcessId());
+		ProjectStaffEntity projectStaff = ConvertUtils.sourceToTarget(projectStaffDTO, ProjectStaffEntity.class);
+		projectStaff.setId(null);
+		projectStaff.setIsHandle(ProjectConstant.UNHANDLED);
+		projectStaffService.insert(projectStaff);
+
+		//TODO 通知
+	}
+
 	/**
 	 * 获取客户定制的可滞留天数
 	 *
-	 * @param fromDTO
+	 * @param fromDTO 参数
 	 * @return java.lang.Integer
 	 * @author zhaoqifeng
 	 * @date 2020/5/12 16:20
@@ -255,7 +348,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 	/**
 	 * 工作日计算
 	 *
-	 * @param projectDTO
+	 * @param projectDTO 参数
 	 * @return java.lang.String
 	 * @author zhaoqifeng
 	 * @date 2020/5/12 16:20
@@ -266,7 +359,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 		List<WorkDayFormDTO> list = new ArrayList<>();
 		WorkDayFormDTO workDayFormDTO = new WorkDayFormDTO();
 		workDayFormDTO.setId(projectDTO.getId());
-		workDayFormDTO.setStartDate(format.format(projectDTO.getCreatedTime()));
+		workDayFormDTO.setStartDate(format.format(projectDTO.getUpdatedTime()));
 		workDayFormDTO.setEndDate(format.format(new Date()));
 		Result<List<WorkDayResultDTO>> detentionDays = commonFeignClient.detentionDays(list);
 		return detentionDays.getData().get(0).getDetentionDays();

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

@@ -20,13 +20,17 @@ 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.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.utils.Result;
 import com.epmet.dao.ProjectStaffDao;
 import com.epmet.dto.ProjectStaffDTO;
+import com.epmet.dto.form.DepartmentStaffListFormDTO;
 import com.epmet.dto.result.DepartmentResultDTO;
+import com.epmet.dto.result.DepartmentStaffListResultDTO;
 import com.epmet.entity.ProjectStaffEntity;
+import com.epmet.feign.GovOrgFeignClient;
 import com.epmet.redis.ProjectStaffRedis;
 import com.epmet.service.ProjectStaffService;
 import org.apache.commons.lang3.StringUtils;
@@ -49,6 +53,8 @@ public class ProjectStaffServiceImpl extends BaseServiceImpl<ProjectStaffDao, Pr
 
     @Autowired
     private ProjectStaffRedis projectStaffRedis;
+    @Autowired
+    private GovOrgFeignClient govOrgFeignClient;
 
     @Override
     public PageData<ProjectStaffDTO> page(Map<String, Object> params) {
@@ -107,4 +113,16 @@ public class ProjectStaffServiceImpl extends BaseServiceImpl<ProjectStaffDao, Pr
         return baseDao.selectDepartmentNameList(dto);
     }
 
+    @Override
+    public ProjectStaffDTO getProjectStaffInfo(String projectProcessId) {
+        return baseDao.selectProjectStaffInfo(projectProcessId);
+    }
+
+    @Override
+    public DepartmentStaffListResultDTO departmentStaffList(DepartmentStaffListFormDTO formDTO) {
+        //1:调用gov-org服务，分别查询组织下人员，组织下部门人员，组织下网格人员列表信息
+        Result<DepartmentStaffListResultDTO> resultDTOResult = govOrgFeignClient.departmentStaffList(formDTO.getAgencyId());
+        return resultDTOResult.getData();
+    }
+
 }

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

@@ -3,6 +3,7 @@ package com.epmet.service.impl;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
+import com.epmet.service.ProjectProcessService;
 import com.epmet.service.ProjectService;
 import com.epmet.service.ProjectTraceService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,6 +20,8 @@ import java.util.List;
 public class ProjectTraceServiceImpl implements ProjectTraceService {
 	@Autowired
 	private ProjectService projectService;
+	@Autowired
+	private ProjectProcessService projectProcessService;
 
 	@Override
 	public List<PendProjectListResultDTO> getPendProjectList(TokenDto tokenDto, ProjectListFromDTO fromDTO) {
@@ -40,21 +43,24 @@ public class ProjectTraceServiceImpl implements ProjectTraceService {
 
 	@Override
 	public ProjectDetailResultDTO getProjectDetail(TokenDto tokenDto, ProjectDetailFromDTO fromDTO) {
-		return null;
+		fromDTO.setProjectId(tokenDto.getUserId());
+		return projectService.getProjectDetail(fromDTO);
 	}
 
 	@Override
 	public void closed(TokenDto tokenDto, ProjectClosedFromDTO fromDTO) {
-
+		fromDTO.setUserId(tokenDto.getUserId());
+		projectService.closed(fromDTO);
 	}
 
 	@Override
 	public List<ReturnListResultDTO> getReturnableList(ReturnListFromDTO fromDTO) {
-		return null;
+		return projectProcessService.getReturnableList(fromDTO);
 	}
 
 	@Override
 	public void projectReturn(TokenDto tokenDto, ReturnFromDTO fromDTO) {
-
+		fromDTO.setUserId(tokenDto.getUserId());
+		projectService.projectReturn(fromDTO);
 	}
 }

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

@@ -23,7 +23,8 @@
         SELECT distinct
             p.ID,
             p.TITLE,
-            psp.CREATED_TIME
+            p.CREATED_TIME,
+            psp.CREATED_TIME AS UPDATED_TIME
         FROM project p
                  INNER JOIN (SELECT
                                  ps.PROJECT_ID,
@@ -37,51 +38,76 @@
                              GROUP BY ps.PROJECT_ID) psp ON p.ID = psp.PROJECT_ID
         WHERE p.DEL_FLAG = '0'
         AND p.status = 'pending'
-        ORDER BY psp.CREATED_TIME ASC
+        ORDER BY p.CREATED_TIME ASC
+        LIMIT #{pageNo}, #{pageSize}
     </select>
     <select id="selectCreatedList" resultType="com.epmet.dto.ProjectDTO" parameterType="com.epmet.dto.form.ProjectListFromDTO">
         SELECT distinct
             p.ID,
             p.TITLE,
             p.STATUS,
-            psp.CREATED_TIME
+            IFNULL(pp.PUBLIC_REPLY, "") AS PUBLIC_REPLY,
+            p.CREATED_TIME,
+            ps.CREATED_TIME AS UPDATED_TIME
         FROM project p
-                 INNER JOIN (SELECT
-                                 ps.PROJECT_ID,
-                                 MAX(ps.CREATED_TIME) AS CREATED_TIME
-                             FROM
-                                 project_staff ps
-                             INNER JOIN  project_process pp ON ps.PROCESS_ID = pp.ID AND pp.DEL_FLAG = '0'
-                                        AND pp.OPERATION = 'created'
-                             WHERE
-                                 ps.DEL_FLAG = '0'
-                               AND ps.IS_HANDLE = 'handle'
-                               AND ps.STAFF_ID = #{userId}
-                             GROUP BY ps.PROJECT_ID) psp ON p.ID = psp.PROJECT_ID
+        INNER JOIN (SELECT DISTINCT
+                     ps.PROJECT_ID
+                 FROM
+                     project_staff ps
+                 INNER JOIN  project_process pp ON ps.PROCESS_ID = pp.ID AND pp.DEL_FLAG = '0'
+                            AND pp.OPERATION = 'created'
+                 WHERE
+                     ps.DEL_FLAG = '0'
+                   AND ps.IS_HANDLE = 'handle'
+                   AND ps.STAFF_ID = #{userId}
+                 GROUP BY ps.PROJECT_ID) psp ON p.ID = psp.PROJECT_ID
+        INNER JOIN (
+            SELECT DISTINCT
+                PROJECT_ID,
+                MIN(CREATED_TIME) AS CREATED_TIME
+            FROM
+                project_staff
+            WHERE DEL_FLAG = '0'
+            AND IS_HANDLE = 'unhandled'
+            GROUP BY PROJECT_ID) ps ON p.ID = ps.PROJECT_ID
+        LEFT JOIN project_process pp ON p.ID = pp.PROJECT_ID AND pp.OPERATION = 'close'
         WHERE p.DEL_FLAG = '0'
-        ORDER BY psp.CREATED_TIME ASC
+        ORDER BY p.CREATED_TIME ASC
+        LIMIT #{pageNo}, #{pageSize}
     </select>
     <select id="selectInvolvedList" resultType="com.epmet.dto.ProjectDTO" parameterType="com.epmet.dto.form.ProjectListFromDTO">
         SELECT distinct
             p.ID,
             p.TITLE,
             p.STATUS,
-            psp.CREATED_TIME
+            IFNULL(pp.PUBLIC_REPLY, "") AS PUBLIC_REPLY,
+            p.CREATED_TIME,
+            ps.CREATED_TIME AS UPDATED_TIME
         FROM project p
-                 INNER JOIN (SELECT
-                                 ps.PROJECT_ID,
-                                 MAX(ps.CREATED_TIME) AS CREATED_TIME
-                             FROM
-                                 project_staff ps
-                                     INNER JOIN  project_process pp ON ps.PROCESS_ID = pp.ID AND pp.DEL_FLAG = '0'
-                                     AND pp.OPERATION != 'created'
-                             WHERE
-                                 ps.DEL_FLAG = '0'
-                               AND ps.IS_HANDLE = 'handle'
-                               AND ps.STAFF_ID = #{userId}
-                             GROUP BY ps.PROJECT_ID) psp ON p.ID = psp.PROJECT_ID
+        INNER JOIN (SELECT
+                     ps.PROJECT_ID
+                 FROM
+                     project_staff ps
+                         INNER JOIN  project_process pp ON ps.PROCESS_ID = pp.ID AND pp.DEL_FLAG = '0'
+                         AND pp.OPERATION != 'created'
+                 WHERE
+                     ps.DEL_FLAG = '0'
+                   AND ps.IS_HANDLE = 'handle'
+                   AND ps.STAFF_ID = #{userId}
+                 GROUP BY ps.PROJECT_ID) psp ON p.ID = psp.PROJECT_ID
+        INNER JOIN (
+            SELECT DISTINCT
+                PROJECT_ID,
+                MIN(CREATED_TIME) AS CREATED_TIME
+            FROM
+                project_staff
+            WHERE DEL_FLAG = '0'
+              AND IS_HANDLE = 'unhandled'
+            GROUP BY PROJECT_ID) ps ON p.ID = ps.PROJECT_ID
+        LEFT JOIN project_process pp ON p.ID = pp.PROJECT_ID AND pp.OPERATION = 'close'
         WHERE p.DEL_FLAG = '0'
-        ORDER BY psp.CREATED_TIME ASC
+        ORDER BY p.CREATED_TIME ASC
+        LIMIT #{pageNo}, #{pageSize}
     </select>
     <select id="selectDepartmentNameList" resultType="java.lang.String" parameterType="com.epmet.dto.ProjectDTO">
         SELECT DISTINCT

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

@@ -19,6 +19,15 @@
         AND project_id = #{projectId}
         ORDER BY created_time DESC
     </select>
-
+    <select id="selectReturnableList" resultType="com.epmet.entity.ProjectProcessEntity">
+        SELECT
+            *
+        FROM
+            project_process
+        WHERE
+            DEL_FLAG = '0'
+          AND PROJECT_ID = #{projectId}
+        ORDER BY CREATED_TIME DESC
+    </select>
 
 </mapper>

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

@@ -30,5 +30,33 @@
         ORDER BY CREATED_TIME DESC
     </select>
 
+    <!-- 满意度评价初始化——已转项目 -->
+    <select id="checkProjectSatisfaction" parameterType="com.epmet.dto.form.ProjectInitEvaluationFormDTO" resultType="com.epmet.dto.result.ProjectEvaluateInfoResultDTO">
+        SELECT
+            comment AS evaluateContent,
+            satisfaction AS satisfaction
+        FROM
+            project_satisfaction_detail
+        WHERE
+            del_flag = 0
+            AND project_id = #{projectId}
+            AND created_by = #{userId}
+    </select>
+
+    <!-- 满意度评价列表——已转项目 -->
+    <select id="projectEvaluationList" resultType="com.epmet.dto.result.ProjectEvaluationListResultDTO" parameterType="com.epmet.dto.form.ProjectEvaluationListFormDTO">
+        SELECT
+            created_by AS userId,
+            satisfaction AS satisfaction,
+            UNIX_TIMESTAMP( created_time ) AS evaluateTime,
+            COMMENT AS evaluateContent
+        FROM
+            project_satisfaction_detail
+        WHERE
+            del_flag = 0
+            AND project_id = #{projectId}
+        ORDER BY created_time DESC
+        LIMIT #{pageNo},#{pageSize}
+    </select>
 
 </mapper>

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

@@ -32,6 +32,14 @@
             AND IS_HANDLE = 'unhandled'
 
     </select>
+    <select id="selectProjectStaffInfo" resultType="com.epmet.dto.ProjectStaffDTO">
+        SELECT ps.* FROM project_staff ps
+        INNER JOIN project_process pp ON ps.DEPARTMENT_NAME = pp.DEPARTMENT_NAME AND ps.STAFF_ID = pp.STAFF_ID
+        WHERE ps.DEL_FLAG = '0'
+            AND pp.DEL_FLAG = '0'
+            AND pp.ID = #{processId}
+        LIMIT 1
+    </select>
 
 
 </mapper>

epmet-module/resi-hall/resi-hall-client/resi-hall-client.iml

@@ -14,6 +14,8 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" scope="TEST" name="Maven: javax.xml.bind:jaxb-api:2.3.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: javax.activation:javax.activation-api:1.2.0" level="project" />
     <orderEntry type="module" module-name="epmet-commons-tools" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.1.11.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.1.12.RELEASE" level="project" />
@@ -139,7 +141,5 @@
     <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.1.12.RELEASE" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:5.1.12.RELEASE" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.xmlunit:xmlunit-core:2.6.3" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: javax.xml.bind:jaxb-api:2.3.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: javax.activation:javax.activation-api:1.2.0" level="project" />
   </component>
 </module>

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

@@ -0,0 +1,32 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * 满意度评价列表——已关闭
+ */
+@Data
+public class EvaluationListFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 议题Id
+     */
+    private String IssueId;
+
+    /**
+     * 页码
+     */
+    private Integer pageNo;
+
+    /**
+     * 每页数量
+     */
+    private Integer pageSize;
+
+
+}

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

@@ -0,0 +1,37 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * 提交满意度评价——已转项目
+ */
+@Data
+public class ProjectEvaluateFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 议题Id
+     */
+    private String projectId;
+
+    /**
+     * 满意度 - 不满意:bad、基本满意:good、非常满意:perfect
+     */
+    private String satisfaction;
+
+    /**
+     * 评价内容
+     */
+    private String comment;
+
+    /**
+     * 用户ID
+     */
+    private String userId;
+
+
+}

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

@@ -0,0 +1,32 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * 满意度评价列表——已转项目
+ */
+@Data
+public class ProjectEvaluationListFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 议题Id
+     */
+    private String projectId;
+
+    /**
+     * 页码
+     */
+    private Integer pageNo;
+
+    /**
+     * 每页数量
+     */
+    private Integer pageSize;
+
+
+}

epmet-module/resi-hall/resi-hall-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/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/ProjectInitEvaluationFormDTO.java

@@ -0,0 +1,27 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * 满意度评价初始化
+ */
+@Data
+public class ProjectInitEvaluationFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 项目Id
+     */
+    private String projectId;
+
+    /**
+     * 创建人
+     */
+    private String userId;
+
+
+}

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

@@ -0,0 +1,22 @@
+package com.epmet.dto.form;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description userId集合
+ * @Author yinzuomei
+ * @Date 2020/4/7 18:20
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class UserResiInfoListFormDTO implements Serializable {
+	private static final long serialVersionUID = -4454561042197166135L;
+
+	private List<String> userIdList;
+}

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

@@ -0,0 +1,47 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * 满意度评价列表——已关闭
+ */
+@Data
+public class EvaluationListResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -1L;
+
+    /**
+     * 评价用户Id
+     */
+    private String userId;
+
+    /**
+     * 评价用户（山东路168-尹女士）
+     */
+    private String userNickName;
+
+    /**
+     * 满意度 - 不满意:bad、基本满意:good、非常满意:perfect
+     */
+    private String satisfaction;
+
+    /**
+     * 评价时间
+     */
+    private Long evaluateTime;
+
+    /**
+     * 评价内容
+     */
+    private String evaluateContent;
+
+    /**
+     * 用户头像
+     */
+    private String userHeadPhoto;
+
+
+}

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

@@ -0,0 +1,25 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * 项目满意度评价信息
+ */
+@Data
+public class ProjectEvaluateInfoResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -3699103790181586654L;
+
+    /**
+     * 评价内容
+     */
+    private String evaluateContent;
+
+    /**
+     * 满意度 - 不满意:bad、基本满意:good、非常满意:perfect
+     */
+    private String satisfaction;
+}

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

@@ -0,0 +1,47 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * 满意度评价列表——已关闭
+ */
+@Data
+public class ProjectEvaluationListResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -1L;
+
+    /**
+     * 评价用户Id
+     */
+    private String userId;
+
+    /**
+     * 评价用户（山东路168-尹女士）
+     */
+    private String userNickName;
+
+    /**
+     * 满意度 - 不满意:bad、基本满意:good、非常满意:perfect
+     */
+    private String satisfaction;
+
+    /**
+     * 评价时间
+     */
+    private Long evaluateTime;
+
+    /**
+     * 评价内容
+     */
+    private String evaluateContent;
+
+    /**
+     * 用户头像
+     */
+    private String userHeadPhoto;
+
+
+}

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

@@ -0,0 +1,26 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * 满意度评价初始化
+ */
+@Data
+public class ProjectInitEvaluationResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -1L;
+
+    /**
+     * 评价状态：true已评价，false未评价
+     */
+    private Boolean status;
+
+    /**
+     * 评价信息
+     */
+    private ProjectEvaluateInfoResultDTO evaluateInfo;
+
+}

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

@@ -0,0 +1,64 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description 用户注册信息返参DTO
+ * @Author yinzuomei
+ * @Date 2020/4/7 18:45
+ */
+@Data
+public class UserResiInfoResultDTO implements Serializable {
+
+	/**
+	 * 唯一标识
+	 */
+	private String id;
+
+	/**
+	 * 用户Id(主键) user.id
+	 */
+	private String userId;
+
+	/**
+	 * 手机号(注册手机号)
+	 */
+	private String regMobile;
+
+	/**
+	 * 姓氏
+	 */
+	private String surname;
+
+	/**
+	 * 名称
+	 */
+	private String name;
+
+	/**
+	 * 街道
+	 */
+	private String street;
+
+	/**
+	 * 小区名称
+	 */
+	private String district;
+
+	/**
+	 * 楼栋单元
+	 */
+	private String buildingAddress;
+
+	/**
+	 * 用户显示名称
+	 */
+	private String showName;
+
+	/**
+	 * 用户头像
+	 */
+	private String headPhoto;
+}

epmet-module/resi-hall/resi-hall-server/resi-hall-server.iml

@@ -25,6 +25,8 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" scope="TEST" name="Maven: javax.xml.bind:jaxb-api:2.3.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: javax.activation:javax.activation-api:1.2.0" level="project" />
     <orderEntry type="module" module-name="resi-hall-client" />
     <orderEntry type="module" module-name="epmet-commons-tools" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.1.11.RELEASE" level="project" />
@@ -195,7 +197,5 @@
     <orderEntry type="library" scope="TEST" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:5.1.12.RELEASE" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.xmlunit:xmlunit-core:2.6.3" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: javax.xml.bind:jaxb-api:2.3.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: javax.activation:javax.activation-api:1.2.0" level="project" />
   </component>
 </module>

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

@@ -0,0 +1,14 @@
+package com.epmet.constat;
+
+/**
+ * @Author zxc
+ * @CreateTime 2020/5/13 18:02
+ */
+public interface HallConstat {
+
+    /**
+     * 调用epmet-user服务查询数据失败
+     */
+    String SELECT_USERINFO_EXCEPTION = "获取用户昵称、头像失败";
+
+}

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

@@ -5,13 +5,8 @@ import com.epmet.commons.tools.annotation.RequirePermission;
 import com.epmet.commons.tools.enums.RequirePermissionEnum;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.dto.form.EvaluateFormDTO;
-import com.epmet.dto.form.IssueDetailFormDTO;
-import com.epmet.dto.form.IssueIdFormDTO;
-import com.epmet.dto.result.InitEvaluationResultDTO;
-import com.epmet.dto.result.IssueDetailResultDTO;
-import com.epmet.dto.result.VoteResultDTO;
-import com.epmet.dto.result.VotingTrendResultDTO;
+import com.epmet.dto.form.*;
+import com.epmet.dto.result.*;
 import com.epmet.service.IssueService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -19,6 +14,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description 居民端党群议事
  * @Author yinzuomei
@@ -86,7 +83,7 @@ public class IssueController {
     }
 
     /**
-     * @Description  满意度评价初始化
+     * @Description  满意度评价初始化——已关闭
      * @param tokenDto
      * @param issueId
      * @author zxc
@@ -97,7 +94,18 @@ public class IssueController {
     }
 
     /**
-     * @Description  提交满意度评价
+     * @Description  满意度评价初始化——已转项目
+     * @param tokenDto
+     * @param projectId
+     * @author zxc
+     */
+    @PostMapping("projectinitevaluation")
+    public Result<ProjectInitEvaluationResultDTO> projectInitEvaluation(@LoginUser TokenDto tokenDto, @RequestBody ProjectIdFormDTO projectId){
+        return new Result<ProjectInitEvaluationResultDTO>().ok(issueService.projectInitEvaluation(tokenDto,projectId));
+    }
+
+    /**
+     * @Description  提交满意度评价——已关闭的议题
      * @param formDTO
      * @author zxc
      */
@@ -107,5 +115,36 @@ public class IssueController {
         return new Result();
     }
 
+    /**
+     * @Description  提交满意度评价——已转项目
+     * @param formDTO
+     * @author zxc
+     */
+    @PostMapping("projectevaluate")
+    public Result projectEvaluate(@LoginUser TokenDto tokenDto,@RequestBody ProjectEvaluateFormDTO formDTO){
+        issueService.projectEvaluate(tokenDto,formDTO);
+        return new Result();
+    }
+
+    /**
+     * @Description  满意度评价列表——已关闭
+     * @param formDTO
+     * @author zxc
+     */
+    @PostMapping("evaluationlist")
+    public Result<List<EvaluationListResultDTO>> evaluationList(@RequestBody EvaluationListFormDTO formDTO){
+        return new Result<List<EvaluationListResultDTO>>().ok(issueService.evaluationList(formDTO));
+    }
+
+    /**
+     * @Description  满意度评价列表——已转项目
+     * @param formDTO
+     * @author zxc
+     */
+    @PostMapping("projectevaluationlist")
+    public Result<List<EvaluationListResultDTO>> projectEvaluationList(@RequestBody ProjectEvaluationListFormDTO formDTO){
+        return new Result<List<EvaluationListResultDTO>>().ok(issueService.projectEvaluationList(formDTO));
+    }
+
 }
 

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

@@ -3,12 +3,16 @@ package com.epmet.feign;
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.form.IssueInitiatorFormDTO;
+import com.epmet.dto.form.UserResiInfoListFormDTO;
 import com.epmet.dto.result.IssueInitiatorResultDTO;
+import com.epmet.dto.result.UserResiInfoResultDTO;
 import com.epmet.feign.fallback.EpmetUserFeignClientFallBack;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
+import java.util.List;
+
 /**
  * @author zxc
  * @dscription
@@ -27,4 +31,13 @@ public interface EpmetUserFeignClient {
 	@PostMapping(value = "/epmetuser/userresiinfo/selectissueinitiator")
 	Result<IssueInitiatorResultDTO> selectIssueInitiator(@RequestBody IssueInitiatorFormDTO formDTO);
 
+	/**
+	 * @Description  查询评价人和评价人头像
+	 * @param formDTO
+	 * @author zxc
+	 */
+	@PostMapping("/epmetuser/userresiinfo/getuserresiinfolist")
+	Result<List<UserResiInfoResultDTO>> getUserResiInfoList(@RequestBody UserResiInfoListFormDTO formDTO);
+
+
 }

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

@@ -1,19 +1,16 @@
 package com.epmet.feign;
 
-import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.constant.ServiceConstant;
-import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.form.*;
-import com.epmet.dto.result.InitEvaluationResultDTO;
-import com.epmet.dto.result.IssueResultDTO;
-import com.epmet.dto.result.VoteResultDTO;
-import com.epmet.dto.result.VotingTrendResultDTO;
+import com.epmet.dto.result.*;
 import com.epmet.feign.fallback.GovIssueFeignClientFallBack;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
+import java.util.List;
+
 
 /**
  * @Description Feign调用gov-issue-server模块
@@ -56,7 +53,7 @@ public interface GovIssueFeignClient {
     Result vote(@RequestBody VoteFormDTO issueId);
 
     /**
-     * @Description  满意度评价初始化
+     * @Description  满意度评价初始化——已关闭
      * @param formDTO
      * @author zxc
      */
@@ -71,4 +68,12 @@ public interface GovIssueFeignClient {
     @PostMapping("/gov/issue/issuesatisfactiondetail/evaluate")
     Result evaluate(@RequestBody EvaluateFormDTO formDTO);
 
+    /**
+     * @Description  满意度评价列表——已关闭
+     * @param formDTO
+     * @author zxc
+     */
+    @PostMapping("/gov/issue/issuesatisfactiondetail/evaluationlist")
+    Result<List<EvaluationListResultDTO>> evaluationList(@RequestBody EvaluationListFormDTO formDTO);
+
 }

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

@@ -0,0 +1,49 @@
+package com.epmet.feign;
+
+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.ProjectInitEvaluationFormDTO;
+import com.epmet.dto.result.ProjectEvaluationListResultDTO;
+import com.epmet.dto.result.ProjectInitEvaluationResultDTO;
+import com.epmet.feign.fallback.GovProjectFeignClientFallBack;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
+
+
+/**
+ * @Description Feign调用gov-project-server模块
+ * @ClassName GovProjectFeignClient
+ * url = "localhost:8102"
+ */
+@FeignClient(name = ServiceConstant.GOV_PROJECT_SERVER, fallback = GovProjectFeignClientFallBack.class)
+public interface GovProjectFeignClient {
+
+    /**
+     * @Description  提交满意度评价初始化——已转项目
+     * @param formDTO
+     * @author zxc
+     */
+    @PostMapping("/gov/project/projectsatisfactiondetail/projectinitevaluation")
+    Result<ProjectInitEvaluationResultDTO> projectInitEvaluation(@RequestBody ProjectInitEvaluationFormDTO formDTO);
+
+    /**
+     * @Description  提交满意度评价——已转项目
+     * @param projectEvaluate
+     * @author zxc
+     */
+    @PostMapping("/gov/project/projectsatisfactiondetail/projectevaluate")
+    Result projectEvaluate(@RequestBody ProjectEvaluateFormDTO projectEvaluate);
+
+    /**
+     * @Description  满意度评价列表——已转项目
+     * @param formDTO
+     * @author zxc
+     */
+    @PostMapping("/gov/project/projectsatisfactiondetail/projectevaluationlist")
+    Result<List<ProjectEvaluationListResultDTO>> projectEvaluationList(ProjectEvaluationListFormDTO formDTO);
+}

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

@@ -4,10 +4,15 @@ 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.IssueInitiatorFormDTO;
+import com.epmet.dto.form.UserResiInfoListFormDTO;
+import com.epmet.dto.result.EvaluationListResultDTO;
 import com.epmet.dto.result.IssueInitiatorResultDTO;
+import com.epmet.dto.result.UserResiInfoResultDTO;
 import com.epmet.feign.EpmetUserFeignClient;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+
 /**
  * @Auther zxc
  * @Create 2020-05-11 10:33
@@ -25,4 +30,9 @@ public class EpmetUserFeignClientFallBack implements EpmetUserFeignClient {
     public Result<IssueInitiatorResultDTO> selectIssueInitiator(IssueInitiatorFormDTO formDTO) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "selectIssueInitiator", formDTO);
     }
+
+    @Override
+    public Result<List<UserResiInfoResultDTO>> getUserResiInfoList(UserResiInfoListFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getUserResiInfoList", formDTO);
+    }
 }

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

@@ -5,13 +5,12 @@ import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.form.*;
-import com.epmet.dto.result.InitEvaluationResultDTO;
-import com.epmet.dto.result.IssueResultDTO;
-import com.epmet.dto.result.VoteResultDTO;
-import com.epmet.dto.result.VotingTrendResultDTO;
+import com.epmet.dto.result.*;
 import com.epmet.feign.GovIssueFeignClient;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+
 /**
  * @Description Feign
  * @ClassName GovIssueFeginFallBack
@@ -48,4 +47,9 @@ public class GovIssueFeignClientFallBack implements GovIssueFeignClient {
     public Result<InitEvaluationResultDTO> evaluate(EvaluateFormDTO formDTO) {
         return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "evaluate", formDTO);
     }
+
+    @Override
+    public Result<List<EvaluationListResultDTO>> evaluationList(EvaluationListFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "evaluationList", formDTO);
+    }
 }

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

@@ -0,0 +1,37 @@
+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.ProjectEvaluateFormDTO;
+import com.epmet.dto.form.ProjectEvaluationListFormDTO;
+import com.epmet.dto.form.ProjectInitEvaluationFormDTO;
+import com.epmet.dto.result.ProjectEvaluationListResultDTO;
+import com.epmet.dto.result.ProjectInitEvaluationResultDTO;
+import com.epmet.feign.GovProjectFeignClient;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @Description Feign
+ * @ClassName GovProjectFeignClientFallBack
+ */
+@Component
+public class GovProjectFeignClientFallBack implements GovProjectFeignClient {
+
+    @Override
+    public Result<ProjectInitEvaluationResultDTO> projectInitEvaluation(ProjectInitEvaluationFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_PROJECT_SERVER, "projectInitEvaluation", formDTO);
+    }
+
+    @Override
+    public Result projectEvaluate(ProjectEvaluateFormDTO projectEvaluate) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_PROJECT_SERVER, "projectEvaluate", projectEvaluate);
+    }
+
+    @Override
+    public Result<List<ProjectEvaluationListResultDTO>> projectEvaluationList(ProjectEvaluationListFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_PROJECT_SERVER, "projectEvaluationList", formDTO);
+    }
+}