diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/EvaluationListFormDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/EvaluationListFormDTO.java new file mode 100644 index 0000000000..11c8bc0d5e --- /dev/null +++ b/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; + + +} diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/UserResiInfoListFormDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/UserResiInfoListFormDTO.java new file mode 100644 index 0000000000..1a5fe5274c --- /dev/null +++ b/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 userIdList; +} diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/EvaluationListResultDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/EvaluationListResultDTO.java new file mode 100644 index 0000000000..0a286112d7 --- /dev/null +++ b/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; + + +} diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/UserResiInfoResultDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/UserResiInfoResultDTO.java new file mode 100644 index 0000000000..6bdc1f6d2f --- /dev/null +++ b/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; +} diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/constant/IssueConstant.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/constant/IssueConstant.java index 48ed20352d..c5170b7e79 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/constant/IssueConstant.java +++ b/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 = "获取用户昵称、头像失败"; } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueManageController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueManageController.java index 9738c4272d..da9fa30482 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueManageController.java +++ b/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().ok(issueService.departmentStaffList(formDTO)); } + + /** + * @Description 详情折线图 + * @param issueId + * @author zxc + */ + @PostMapping("votingtrend") + public Result votingTrend(@RequestBody IssueIdFormDTO issueId){ + return new Result().ok(issueVoteStatisticalService.votingTrend(issueId)); + } + + /** + * @Description 满意度评价列表——已关闭 + * @param formDTO + * @author zxc + */ + @PostMapping("evaluationlist") + public Result> evaluationList(@RequestBody EvaluationListFormDTO formDTO){ + return new Result>().ok(issueVoteStatisticalService.evaluationList(formDTO)); + } } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueSatisfactionDetailController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueSatisfactionDetailController.java index b899a287ca..4eb362bec6 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueSatisfactionDetailController.java +++ b/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> evaluationList(@RequestBody EvaluationListFormDTO formDTO){ + return new Result>().ok(issueSatisfactionDetailService.evaluationList(formDTO)); + } + } \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueSatisfactionDetailDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueSatisfactionDetailDao.java index 0c29b55ace..b8152ad1d3 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueSatisfactionDetailDao.java +++ b/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 evaluationList(EvaluationListFormDTO formDTO); + } \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java new file mode 100644 index 0000000000..dd7dd564dc --- /dev/null +++ b/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> getUserResiInfoList(@RequestBody UserResiInfoListFormDTO formDTO); + + +} diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java new file mode 100644 index 0000000000..8dd1e31196 --- /dev/null +++ b/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> getUserResiInfoList(UserResiInfoListFormDTO formDTO) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getUserResiInfoList", formDTO); + } +} diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueSatisfactionDetailService.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueSatisfactionDetailService.java index 1abbd939af..a8fafa08a0 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueSatisfactionDetailService.java +++ b/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 evaluationList(@RequestBody EvaluationListFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueVoteStatisticalService.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueVoteStatisticalService.java index 8e1751de09..39e65850e8 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueVoteStatisticalService.java +++ b/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 evaluationList(EvaluationListFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueSatisfactionDetailServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueSatisfactionDetailServiceImpl.java index 5bd8aff0e6..37fb08814d 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueSatisfactionDetailServiceImpl.java +++ b/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 evaluationList(EvaluationListFormDTO formDTO) { + return baseDao.evaluationList(formDTO); + } + } \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteDetailServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteDetailServiceImpl.java index 2f10a43d19..ab2483778d 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteDetailServiceImpl.java +++ b/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 page(Map params) { @@ -145,4 +160,35 @@ public class IssueVoteStatisticalServiceImpl extends BaseServiceImpl evaluationList(EvaluationListFormDTO formDTO) { + int pageIndex = (formDTO.getPageNo() - NumConstant.ONE) * formDTO.getPageSize(); + formDTO.setPageNo(pageIndex); + List data = issueSatisfactionDetailDao.evaluationList(formDTO); + if (data.size()==NumConstant.ZERO||data==null){ + return new ArrayList<>(); + } + //获取头像和昵称 eg:山东路168号-周先生 + List userIds = data.stream().map(EvaluationListResultDTO::getUserId).collect(Collectors.toList()); + UserResiInfoListFormDTO userResiInfo = new UserResiInfoListFormDTO(); + userResiInfo.setUserIdList(userIds); + List userResiInfoList = userFeignClient.getUserResiInfoList(userResiInfo).getData(); + if (null == userResiInfoList || userResiInfoList.size() < NumConstant.ONE) { + throw new RenException(IssueConstant.SELECT_USERINFO_EXCEPTION); + } + List 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; + } + } \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueSatisfactionDetailDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueSatisfactionDetailDao.xml index 576f6b859d..9f3644db84 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueSatisfactionDetailDao.xml +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueSatisfactionDetailDao.xml @@ -29,4 +29,20 @@ AND created_by = #{userId} + + + \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectEvaluateFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectEvaluateFormDTO.java new file mode 100644 index 0000000000..d70fe56a24 --- /dev/null +++ b/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; + + +} diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectEvaluationListFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectEvaluationListFormDTO.java new file mode 100644 index 0000000000..6ba8cf9c1d --- /dev/null +++ b/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; + + +} diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectInitEvaluationFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectInitEvaluationFormDTO.java new file mode 100644 index 0000000000..c57d2cc4be --- /dev/null +++ b/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; + + +} diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectEvaluateInfoResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectEvaluateInfoResultDTO.java new file mode 100644 index 0000000000..52950afad5 --- /dev/null +++ b/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; +} diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectEvaluationListResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectEvaluationListResultDTO.java new file mode 100644 index 0000000000..dc40ce5a3c --- /dev/null +++ b/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; + + +} diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectInitEvaluationResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectInitEvaluationResultDTO.java new file mode 100644 index 0000000000..33883cd6ab --- /dev/null +++ b/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; + +} diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectSatisfactionDetailController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectSatisfactionDetailController.java index 4505cf4ec7..e6cff263f9 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectSatisfactionDetailController.java +++ b/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 projectInitEvaluation(@RequestBody ProjectInitEvaluationFormDTO formDTO){ + return new Result().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> projectEvaluationList(@RequestBody ProjectEvaluationListFormDTO formDTO){ + return new Result>().ok(projectSatisfactionDetailService.projectEvaluationList(formDTO)); + } + } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectSatisfactionDetailDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectSatisfactionDetailDao.java index 514c7060b1..83ab6375c0 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectSatisfactionDetailDao.java +++ b/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 getEvaluationListByProjectId(@Param("projectId") String projectId); + + /** + * @Description 满意度评价初始化——已转项目 + * @param projectEvaluateFormDTO + * @author zxc + */ + ProjectEvaluateInfoResultDTO checkProjectSatisfaction(ProjectInitEvaluationFormDTO projectEvaluateFormDTO); + + /** + * @Description 满意度评价列表——已转项目 + * @param formDTO + * @author zxc + */ + List projectEvaluationList(ProjectEvaluationListFormDTO formDTO); + } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectSatisfactionDetailService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectSatisfactionDetailService.java index 94decfd804..245b443e28 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectSatisfactionDetailService.java +++ b/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 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 projectEvaluationList(@RequestBody ProjectEvaluationListFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSatisfactionDetailServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSatisfactionDetailServiceImpl.java index 7ad9452c05..df8fb0c47b 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSatisfactionDetailServiceImpl.java +++ b/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 projectEvaluationList(ProjectEvaluationListFormDTO formDTO) { + int pageIndex = (formDTO.getPageNo() - NumConstant.ONE) * formDTO.getPageSize(); + formDTO.setPageNo(pageIndex); + return baseDao.projectEvaluationList(formDTO); + } + } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectSatisfactionDetailDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectSatisfactionDetailDao.xml index e2ddbd3417..afa26f2ac2 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectSatisfactionDetailDao.xml +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectSatisfactionDetailDao.xml @@ -30,5 +30,33 @@ ORDER BY CREATED_TIME DESC + + + + + \ No newline at end of file diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/EvaluationListFormDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/EvaluationListFormDTO.java new file mode 100644 index 0000000000..11c8bc0d5e --- /dev/null +++ b/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; + + +} diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/ProjectEvaluateFormDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/ProjectEvaluateFormDTO.java new file mode 100644 index 0000000000..d70fe56a24 --- /dev/null +++ b/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; + + +} diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/ProjectEvaluationListFormDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/ProjectEvaluationListFormDTO.java new file mode 100644 index 0000000000..6ba8cf9c1d --- /dev/null +++ b/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; + + +} diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/ProjectIdFormDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/ProjectIdFormDTO.java new file mode 100644 index 0000000000..318eae5dcf --- /dev/null +++ b/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; + +} + diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/ProjectInitEvaluationFormDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/ProjectInitEvaluationFormDTO.java new file mode 100644 index 0000000000..c57d2cc4be --- /dev/null +++ b/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; + + +} diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/UserResiInfoListFormDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/UserResiInfoListFormDTO.java new file mode 100644 index 0000000000..1a5fe5274c --- /dev/null +++ b/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 userIdList; +} diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/EvaluationListResultDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/EvaluationListResultDTO.java new file mode 100644 index 0000000000..0a286112d7 --- /dev/null +++ b/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; + + +} diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/ProjectEvaluateInfoResultDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/ProjectEvaluateInfoResultDTO.java new file mode 100644 index 0000000000..52950afad5 --- /dev/null +++ b/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; +} diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/ProjectEvaluationListResultDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/ProjectEvaluationListResultDTO.java new file mode 100644 index 0000000000..dc40ce5a3c --- /dev/null +++ b/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; + + +} diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/ProjectInitEvaluationResultDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/ProjectInitEvaluationResultDTO.java new file mode 100644 index 0000000000..182cdff0fd --- /dev/null +++ b/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; + +} diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/UserResiInfoResultDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/UserResiInfoResultDTO.java new file mode 100644 index 0000000000..6bdc1f6d2f --- /dev/null +++ b/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; +} diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/constat/HallConstat.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/constat/HallConstat.java new file mode 100644 index 0000000000..19af02540a --- /dev/null +++ b/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 = "获取用户昵称、头像失败"; + +} diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueController.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueController.java index 508694bfea..cc50d7dcd0 100644 --- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueController.java +++ b/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 projectInitEvaluation(@LoginUser TokenDto tokenDto, @RequestBody ProjectIdFormDTO projectId){ + return new Result().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> evaluationList(@RequestBody EvaluationListFormDTO formDTO){ + return new Result>().ok(issueService.evaluationList(formDTO)); + } + + /** + * @Description 满意度评价列表——已转项目 + * @param formDTO + * @author zxc + */ + @PostMapping("projectevaluationlist") + public Result> projectEvaluationList(@RequestBody ProjectEvaluationListFormDTO formDTO){ + return new Result>().ok(issueService.projectEvaluationList(formDTO)); + } + } diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java index 6b397e298e..e5721246f5 100644 --- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java +++ b/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 selectIssueInitiator(@RequestBody IssueInitiatorFormDTO formDTO); + /** + * @Description 查询评价人和评价人头像 + * @param formDTO + * @author zxc + */ + @PostMapping("/epmetuser/userresiinfo/getuserresiinfolist") + Result> getUserResiInfoList(@RequestBody UserResiInfoListFormDTO formDTO); + + } diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/GovIssueFeignClient.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/GovIssueFeignClient.java index c4103e74dc..992cf49c72 100644 --- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/GovIssueFeignClient.java +++ b/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> evaluationList(@RequestBody EvaluationListFormDTO formDTO); + } diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/GovProjectFeignClient.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/GovProjectFeignClient.java new file mode 100644 index 0000000000..1d9f6bcabc --- /dev/null +++ b/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 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> projectEvaluationList(ProjectEvaluationListFormDTO formDTO); +} diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java index e7003949aa..8cdf3782bb 100644 --- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java +++ b/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 selectIssueInitiator(IssueInitiatorFormDTO formDTO) { return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "selectIssueInitiator", formDTO); } + + @Override + public Result> getUserResiInfoList(UserResiInfoListFormDTO formDTO) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getUserResiInfoList", formDTO); + } } diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/fallback/GovIssueFeignClientFallBack.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/fallback/GovIssueFeignClientFallBack.java index c464a6f5a3..03ba888efa 100644 --- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/fallback/GovIssueFeignClientFallBack.java +++ b/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 evaluate(EvaluateFormDTO formDTO) { return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "evaluate", formDTO); } + + @Override + public Result> evaluationList(EvaluationListFormDTO formDTO) { + return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "evaluationList", formDTO); + } } diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/fallback/GovProjectFeignClientFallBack.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/fallback/GovProjectFeignClientFallBack.java new file mode 100644 index 0000000000..a68d848f90 --- /dev/null +++ b/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 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> projectEvaluationList(ProjectEvaluationListFormDTO formDTO) { + return ModuleUtils.feignConError(ServiceConstant.GOV_PROJECT_SERVER, "projectEvaluationList", formDTO); + } +} diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueService.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueService.java index 20eace94e3..7127ec9eee 100644 --- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueService.java +++ b/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 evaluationList(EvaluationListFormDTO formDTO); + + /** + * @Description 满意度评价列表——已转项目 + * @param formDTO + * @author zxc + */ + List projectEvaluationList(ProjectEvaluationListFormDTO formDTO); + } diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java index 2f520351cf..dd197c2d98 100644 --- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java +++ b/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 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 evaluationList(EvaluationListFormDTO formDTO) { + Result> listResult = govIssueFeignClient.evaluationList(formDTO); + List data = listResult.getData(); + if (data.size()==NumConstant.ZERO||data==null){ + return new ArrayList<>(); + } + //获取头像和昵称 eg:山东路168号-周先生 + List userIds = data.stream().map(EvaluationListResultDTO::getUserId).collect(Collectors.toList()); + UserResiInfoListFormDTO userResiInfo = new UserResiInfoListFormDTO(); + userResiInfo.setUserIdList(userIds); + List userResiInfoList = userFeignClient.getUserResiInfoList(userResiInfo).getData(); + if (null == userResiInfoList || userResiInfoList.size() < NumConstant.ONE) { + throw new RenException(HallConstat.SELECT_USERINFO_EXCEPTION); + } + List 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 projectEvaluationList(ProjectEvaluationListFormDTO formDTO) { + List listResult = govProjectFeignClient.projectEvaluationList(formDTO).getData(); + if (listResult.size()==NumConstant.ZERO||listResult.equals(null)){ + return new ArrayList<>(); + } + //获取头像和昵称 eg:山东路168号-周先生 + List userIds = listResult.stream().map(ProjectEvaluationListResultDTO::getUserId).collect(Collectors.toList()); + UserResiInfoListFormDTO userResiInfo = new UserResiInfoListFormDTO(); + userResiInfo.setUserIdList(userIds); + List userResiInfoList = userFeignClient.getUserResiInfoList(userResiInfo).getData(); + if (null == userResiInfoList || userResiInfoList.size() < NumConstant.ONE) { + throw new RenException(HallConstat.SELECT_USERINFO_EXCEPTION); + } + List 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; + } } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EvaluationListResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EvaluationListResultDTO.java new file mode 100644 index 0000000000..0a286112d7 --- /dev/null +++ b/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; + + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserWechatService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserWechatService.java index 8d6f6cbdb0..5dde082f0f 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserWechatService.java +++ b/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 { + /** + * @Description 获取头像 + * @param certifiedResultDTOS + * @author zxc + */ List selectUserHeadPhotoByUserId(List certifiedResultDTOS); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserWechatServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserWechatServiceImpl.java index 3231224271..2f2f27b7d2 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserWechatServiceImpl.java +++ b/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 selectUserHeadPhotoByUserId(List certifiedResultDTOS) { List userHeadPhotoDTOS = userWechatDao.selectUserHeadPhotoByUserId(certifiedResultDTOS); diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml index c889d350da..16b1f13c66 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml +++ b/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