Merge branch 'dev_personal_center' into dev_temp

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/RequirePermissionEnum.java

@@ -87,6 +87,11 @@ public enum RequirePermissionEnum {
     WORK_GRASSROOTS_ISSUE_SHIFT_PROJECT("work_grassroots_issue_shift_project", "基层治理:议题管理:转项目","转项目（选择处理部门api也需要添加此校验）"),
     WORK_GRASSROOTS_ISSUE_CLOSE("work_grassroots_issue_close","基层治理:议题管理:关闭议题","关闭议题"),
 
+    /**
+     * 徽章
+     */
+    WORK_GRASSROOTS_BADGE_AUDIT("work_grassroots_badge_audit","基层治理:徽章审核:徽章审核","徽章审核权限，目前这个模块的操作都用这一个权限控制，没有细分"),
+
     /**
      * 工作-项目跟踪
      */

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MyAdviceListResultDTO.java

@@ -18,6 +18,8 @@ public class MyAdviceListResultDTO implements Serializable {
 
     private String adviceContent;
 
+    private String adviceType;
+
     private List<String> imgList;
 
     @JsonFormat(pattern = "yyyy/MM/dd", timezone = "GMT+8")

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserAdviceController.java

@@ -156,7 +156,7 @@ public class UserAdviceController {
 
     /**
      * @Description 居民端-我的建议列表
-     * @param map ->pageSize,pageNo
+     * @param dto
      * @return com.epmet.commons.tools.utils.Result<java.util.List < com.epmet.dto.result.MyAdviceListResultDTO>>
      * @Author liushaowen
      * @Date 2020/11/9 17:35

epmet-user/epmet-user-server/src/main/resources/mapper/UserAdviceDao.xml

@@ -46,6 +46,7 @@
     <resultMap id="myAdviceListResultMap" type="com.epmet.dto.result.MyAdviceListResultDTO">
         <id column="id"></id>
         <result property="adviceContent" column="ADVICE_CONTENT"/>
+        <result property="adviceType" column="ADVICE_TYPE"/>
         <result property="adviceTime" column="ADVICE_TIME"/>
         <result property="replyContent" column="REPLY_CONTENT"/>
         <result property="replyTime" column="REPLY_TIME"/>
@@ -53,7 +54,7 @@
     </resultMap>
 
     <select id="myAdviceList" resultMap="myAdviceListResultMap">
-        select id,advice_content,advice_time,IFNULL(reply_content,''),IFNULL(reply_time,'')
+        select id,advice_type,advice_content,advice_time,IFNULL(reply_content,''),IFNULL(reply_time,'')
         from user_advice
         where del_flag = 0 and user_id = #{userId}
         order by created_time desc