diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/IssueServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/IssueServiceImpl.java index 468676da7..59a253c1b 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/IssueServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/IssueServiceImpl.java @@ -40,16 +40,16 @@ public class IssueServiceImpl implements IssueService { Result deptDTOResult = sysDeptFeignClient.getCompleteDept(Long.valueOf(userDetail.getGridId())); CompleteDeptDTO deptDTO = deptDTOResult.getData(); formDto.setArea(deptDTO.getDistrict()); - formDto.setAreaId(deptDTO.getDistrictId().toString()); + formDto.setAreaId(deptDTO.getDistrictId()); formDto.setStreet(deptDTO.getStreet()); - formDto.setStreetId(deptDTO.getStreetId().toString()); + formDto.setStreetId(deptDTO.getStreetId()); formDto.setCommunity(deptDTO.getCommunity()); - formDto.setCommunityId(deptDTO.getCommunityId().toString()); + formDto.setCommunityId(deptDTO.getCommunityId()); formDto.setGrid(deptDTO.getGrid()); - formDto.setGridId(deptDTO.getGridId().toString()); + formDto.setGridId(deptDTO.getGridId()); // 用户信息 formDto.setUserId(userDetail.getUserId()); - formDto.setNickName(userDetail.getNickName()); + formDto.setNickName(userDetail.getNickname()); formDto.setUserFace(userDetail.getFaceImg()); formDto.setIsPartyMember(userDetail.getPartyFlag()); diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/form/EpdcEventSubmitFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/form/EpdcEventSubmitFormDTO.java index c7d67ed32..5d1da6411 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/form/EpdcEventSubmitFormDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/form/EpdcEventSubmitFormDTO.java @@ -47,7 +47,7 @@ public class EpdcEventSubmitFormDTO implements Serializable { * 区ID */ @NotBlank(message = "用户区ID不能为空") - private String areaId; + private Long areaId; /** * 街道 */ @@ -56,7 +56,7 @@ public class EpdcEventSubmitFormDTO implements Serializable { * 街道ID */ @NotBlank(message = "用户街道ID不能为空") - private String streetId; + private Long streetId; /** * 社区 */ @@ -65,7 +65,7 @@ public class EpdcEventSubmitFormDTO implements Serializable { * 社区ID */ @NotBlank(message = "用户社区ID不能为空") - private String communityId; + private Long communityId; /** * 网格 */ @@ -74,7 +74,7 @@ public class EpdcEventSubmitFormDTO implements Serializable { * 网格ID */ @NotBlank(message = "用户网格ID不能为空") - private String gridId; + private Long gridId; /** * 用户ID */ @@ -94,5 +94,5 @@ public class EpdcEventSubmitFormDTO implements Serializable { /** * 党员标识 0:否、1:是 */ - private Long isPartyMember; + private String isPartyMember; } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/IssueDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/IssueDTO.java index 5fda46676..65b959c13 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/IssueDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/IssueDTO.java @@ -72,7 +72,7 @@ public class IssueDTO implements Serializable { /** * 区ID */ - private String areaId; + private Long areaId; /** * 街道 @@ -82,7 +82,7 @@ public class IssueDTO implements Serializable { /** * 街道ID */ - private String streetId; + private Long streetId; /** * 社区 @@ -92,7 +92,7 @@ public class IssueDTO implements Serializable { /** * 社区ID */ - private String communityId; + private Long communityId; /** * 网格 @@ -102,7 +102,7 @@ public class IssueDTO implements Serializable { /** * 网格ID */ - private String gridId; + private Long gridId; /** * 议题位置地址 diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssueFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssueFormDTO.java index 11061daa1..8bb9000a7 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssueFormDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssueFormDTO.java @@ -20,7 +20,7 @@ public class IssueFormDTO implements Serializable { * 用户所属网格ID */ @NotBlank(message = "用户网格ID不能为空") - private String deptId; + private Long deptId; /** * 0: 获取最新列表,1: 获取最热列表 */ diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueDetailResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueDetailResultDTO.java new file mode 100644 index 000000000..bd14c2607 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueDetailResultDTO.java @@ -0,0 +1,70 @@ +package com.elink.esua.epdc.dto.issue.result; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; + +/** + * 移动端-议题详情DTO + * @Author LC + * @Date 2019/9/9 9:50 + */ +@Data +public class IssueDetailResultDTO implements Serializable { + private static final long serialVersionUID = -4512771534907006929L; + + /** + * 议题ID + */ + private String id; + /** + * 议题内容 + */ + private String content; + /** + * 创建时间 + */ + private Date createdTime; + /** + * 是否党员 0否;1是 + */ + private Integer partyFlag; + /** + * 昵称 + */ + private String nickname; + /** + * 头像地址 + */ + private String avatar; + /** + * 浏览量 + */ + private Integer browseNum; + /** + * 赞数 + */ + private Integer approveNum; + /** + * 踩数 + */ + private Integer opposeNum; + /** + * 所属类别ID + */ + private String categoryId; + /** + * 用户是否赞过,false未赞 + */ + private boolean userLike; + /** + * 用户是否踩过,true踩 + */ + private boolean userDislike; + /** + * 议事图片 + */ + private List images; +} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/ItemDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/ItemDTO.java index 847b2786e..6e9d98c54 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/ItemDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/ItemDTO.java @@ -77,7 +77,7 @@ public class ItemDTO implements Serializable { /** * 区ID */ - private String areaId; + private Long areaId; /** * 街道 @@ -87,7 +87,7 @@ public class ItemDTO implements Serializable { /** * 街道ID */ - private String streetId; + private Long streetId; /** * 社区 @@ -97,7 +97,7 @@ public class ItemDTO implements Serializable { /** * 社区ID */ - private String communityId; + private Long communityId; /** * 网格 @@ -107,7 +107,7 @@ public class ItemDTO implements Serializable { /** * 网格ID */ - private String gridId; + private Long gridId; /** * 议题位置地址 diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/entity/EpdcEventsEntity.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/entity/EpdcEventsEntity.java index 7c8480dcb..a6b1d554e 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/entity/EpdcEventsEntity.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/entity/EpdcEventsEntity.java @@ -57,7 +57,7 @@ public class EpdcEventsEntity extends BaseEpdcEntity { /** * 党员标识 0:否,1:是 */ - private Integer isPartyMember; + private String isPartyMember; /** * 议题内容 */ @@ -69,7 +69,7 @@ public class EpdcEventsEntity extends BaseEpdcEntity { /** * 区ID */ - private String areaId; + private Long areaId; /** * 街道 */ @@ -77,7 +77,7 @@ public class EpdcEventsEntity extends BaseEpdcEntity { /** * 街道ID */ - private String streetId; + private Long streetId; /** * 社区 */ @@ -85,7 +85,7 @@ public class EpdcEventsEntity extends BaseEpdcEntity { /** * 社区ID */ - private String communityId; + private Long communityId; /** * 网格 */ @@ -93,7 +93,7 @@ public class EpdcEventsEntity extends BaseEpdcEntity { /** * 网格ID */ - private String gridId; + private Long gridId; /** * 议题位置地址 */ diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/excel/EpdcEventsExcel.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/excel/EpdcEventsExcel.java index 020c6c889..37e56cbb0 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/excel/EpdcEventsExcel.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/excel/EpdcEventsExcel.java @@ -40,19 +40,19 @@ public class EpdcEventsExcel { @Excel(name = "区") private String area; @Excel(name = "区ID") - private String areaId; + private Long areaId; @Excel(name = "街道") private String street; @Excel(name = "街道ID") - private String streetId; + private Long streetId; @Excel(name = "社区") private String community; @Excel(name = "社区ID") - private String communityId; + private Long communityId; @Excel(name = "网格") private String grid; @Excel(name = "网格ID") - private String gridId; + private Long gridId; @Excel(name = "议题位置地址") private String issueAddress; @Excel(name = "议题分类ID") diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/entity/IssueEntity.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/entity/IssueEntity.java index c6d778542..367e90363 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/entity/IssueEntity.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/entity/IssueEntity.java @@ -62,7 +62,7 @@ public class IssueEntity extends BaseEpdcEntity { /** * 党员标识 0:否,1:是 */ - private Integer isPartyMember; + private String isPartyMember; /** * 议题内容 @@ -82,7 +82,7 @@ public class IssueEntity extends BaseEpdcEntity { /** * 区ID */ - private String areaId; + private Long areaId; /** * 街道 @@ -92,7 +92,7 @@ public class IssueEntity extends BaseEpdcEntity { /** * 街道ID */ - private String streetId; + private Long streetId; /** * 社区 @@ -102,7 +102,7 @@ public class IssueEntity extends BaseEpdcEntity { /** * 社区ID */ - private String communityId; + private Long communityId; /** * 网格 @@ -112,7 +112,7 @@ public class IssueEntity extends BaseEpdcEntity { /** * 网格ID */ - private String gridId; + private Long gridId; /** * 议题位置地址 diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/excel/IssueExcel.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/excel/IssueExcel.java index 79b899488..da5d09cc7 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/excel/IssueExcel.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/excel/IssueExcel.java @@ -54,25 +54,25 @@ public class IssueExcel { private String area; @Excel(name = "区ID") - private String areaId; + private Long areaId; @Excel(name = "街道") private String street; @Excel(name = "街道ID") - private String streetId; + private Long streetId; @Excel(name = "社区") private String community; @Excel(name = "社区ID") - private String communityId; + private Long communityId; @Excel(name = "网格") private String grid; @Excel(name = "网格ID") - private String gridId; + private Long gridId; @Excel(name = "议题位置地址") private String issueAddress; diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemEntity.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemEntity.java index 671fbd240..c2ee4fdc0 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemEntity.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemEntity.java @@ -67,7 +67,7 @@ public class ItemEntity extends BaseEpdcEntity { /** * 党员标识 0:否,1:是 */ - private Integer isPartyMember; + private String isPartyMember; /** * 议题内容 @@ -87,7 +87,7 @@ public class ItemEntity extends BaseEpdcEntity { /** * 区ID */ - private String areaId; + private Long areaId; /** * 街道 @@ -97,7 +97,7 @@ public class ItemEntity extends BaseEpdcEntity { /** * 街道ID */ - private String streetId; + private Long streetId; /** * 社区 @@ -107,7 +107,7 @@ public class ItemEntity extends BaseEpdcEntity { /** * 社区ID */ - private String communityId; + private Long communityId; /** * 网格 @@ -117,7 +117,7 @@ public class ItemEntity extends BaseEpdcEntity { /** * 网格ID */ - private String gridId; + private Long gridId; /** * 议题位置地址 diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/excel/ItemExcel.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/excel/ItemExcel.java index 357e46e39..6380d7761 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/excel/ItemExcel.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/excel/ItemExcel.java @@ -57,25 +57,25 @@ public class ItemExcel { private String area; @Excel(name = "区ID") - private String areaId; + private Long areaId; @Excel(name = "街道") private String street; @Excel(name = "街道ID") - private String streetId; + private Long streetId; @Excel(name = "社区") private String community; @Excel(name = "社区ID") - private String communityId; + private Long communityId; @Excel(name = "网格") private String grid; @Excel(name = "网格ID") - private String gridId; + private Long gridId; @Excel(name = "议题位置地址") private String issueAddress; diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml index e73671260..b900735f6 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml @@ -225,4 +225,65 @@ img.CREATED_TIME LIMIT #{pageIndex},#{pageSize} + + + + + + + + + + + + + + + + + + + diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcNoticeFormDTO.java b/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcNoticeFormDTO.java index 5e6ec1a71..3ca36cb3d 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcNoticeFormDTO.java +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcNoticeFormDTO.java @@ -22,7 +22,7 @@ public class EpdcNoticeFormDTO implements Serializable { * 用户所属网格ID */ @NotBlank(message = "用户网格ID不能为空") - private String deptId; + private Long deptId; /** * 页码