功能调整提交

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';
+-- 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 '手机号';

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);
     }

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;
     /**
      * 事件内容
      */

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;
     /**
      * 事件地址
      */

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;
 }

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;
     /**
      * 议题内容
      */

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;
+
     /**
      * 议题内容
      */

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;
     /**
      * 议题内容
      */

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;
 
     /**
      * 议题内容

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;
     /**
      * 发布时间
      */

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;
 }

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;
     /**
      * 议题内容
      */

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<EpdcEventsDao, EpdcEv
         issueEntity.setNickName(entity.getNickName());
         issueEntity.setUserFace(entity.getUserFace());
         issueEntity.setIsPartyMember(entity.getIsPartyMember());
+        issueEntity.setMobile(entity.getMobile());
         issueEntity.setIssueContent(entity.getEventContent());
         issueEntity.setDistributeTime(entity.getCreatedTime());
         issueEntity.setArea(entity.getArea());

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/entity/IssueEntity.java

@@ -64,6 +64,11 @@ public class IssueEntity extends BaseEpdcEntity {
 	 */
 	private String isPartyMember;
 
+	/**
+	 * 手机号
+	 */
+	private String mobile;
+
     /**
      * 议题内容
      */

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java

@@ -319,6 +319,7 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> 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());

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;
+
     /**
      * 议题内容
      */

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml

@@ -6,6 +6,7 @@
         <result property="id" column="ID"/>
         <result property="eventContent" column="EVENT_CONTENT"/>
         <result property="nickName" column="NICK_NAME"/>
+        <result property="mobile" column="MOBILE"/>
         <result property="createdTime" column="CREATED_TIME"/>
         <result property="address" column="ISSUE_ADDRESS"/>
         <result property="issueLatitude" column="ISSUE_LATITUDE"/>
@@ -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 @@
         <result property="id" column="ID"/>
         <result property="eventContent" column="EVENT_CONTENT"/>
         <result property="nickName" column="NICK_NAME"/>
+        <result property="mobile" column="MOBILE"/>
         <result property="createdTime" column="CREATED_TIME"/>
         <result property="address" column="ISSUE_ADDRESS"/>
         <result property="stateName" column="STATE_NAME"/>
@@ -110,6 +113,7 @@
             temp.ID,
             temp.NICK_NAME,
             temp.CREATED_TIME,
+            temp.MOBILE,
             temp.EVENT_CONTENT,
             temp.ISSUE_ADDRESS,
             '已驳回' AS STATE_NAME,

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml

@@ -40,6 +40,7 @@
         <result property="id" column="id"/>
         <result property="nickName" column="NICK_NAME"/>
         <result property="distributeTime" column="DISTRIBUTE_TIME"/>
+        <result property="mobile" column="MOBILE"/>
         <result property="issueContent" column="ISSUE_CONTENT"/>
         <result property="address" column="ISSUE_ADDRESS"/>
         <result property="issueLatitude" column="ISSUE_LATITUDE"/>
@@ -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 @@
     <resultMap id="issueContentDetailMap" type="com.elink.esua.epdc.dto.issue.IssueContentDetailDTO">
         <result property="nickName" column="NICK_NAME"/>
         <result property="distributeTime" column="DISTRIBUTE_TIME"/>
+        <result property="mobile" column="MOBILE"/>
         <result property="issueContent" column="ISSUE_CONTENT"/>
         <result property="address" column="ISSUE_ADDRESS"/>
         <result property="issueLatitude" column="ISSUE_LATITUDE"/>
@@ -115,6 +118,7 @@
         SELECT
             i.NICK_NAME,
             i.DISTRIBUTE_TIME,
+            i.MOBILE,
             i.ISSUE_CONTENT,
             e.APPROVE_NUM,
             e.OPPOSE_NUM,

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml

@@ -274,11 +274,15 @@
         <result property="id" column="ID"/>
         <result property="nickName" column="NICK_NAME"/>
         <result property="distributeTime" column="DISTRIBUTE_TIME"/>
+        <result property="mobile" column="MOBILE"/>
         <result property="itemContent" column="ITEM_CONTENT"/>
         <result property="issueAddress" column="ISSUE_ADDRESS"/>
         <result property="issueLatitude" column="ISSUE_LATITUDE"/>
         <result property="issueLongitude" column="ISSUE_LONGITUDE"/>
         <result property="categoryName" column="CATEGORY_NAME"/>
+        <result property="approveNum" column="APPROVE_NUM"/>
+        <result property="opposeNum" column="OPPOSE_NUM"/>
+        <result property="commentNum" column="COMMENT_NUM"/>
         <collection property="images" ofType="java.lang.String">
             <result property="image" column="IMG_URL"/>
         </collection>
@@ -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 @@
         <result property="id" column="ID"/>
         <result property="nickName" column="NICK_NAME"/>
         <result property="distributeTime" column="DISTRIBUTE_TIME"/>
+        <result property="mobile" column="MOBILE"/>
         <result property="itemContent" column="ITEM_CONTENT"/>
         <result property="itemState" column="ITEM_STATE"/>
         <result property="issueAddress" column="ISSUE_ADDRESS"/>
@@ -390,6 +401,7 @@
             item.ID,
             item.NICK_NAME,
             item.DISTRIBUTE_TIME,
+            item.MOBILE,
             item.ITEM_CONTENT,
             item.ITEM_STATE,
             item.ISSUE_ADDRESS,