From 10f4b83d6a15cf5f695317c7644a4ceba63e4c2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=AF=E8=BE=89?= Date: Tue, 7 Jul 2026 21:37:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E9=A3=8E=E9=87=87=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E5=88=97=E8=A1=A8=E5=AD=97=E6=AE=B5=E5=A2=9E=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cms/controller/cms/CmsFileController.java | 2 +- .../java/com/ruoyi/cms/mapper/FileMapper.java | 3 +- .../com/ruoyi/cms/service/IFileService.java | 3 +- .../cms/service/impl/FileServiceImpl.java | 3 +- .../main/resources/mapper/app/FileMapper.xml | 6 +++- .../ruoyi/common/core/domain/entity/File.java | 14 ---------- .../common/core/domain/vo/FileReviewVO.java | 28 +++++++++++++++++++ 7 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/core/domain/vo/FileReviewVO.java diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsFileController.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsFileController.java index bb6cfb4..6250560 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsFileController.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsFileController.java @@ -34,7 +34,7 @@ public class CmsFileController extends BaseController { @GetMapping("/review/list") public TableDataInfo reviewList(File file) { startPage(); - List list = fileService.selectFileListForReview(file); + List list = fileService.selectFileListForReview(file); return getDataTable(list); } diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/FileMapper.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/FileMapper.java index e888fda..3437c18 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/FileMapper.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/FileMapper.java @@ -2,6 +2,7 @@ package com.ruoyi.cms.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.common.core.domain.entity.File; +import com.ruoyi.common.core.domain.vo.FileReviewVO; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -30,5 +31,5 @@ public interface FileMapper extends BaseMapper /** * 查询风采审核列表（后台管理用） */ - public List selectFileListForReview(File file); + public List selectFileListForReview(File file); } diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/IFileService.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/IFileService.java index 6e945ca..8697b40 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/IFileService.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/IFileService.java @@ -2,6 +2,7 @@ package com.ruoyi.cms.service; import com.ruoyi.common.core.domain.entity.File; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.domain.vo.FileReviewVO; import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletRequest; @@ -62,7 +63,7 @@ public interface IFileService /** * 查询风采审核列表（后台管理用） */ - public List selectFileListForReview(File file); + public List selectFileListForReview(File file); /** * 审核风采文件 diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/FileServiceImpl.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/FileServiceImpl.java index 29aa7d8..5bf6b05 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/FileServiceImpl.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/FileServiceImpl.java @@ -9,6 +9,7 @@ import java.util.Arrays; import com.ruoyi.cms.util.StringUtil; import com.ruoyi.common.core.domain.entity.File; +import com.ruoyi.common.core.domain.vo.FileReviewVO; import com.ruoyi.cms.mapper.FileMapper; import com.ruoyi.cms.service.IFileService; import com.ruoyi.common.core.domain.AjaxResult; @@ -174,7 +175,7 @@ public class FileServiceImpl extends ServiceImpl implements IF } @Override - public List selectFileListForReview(File file) { + public List selectFileListForReview(File file) { return fileMapper.selectFileListForReview(file); } diff --git a/ruoyi-bussiness/src/main/resources/mapper/app/FileMapper.xml b/ruoyi-bussiness/src/main/resources/mapper/app/FileMapper.xml index e0f0040..112181f 100644 --- a/ruoyi-bussiness/src/main/resources/mapper/app/FileMapper.xml +++ b/ruoyi-bussiness/src/main/resources/mapper/app/FileMapper.xml @@ -17,6 +17,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + @@ -69,7 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select f.id, f.file_url, f.bussinessid, f.del_flag, f.create_by, f.create_time, f.update_by, f.update_time, f.review_status, f.review_remark, f.review_by, f.review_time, diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/File.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/File.java index bac1cf9..62a1c42 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/File.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/File.java @@ -46,18 +46,4 @@ public class File extends BaseEntity @ApiModelProperty("审核时间") private String reviewTime; - /** --- 以下为 JOIN 查询 transient 字段，非 file 表列 --- */ - - @TableField(exist = false) - @ApiModelProperty("用户名称") - private String userName; - - @TableField(exist = false) - @ApiModelProperty("用户类型（0企业 1求职者 2网格员 3政府人员）") - private String userType; - - @TableField(exist = false) - @ApiModelProperty("用户手机号码") - private String userPhone; - } diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/vo/FileReviewVO.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/vo/FileReviewVO.java new file mode 100644 index 0000000..39b1e0e --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/vo/FileReviewVO.java @@ -0,0 +1,28 @@ +package com.ruoyi.common.core.domain.vo; + +import com.ruoyi.common.core.domain.entity.File; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 风采审核列表 VO —— 扩展 File 实体，携带 JOIN app_user 的用户信息 + * + * @author admin + * @date 2026-07-07 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@ApiModel("风采审核视图对象") +public class FileReviewVO extends File { + + @ApiModelProperty("用户名称") + private String userName; + + @ApiModelProperty("用户类型（0企业 1求职者 2网格员 3政府人员）") + private String userType; + + @ApiModelProperty("用户手机号码") + private String userPhone; +}