From 74fc3dac0340c9da1fcebe86d50426c60e2d5876 Mon Sep 17 00:00:00 2001 From: liuchuang Date: Tue, 29 Oct 2019 14:45:35 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E8=B0=83=E6=95=B4=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../doc/db/dev_newRegister/esua_epdc_events.sql | 12 +++++++++++- .../epdc/service/impl/IssueServiceImpl.java | 1 + .../epdc/dto/events/EpdcEventsDetailDTO.java | 4 ++++ .../dto/events/EpdcRejectEventDetailDTO.java | 4 ++++ .../dto/events/form/EpdcEventSubmitFormDTO.java | 5 +++++ .../epdc/dto/issue/IssueContentDetailDTO.java | 4 ++++ .../com/elink/esua/epdc/dto/issue/IssueDTO.java | 5 +++++ .../dto/issue/IssueWaitHandleDetailDTO.java | 4 ++++ .../com/elink/esua/epdc/dto/item/ItemDTO.java | 4 ++++ .../result/ItemContentForPCEndResultDTO.java | 4 ++++ .../result/ItemDetailForPCEndResultDTO.java | 17 +++++++++++++++++ .../modules/events/entity/EpdcEventsEntity.java | 4 ++++ .../service/impl/EpdcEventsServiceImpl.java | 1 + .../epdc/modules/issue/entity/IssueEntity.java | 5 +++++ .../issue/service/impl/IssueServiceImpl.java | 1 + .../epdc/modules/item/entity/ItemEntity.java | 5 +++++ .../resources/mapper/events/EpdcEventsDao.xml | 4 ++++ .../main/resources/mapper/issue/IssueDao.xml | 4 ++++ .../src/main/resources/mapper/item/ItemDao.xml | 12 ++++++++++++ 19 files changed, 99 insertions(+), 1 deletion(-) diff --git a/esua-epdc/doc/db/dev_newRegister/esua_epdc_events.sql b/esua-epdc/doc/db/dev_newRegister/esua_epdc_events.sql index 8b85bdad0..cdb286a52 100644 --- a/esua-epdc/doc/db/dev_newRegister/esua_epdc_events.sql +++ b/esua-epdc/doc/db/dev_newRegister/esua_epdc_events.sql @@ -1,4 +1,14 @@ -- 2019-10-27 项目表增加最近一次处理时间 ALTER TABLE epdc_item ADD LAST_HANDLE_TIME datetime NULL COMMENT '最近一次处理时间'; -ALTER TABLE epdc_item_dept ADD ITEM_HANDLE_ID VARCHAR(32) NULL COMMENT '项目处理表ID'; \ No newline at end of file +-- 2019-10-27 项目部门关联表表增加项目处理表ID +ALTER TABLE epdc_item_dept ADD ITEM_HANDLE_ID VARCHAR(32) NULL COMMENT '项目处理表ID'; + +-- 2019-10-29 事件表增加手机号 +ALTER TABLE epdc_events ADD MOBILE VARCHAR(20) NULL COMMENT '手机号'; + +-- 2019-10-29 议题表增加手机号 +ALTER TABLE epdc_issue ADD MOBILE VARCHAR(20) NULL COMMENT '手机号'; + +-- 2019-10-29 项目表增加手机号 +ALTER TABLE epdc_item ADD MOBILE VARCHAR(20) NULL COMMENT '手机号'; \ No newline at end of file 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 66fedfe53..146c72c36 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 @@ -74,6 +74,7 @@ public class IssueServiceImpl implements IssueService { formDto.setNickName(userDetail.getNickname()); formDto.setUserFace(userDetail.getFaceImg()); formDto.setIsPartyMember(userDetail.getPartyFlag()); + formDto.setMobile(userDetail.getMobile()); return issueFeignClient.submitEvent(formDto); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/EpdcEventsDetailDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/EpdcEventsDetailDTO.java index 4591db52c..262c45d0a 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/EpdcEventsDetailDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/EpdcEventsDetailDTO.java @@ -23,6 +23,10 @@ public class EpdcEventsDetailDTO implements Serializable { * 用户昵称 */ private String nickName; + /** + * 手机号 + */ + private String mobile; /** * 事件内容 */ diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/EpdcRejectEventDetailDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/EpdcRejectEventDetailDTO.java index 97a44ef24..f197ca986 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/EpdcRejectEventDetailDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/EpdcRejectEventDetailDTO.java @@ -31,6 +31,10 @@ public class EpdcRejectEventDetailDTO implements Serializable { * 提交时间 */ private Date createdTime; + /** + * 手机号 + */ + private String mobile; /** * 事件地址 */ 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 5d1da6411..9ff25f7d6 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 @@ -95,4 +95,9 @@ public class EpdcEventSubmitFormDTO implements Serializable { * 党员标识 0：否、1：是 */ private String isPartyMember; + + /** + * 手机号 + */ + private String mobile; } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/IssueContentDetailDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/IssueContentDetailDTO.java index bd2d34f4a..fb41edaa6 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/IssueContentDetailDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/IssueContentDetailDTO.java @@ -24,6 +24,10 @@ public class IssueContentDetailDTO implements Serializable { * 发布时间 */ private Date distributeTime; + /** + * 手机号 + */ + private String mobile; /** * 议题内容 */ 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 65b959c13..a6a6d3873 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 @@ -59,6 +59,11 @@ public class IssueDTO implements Serializable { */ private String userFace; + /** + * 手机号 + */ + private String mobile; + /** * 议题内容 */ diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/IssueWaitHandleDetailDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/IssueWaitHandleDetailDTO.java index 0bf2878d0..2504bdb0f 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/IssueWaitHandleDetailDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/IssueWaitHandleDetailDTO.java @@ -28,6 +28,10 @@ public class IssueWaitHandleDetailDTO implements Serializable { * 发布时间 */ private Date distributeTime; + /** + * 手机号 + */ + private String mobile; /** * 议题内容 */ 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 c191261f6..cea408f09 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 @@ -63,6 +63,10 @@ public class ItemDTO implements Serializable { * 用户头像 */ private String userFace; + /** + * 手机号 + */ + private String mobile; /** * 议题内容 diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemContentForPCEndResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemContentForPCEndResultDTO.java index f40592850..14d196a08 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemContentForPCEndResultDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemContentForPCEndResultDTO.java @@ -24,6 +24,10 @@ public class ItemContentForPCEndResultDTO implements Serializable { * 发布人 */ private String nickName; + /** + * 手机号 + */ + private String mobile; /** * 发布时间 */ diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemDetailForPCEndResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemDetailForPCEndResultDTO.java index fdada642c..3f39515d7 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemDetailForPCEndResultDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemDetailForPCEndResultDTO.java @@ -29,6 +29,10 @@ public class ItemDetailForPCEndResultDTO implements Serializable { * 发布时间 */ private Date distributeTime; + /** + * 手机号 + */ + private String mobile; /** * 项目内容 */ @@ -70,4 +74,17 @@ public class ItemDetailForPCEndResultDTO implements Serializable { * 所属类别 */ private String categoryName; + + /** + * 支持数 + */ + private Integer approveNum; + /** + * 反对数 + */ + private Integer opposeNum; + /** + * 评论数 + */ + private Integer commentNum; } 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 0f7f7de1f..11c93b32d 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 @@ -58,6 +58,10 @@ public class EpdcEventsEntity extends BaseEpdcEntity { * 党员标识 0：否，1：是 */ private String isPartyMember; + /** + * 手机号 + */ + private String mobile; /** * 议题内容 */ diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java index de8ef79de..e50fa8c82 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java @@ -237,6 +237,7 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl imp itemEntity.setNickName(issueEntity.getNickName()); itemEntity.setUserFace(issueEntity.getUserFace()); itemEntity.setIsPartyMember(issueEntity.getIsPartyMember()); + itemEntity.setMobile(issueEntity.getMobile()); itemEntity.setItemContent(issueEntity.getIssueContent()); itemEntity.setDistributeTime(issueEntity.getDistributeTime()); itemEntity.setArea(issueEntity.getArea()); 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 395da4df1..a9d132a2a 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 @@ -69,6 +69,11 @@ public class ItemEntity extends BaseEpdcEntity { */ private String isPartyMember; + /** + * 手机号 + */ + private String mobile; + /** * 议题内容 */ diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml index 9122cf793..9e1dc3317 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml @@ -6,6 +6,7 @@ + @@ -21,6 +22,7 @@ e.EVENT_CONTENT, i.IMG_URL, e.NICK_NAME, + e.MOBILE, e.CREATED_TIME, e.ISSUE_ADDRESS, e.ISSUE_LATITUDE, @@ -94,6 +96,7 @@ + @@ -110,6 +113,7 @@ temp.ID, temp.NICK_NAME, temp.CREATED_TIME, + temp.MOBILE, temp.EVENT_CONTENT, temp.ISSUE_ADDRESS, '已驳回' AS STATE_NAME, 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 29c0a681e..be9fa4f98 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 @@ -40,6 +40,7 @@ + @@ -62,6 +63,7 @@ i.id, i.NICK_NAME, i.DISTRIBUTE_TIME, + i.MOBILE, i.ISSUE_CONTENT, i.ISSUE_ADDRESS, i.ISSUE_LATITUDE, @@ -98,6 +100,7 @@ + @@ -115,6 +118,7 @@ SELECT i.NICK_NAME, i.DISTRIBUTE_TIME, + i.MOBILE, i.ISSUE_CONTENT, e.APPROVE_NUM, e.OPPOSE_NUM, diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml index 756124ac1..529afaaa0 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml @@ -274,11 +274,15 @@ + + + + @@ -288,10 +292,14 @@ item.ID, item.NICK_NAME, item.DISTRIBUTE_TIME, + item.MOBILE, item.ITEM_CONTENT, item.ISSUE_ADDRESS, item.ISSUE_LATITUDE, item.ISSUE_LONGITUDE, + eve.APPROVE_NUM, + eve.OPPOSE_NUM, + eve.COMMENT_NUM, cate.CATEGORY_NAME, img.IMG_URL FROM @@ -300,6 +308,8 @@ AND img.DEL_FLAG = '0' LEFT JOIN epdc_event_category cate ON item.ISSUE_CATEGORY_ID = cate.ID AND cate.DEL_FLAG = '0' + LEFT JOIN epdc_events eve ON item.EVENT_ID = eve.ID + AND eve.DEL_FLAG = '0' WHERE item.DEL_FLAG = '0' AND item.ID = #{itemId} @@ -371,6 +381,7 @@ + @@ -390,6 +401,7 @@ item.ID, item.NICK_NAME, item.DISTRIBUTE_TIME, + item.MOBILE, item.ITEM_CONTENT, item.ITEM_STATE, item.ISSUE_ADDRESS,