修改字段类型

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<CompleteDeptDTO> 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());
 

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

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;
 
     /**
      * 议题位置地址

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: 获取最热列表
      */

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<String> images;
+}

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;
 
     /**
      * 议题位置地址

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;
     /**
      * 议题位置地址
      */

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")

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;
 
     /**
      * 议题位置地址

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;

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;
 
     /**
      * 议题位置地址

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;

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}
     </select>
+
+    <resultMap id="issueDetailMap" type="com.elink.esua.epdc.dto.issue.result.IssueDetailResultDTO">
+        <result property="id" column="ID"/>
+        <result property="userLike" column="userLike"/>
+        <result property="userDislike" column="userDislike"/>
+        <result property="content" column="ISSUE_CONTENT"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="partyFlag" column="IS_PARTY_MEMBER"/>
+        <result property="nickname" column="NICK_NAME"/>
+        <result property="avatar" column="USER_FACE"/>
+        <result property="browseNum" column="BROWSE_NUM"/>
+        <result property="approveNum" column="APPROVE_NUM"/>
+        <result property="opposeNum" column="OPPOSE_NUM"/>
+        <result property="categoryId" column="ISSUE_CATEGORY_ID"/>
+        <collection property="images" ofType="java.lang.String">
+            <result property="image" column="IMG_URL"/>
+        </collection>
+    </resultMap>
+    <select id="getIssueDetail" resultMap="issueDetailMap">
+        SELECT
+        <if test='userId != "" and userId != null'>
+            (ua.attitude_flag = 0) userLike,
+            (ua.attitude_flag = 1) userDislike,
+        </if>
+            issue.ID,
+            issue.ISSUE_CONTENT,
+            issue.CREATED_TIME,
+            issue.IS_PARTY_MEMBER,
+            issue.NICK_NAME,
+            issue.USER_FACE,
+            issue.ISSUE_CATEGORY_ID,
+            eve.APPROVE_NUM,
+            eve.OPPOSE_NUM,
+            eve.BROWSE_NUM,
+            img.IMG_URL
+        FROM
+            epdc_issue issue
+            LEFT JOIN epdc_img img ON issue.ID = img.REFERENCE_ID
+            AND img.DEL_FLAG = '0'
+            LEFT JOIN epdc_events eve ON issue.EVENT_ID = eve.ID
+            AND eve.DEL_FLAG = '0'
+        <if test='userId != "" and userId != null'>
+            LEFT JOIN epdc_event_user_attitude ua ON issue.EVENT_ID = ua.EVENT_ID
+            AND ua.DEL_FLAG = '0'
+            AND ua.USER_ID = #{userId}
+            AND ua.UPDATED_TIME = (
+            SELECT
+            MAX( a.update_time )
+            FROM
+            epdc_event_user_attitude a
+            WHERE
+            a.EVENT_ID = ua.EVENT_ID
+            AND a.user_id = ua.user_id
+            )
+        </if>
+        WHERE
+            issue.DEL_FLAG = '0'
+            AND issue.ID = #{issueId}
+        ORDER BY
+            img.CREATED_TIME
+    </select>
 </mapper>

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;
 
     /**
      * 页码