elink-star
/
epmet-cloud-lingshan
forked from luyan/epmet-cloud-lingshan
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

议事

master
zhaoqifeng 4 years ago
parent
d47db4ad95
commit
eb4d2eb6e6
16 changed files with 67 additions and 48 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/CommonIssueListFormDTO.java
  2. 26
      epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
  3. 4
      epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml
  4. 2
      epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ShiftProjectListFromDTO.java
  5. 2
      epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/PendingResultDTO.java
  6. 3
      epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ResolvedResultDTO.java
  7. 2
      epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/UnResolvedResultDTO.java
  8. 10
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java
  9. 28
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
  10. 2
      epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml
  11. 3
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/ResiTopicDetailResultDTO.java
  12. 2
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
  13. 2
      epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/CommonIssueListFormDTO.java
  14. 2
      epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/ClosedIssueListResultDTO.java
  15. 3
      epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/VotingIssueListResultDTO.java
  16. 22
      epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java

2
epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/CommonIssueListFormDTO.java
View File

@ -32,4 +32,6 @@ public class CommonIssueListFormDTO implements Serializable {
* 每页多少条
* */
private Integer pageSize = 20;
private Boolean isPage = true;
}

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

@ -587,9 +587,7 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
**/
@Override
public List<VotingIssueListResultDTO> votingList(CommonIssueListFormDTO issueListForm) {
issueListForm.setPageNo(null == issueListForm.getPageNo() ? NumConstant.ZERO :
(issueListForm.getPageNo() - NumConstant.ONE)*issueListForm.getPageSize()
);
PageHelper.startPage(issueListForm.getPageNo(), issueListForm.getPageSize(), issueListForm.getIsPage());
return baseDao.selectVotingList(issueListForm);
}
@ -602,9 +600,7 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
**/
@Override
public List<ClosedIssueListResultDTO> closedList(CommonIssueListFormDTO issueListForm) {
issueListForm.setPageNo(null == issueListForm.getPageNo() ? NumConstant.ZERO :
(issueListForm.getPageNo() - NumConstant.ONE)*issueListForm.getPageSize()
);
PageHelper.startPage(issueListForm.getPageNo(), issueListForm.getPageSize(), issueListForm.getIsPage());
return baseDao.selectClosedList(issueListForm);
}
@ -1555,15 +1551,17 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
}
if (CollectionUtils.isNotEmpty(resultList)) {
resultList = resultList.stream().sorted(Comparator.comparing(UnResolvedResultDTO::getClosedTime).reversed()).collect(Collectors.toList());
int fromIndex = (fromDTO.getPageNo() - NumConstant.ONE) * fromDTO.getPageSize();
int toIndex = fromDTO.getPageNo() * fromDTO.getPageSize();
if (fromIndex >= resultList.size()) {
return new ArrayList<>();
}
if (toIndex > resultList.size()) {
toIndex = resultList.size();
if (fromDTO.getIsPage()) {
int fromIndex = (fromDTO.getPageNo() - NumConstant.ONE) * fromDTO.getPageSize();
int toIndex = fromDTO.getPageNo() * fromDTO.getPageSize();
if (fromIndex >= resultList.size()) {
return new ArrayList<>();
}
if (toIndex > resultList.size()) {
toIndex = resultList.size();
}
resultList = resultList.subList(fromIndex, toIndex);
}
resultList = resultList.subList(fromIndex, toIndex);
}
return resultList;
}

4
epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml
View File

@ -218,8 +218,6 @@
AND ISSUE_STATUS = 'voting'
ORDER BY
created_time DESC
LIMIT #{pageNo},
#{pageSize}
</select>
<!-- 查询已关闭议题列表 -->
@ -239,8 +237,6 @@
AND RESOLVE_TYPE = 'resolved'
ORDER BY
created_time DESC
LIMIT #{pageNo},
#{pageSize}
</select>
<!-- 查询已关闭议题列表 政府端 -->
<select id="selectClosedListGov" parameterType="com.epmet.dto.form.CommonIssueListFormDTO" resultType="com.epmet.dto.result.ClosedIssueListGovResultDTO">

2
epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ShiftProjectListFromDTO.java
View File

@ -25,4 +25,6 @@ public class ShiftProjectListFromDTO implements Serializable {
* 每页记录数
*/
private Integer pageSize;
private Boolean isPage = true;
}

2
epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/PendingResultDTO.java
View File

@ -28,4 +28,6 @@ public class PendingResultDTO implements Serializable {
private String sourceId;
@JsonIgnore
private String projectId;
private String longitude;
private String latitude;
}

3
epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ResolvedResultDTO.java
View File

@ -50,4 +50,7 @@ public class ResolvedResultDTO implements Serializable {
* 话题内容
*/
private String topicContent;
private String longitude;
private String latitude;
}

2
epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/UnResolvedResultDTO.java
View File

@ -50,4 +50,6 @@ public class UnResolvedResultDTO implements Serializable {
* 话题内容
*/
private String topicContent;
private String longitude;
private String latitude;
}

10
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java
View File

@ -180,24 +180,18 @@ public interface ProjectDao extends BaseDao<ProjectEntity> {
* @author zhaoqifeng
* @date 2021/7/27 10:28
* @param gridId
* @param pageNo
* @param pageSize
* @return java.util.List<com.epmet.dto.result.ShiftProjectListResultDTO>
*/
List<PendingResultDTO> selectPendingListByGrid(@Param("gridId")String gridId, @Param("pageNo") Integer pageNo,
@Param("pageSize") Integer pageSize);
List<PendingResultDTO> selectPendingListByGrid(@Param("gridId")String gridId);
/**
* 获取党建声音已结案列表
* @author zhaoqifeng
* @date 2021/7/27 10:28
* @param gridId
* @param pageNo
* @param pageSize
* @return java.util.List<com.epmet.dto.result.ShiftProjectListResultDTO>
*/
List<ResolvedResultDTO> selectResolvedListByGrid(@Param("gridId")String gridId, @Param("pageNo") Integer pageNo,
@Param("pageSize") Integer pageSize);
List<ResolvedResultDTO> selectResolvedListByGrid(@Param("gridId")String gridId);
/**
* 无需解决列表

28
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
View File

@ -25,8 +25,8 @@ import com.epmet.commons.rocketmq.messages.ProjectChangedMQMsg;
import com.epmet.commons.tools.constant.*;
import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
import com.epmet.commons.tools.exception.EpmetErrorCode;
import com.epmet.commons.tools.exception.ExceptionUtils;
import com.epmet.commons.tools.exception.EpmetException;
import com.epmet.commons.tools.exception.ExceptionUtils;
import com.epmet.commons.tools.exception.RenException;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.redis.common.CustomerOrgRedis;
@ -58,11 +58,12 @@ import com.epmet.resi.mine.dto.from.MyPartProjectsFormDTO;
import com.epmet.send.SendMqMsgUtil;
import com.epmet.service.*;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.google.common.base.Joiner;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import org.apache.commons.collections4.CollectionUtils;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.collections4.ListUtils;
import org.apache.commons.io.FilenameUtils;
import org.apache.commons.lang3.StringUtils;
@ -76,7 +77,6 @@ import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletRequest;
import java.text.ParseException;
import java.text.SimpleDateFormat;
@ -2810,14 +2810,16 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
*/
@Override
public List<PendingResultDTO> getPendingList(ShiftProjectListFromDTO fromDTO) {
int pageIndex = (fromDTO.getPageNo() - NumConstant.ONE) * fromDTO.getPageSize();
List<PendingResultDTO> list = baseDao.selectPendingListByGrid(fromDTO.getGridId(), pageIndex, fromDTO.getPageSize());
list.forEach(item -> {
ProjectDTO dto = new ProjectDTO();
dto.setId(item.getProjectId());
item.setCurrentHandleDepartMent(baseDao.selectDepartmentNameList(dto));
});
return list;
PageInfo<PendingResultDTO> result =
PageHelper.startPage(fromDTO.getPageNo(), fromDTO.getPageSize(), fromDTO.getIsPage()).doSelectPageInfo(() -> baseDao.selectPendingListByGrid(fromDTO.getGridId()));
if (CollectionUtils.isNotEmpty(result.getList())) {
result.getList().forEach(item -> {
ProjectDTO dto = new ProjectDTO();
dto.setId(item.getProjectId());
item.setCurrentHandleDepartMent(baseDao.selectDepartmentNameList(dto));
});
}
return result.getList();
}
/**
@ -2830,8 +2832,8 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
*/
@Override
public List<ResolvedResultDTO> getResolvedListByGrid(ShiftProjectListFromDTO fromDTO) {
int pageIndex = (fromDTO.getPageNo() - NumConstant.ONE) * fromDTO.getPageSize();
return baseDao.selectResolvedListByGrid(fromDTO.getGridId(), pageIndex, fromDTO.getPageSize());
PageHelper.startPage(fromDTO.getPageNo(), fromDTO.getPageSize(), fromDTO.getIsPage());
return baseDao.selectResolvedListByGrid(fromDTO.getGridId());
}
/**

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

@ -333,7 +333,6 @@
AND a.`STATUS` = 'pending'
AND a.ORIGIN = 'issue'
ORDER BY a.CREATED_TIME DESC
LIMIT #{pageNo}, #{pageSize}
</select>
<select id="selectResolvedListByGrid" resultType="com.epmet.dto.result.ResolvedResultDTO">
SELECT
@ -355,7 +354,6 @@
AND a.ORIGIN = 'issue'
AND a.CLOSED_STATUS = 'resolved'
ORDER BY a.UPDATED_TIME DESC
LIMIT #{pageNo}, #{pageSize}
</select>
<select id="selectUnResolvedListByGrid" resultType="com.epmet.dto.result.UnResolvedResultDTO">
SELECT

3
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/ResiTopicDetailResultDTO.java
View File

@ -65,6 +65,7 @@ public class ResiTopicDetailResultDTO implements Serializable {
*/
private List<String> topicVoices;
private String longitude;
private String latitude;
}

2
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
View File

@ -2850,6 +2850,8 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
topicDTO.setTopicStatus(topic.getStatus());
topicDTO.setTopicImgs(getTopicAttachmentUrls(topic.getId(), "image"));
topicDTO.setTopicVoices(getTopicAttachmentUrls(topic.getId(), "voice"));
topicDTO.setLongitude(topic.getLongitude());
topicDTO.setLatitude(topic.getDimension());
topicListDTOS.add(topicDTO);
});

2
epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/CommonIssueListFormDTO.java
View File

@ -32,4 +32,6 @@ public class CommonIssueListFormDTO implements Serializable {
* 每页多少条
* */
private Integer pageSize = 20;
private Boolean isPage = true;
}

2
epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/ClosedIssueListResultDTO.java
View File

@ -54,4 +54,6 @@ public class ClosedIssueListResultDTO implements Serializable {
*
*/
private String topicContent;
private String longitude;
private String latitude;
}

3
epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/VotingIssueListResultDTO.java
View File

@ -54,4 +54,7 @@ public class VotingIssueListResultDTO implements Serializable {
* 话题内容
*/
private String topicContent;
private String longitude;
private String latitude;
}

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

@ -363,11 +363,11 @@ public class IssueServiceImpl implements IssueService {
} else {
List<ResiTopicDetailResultDTO> topicDetails = topicDetailsResult.getData();
HashMap<String, ResiTopicDetailResultDTO> rtm = convertTopicDetailList2Map(topicDetails);
resultList.stream().forEach(vi -> {
resultList.forEach(vi -> {
ResiTopicDetailResultDTO rr = rtm.get(vi.getSourceId());
vi.setTopicImgs(rr == null ? null : rr.getTopicImgs());
vi.setTopicVoices(rr == null ? null : rr.getTopicImgs());
vi.setTopicContent(rr.getTopicContent());
vi.setTopicContent(rr == null ? "" : rr.getTopicContent());
});
}
@ -421,11 +421,13 @@ public class IssueServiceImpl implements IssueService {
} else {
List<ResiTopicDetailResultDTO> topicDetails = topicDetailsResult.getData();
HashMap<String, ResiTopicDetailResultDTO> rtm = convertTopicDetailList2Map(topicDetails);
votingIssueList.stream().forEach(vi -> {
votingIssueList.forEach(vi -> {
ResiTopicDetailResultDTO rr = rtm.get(vi.getSourceId());
vi.setTopicImgs(rr == null ? null : rr.getTopicImgs());
vi.setTopicVoices(rr == null ? null : rr.getTopicImgs());
vi.setTopicContent(rr.getTopicContent());
vi.setTopicContent(rr == null ? "" : rr.getTopicContent());
vi.setLongitude(rr == null ? "" : rr.getLongitude());
vi.setLatitude(rr == null ? "" : rr.getLatitude());
});
}
}
@ -459,11 +461,13 @@ public class IssueServiceImpl implements IssueService {
} else {
List<ResiTopicDetailResultDTO> topicDetails = topicDetailsResult.getData();
HashMap<String, ResiTopicDetailResultDTO> rtm = convertTopicDetailList2Map(topicDetails);
issueList.stream().forEach(vi -> {
issueList.forEach(vi -> {
ResiTopicDetailResultDTO rr = rtm.get(vi.getSourceId());
vi.setTopicImgs(rr == null ? null : rr.getTopicImgs());
vi.setTopicVoices(rr == null ? null : rr.getTopicImgs());
vi.setTopicContent(rr.getTopicContent());
vi.setTopicContent(rr == null ? "" :rr.getTopicContent());
vi.setLongitude(rr == null ? "" : rr.getLongitude());
vi.setLatitude(rr == null ? "" : rr.getLatitude());
});
}
}
@ -500,6 +504,8 @@ public class IssueServiceImpl implements IssueService {
vi.setTopicImgs(rr == null ? new ArrayList<>() : rr.getTopicImgs());
vi.setTopicVoices(rr == null ? new ArrayList<>() : rr.getTopicImgs());
vi.setTopicContent(rr == null ? "" : rr.getTopicContent());
vi.setLongitude(rr == null ? "" : rr.getLongitude());
vi.setLatitude(rr == null ? "" : rr.getLatitude());
});
}
@ -535,6 +541,8 @@ public class IssueServiceImpl implements IssueService {
vi.setTopicImgs(rr == null ? new ArrayList<>() : rr.getTopicImgs());
vi.setTopicVoices(rr == null ? new ArrayList<>() : rr.getTopicImgs());
vi.setTopicContent(rr == null ? "" : rr.getTopicContent());
vi.setLongitude(rr == null ? "" : rr.getLongitude());
vi.setLatitude(rr == null ? "" : rr.getLatitude());
});
}
@ -570,6 +578,8 @@ public class IssueServiceImpl implements IssueService {
vi.setTopicImgs(rr == null ? new ArrayList<>() : rr.getTopicImgs());
vi.setTopicVoices(rr == null ? new ArrayList<>() : rr.getTopicImgs());
vi.setTopicContent(rr == null ? "" : rr.getTopicContent());
vi.setLongitude(rr == null ? "" : rr.getLongitude());
vi.setLatitude(rr == null ? "" : rr.getLatitude());
});
}

Write Preview
Loading…
Cancel
Save