补充反馈的时候应该更改反馈状态

src/main/java/com/xjrsoft/module/feedback/service/impl/FeedbackServiceImpl.java

@@ -202,9 +202,9 @@ public class FeedbackServiceImpl extends MPJBaseServiceImpl<FeedbackMapper, Feed
         LocalDateTime nowLocalDateTime = LocalDateTime.now();
         Long loginId = StpUtil.getLoginIdAsLong();
 
+        Feedback feedback = new Feedback();
         // 如果没有传入意见反馈主键id表示为新增反馈，应该添加主表记录
         if(ObjectUtils.isEmpty(dto.getFeedbackId())){
-            Feedback feedback = new Feedback();
             feedback.setCreateDate(nowLocalDateTime);
             feedback.setCreateUserId(loginId);
             feedback.setUserId(loginId);
@@ -233,9 +233,16 @@ public class FeedbackServiceImpl extends MPJBaseServiceImpl<FeedbackMapper, Feed
             this.save(feedback);
 
             dto.setFeedbackId(feedback.getId());
+        } else {
+            feedback.setId(dto.getFeedbackId());
+            feedback.setFeedbackTime(nowLocalDateTime);
+            feedback.setHandleStatus(0);
+            feedback.setHandleTime(null);
+            feedback.setModifyUserId(loginId);
+            feedback.setModifyDate(nowLocalDateTime);
+            this.updateById(feedback);
         }
 
-
         FeedbackItem feedbackItem = BeanUtil.toBean(dto, FeedbackItem.class);
         feedbackItem.setCreateDate(nowLocalDateTime);
         feedbackItem.setCreateUserId(loginId);

src/main/java/com/xjrsoft/module/textbook/service/impl/TextbookStudentClaimServiceImpl.java

@@ -275,7 +275,7 @@ public class TextbookStudentClaimServiceImpl extends MPJBaseServiceImpl<Textbook
         List<HeadTeaLookClassBookCategoryDetailVo> personalList = wfTextbookClaimItemMapper.selectJoinList(HeadTeaLookClassBookCategoryDetailVo.class, personalMPJLambdaWrapper);
 
         // 合并两个列表，如果有个人领取记录，应该保留个人的，移除班级的
-        List<HeadTeaLookClassBookCategoryDetailVo> mergedList = Stream.concat(classList.stream(), personalList.stream())
+        List<HeadTeaLookClassBookCategoryDetailVo> mergedList = new ArrayList<>(Stream.concat(classList.stream(), personalList.stream())
                 .collect(Collectors.toMap(
                         // 使用唯一标识作为 key
                         HeadTeaLookClassBookCategoryDetailVo::getTextbookId,
@@ -283,9 +283,7 @@ public class TextbookStudentClaimServiceImpl extends MPJBaseServiceImpl<Textbook
                         vo -> vo,
                         (classVo, personalVo) -> personalVo // 解决冲突时，优先选择 personalList 的记录
                 ))
-                .values() // 获取去重后的值集合
-                .stream()
-                .collect(Collectors.toList()); // 转换回 List
+                .values()); // 转换回 List
 
         // 根据 textbookId 去重
         List<HeadTeaLookClassBookCategoryDetailVo> distinctList = new ArrayList<>(mergedList.stream()