diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/LatestIssueListResultDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/LatestIssueListResultDTO.java index 1c4fe33e19..13826f91e2 100644 --- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/LatestIssueListResultDTO.java +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/LatestIssueListResultDTO.java @@ -21,16 +21,21 @@ public class LatestIssueListResultDTO implements Serializable { * 议题标题 */ private String issueTitle = ""; - /** - * 议题发起人:XX路-XX先生 - */ - private String issuePublisherName = ""; /** * 话题内容 */ private String topicContent = ""; /** - * 表达态度总人数 + * 用户头像 + */ + private String staffHeadPhoto = ""; + /** + * 议题发起人:XX路-XX先生/女士 + * + */ + private String issuePublisherName = ""; + /** + * 议题创建时间 */ - private Integer votedCount = 0; + private Long createIssueTime; } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java index 8fc76e1b85..377c731120 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java @@ -20,10 +20,6 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dto.IssueDTO; import com.epmet.dto.form.*; -import com.epmet.dto.result.ClosedIssueListGovResultDTO; -import com.epmet.dto.result.ClosedIssueListResultDTO; -import com.epmet.dto.result.IssueResultDTO; -import com.epmet.dto.result.VotingIssueListResultDTO; import com.epmet.dto.result.*; import com.epmet.entity.IssueEntity; import org.apache.ibatis.annotations.Mapper; diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueVoteStatisticalDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueVoteStatisticalDao.java index 949d0c14fa..134ec32bb1 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueVoteStatisticalDao.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueVoteStatisticalDao.java @@ -68,13 +68,6 @@ public interface IssueVoteStatisticalDao extends BaseDao polyLineData(IssueIdFormDTO issueId); - /** - * @param issueIdList - * @return - * @Author sun - * @Description 根据议题Id查询议题投票情况 - **/ - List selectListByissueId(@Param("issueIdList") List issueIdList); /** * @Description 得到表决中的议题 来进行缓存与数据库的同步 * @param diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java index 632017e990..b310d78e48 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java @@ -605,22 +605,24 @@ public class IssueServiceImpl extends BaseServiceImpl imp } //1:根据已结案项目列表查询议题项目关系表数据 List listRelation = issueProjectRelationDao.selectRelationList(projectIdList); - if(null==listRelation||listRelation.size() issueIdList = listRelation.stream().map(IssueProjectRelationEntity::getIssueId).collect(Collectors.toList()); //2:根据查询条件筛选出客户网格下已结案项目对应的议题详情列表 LatestListFormDTO latestListForm = formDTO.getLatestListForm(); - latestListForm.setPageNo((latestListForm.getPageNo()-NumConstant.ONE)*latestListForm.getPageSize()); + latestListForm.setPageNo((latestListForm.getPageNo() - NumConstant.ONE) * latestListForm.getPageSize()); List entityList = baseDao.selectIssueList(issueIdList, latestListForm); - + if (null == entityList || entityList.size() < NumConstant.ONE) { + throw new RenException(IssueConstant.SELECT_EXCEPTION); + } //3:遍历封装数据 - entityList.forEach(issue->{ - listRelation.forEach(relation->{ - if(relation.getIssueId().equals(issue.getId())){ - formDTO.getLatestListResult().forEach(project->{ - if(relation.getProjectId().equals(project.getProjectId())){ + entityList.forEach(issue -> { + listRelation.forEach(relation -> { + if (relation.getIssueId().equals(issue.getId())) { + formDTO.getLatestListResult().forEach(project -> { + if (relation.getProjectId().equals(project.getProjectId())) { LatestListResultDTO latest = ConvertUtils.sourceToTarget(project, LatestListResultDTO.class); latest.setIssueId(issue.getId()); latest.setIssueTitle(issue.getIssueTitle()); @@ -649,11 +651,7 @@ public class IssueServiceImpl extends BaseServiceImpl imp return returnList; } - //2:根据议题Id查询议题投票情况 - List issueIdList = entityList.stream().map(IssueEntity::getId).collect(Collectors.toList()); - List StatisticalList = issueVoteStatisticalDao.selectListByissueId(issueIdList); - - //3:调用epmet-user服务,查询议题发起人基本信息 + //2:调用epmet-user服务,查询议题发起人基本信息 List userIdList = entityList.stream().map(IssueEntity::getCreatedBy).collect(Collectors.toList()); UserResiInfoListFormDTO userResiInfoListFormDTO = new UserResiInfoListFormDTO(); userResiInfoListFormDTO.setUserIdList(userIdList); @@ -663,7 +661,7 @@ public class IssueServiceImpl extends BaseServiceImpl imp } List userInfoList = listResult.getData(); - //4:调用resi-group服务,批量查询话题内容 + //3:调用resi-group服务,批量查询话题内容 List topicIdList = entityList.stream().map(IssueEntity::getSourceId).collect(Collectors.toList()); Result> resultTopicList = resiGroupFeignClient.getTopicList(topicIdList); if (!resultTopicList.success() || null == resultTopicList.getData()) { @@ -671,19 +669,15 @@ public class IssueServiceImpl extends BaseServiceImpl imp } List topicList = resultTopicList.getData(); - //5:遍历组装对象 + //4:遍历组装对象 entityList.forEach(issue -> { LatestIssueListResultDTO resultDTO = new LatestIssueListResultDTO(); resultDTO.setIssueId(issue.getId()); resultDTO.setIssueTitle(issue.getIssueTitle()); - StatisticalList.forEach(sta -> { - if (issue.getId().equals(sta.getIssueId())) { - //表达态度总人数 - resultDTO.setVotedCount(sta.getSupportCount() + sta.getOppositionCount()); - } - }); + resultDTO.setCreateIssueTime(issue.getCreatedTime().getTime()/1000); userInfoList.forEach(user -> { if (issue.getCreatedBy().equals(user.getUserId())) { + resultDTO.setStaffHeadPhoto(user.getHeadPhoto()); //话题发起人昵称 resultDTO.setIssuePublisherName(user.getShowName()); } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteStatisticalDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteStatisticalDao.xml index 5d48526dfd..ac039d7cd0 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteStatisticalDao.xml +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteStatisticalDao.xml @@ -69,17 +69,6 @@ ORDER BY statistical_date ASC - -