用户反馈增加精选 和 回复字段

ruoyi-generator/src/main/java/com/ruoyi/generator/controller/CommunityFeedbackController.java

@@ -105,7 +105,7 @@ public class CommunityFeedbackController {
      */
     @ApiOperation("查询反馈")
     @GetMapping("/feedbackUsers")
-    public AjaxResult feedbackUsers(Long id, Long type, String userId) {
+    public AjaxResult feedbackUsers(Long id, Long type, String userId,Boolean isChoice,Boolean isReply) {
         int total = 0;
         List<CommunityFeedbackUserVo> communityFeedbackUserVos = null;
         try {
@@ -115,7 +115,7 @@ public class CommunityFeedbackController {
             int offset = (pageNum - 1) * pageSize;
             int searchType = Convert.toInt(ServletUtils.getParameter("searchType"), 0);
 
-            communityFeedbackUserVos = communityFeedbackUserMapper.selectFeedbackUserVo(offset, pageSize, searchType, id, type, userId);
+            communityFeedbackUserVos = communityFeedbackUserMapper.selectFeedbackUserVo(offset, pageSize, searchType, id, type, userId,isChoice,isReply);
 
 
             List<CommunityFeedbackUserVo> feedbackVos_copy = new ArrayList<>(communityFeedbackUserVos);

ruoyi-generator/src/main/java/com/ruoyi/generator/domain/Community/CommunityFeedbackUser.java

@@ -86,6 +86,12 @@ public class CommunityFeedbackUser implements Serializable {
     @ApiModelProperty("是否已删除")
     private Boolean isDelete;
 
+    /**
+     * 是否精选
+     */
+    @ApiModelProperty("是否精选")
+    private Boolean isChoice;
+
     /**
      * 创建人
      */

ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/community/CommunityFeedbackUserMapper.java

@@ -28,5 +28,7 @@ public interface CommunityFeedbackUserMapper  extends BaseMapper<CommunityFeedba
                                                                       @Param("searchType") int searchType,
                                                                       @Param("id") Long  id,
                                                                       @Param("type") Long  type,
-                                                                      @Param("userId") String  userId);
+                                                                      @Param("userId") String  userId,
+                                                                      @Param("isChoice") Boolean  isChoice,
+                                                                      @Param("isReply") Boolean  isReply);
 }

ruoyi-generator/src/main/java/com/ruoyi/generator/service/CommunityFeedbackUserServiceImpl.java

@@ -45,6 +45,7 @@ public class CommunityFeedbackUserServiceImpl extends ServiceImpl<CommunityFeedb
         }
 
         feedbackUser.setType(communityFeedbackUser.getType());
+        feedbackUser.setIsChoice(communityFeedbackUser.getIsChoice());
         feedbackUser.setUserId(userId);
         feedbackUser.setUserFeedback(communityFeedbackUser.getUserFeedback());
         feedbackUser.setCreateBy(userId);
@@ -87,6 +88,7 @@ public class CommunityFeedbackUserServiceImpl extends ServiceImpl<CommunityFeedb
         }
 
         feedbackUser.setId(communityFeedbackUser.getId());
+        feedbackUser.setIsChoice(communityFeedbackUser.getIsChoice());
         feedbackUser.setPunishId(punishId);
         feedbackUser.setPunishFeedback(communityFeedbackUser.getPunishFeedback());
         feedbackUser.setUpdateBy(punishId);

ruoyi-generator/src/main/java/com/ruoyi/generator/vo/CommunityFeedbackUserVo.java

@@ -105,6 +105,18 @@ public class CommunityFeedbackUserVo implements Serializable {
     @ApiModelProperty("是否已删除")
     private Boolean isDelete;
 
+    /**
+     * 是否精选
+     */
+    @ApiModelProperty("是否精选")
+    private Boolean isChoice;
+
+    /**
+     * 是否回复
+     */
+    @ApiModelProperty("是否回复")
+    private Boolean isReply;
+
     /**
      * 创建人
      */

ruoyi-generator/src/main/resources/mapper/community/CommunityFeedbackUserMapper.xml

@@ -12,6 +12,8 @@
         <result property="punishId" column="user_punishd"/>
         <result property="punishFeedback" column="user_punishFeedback"/>
         <result property="isDelete" column="user_isDelete"/>
+        <result property="isChoice" column="user_isChoice"/>
+        <result property="isReply" column="user_isReply"/>
         <result property="createBy" column="user_createBy"/>
         <result property="createTime" column="user_createTime"/>
         <result property="updateBy" column="user_updateBy"/>
@@ -30,6 +32,8 @@
             a.punish_id        as  user_punishd,
             a.punish_feedback  as  user_punishFeedback,
             a.is_delete 			 as  user_isDelete,
+            a.is_Choice 			 as  user_isChoice,
+            case when  a.update_by  is null then 0 else 1 end  user_isReply,
             a.create_by        as  user_createBy,
             a.create_time 	   as  user_createTime,
             a.update_by        as  user_updateBy,
@@ -95,6 +99,8 @@
             <if test="userId != null and userId != ''">
                 AND a.user_id = #{userId}
             </if>
+            AND IFNULL(a.is_choice, 0) = #{isChoice}
+            AND CASE  WHEN a.update_by IS NOT NULL AND a.update_by != 0 THEN 1 ELSE 0 END   =   #{isReply}
         </where>
         <if test="searchType == 1">
             order by a.create_time desc