Merge branch 'release' of gitadmin/tuoheng_qmhh into master

tuoheng-api/src/main/java/com/tuoheng/api/entity/domain/Feedback.java

@@ -98,6 +98,21 @@ public class Feedback extends BaseEntity {
      */
     private String handleRemark;
 
+    /**
+     * 反馈类型：1全民护河 2河湖长
+     */
+    private Integer type;
+
+    /**
+     * 视频地址
+     */
+    private String videoUrl;
+
+    /**
+     * 问题类型 1水面 2岸线 3水质 4排口
+     */
+    private Integer questionType;
+
     /**
      * 处理时间
      */

tuoheng-api/src/main/java/com/tuoheng/api/service/impl/FeedbackServiceImpl.java

@@ -55,6 +55,7 @@ public class FeedbackServiceImpl extends BaseServiceImpl<FeedbackMapper, Feedbac
             feedback.setStreamName(stream.getName());
             feedback.setStreamAdminId(stream.getStreamAdminId());
             feedback.setStreamAdminName(stream.getStreamAdminName());
+            feedback.setType(1);
         }else {
             return JsonResult.error("河流信息不存在");
         }
@@ -78,6 +79,7 @@ public class FeedbackServiceImpl extends BaseServiceImpl<FeedbackMapper, Feedbac
         IPage<Feedback> pageData = feedbackMapper.selectPage(page, new LambdaQueryWrapper<Feedback>()
                 .eq(Feedback::getMark, 1)
                 .eq(Feedback::getOpenid, query.getOpenid())
+                .eq(Feedback::getType,1)
                 .orderByDesc(Feedback::getCreateTime));
         pageData.getRecords().stream().map(vo -> {
             Stream stream = streamMapper.selectById(vo.getStreamId());
@@ -85,14 +87,22 @@ public class FeedbackServiceImpl extends BaseServiceImpl<FeedbackMapper, Feedbac
                 vo.setStreamImage(CommonUtils.getImageURL(stream.getImage()));
             }
             if (StringUtils.isNotNull(vo.getStatus())){
-                if(vo.getStatus()==4 || vo.getStatus()==3){
+                if(vo.getStatus()==4){
                     User user = userMapper.selectById(vo.getStreamAdminId());
                     //判空
                     if(StringUtils.isNull(user)){
                         throw new ServiceException(HttpStatus.BAD_REQUEST.value(),"当前反馈问题id"+vo.getId()+"查询不到对应责任河湖长");
                     }
                     vo.setRealname(user.getRealname());
-                }else {
+                }
+                if(vo.getStatus()==3){
+                    User user = userMapper.selectById(Integer.parseInt(vo.getUpdateUser().toString()));
+                    //判空
+                    if(StringUtils.isNull(user)){
+                        throw new ServiceException(HttpStatus.BAD_REQUEST.value(),"当前反馈问题id"+vo.getId()+"查询不到对应责任河湖长");
+                    }
+                    vo.setRealname(user.getRealname());
+                }else if(vo.getStatus()==1 || vo.getStatus()==2){
                     vo.setHandleTime(null);
                 }
             }