From 3f105a804db69eeb3a4340b113932cc709fc4525 Mon Sep 17 00:00:00 2001 From: maotiantian Date: Thu, 12 Mar 2026 16:55:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=85=A5=E9=A9=BB=E5=85=BD?= =?UTF-8?q?=E5=8C=BB=E5=B7=B2=E5=AE=A1=E6=A0=B8=E9=80=9A=E8=BF=87=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/SysVetAuditController.java | 19 +++++- .../com/chenhai/muhu/domain/MuhuFeedback.java | 68 +++++++++++-------- .../service/impl/MuhuFeedbackServiceImpl.java | 17 ++--- .../mapper/muhu/MuhuFeedbackMapper.xml | 15 ++-- .../mapper/vet/VetPersonalInfoMapper.xml | 8 ++- .../src/views/system/vet/aduit/index.vue | 2 +- 6 files changed, 83 insertions(+), 46 deletions(-) diff --git a/chenhai-admin/src/main/java/com/chenhai/web/controller/system/SysVetAuditController.java b/chenhai-admin/src/main/java/com/chenhai/web/controller/system/SysVetAuditController.java index 957d39e..fd04410 100644 --- a/chenhai-admin/src/main/java/com/chenhai/web/controller/system/SysVetAuditController.java +++ b/chenhai-admin/src/main/java/com/chenhai/web/controller/system/SysVetAuditController.java @@ -39,7 +39,7 @@ public class SysVetAuditController extends BaseController /** * 查询兽医信息列表（审核管理专用） */ - @PreAuthorize("@ss.hasPermi('sys:vetAudit:list')") + @PreAuthorize("@ss.hasPermi('sys:vetAudit:list') or @ss.hasRole('muhu') or @ss.hasRole('vet')") @GetMapping("/list") public TableDataInfo list(VetPersonalInfo vetPersonalInfo) { @@ -48,6 +48,21 @@ public class SysVetAuditController extends BaseController return getDataTable(list); } + /** + * 查询审核通过的兽医列表 + * 用于前台展示已认证兽医 + */ + @PreAuthorize("@ss.hasRole('muhu') or @ss.hasRole('vet')") + @GetMapping("/approved/list") + public TableDataInfo approvedList(VetPersonalInfo vetPersonalInfo) + { + startPage(); + // 设置审核状态为已通过（假设1表示审核通过，请根据实际状态码调整） + vetPersonalInfo.setAuditStatus("1"); + List list = vetPersonalInfoService.selectVetPersonalInfoList(vetPersonalInfo); + return getDataTable(list); + } + /** * 获取兽医完整审核信息（包含证书详情） */ @@ -129,4 +144,4 @@ public class SysVetAuditController extends BaseController vetQualification.setAuditTime(new Date()); return toAjax(vetQualificationService.updateVetQualification(vetQualification)); } -} \ No newline at end of file +} diff --git a/chenhai-system/src/main/java/com/chenhai/muhu/domain/MuhuFeedback.java b/chenhai-system/src/main/java/com/chenhai/muhu/domain/MuhuFeedback.java index 1413d53..f1ce026 100644 --- a/chenhai-system/src/main/java/com/chenhai/muhu/domain/MuhuFeedback.java +++ b/chenhai-system/src/main/java/com/chenhai/muhu/domain/MuhuFeedback.java @@ -11,7 +11,7 @@ import com.chenhai.common.core.domain.BaseEntity; /** * 反馈建议对象 muhu_feedback - * + * * @author ruoyi * @date 2026-02-10 */ @@ -75,132 +75,135 @@ public class MuhuFeedback extends BaseEntity /** 用户昵称 */ private String nickName; - public void setId(Long id) + /** 用户头像 */ + private String avatar; + + public void setId(Long id) { this.id = id; } - public Long getId() + public Long getId() { return id; } - public void setUserId(Long userId) + public void setUserId(Long userId) { this.userId = userId; } - public Long getUserId() + public Long getUserId() { return userId; } - public void setType(String type) + public void setType(String type) { this.type = type; } - public String getType() + public String getType() { return type; } - public void setTitle(String title) + public void setTitle(String title) { this.title = title; } - public String getTitle() + public String getTitle() { return title; } - public void setContent(String content) + public void setContent(String content) { this.content = content; } - public String getContent() + public String getContent() { return content; } - public void setContactInfo(String contactInfo) + public void setContactInfo(String contactInfo) { this.contactInfo = contactInfo; } - public String getContactInfo() + public String getContactInfo() { return contactInfo; } - public void setStatus(String status) + public void setStatus(String status) { this.status = status; } - public String getStatus() + public String getStatus() { return status; } - public void setPriority(String priority) + public void setPriority(String priority) { this.priority = priority; } - public String getPriority() + public String getPriority() { return priority; } - public void setPlatform(String platform) + public void setPlatform(String platform) { this.platform = platform; } - public String getPlatform() + public String getPlatform() { return platform; } - public void setVersion(String version) + public void setVersion(String version) { this.version = version; } - public String getVersion() + public String getVersion() { return version; } - public void setImages(String images) + public void setImages(String images) { this.images = images; } - public String getImages() + public String getImages() { return images; } - public void setCreatedAt(Date createdAt) + public void setCreatedAt(Date createdAt) { this.createdAt = createdAt; } - public Date getCreatedAt() + public Date getCreatedAt() { return createdAt; } - public void setUpdatedAt(Date updatedAt) + public void setUpdatedAt(Date updatedAt) { this.updatedAt = updatedAt; } - public Date getUpdatedAt() + public Date getUpdatedAt() { return updatedAt; } @@ -215,6 +218,16 @@ public class MuhuFeedback extends BaseEntity return nickName; } + public void setAvatar(String avatar) + { + this.avatar = avatar; + } + + public String getAvatar() + { + return avatar; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) @@ -232,6 +245,7 @@ public class MuhuFeedback extends BaseEntity .append("createdAt", getCreatedAt()) .append("updatedAt", getUpdatedAt()) .append("nickName", getNickName()) + .append("avatar",getAvatar()) .toString(); } } diff --git a/chenhai-system/src/main/java/com/chenhai/muhu/service/impl/MuhuFeedbackServiceImpl.java b/chenhai-system/src/main/java/com/chenhai/muhu/service/impl/MuhuFeedbackServiceImpl.java index e79e8d3..338de56 100644 --- a/chenhai-system/src/main/java/com/chenhai/muhu/service/impl/MuhuFeedbackServiceImpl.java +++ b/chenhai-system/src/main/java/com/chenhai/muhu/service/impl/MuhuFeedbackServiceImpl.java @@ -14,19 +14,19 @@ import com.chenhai.muhu.service.IMuhuFeedbackService; /** * 反馈建议Service业务层处理 - * + * * @author ruoyi * @date 2026-02-10 */ @Service -public class MuhuFeedbackServiceImpl implements IMuhuFeedbackService +public class MuhuFeedbackServiceImpl implements IMuhuFeedbackService { @Autowired private MuhuFeedbackMapper muhuFeedbackMapper; /** * 查询反馈建议 - * + * * @param id 反馈建议主键 * @return 反馈建议 */ @@ -38,7 +38,7 @@ public class MuhuFeedbackServiceImpl implements IMuhuFeedbackService /** * 查询反馈建议列表 - * + * * @param muhuFeedback 反馈建议 * @return 反馈建议 */ @@ -50,7 +50,7 @@ public class MuhuFeedbackServiceImpl implements IMuhuFeedbackService /** * 新增反馈建议 - * + * * @param muhuFeedback 反馈建议 * @return 结果 */ @@ -65,6 +65,7 @@ public class MuhuFeedbackServiceImpl implements IMuhuFeedbackService // 自动设置用户ID和昵称 muhuFeedback.setUserId(user.getUserId()); muhuFeedback.setNickName(user.getNickName()); + muhuFeedback.setAvatar(user.getAvatar()); } else { // 如果没有登录用户，可以根据需要设置默认值或抛出异常 throw new RuntimeException("用户未登录，无法提交反馈"); @@ -81,7 +82,7 @@ public class MuhuFeedbackServiceImpl implements IMuhuFeedbackService /** * 修改反馈建议 - * + * * @param muhuFeedback 反馈建议 * @return 结果 */ @@ -93,7 +94,7 @@ public class MuhuFeedbackServiceImpl implements IMuhuFeedbackService /** * 批量删除反馈建议 - * + * * @param ids 需要删除的反馈建议主键 * @return 结果 */ @@ -105,7 +106,7 @@ public class MuhuFeedbackServiceImpl implements IMuhuFeedbackService /** * 删除反馈建议信息 - * + * * @param id 反馈建议主键 * @return 结果 */ diff --git a/chenhai-system/src/main/resources/mapper/muhu/MuhuFeedbackMapper.xml b/chenhai-system/src/main/resources/mapper/muhu/MuhuFeedbackMapper.xml index 569d6a5..548b236 100644 --- a/chenhai-system/src/main/resources/mapper/muhu/MuhuFeedbackMapper.xml +++ b/chenhai-system/src/main/resources/mapper/muhu/MuhuFeedbackMapper.xml @@ -3,7 +3,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -19,6 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -37,14 +38,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" f.images, f.created_at, f.updated_at, - u.nick_name + u.nick_name, + u.avatar from muhu_feedback f left join sys_user u on f.user_id = u.user_id - +