Procházet zdrojové kódy

反馈功能模块

大数据与最优化研究所 před 8 měsíci
rodič
revize
3b3b89f8f9
22 změnil soubory, kde provedl 1290 přidání a 2 odebrání
  1. 38 0
      src/main/java/com/xjrsoft/common/enums/TerminalTypeEnum.java
  2. 112 0
      src/main/java/com/xjrsoft/module/feedback/controller/FeedbackController.java
  3. 47 0
      src/main/java/com/xjrsoft/module/feedback/dto/AddFeedbackItemDto.java
  4. 36 0
      src/main/java/com/xjrsoft/module/feedback/dto/FeedbackPageDto.java
  5. 19 0
      src/main/java/com/xjrsoft/module/feedback/dto/HistoryPageMobileDto.java
  6. 21 0
      src/main/java/com/xjrsoft/module/feedback/dto/ItemDetailListDto.java
  7. 22 0
      src/main/java/com/xjrsoft/module/feedback/dto/ReadFeedbackItemDto.java
  8. 33 0
      src/main/java/com/xjrsoft/module/feedback/dto/ReplyFeedbackItemDto.java
  9. 111 0
      src/main/java/com/xjrsoft/module/feedback/entity/Feedback.java
  10. 123 0
      src/main/java/com/xjrsoft/module/feedback/entity/FeedbackItem.java
  11. 17 0
      src/main/java/com/xjrsoft/module/feedback/mapper/FeedbackItemMapper.java
  12. 17 0
      src/main/java/com/xjrsoft/module/feedback/mapper/FeedbackMapper.java
  13. 33 0
      src/main/java/com/xjrsoft/module/feedback/service/IFeedbackService.java
  14. 287 0
      src/main/java/com/xjrsoft/module/feedback/service/impl/FeedbackServiceImpl.java
  15. 73 0
      src/main/java/com/xjrsoft/module/feedback/vo/FeedbackPageVo.java
  16. 54 0
      src/main/java/com/xjrsoft/module/feedback/vo/HistoryPageMobileVo.java
  17. 111 0
      src/main/java/com/xjrsoft/module/feedback/vo/ItemDetailListVo.java
  18. 1 1
      src/main/java/com/xjrsoft/module/student/controller/LeagueMembersManageController.java
  19. 1 1
      src/main/java/com/xjrsoft/module/veb/util/ImportExcelUtil.java
  20. 51 0
      src/main/resources/sqlScript/20250409_sql.sql
  21. 33 0
      src/test/java/com/xjrsoft/module/feedback/service/impl/FeedbackServiceImplTest.java
  22. 50 0
      src/test/java/com/xjrsoft/xjrsoftboot/FreeMarkerGeneratorTest.java

+ 38 - 0
src/main/java/com/xjrsoft/common/enums/TerminalTypeEnum.java

@@ -0,0 +1,38 @@
+package com.xjrsoft.common.enums;
+
+/**
+ * @author phoenix
+ * @date 2025/04/09
+ * 	终端类型
+ */
+public enum TerminalTypeEnum {
+
+    /**
+     * 电脑端
+     * */
+    TT0001("TT0001", "电脑端"),
+    /**
+     * 移动端
+     * */
+    TT0002("TT0002", "移动端"),
+    /**
+     * 其他
+     * */
+    TT0003("TT0003", "其他");
+
+    final String code;
+    final String value;
+
+    public String getCode() {
+        return this.code;
+    }
+
+    public String getValue() {
+        return this.value;
+    }
+
+    TerminalTypeEnum(final String code, final String message) {
+        this.code = code;
+        this.value = message;
+    }
+}

+ 112 - 0
src/main/java/com/xjrsoft/module/feedback/controller/FeedbackController.java

@@ -0,0 +1,112 @@
+package com.xjrsoft.module.feedback.controller;
+
+import cn.dev33.satoken.stp.StpUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.xjrsoft.common.page.ConventPage;
+import com.xjrsoft.common.page.PageOutput;
+import com.xjrsoft.common.model.result.RT;
+import com.xjrsoft.module.feedback.dto.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import com.xjrsoft.common.annotation.XjrLog;
+
+import com.xjrsoft.module.feedback.entity.Feedback;
+import com.xjrsoft.module.feedback.service.IFeedbackService;
+import com.xjrsoft.module.feedback.vo.FeedbackPageVo;
+
+import com.xjrsoft.module.feedback.vo.HistoryPageMobileVo;
+import com.xjrsoft.module.feedback.vo.ItemDetailListVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+* @title: 意见反馈
+* @Author phoenix
+* @Date: 2025-04-09
+* @Version 1.0
+*/
+@RestController
+@RequestMapping("/feedback" + "/feedback")
+@Api(value = "/feedback"  + "/feedback",tags = "意见反馈代码")
+@AllArgsConstructor
+public class FeedbackController {
+
+
+    private final IFeedbackService feedbackService;
+
+    @GetMapping(value = "/page")
+    @ApiOperation(value="意见反馈列表(分页)")
+    @SaCheckPermission("feedback:detail")
+    @XjrLog(value = "意见反馈列表(分页)")
+    public RT<PageOutput<FeedbackPageVo>> page(@Valid FeedbackPageDto dto){
+        IPage<FeedbackPageVo> page = feedbackService.pageRubAndHand(dto);
+        PageOutput<FeedbackPageVo> pageOutput = ConventPage.getPageOutput(page, FeedbackPageVo.class);
+        return RT.ok(pageOutput);
+    }
+
+    @GetMapping(value = "/history-page-mobile")
+    @ApiOperation(value="移动端-历史反馈列表(分页)")
+    @SaCheckPermission("feedback:detail")
+    @XjrLog(value = "移动端-历史反馈列表(分页)")
+    public RT<PageOutput<HistoryPageMobileVo>> historyPageMobile(@Valid HistoryPageMobileDto dto){
+        IPage<HistoryPageMobileVo> page = feedbackService.historyPageMobile(dto);
+        PageOutput<HistoryPageMobileVo> pageOutput = ConventPage.getPageOutput(page, HistoryPageMobileVo.class);
+        return RT.ok(pageOutput);
+    }
+
+    @GetMapping(value = "/item-detail-list")
+    @ApiOperation(value="反馈详情列表(不分页)")
+    @SaCheckPermission("feedback:detail")
+    @XjrLog(value = "反馈详情列表(不分页)")
+    public RT<List<ItemDetailListVo>> itemDetailList(@Valid ItemDetailListDto dto){
+        List<ItemDetailListVo> List = feedbackService.itemDetailList(dto);
+        return RT.ok(List);
+    }
+
+    @GetMapping(value = "isRead")
+    @ApiOperation(value="当前用户的反馈的回复是否已经全部阅读")
+    @SaCheckPermission("feedback:detail")
+    @XjrLog(value = "当前用户的反馈的回复是否已经全部阅读")
+    public RT<Boolean> isRead(){
+        LambdaQueryWrapper<Feedback> feedbackLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        feedbackLambdaQueryWrapper
+                .eq(Feedback::getUserId, StpUtil.getLoginIdAsLong())
+                .eq(Feedback::getHandleReadStatus, 0)
+                ;
+        List<Feedback> feedbacks = feedbackService.list(feedbackLambdaQueryWrapper);
+        if(CollectionUtils.isNotEmpty(feedbacks)){
+            return RT.ok(true);
+        }
+        return RT.ok(false);
+    }
+
+    @PostMapping("/add-feedback-item")
+    @ApiOperation(value = "新增(补充)意见反馈-具体反馈单项")
+    @SaCheckPermission("feedback:add")
+    @XjrLog(value = "新增(补充)意见反馈-具体反馈单项")
+    public RT<Boolean> addFeedbackItem(@Valid @RequestBody AddFeedbackItemDto dto){
+        return RT.ok(feedbackService.addFeedbackItem(dto));
+    }
+
+    @PostMapping("/reply")
+    @ApiOperation(value = "回复反馈")
+    @SaCheckPermission("feedback:edit")
+    @XjrLog(value = "回复反馈")
+    public RT<Boolean> replyFeedbackItem(@Valid @RequestBody ReplyFeedbackItemDto dto){
+        return RT.ok(feedbackService.replyFeedbackItem(dto));
+    }
+
+    @PostMapping("/read")
+    @ApiOperation(value = "已读回复")
+    @SaCheckPermission("feedback:edit")
+    @XjrLog(value = "已读回复")
+    public RT<Boolean> readFeedbackItem(@Valid @RequestBody ReadFeedbackItemDto dto){
+        return RT.ok(feedbackService.readFeedbackItem(dto));
+    }
+}

+ 47 - 0
src/main/java/com/xjrsoft/module/feedback/dto/AddFeedbackItemDto.java

@@ -0,0 +1,47 @@
+package com.xjrsoft.module.feedback.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Date;
+
+
+
+/**
+* @title: 意见反馈-具体反馈单项
+* @Author phoenix
+* @Date: 2025-04-09
+* @Version 1.0
+*/
+@Data
+public class AddFeedbackItemDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 终端类型(xjr_dictionary_item(terminal_type))
+     */
+    @ApiModelProperty("终端类型(xjr_dictionary_item(terminal_type))")
+    private String terminalType;
+    /**
+    * 意见反馈主键id(feedback)
+    */
+    @ApiModelProperty("意见反馈主键id(feedback)")
+    private Long feedbackId;
+    /**
+    * 反馈文本
+    */
+    @ApiModelProperty("反馈文本")
+    private String feedback;
+    /**
+    * 反馈附件主键id
+    */
+    @ApiModelProperty("反馈附件主键id")
+    private Long feedbackFileId;
+}

+ 36 - 0
src/main/java/com/xjrsoft/module/feedback/dto/FeedbackPageDto.java

@@ -0,0 +1,36 @@
+package com.xjrsoft.module.feedback.dto;
+
+import com.xjrsoft.common.page.PageInput;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.Date;
+
+
+/**
+* @title: 意见反馈分页查询入参
+* @Author phoenix
+* @Date: 2025-04-09
+* @Version 1.0
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class FeedbackPageDto extends PageInput {
+
+    @ApiModelProperty("处理状态(0:未处理,1:已处理)")
+    private Integer handleStatus;
+
+    @ApiModelProperty("意见反馈反馈用户主键id(xjr_user)")
+    private String userIdCn;
+
+    @ApiModelProperty("用户类型(1:教师,2:学生,3:家长)")
+    private Integer userType;
+
+    @ApiModelProperty("终端类型(xjr_dictionary_item(terminal_type))")
+    private String terminalType;
+}

+ 19 - 0
src/main/java/com/xjrsoft/module/feedback/dto/HistoryPageMobileDto.java

@@ -0,0 +1,19 @@
+package com.xjrsoft.module.feedback.dto;
+
+import com.xjrsoft.common.page.PageInput;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+
+/**
+* @title: 移动端-历史反馈列表(分页)
+* @Author phoenix
+* @Date: 2025-04-09
+* @Version 1.0
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class HistoryPageMobileDto extends PageInput {
+
+
+}

+ 21 - 0
src/main/java/com/xjrsoft/module/feedback/dto/ItemDetailListDto.java

@@ -0,0 +1,21 @@
+package com.xjrsoft.module.feedback.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+* @title: 反馈详情列表(不分页)入参
+* @Author phoenix
+* @Date: 2025-04-09
+* @Version 1.0
+*/
+@Data
+public class ItemDetailListDto {
+
+    @ApiModelProperty("意见反馈主键id(feedback)")
+    private Long feedbackId;
+}

+ 22 - 0
src/main/java/com/xjrsoft/module/feedback/dto/ReadFeedbackItemDto.java

@@ -0,0 +1,22 @@
+package com.xjrsoft.module.feedback.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+* @title: 意见反馈-具体反馈单项
+* @Author phoenix
+* @Date: 2025-04-09
+* @Version 1.0
+*/
+@Data
+public class ReadFeedbackItemDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键编号")
+    private Long id;
+}

+ 33 - 0
src/main/java/com/xjrsoft/module/feedback/dto/ReplyFeedbackItemDto.java

@@ -0,0 +1,33 @@
+package com.xjrsoft.module.feedback.dto;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+* @title: 意见反馈-具体反馈单项
+* @Author phoenix
+* @Date: 2025-04-09
+* @Version 1.0
+*/
+@Data
+public class ReplyFeedbackItemDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键编号")
+    private Long id;
+    /**
+     * 回复文本
+     */
+    @ApiModelProperty("回复文本")
+    private String reply;
+    /**
+     * 回复附件主键id
+     */
+    @ApiModelProperty("回复附件主键id")
+    private Long replyFileId;
+}

+ 111 - 0
src/main/java/com/xjrsoft/module/feedback/entity/Feedback.java

@@ -0,0 +1,111 @@
+package com.xjrsoft.module.feedback.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.github.yulichang.annotation.EntityMapping;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Date;
+
+
+/**
+* @title: 意见反馈
+* @Author phoenix
+* @Date: 2025-04-09
+* @Version 1.0
+*/
+@Data
+@TableName("feedback")
+@ApiModel(value = "feedback", description = "意见反馈")
+public class Feedback implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    @TableId
+    private Long id;
+    /**
+    * 创建人
+    */
+    @ApiModelProperty("创建人")
+    @TableField(fill = FieldFill.INSERT)
+    private Long createUserId;
+    /**
+    * 创建时间
+    */
+    @ApiModelProperty("创建时间")
+    @TableField(fill = FieldFill.INSERT)
+    private LocalDateTime createDate;
+    /**
+    * 修改人
+    */
+    @ApiModelProperty("修改人")
+    @TableField(fill = FieldFill.UPDATE)
+    private Long modifyUserId;
+    /**
+    * 修改时间
+    */
+    @ApiModelProperty("修改时间")
+    @TableField(fill = FieldFill.UPDATE)
+    private LocalDateTime modifyDate;
+    /**
+    * 删除标记
+    */
+    @ApiModelProperty("删除标记")
+    @TableField(fill = FieldFill.INSERT)
+    @TableLogic
+    private Integer deleteMark;
+    /**
+    * 有效标志
+    */
+    @ApiModelProperty("有效标志")
+    @TableField(fill = FieldFill.INSERT)
+    private Integer enabledMark;
+    /**
+    * 意见反馈反馈用户主键id(xjr_user)
+    */
+    @ApiModelProperty("意见反馈反馈用户主键id(xjr_user)")
+    private Long userId;
+    /**
+    * 用户类型(1:教师,2:学生,3:家长)
+    */
+    @ApiModelProperty("用户类型(1:教师,2:学生,3:家长,4:其他)")
+    private Integer userType;
+    /**
+    * 终端类型(xjr_dictionary_item(terminal_type))
+    */
+    @ApiModelProperty("终端类型(xjr_dictionary_item(terminal_type))")
+    private String terminalType;
+    /**
+    * 反馈时间
+    */
+    @ApiModelProperty("反馈时间")
+    private LocalDateTime feedbackTime;
+    /**
+    * 处理状态(0:未处理,1:已处理)
+    */
+    @ApiModelProperty("处理状态(0:未处理,1:已处理)")
+    private Integer handleStatus;
+    /**
+    * 处理时间
+    */
+    @ApiModelProperty("处理时间")
+    private LocalDateTime handleTime;
+    /**
+    * 处理知晓状态(0:未读,1:已读)
+    */
+    @ApiModelProperty("处理知晓状态(0:未读,1:已读)")
+    private Integer handleReadStatus;
+}

+ 123 - 0
src/main/java/com/xjrsoft/module/feedback/entity/FeedbackItem.java

@@ -0,0 +1,123 @@
+package com.xjrsoft.module.feedback.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.github.yulichang.annotation.EntityMapping;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Date;
+
+
+/**
+* @title: 意见反馈-具体反馈单项
+* @Author phoenix
+* @Date: 2025-04-09
+* @Version 1.0
+*/
+@Data
+@TableName("feedback_item")
+@ApiModel(value = "feedback_item", description = "意见反馈-具体反馈单项")
+public class FeedbackItem implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    @TableId
+    private Long id;
+    /**
+    * 创建人
+    */
+    @ApiModelProperty("创建人")
+    @TableField(fill = FieldFill.INSERT)
+    private Long createUserId;
+    /**
+    * 创建时间
+    */
+    @ApiModelProperty("创建时间")
+    @TableField(fill = FieldFill.INSERT)
+    private LocalDateTime createDate;
+    /**
+    * 修改人
+    */
+    @ApiModelProperty("修改人")
+    @TableField(fill = FieldFill.UPDATE)
+    private Long modifyUserId;
+    /**
+    * 修改时间
+    */
+    @ApiModelProperty("修改时间")
+    @TableField(fill = FieldFill.UPDATE)
+    private LocalDateTime modifyDate;
+    /**
+    * 删除标记
+    */
+    @ApiModelProperty("删除标记")
+    @TableField(fill = FieldFill.INSERT)
+    @TableLogic
+    private Integer deleteMark;
+    /**
+    * 有效标志
+    */
+    @ApiModelProperty("有效标志")
+    @TableField(fill = FieldFill.INSERT)
+    private Integer enabledMark;
+    /**
+    * 意见反馈主键id(feedback)
+    */
+    @ApiModelProperty("意见反馈主键id(feedback)")
+    private Long feedbackId;
+    /**
+    * 反馈文本
+    */
+    @ApiModelProperty("反馈文本")
+    private String feedback;
+    /**
+    * 反馈附件主键id
+    */
+    @ApiModelProperty("反馈附件主键id")
+    private Long feedbackFileId;
+    /**
+    * 回复状态(0:未回复,1:已回复)
+    */
+    @ApiModelProperty("回复状态(0:未回复,1:已回复)")
+    private Integer replyStatus;
+    /**
+    * 回复反馈用户主键id(xjr_user)
+    */
+    @ApiModelProperty("回复反馈用户主键id(xjr_user)")
+    private Long replyUserId;
+    /**
+    * 回复文本
+    */
+    @ApiModelProperty("回复文本")
+    private String reply;
+    /**
+    * 回复附件主键id
+    */
+    @ApiModelProperty("回复附件主键id")
+    private Long replyFileId;
+    /**
+    * 回复时间
+    */
+    @ApiModelProperty("回复时间")
+    private LocalDateTime replyTime;
+    /**
+    * 回复阅读状态(0:未读,1:已读)
+    */
+    @ApiModelProperty("回复阅读状态(0:未读,1:已读)")
+    private Integer replyReadStatus;
+
+
+}

+ 17 - 0
src/main/java/com/xjrsoft/module/feedback/mapper/FeedbackItemMapper.java

@@ -0,0 +1,17 @@
+package com.xjrsoft.module.feedback.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.github.yulichang.base.MPJBaseMapper;
+import com.xjrsoft.module.feedback.entity.FeedbackItem;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @title: 意见反馈-具体反馈单项
+* @Author phoenix
+* @Date: 2025-04-09
+* @Version 1.0
+*/
+@Mapper
+public interface FeedbackItemMapper extends MPJBaseMapper<FeedbackItem> {
+
+}

+ 17 - 0
src/main/java/com/xjrsoft/module/feedback/mapper/FeedbackMapper.java

@@ -0,0 +1,17 @@
+package com.xjrsoft.module.feedback.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.github.yulichang.base.MPJBaseMapper;
+import com.xjrsoft.module.feedback.entity.Feedback;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @title: 意见反馈
+* @Author phoenix
+* @Date: 2025-04-09
+* @Version 1.0
+*/
+@Mapper
+public interface FeedbackMapper extends MPJBaseMapper<Feedback> {
+
+}

+ 33 - 0
src/main/java/com/xjrsoft/module/feedback/service/IFeedbackService.java

@@ -0,0 +1,33 @@
+package com.xjrsoft.module.feedback.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.github.yulichang.base.MPJBaseService;
+import com.xjrsoft.module.feedback.dto.*;
+import com.xjrsoft.module.feedback.entity.Feedback;
+import com.xjrsoft.module.feedback.vo.FeedbackPageVo;
+import com.xjrsoft.module.feedback.vo.HistoryPageMobileVo;
+import com.xjrsoft.module.feedback.vo.ItemDetailListVo;
+import lombok.Data;
+import java.util.List;
+
+/**
+* @title: 意见反馈
+* @Author phoenix
+* @Date: 2025-04-09
+* @Version 1.0
+*/
+
+public interface IFeedbackService extends MPJBaseService<Feedback> {
+    IPage<FeedbackPageVo> pageRubAndHand(FeedbackPageDto dto);
+
+    IPage<HistoryPageMobileVo> historyPageMobile(HistoryPageMobileDto dto);
+
+    List<ItemDetailListVo> itemDetailList(ItemDetailListDto dto);
+
+    Boolean addFeedbackItem(AddFeedbackItemDto dto);
+
+    Boolean replyFeedbackItem(ReplyFeedbackItemDto dto);
+
+    Boolean readFeedbackItem(ReadFeedbackItemDto dto);
+}

+ 287 - 0
src/main/java/com/xjrsoft/module/feedback/service/impl/FeedbackServiceImpl.java

@@ -0,0 +1,287 @@
+package com.xjrsoft.module.feedback.service.impl;
+
+import cn.dev33.satoken.stp.StpUtil;
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import com.xjrsoft.common.exception.MyException;
+import com.xjrsoft.common.page.ConventPage;
+import com.xjrsoft.common.utils.VoToColumnUtil;
+import com.xjrsoft.module.feedback.dto.*;
+import com.xjrsoft.module.feedback.entity.Feedback;
+import com.xjrsoft.module.feedback.entity.FeedbackItem;
+import com.xjrsoft.module.feedback.mapper.FeedbackItemMapper;
+import com.xjrsoft.module.feedback.mapper.FeedbackMapper;
+import com.xjrsoft.module.feedback.service.IFeedbackService;
+import com.xjrsoft.module.feedback.vo.FeedbackPageVo;
+import com.xjrsoft.module.feedback.vo.HistoryPageMobileVo;
+import com.xjrsoft.module.feedback.vo.ItemDetailListVo;
+import com.xjrsoft.module.system.entity.DictionaryDetail;
+import com.xjrsoft.module.system.entity.File;
+import com.xjrsoft.module.system.service.IFileService;
+import com.xjrsoft.module.teacher.entity.XjrUser;
+import lombok.AllArgsConstructor;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.time.LocalDateTime;
+import java.util.*;
+import java.util.stream.Collectors;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+
+/**
+* @title: 意见反馈
+* @Author phoenix
+* @Date: 2025-04-09
+* @Version 1.0
+*/
+@Service
+@AllArgsConstructor
+public class FeedbackServiceImpl extends MPJBaseServiceImpl<FeedbackMapper, Feedback> implements IFeedbackService {
+
+    private final FeedbackItemMapper feedbackItemMapper;
+
+    private final IFileService fileService;
+
+    @Override
+    public IPage<FeedbackPageVo> pageRubAndHand(FeedbackPageDto dto) {
+        MPJLambdaWrapper<Feedback> feedbackMPJLambdaWrapper = new MPJLambdaWrapper<>();
+        feedbackMPJLambdaWrapper
+                .disableSubLogicDel()
+                .select(Feedback::getId)
+                .select(Feedback.class,x -> VoToColumnUtil.fieldsToColumns(FeedbackPageVo.class).contains(x.getProperty()))
+                .leftJoin(XjrUser.class, XjrUser::getId, Feedback::getUserId,
+                        wrapper -> wrapper
+                                .selectAs(XjrUser::getName, FeedbackPageVo::getUserIdCn)
+                                .like(StringUtils.isNotEmpty(dto.getUserIdCn()), XjrUser::getName, dto.getUserIdCn())
+                )
+                .leftJoin(DictionaryDetail.class, DictionaryDetail::getCode, Feedback::getTerminalType,
+                        wrapper -> wrapper
+                                .selectAs(DictionaryDetail::getName, FeedbackPageVo::getTerminalTypeCn)
+                )
+                .eq(Feedback::getHandleStatus, dto.getHandleStatus())
+                .eq(ObjectUtils.isNotEmpty(dto.getUserType()), Feedback::getUserType, dto.getUserType())
+                .eq(StringUtils.isNotEmpty(dto.getTerminalType()), Feedback::getTerminalType, dto.getTerminalType())
+                .orderByDesc(Feedback::getCreateDate)
+                ;
+        return this.selectJoinListPage(ConventPage.getPage(dto), FeedbackPageVo.class, feedbackMPJLambdaWrapper);
+    }
+
+    @Override
+    public IPage<HistoryPageMobileVo> historyPageMobile(HistoryPageMobileDto dto) {
+        Long loginId = StpUtil.getLoginIdAsLong();
+
+        MPJLambdaWrapper<Feedback> feedbackMPJLambdaWrapper = new MPJLambdaWrapper<>();
+        feedbackMPJLambdaWrapper
+                .disableSubLogicDel()
+                .select(Feedback::getId)
+                .select(Feedback.class,x -> VoToColumnUtil.fieldsToColumns(HistoryPageMobileVo.class).contains(x.getProperty()))
+                .leftJoin(DictionaryDetail.class, DictionaryDetail::getCode, Feedback::getTerminalType,
+                        wrapper -> wrapper
+                                .selectAs(DictionaryDetail::getName, HistoryPageMobileVo::getTerminalTypeCn)
+                        )
+                .eq(Feedback::getUserId, loginId)
+                .orderByDesc(Feedback::getHandleReadStatus)
+                ;
+        IPage<HistoryPageMobileVo> page = this.selectJoinListPage(ConventPage.getPage(dto), HistoryPageMobileVo.class, feedbackMPJLambdaWrapper);
+
+        // 处理最后一条反馈内容
+        List<HistoryPageMobileVo> dataList = page.getRecords();
+        if(CollectionUtils.isNotEmpty(dataList)){
+            List<String> ids = dataList.stream()
+                    .map(HistoryPageMobileVo::getId)
+                    .collect(Collectors.toList());
+            if(CollectionUtils.isNotEmpty(ids)){
+                List<FeedbackItem> feedbackItems = feedbackItemMapper.selectList(
+                        Wrappers.lambdaQuery(FeedbackItem.class)
+                                .in(FeedbackItem::getFeedbackId, ids)
+                );
+
+                Map<Long, List<FeedbackItem>> groupByFeedbackId = feedbackItems.stream()
+                        .collect(Collectors.groupingBy(FeedbackItem::getFeedbackId));
+
+                for (HistoryPageMobileVo vo : page.getRecords()){
+                    List<FeedbackItem> feedbackItemList = groupByFeedbackId.get(Long.parseLong(vo.getId()));
+                    if(CollectionUtils.isNotEmpty(feedbackItemList)){
+                        feedbackItemList.sort(Comparator.comparing(FeedbackItem::getCreateDate).reversed());
+                        FeedbackItem lastOne = feedbackItemList.get(0);
+                        if(ObjectUtils.isNotEmpty(lastOne)){
+                            vo.setFeedback(lastOne.getFeedback());
+                            vo.setReply(lastOne.getReply());
+                        }
+                    }
+                }
+            }
+        }
+
+        return page;
+    }
+
+    @Override
+    public List<ItemDetailListVo> itemDetailList(ItemDetailListDto dto) {
+        MPJLambdaWrapper<FeedbackItem> feedbackItemMPJLambdaWrapper = new MPJLambdaWrapper<>();
+        feedbackItemMPJLambdaWrapper
+                .disableSubLogicDel()
+                .select(FeedbackItem::getId)
+                .select(FeedbackItem.class,x -> VoToColumnUtil.fieldsToColumns(ItemDetailListVo.class).contains(x.getProperty()))
+                .innerJoin(Feedback.class, Feedback::getId, FeedbackItem::getFeedbackId,
+                        wrapper -> wrapper
+                                .selectAs(Feedback::getUserType, ItemDetailListVo::getUserType)
+                                .selectAs(Feedback::getTerminalType, ItemDetailListVo::getTerminalType)
+                                .leftJoin(DictionaryDetail.class, DictionaryDetail::getCode, Feedback::getTerminalType,
+                                        wrap -> wrap
+                                                .selectAs(DictionaryDetail::getName, ItemDetailListVo::getTerminalTypeCn)
+                                )
+                        )
+                .leftJoin(XjrUser.class, XjrUser::getId, FeedbackItem::getCreateUserId,
+                        wrapper -> wrapper
+                                .selectAs(XjrUser::getName, ItemDetailListVo::getCreateUserIdCn)
+                )
+                .leftJoin(XjrUser.class, XjrUser::getId, FeedbackItem::getReplyUserId,
+                        wrapper -> wrapper
+                                .selectAs(XjrUser::getName, ItemDetailListVo::getReplyUserIdCn)
+                )
+                .eq(FeedbackItem::getFeedbackId, dto.getFeedbackId())
+        ;
+        List<ItemDetailListVo> itemDetailListVos = feedbackItemMapper.selectJoinList(ItemDetailListVo.class, feedbackItemMPJLambdaWrapper);
+
+        for (ItemDetailListVo vo : itemDetailListVos){
+            if(ObjectUtils.isNotEmpty(vo.getFeedbackFileId())){
+                List<File> feedbackFile = fileService.list(Wrappers.<File>query().lambda().eq(File::getFolderId, vo.getFeedbackFileId()));
+                vo.setFeedbackFiles(feedbackFile);
+            }
+            if(ObjectUtils.isNotEmpty(vo.getReplyFileId())){
+                List<File> replyFile = fileService.list(Wrappers.<File>query().lambda().eq(File::getFolderId, vo.getReplyFileId()));
+                vo.setFeedbackFiles(replyFile);
+            }
+        }
+
+        return itemDetailListVos;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean addFeedbackItem(AddFeedbackItemDto dto) {
+        LocalDateTime nowLocalDateTime = LocalDateTime.now();
+        Long loginId = StpUtil.getLoginIdAsLong();
+
+        // 如果没有传入了意见反馈主键id表示为新增反馈,应该添加主表记录
+        if(ObjectUtils.isEmpty(dto.getFeedbackId())){
+            Feedback feedback = new Feedback();
+            feedback.setCreateDate(nowLocalDateTime);
+            feedback.setCreateUserId(loginId);
+            feedback.setUserId(loginId);
+
+            //  处理用户类别
+            if(StpUtil.hasRole("TEACHER")){
+                feedback.setUserType(1);
+            } else if(StpUtil.hasRole("STUDENT")){
+                feedback.setUserType(2);
+            } else if(StpUtil.hasRole("PARENT")){
+                feedback.setUserType(3);
+            } else {
+                feedback.setUserType(4);
+            }
+
+            if(ObjectUtils.isNotEmpty(dto.getTerminalType())){
+                feedback.setTerminalType(dto.getTerminalType());
+            } else {
+                throw new MyException("请选择终端类型");
+            }
+
+            feedback.setFeedbackTime(nowLocalDateTime);
+            feedback.setHandleStatus(0);
+            feedback.setHandleReadStatus(0);
+
+            this.save(feedback);
+
+            dto.setFeedbackId(feedback.getId());
+        }
+
+
+        FeedbackItem feedbackItem = BeanUtil.toBean(dto, FeedbackItem.class);
+        feedbackItem.setCreateDate(nowLocalDateTime);
+        feedbackItem.setCreateUserId(loginId);
+        feedbackItemMapper.insert(feedbackItem);
+
+        return true;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean replyFeedbackItem(ReplyFeedbackItemDto dto) {
+        FeedbackItem old = feedbackItemMapper.selectById(dto.getId());
+
+        if(ObjectUtils.isEmpty(old)){
+            throw new MyException("当前反馈已被修改,请刷新重试");
+        }
+
+        LocalDateTime nowLocalDateTime = LocalDateTime.now();
+        Long loginId = StpUtil.getLoginIdAsLong();
+
+        FeedbackItem feedbackItem = BeanUtil.toBean(dto, FeedbackItem.class);
+        feedbackItem.setModifyDate(nowLocalDateTime);
+        feedbackItem.setModifyUserId(loginId);
+
+        feedbackItem.setReplyStatus(1);
+        feedbackItem.setReplyUserId(loginId);
+        feedbackItem.setReplyTime(nowLocalDateTime);
+        feedbackItem.setReplyReadStatus(0);
+
+        feedbackItemMapper.insert(feedbackItem);
+        
+        // 处理主反馈的状态
+        Feedback updateFeedback = new Feedback();
+        updateFeedback.setId(old.getFeedbackId());
+        updateFeedback.setModifyDate(nowLocalDateTime);
+        updateFeedback.setModifyUserId(loginId);
+
+        // 查询当前主反馈是否还有没有回复的
+        LambdaQueryWrapper<FeedbackItem> replyLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        replyLambdaQueryWrapper
+                .eq(FeedbackItem::getFeedbackId, old.getFeedbackId())
+                .eq(FeedbackItem::getReplyStatus, 0)
+                ;
+        List<FeedbackItem> replyLFeedbackItems = feedbackItemMapper.selectList(replyLambdaQueryWrapper);
+        if(CollectionUtils.isEmpty(replyLFeedbackItems)){
+            updateFeedback.setHandleReadStatus(1);
+            updateFeedback.setHandleTime(nowLocalDateTime);
+        }
+
+        updateFeedback.setHandleReadStatus(0);
+
+        this.updateById(updateFeedback);
+        return true;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean readFeedbackItem(ReadFeedbackItemDto dto) {
+        Feedback old = this.getById(dto.getId());
+
+        if(ObjectUtils.isEmpty(old)){
+            throw new MyException("当前反馈已被修改,请刷新重试");
+        }
+
+        // 将所有已经处理反馈项阅读
+        LambdaUpdateWrapper<FeedbackItem> feedbackItemLambdaUpdateWrapper = new LambdaUpdateWrapper<>();
+        feedbackItemLambdaUpdateWrapper
+                .set(FeedbackItem::getReplyReadStatus, 1)
+                .eq(FeedbackItem::getFeedbackId, dto.getId())
+                .eq(FeedbackItem::getReplyStatus, 1)
+                ;
+        feedbackItemMapper.update(new FeedbackItem(), feedbackItemLambdaUpdateWrapper);
+
+        this.updateById(new Feedback(){{
+            setId(dto.getId());
+            setHandleReadStatus(1);
+        }});
+        return true;
+    }
+}

+ 73 - 0
src/main/java/com/xjrsoft/module/feedback/vo/FeedbackPageVo.java

@@ -0,0 +1,73 @@
+package com.xjrsoft.module.feedback.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import com.xjrsoft.common.annotation.Trans;
+import com.xjrsoft.common.enums.TransType;
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+* @title: 意见反馈分页列表出参
+* @Author phoenix
+* @Date: 2025-04-09
+* @Version 1.0
+*/
+@Data
+public class FeedbackPageVo {
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private String id;
+
+    /**
+    * 意见反馈反馈用户主键id(xjr_user)
+    */
+    @ApiModelProperty("意见反馈反馈用户主键id(xjr_user)")
+    private Long userId;
+
+    @ApiModelProperty("意见反馈反馈用户主键id(xjr_user)")
+    private String userIdCn;
+
+    /**
+    * 用户类型(1:教师,2:学生,3:家长)
+    */
+    @ApiModelProperty("用户类型(1:教师,2:学生,3:家长)")
+    private Integer userType;
+    /**
+    * 终端类型(xjr_dictionary_item(terminal_type))
+    */
+    @ApiModelProperty("终端类型(xjr_dictionary_item(terminal_type))")
+    private String terminalType;
+
+    @ApiModelProperty("终端类型(xjr_dictionary_item(terminal_type))")
+    private String terminalTypeCn;
+
+    /**
+    * 反馈时间
+    */
+    @ApiModelProperty("反馈时间")
+    private LocalDateTime feedbackTime;
+    /**
+    * 处理状态(0:未处理,1:已处理)
+    */
+    @ApiModelProperty("处理状态(0:未处理,1:已处理)")
+    private Integer handleStatus;
+    /**
+    * 处理时间
+    */
+    @ApiModelProperty("处理时间")
+    private LocalDateTime handleTime;
+    /**
+    * 处理知晓状态(0:未读,1:已读)
+    */
+    @ApiModelProperty("处理知晓状态(0:未读,1:已读)")
+    private Integer handleReadStatus;
+
+}

+ 54 - 0
src/main/java/com/xjrsoft/module/feedback/vo/HistoryPageMobileVo.java

@@ -0,0 +1,54 @@
+package com.xjrsoft.module.feedback.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+* @title: 移动端-历史反馈列表(分页)
+* @Author phoenix
+* @Date: 2025-04-09
+* @Version 1.0
+*/
+@Data
+public class HistoryPageMobileVo {
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private String id;
+    /**
+    * 终端类型(xjr_dictionary_item(terminal_type))
+    */
+    @ApiModelProperty("终端类型(xjr_dictionary_item(terminal_type))")
+    private String terminalType;
+
+    @ApiModelProperty("终端类型(xjr_dictionary_item(terminal_type))")
+    private String terminalTypeCn;
+
+    /**
+    * 反馈时间
+    */
+    @ApiModelProperty("反馈时间")
+    private LocalDateTime feedbackTime;
+    /**
+    * 处理状态(0:未处理,1:已处理)
+    */
+    @ApiModelProperty("处理状态(0:未处理,1:已处理)")
+    private Integer handleStatus;
+
+    /**
+    * 处理知晓状态(0:未读,1:已读)
+    */
+    @ApiModelProperty("处理知晓状态(0:未读,1:已读)")
+    private Integer handleReadStatus;
+
+    @ApiModelProperty("最后一条反馈文本")
+    private String feedback;
+
+    @ApiModelProperty("最后一条回复文本")
+    private String reply;
+}

+ 111 - 0
src/main/java/com/xjrsoft/module/feedback/vo/ItemDetailListVo.java

@@ -0,0 +1,111 @@
+package com.xjrsoft.module.feedback.vo;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.xjrsoft.module.system.entity.File;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+import java.util.Date;
+import java.util.List;
+
+/**
+* @title: 反馈详情列表(不分页)出参
+* @Author phoenix
+* @Date: 2025-04-09
+* @Version 1.0
+*/
+@Data
+public class ItemDetailListVo {
+
+    @ApiModelProperty("主键编号")
+    private Long id;
+    /**
+     * 创建人
+     */
+    @ApiModelProperty("创建人")
+    private Long createUserId;
+
+    @ApiModelProperty("创建人")
+    private String createUserIdCn;
+
+    /**
+     * 用户类型(1:教师,2:学生,3:家长)
+     */
+    @ApiModelProperty("用户类型(1:教师,2:学生,3:家长,4:其他)")
+    private Integer userType;
+    /**
+     * 终端类型(xjr_dictionary_item(terminal_type))
+     */
+    @ApiModelProperty("终端类型(xjr_dictionary_item(terminal_type))")
+    private String terminalType;
+
+    @ApiModelProperty("终端类型(xjr_dictionary_item(terminal_type))")
+    private String terminalTypeCn;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty("创建时间")
+    private LocalDateTime createDate;
+    /**
+     * 意见反馈主键id(feedback)
+     */
+    @ApiModelProperty("意见反馈主键id(feedback)")
+    private Long feedbackId;
+    /**
+     * 反馈文本
+     */
+    @ApiModelProperty("反馈文本")
+    private String feedback;
+    /**
+     * 反馈附件主键id
+     */
+    @ApiModelProperty("反馈附件主键id")
+    private Long feedbackFileId;
+
+    @ApiModelProperty("反馈附件主键id")
+    private List<File> feedbackFiles;
+
+    /**
+     * 回复状态(0:未回复,1:已回复)
+     */
+    @ApiModelProperty("回复状态(0:未回复,1:已回复)")
+    private Integer replyStatus;
+    /**
+     * 回复反馈用户主键id(xjr_user)
+     */
+    @ApiModelProperty("回复反馈用户主键id(xjr_user)")
+    private Long replyUserId;
+
+    @ApiModelProperty("回复反馈用户主键id(xjr_user)")
+    private String replyUserIdCn;
+
+    /**
+     * 回复文本
+     */
+    @ApiModelProperty("回复文本")
+    private String reply;
+    /**
+     * 回复附件主键id
+     */
+    @ApiModelProperty("回复附件主键id")
+    private Long replyFileId;
+
+    @ApiModelProperty("回复附件主键id")
+    private List<File> replyFiles;
+
+    /**
+     * 回复时间
+     */
+    @ApiModelProperty("回复时间")
+    private LocalDateTime replyTime;
+    /**
+     * 回复阅读状态(0:未读,1:已读)
+     */
+    @ApiModelProperty("回复阅读状态(0:未读,1:已读)")
+    private Integer replyReadStatus;
+}

+ 1 - 1
src/main/java/com/xjrsoft/module/student/controller/LeagueMembersManageController.java

@@ -152,7 +152,7 @@ public class LeagueMembersManageController {
         int finalTotal = total;
         dataList.add(new ClassWithLMNumTreeVo(){{
             setId("8888");
-            setName("总览");
+            setName("总览" + "(" + finalTotal + "人)" );
             setParentId("0");
             setNum(finalTotal);
             setLevel(1);

+ 1 - 1
src/main/java/com/xjrsoft/module/veb/util/ImportExcelUtil.java

@@ -497,7 +497,7 @@ public class ImportExcelUtil {
 
         for (Field field : instance.getClass().getDeclaredFields()) {
             Required required = field.getAnnotation(Required.class);
-            if (required != null) { // 如果字段被 @Required 标记
+            if (ObjectUtils.isNotEmpty(required) && required.value()) { // 如果字段被 @Required 标记
                 field.setAccessible(true); // 允许访问私有字段
                 Object value = field.get(instance); // 获取字段的值
                 if (value == null || (value instanceof String && ((String) value).trim().isEmpty())) {

+ 51 - 0
src/main/resources/sqlScript/20250409_sql.sql

@@ -0,0 +1,51 @@
+-- ---------------------------------------------------------------
+-- 意见反馈
+-- ---------------------------------------------------------------
+drop table if exists `feedback`;
+create table `feedback`
+(
+    id                   bigint      not null comment '主键编号'
+        primary key,
+    create_user_id       bigint      null comment '创建人',
+    create_date          datetime    null comment '创建时间',
+    modify_user_id       bigint      null comment '修改人',
+    modify_date          datetime    null comment '修改时间',
+    delete_mark          int         not null comment '删除标记',
+    enabled_mark         int         not null comment '有效标志',
+
+    `user_id`            bigint      not null comment '意见反馈反馈用户主键id(xjr_user)',
+    `user_type`          int         not null comment '用户类型(1:教师,2:学生,3:家长)',
+    `terminal_type`      varchar(64) not null comment '终端类型(xjr_dictionary_item(terminal_type))',
+    `feedback_time`      datetime    not null comment '反馈时间',
+    `handle_status`      int      default 0 comment '处理状态(0:未处理,1:已处理)',
+    `handle_time`        datetime default null comment '处理时间',
+    `handle_read_status` int      default 0 comment '处理知晓状态(0:未读,1:已读)'
+) engine = innodb
+  default charset = utf8mb4 comment = '意见反馈';
+
+-- ---------------------------------------------------------------
+-- 意见反馈-具体反馈单项
+-- ---------------------------------------------------------------
+drop table if exists `feedback_item`;
+create table `feedback_item`
+(
+    id                  bigint       not null comment '主键编号'
+        primary key,
+    create_user_id      bigint       null comment '创建人',
+    create_date         datetime     null comment '创建时间',
+    modify_user_id      bigint       null comment '修改人',
+    modify_date         datetime     null comment '修改时间',
+    delete_mark         int          not null comment '删除标记',
+    enabled_mark        int          not null comment '有效标志',
+
+    `feedback_id`       bigint       not null comment '意见反馈主键id(feedback)',
+    `feedback`          varchar(512) not null comment '反馈文本',
+    `feedback_file_id`  bigint       default null comment '反馈附件主键id',
+    `reply_status`      int          default 0 comment '回复状态(0:未回复,1:已回复)',
+    `reply_user_id`            bigint      not null comment '回复反馈用户主键id(xjr_user)',
+    `reply`             varchar(512) default null comment '回复文本',
+    `reply_file_id`     bigint       default null comment '回复附件主键id',
+    `reply_time`        datetime     default null comment '回复时间',
+    `reply_read_status` int          default 0 comment '回复阅读状态(0:未读,1:已读)'
+) engine = innodb
+  default charset = utf8mb4 comment = '意见反馈-具体反馈单项';

+ 33 - 0
src/test/java/com/xjrsoft/module/feedback/service/impl/FeedbackServiceImplTest.java

@@ -0,0 +1,33 @@
+package com.xjrsoft.module.feedback.service.impl;
+
+import cn.dev33.satoken.stp.StpUtil;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.context.SpringBootTest;
+
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+@SpringBootTest
+class FeedbackServiceImplTest {
+
+    @BeforeEach
+    void setUp() {
+        // 模拟用户登录
+        StpUtil.login(15331004147782L); // 假设用户ID为1
+    }
+
+    @AfterEach
+    void tearDown() {
+        // 清理会话
+        StpUtil.logout();
+    }
+
+    @Test
+    void addFeedbackItem() {
+        List<String> roleList = StpUtil.getRoleList();
+        System.err.println(roleList);
+    }
+}

+ 50 - 0
src/test/java/com/xjrsoft/xjrsoftboot/FreeMarkerGeneratorTest.java

@@ -4653,4 +4653,54 @@ public class FreeMarkerGeneratorTest {
 
         apiGeneratorService.generateCodes(params);
     }
+
+    @Test
+    public void gcFeedback() throws IOException {
+        List<TableConfig> tableConfigs = new ArrayList<>();
+        TableConfig mainTable = new TableConfig();
+        mainTable.setTableName("feedback");//init_sql中的表名
+        mainTable.setIsMain(true);//是否是主表,一般默认为true
+        mainTable.setPkField(GlobalConstant.DEFAULT_PK);//设置主键
+        mainTable.setPkType(GlobalConstant.DEFAULT_PK_TYPE);//设置主键类型
+        tableConfigs.add(mainTable);
+
+        ApiGenerateCodesDto params = new ApiGenerateCodesDto();
+        params.setAuthor("phoenix");//作者名称
+        params.setPackageName("feedback");//包名
+        params.setTableConfigs(tableConfigs);
+        params.setPage(true);//是否生成分页接口
+        params.setImport(false);//是否生成导入接口
+        params.setExport(false);//是否生成导出接口
+        params.setOutMainDir(false);//是否生成在主目录,前期测试可设置成false
+        params.setDs(ds);
+
+        IApiGeneratorService apiGeneratorService = new ApiGeneratorServiceImpl();
+
+        apiGeneratorService.generateCodes(params);
+    }
+
+    @Test
+    public void gcFeedbackItem() throws IOException {
+        List<TableConfig> tableConfigs = new ArrayList<>();
+        TableConfig mainTable = new TableConfig();
+        mainTable.setTableName("feedback_item");//init_sql中的表名
+        mainTable.setIsMain(true);//是否是主表,一般默认为true
+        mainTable.setPkField(GlobalConstant.DEFAULT_PK);//设置主键
+        mainTable.setPkType(GlobalConstant.DEFAULT_PK_TYPE);//设置主键类型
+        tableConfigs.add(mainTable);
+
+        ApiGenerateCodesDto params = new ApiGenerateCodesDto();
+        params.setAuthor("phoenix");//作者名称
+        params.setPackageName("feedback");//包名
+        params.setTableConfigs(tableConfigs);
+        params.setPage(true);//是否生成分页接口
+        params.setImport(false);//是否生成导入接口
+        params.setExport(false);//是否生成导出接口
+        params.setOutMainDir(false);//是否生成在主目录,前期测试可设置成false
+        params.setDs(ds);
+
+        IApiGeneratorService apiGeneratorService = new ApiGeneratorServiceImpl();
+
+        apiGeneratorService.generateCodes(params);
+    }
 }