Browse Source

满意度评价、初始化、列表

master
zxc 5 years ago
parent
commit
6ea12c8224
  1. 32
      epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/EvaluationListFormDTO.java
  2. 22
      epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/UserResiInfoListFormDTO.java
  3. 47
      epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/EvaluationListResultDTO.java
  4. 64
      epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/UserResiInfoResultDTO.java
  5. 2
      epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/constant/IssueConstant.java
  6. 30
      epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueManageController.java
  7. 14
      epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueSatisfactionDetailController.java
  8. 11
      epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueSatisfactionDetailDao.java
  9. 32
      epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java
  10. 24
      epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java
  11. 14
      epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueSatisfactionDetailService.java
  12. 10
      epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueVoteStatisticalService.java
  13. 18
      epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueSatisfactionDetailServiceImpl.java
  14. 2
      epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteDetailServiceImpl.java
  15. 46
      epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java
  16. 16
      epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueSatisfactionDetailDao.xml
  17. 37
      epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectEvaluateFormDTO.java
  18. 32
      epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectEvaluationListFormDTO.java
  19. 27
      epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectInitEvaluationFormDTO.java
  20. 25
      epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectEvaluateInfoResultDTO.java
  21. 47
      epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectEvaluationListResultDTO.java
  22. 28
      epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectInitEvaluationResultDTO.java
  23. 36
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectSatisfactionDetailController.java
  24. 19
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectSatisfactionDetailDao.java
  25. 27
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectSatisfactionDetailService.java
  26. 63
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSatisfactionDetailServiceImpl.java
  27. 28
      epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectSatisfactionDetailDao.xml
  28. 32
      epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/EvaluationListFormDTO.java
  29. 37
      epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/ProjectEvaluateFormDTO.java
  30. 32
      epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/ProjectEvaluationListFormDTO.java
  31. 20
      epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/ProjectIdFormDTO.java
  32. 27
      epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/ProjectInitEvaluationFormDTO.java
  33. 22
      epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/UserResiInfoListFormDTO.java
  34. 47
      epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/EvaluationListResultDTO.java
  35. 25
      epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/ProjectEvaluateInfoResultDTO.java
  36. 47
      epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/ProjectEvaluationListResultDTO.java
  37. 26
      epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/ProjectInitEvaluationResultDTO.java
  38. 64
      epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/UserResiInfoResultDTO.java
  39. 14
      epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/constat/HallConstat.java
  40. 57
      epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueController.java
  41. 13
      epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java
  42. 19
      epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/GovIssueFeignClient.java
  43. 49
      epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/GovProjectFeignClient.java
  44. 10
      epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java
  45. 12
      epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/fallback/GovIssueFeignClientFallBack.java
  46. 37
      epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/fallback/GovProjectFeignClientFallBack.java
  47. 45
      epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueService.java
  48. 104
      epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
  49. 47
      epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EvaluationListResultDTO.java
  50. 6
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserWechatService.java
  51. 8
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserWechatServiceImpl.java
  52. 2
      epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml

32
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;
}

22
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;
}

47
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;
}

64
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;
}

2
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 = "获取用户昵称、头像失败";
}

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

@ -6,16 +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.DepartmentStaffListFormDTO;
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
@ -27,6 +31,8 @@ public class IssueManageController {
@Autowired
private IssueService issueService;
@Autowired
private IssueVoteStatisticalService issueVoteStatisticalService;
/**
* @param formDTO
@ -54,5 +60,25 @@ public class IssueManageController {
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));
}
}

14
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));
}
}

11
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);
}

32
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);
}

24
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);
}
}

14
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);
}

10
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);
}

18
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);
}
}

2
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());
}
}

46
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;
}
}

16
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>

37
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;
}

32
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;
}

27
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;
}

25
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;
}

47
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;
}

28
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;
}

36
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));
}
}

19
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);
}

27
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);
}

63
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);
}
}

28
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>

32
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;
}

37
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;
}

32
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;
}

20
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;
}

27
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;
}

22
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;
}

47
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;
}

25
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;
}

47
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;
}

26
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;
}

64
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;
}

14
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 = "获取用户昵称、头像失败";
}

57
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));
}
}

13
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);
}

19
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);
}

49
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);
}

10
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);
}
}

12
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);
}
}

37
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);
}
}

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

@ -1,15 +1,13 @@
package com.epmet.service;
import com.epmet.commons.tools.annotation.LoginUser;
import com.epmet.commons.tools.security.dto.TokenDto;
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 org.springframework.web.bind.annotation.RequestBody;
import java.util.List;
/**
* @Author zxc
* @CreateTime 2020/5/11 9:44
@ -54,7 +52,7 @@ public interface IssueService {
VoteResultDTO vote(IssueIdFormDTO issueId);
/**
* @Description 满意度评价初始化
* @Description 满意度评价初始化已关闭
* @param tokenDto
* @param issueId
* @author zxc
@ -62,10 +60,39 @@ public interface IssueService {
InitEvaluationResultDTO initEvaluation(TokenDto tokenDto, IssueIdFormDTO issueId);
/**
* @Description 提交满意度评价
* @Description 满意度评价初始化已转项目
* @param tokenDto
* @param projectId
* @author zxc
*/
ProjectInitEvaluationResultDTO projectInitEvaluation(TokenDto tokenDto, ProjectIdFormDTO projectId);
/**
* @Description 提交满意度评价已关闭
* @param evaluateFormDTO
* @author zxc
*/
void evaluate(TokenDto tokenDto,EvaluateFormDTO evaluateFormDTO);
/**
* @Description 提交满意度评价已转项目
* @param projectEvaluateFormDTO
* @author zxc
*/
void projectEvaluate(TokenDto tokenDto, ProjectEvaluateFormDTO projectEvaluateFormDTO);
/**
* @Description 满意度评价列表已关闭
* @param formDTO
* @author zxc
*/
List<EvaluationListResultDTO> evaluationList(EvaluationListFormDTO formDTO);
/**
* @Description 满意度评价列表已转项目
* @param formDTO
* @author zxc
*/
List<EvaluationListResultDTO> projectEvaluationList(ProjectEvaluationListFormDTO formDTO);
}

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

@ -1,20 +1,25 @@
package com.epmet.service.impl;
import com.epmet.commons.tools.constant.NumConstant;
import com.epmet.commons.tools.exception.RenException;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.commons.tools.utils.Result;
import com.epmet.constat.HallConstat;
import com.epmet.dto.TopicInfoDTO;
import com.epmet.dto.form.*;
import com.epmet.dto.result.*;
import com.epmet.feign.EpmetUserFeignClient;
import com.epmet.feign.GovIssueFeignClient;
import com.epmet.feign.GovOrgFeignClient;
import com.epmet.feign.ResiGroupFeignClient;
import com.epmet.feign.*;
import com.epmet.service.IssueService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
/**
* @Author zxc
* @CreateTime 2020/5/11 9:46
@ -30,6 +35,8 @@ public class IssueServiceImpl implements IssueService {
private ResiGroupFeignClient resiGroupFeignClient;
@Autowired
private GovIssueFeignClient govIssueFeignClient;
@Autowired
private GovProjectFeignClient govProjectFeignClient;
/**
* @Description 议题详情
@ -123,7 +130,7 @@ public class IssueServiceImpl implements IssueService {
}
/**
* @Description 满意度评价初始化
* @Description 满意度评价初始化已关闭
* @param tokenDto
* @param issueId
* @author zxc
@ -138,7 +145,22 @@ public class IssueServiceImpl implements IssueService {
}
/**
* @Description 提交满意度评价
* @Description 满意度评价初始化已转项目
* @param tokenDto
* @param projectId
* @author zxc
*/
@Override
public ProjectInitEvaluationResultDTO projectInitEvaluation(TokenDto tokenDto, ProjectIdFormDTO projectId) {
ProjectInitEvaluationFormDTO formDTO = new ProjectInitEvaluationFormDTO();
formDTO.setProjectId(projectId.getProjectId());
formDTO.setUserId(tokenDto.getUserId());
Result<ProjectInitEvaluationResultDTO> projectInitEvaluationResult = govProjectFeignClient.projectInitEvaluation(formDTO);
return projectInitEvaluationResult.getData();
}
/**
* @Description 提交满意度评价已关闭
* @param evaluateFormDTO
* @author zxc
*/
@ -147,4 +169,74 @@ public class IssueServiceImpl implements IssueService {
evaluateFormDTO.setUserId(tokenDto.getUserId());
govIssueFeignClient.evaluate(evaluateFormDTO);
}
/**
* @Description 提交满意度评价已转项目
* @param projectEvaluateFormDTO
* @author zxc
*/
@Override
public void projectEvaluate(TokenDto tokenDto, ProjectEvaluateFormDTO projectEvaluateFormDTO) {
projectEvaluateFormDTO.setUserId(tokenDto.getUserId());
govProjectFeignClient.projectEvaluate(projectEvaluateFormDTO);
}
/**
* @Description 满意度评价列表已关闭
* @param formDTO
* @author zxc
*/
@Override
public List<EvaluationListResultDTO> evaluationList(EvaluationListFormDTO formDTO) {
Result<List<EvaluationListResultDTO>> listResult = govIssueFeignClient.evaluationList(formDTO);
List<EvaluationListResultDTO> data = listResult.getData();
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(HallConstat.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;
}
/**
* @Description 满意度评价列表已转项目
* @param formDTO
* @author zxc
*/
@Override
public List<EvaluationListResultDTO> projectEvaluationList(ProjectEvaluationListFormDTO formDTO) {
List<ProjectEvaluationListResultDTO> listResult = govProjectFeignClient.projectEvaluationList(formDTO).getData();
if (listResult.size()==NumConstant.ZERO||listResult.equals(null)){
return new ArrayList<>();
}
//获取头像和昵称 eg:山东路168号-周先生
List<String> userIds = listResult.stream().map(ProjectEvaluationListResultDTO::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(HallConstat.SELECT_USERINFO_EXCEPTION);
}
List<EvaluationListResultDTO> resultList = listResult.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;
}
}

47
epmet-user/epmet-user-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;
}

6
epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserWechatService.java

@ -1,7 +1,6 @@
package com.epmet.service;
import com.epmet.commons.mybatis.service.BaseService;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.result.CertifiedResultDTO;
import com.epmet.entity.UserWechatEntity;
@ -15,6 +14,11 @@ import java.util.List;
*/
public interface UserWechatService extends BaseService<UserWechatEntity> {
/**
* @Description 获取头像
* @param certifiedResultDTOS
* @author zxc
*/
List<CertifiedResultDTO> selectUserHeadPhotoByUserId(List<CertifiedResultDTO> certifiedResultDTOS);
}

8
epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserWechatServiceImpl.java

@ -1,6 +1,5 @@
package com.epmet.service.impl;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
import com.epmet.dao.UserWechatDao;
import com.epmet.dto.UserHeadPhotoDTO;
@ -10,8 +9,6 @@ import com.epmet.service.UserWechatService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.io.Serializable;
import java.util.Collection;
import java.util.List;
/**
@ -26,6 +23,11 @@ public class UserWechatServiceImpl extends BaseServiceImpl<UserWechatDao, UserWe
@Autowired
private UserWechatDao userWechatDao;
/**
* @Description 获取头像
* @param certifiedResultDTOS
* @author zxc
*/
@Override
public List<CertifiedResultDTO> selectUserHeadPhotoByUserId(List<CertifiedResultDTO> certifiedResultDTOS) {
List<UserHeadPhotoDTO> userHeadPhotoDTOS = userWechatDao.selectUserHeadPhotoByUserId(certifiedResultDTOS);

2
epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml

@ -121,7 +121,7 @@
'先生'
WHEN uw.sex = '2' THEN
'女士'
ELSE '某某'
ELSE '先生/女士'
END
) AS issueInitiator
FROM

Loading…
Cancel
Save