增加入驻兽医已审核通过列表接口

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<VetPersonalInfo> list = vetPersonalInfoService.selectVetPersonalInfoList(vetPersonalInfo);
+        return getDataTable(list);
+    }
+
     /**
      * 获取兽医完整审核信息（包含证书详情）
      */

chenhai-system/src/main/java/com/chenhai/muhu/domain/MuhuFeedback.java

@@ -75,6 +75,9 @@ public class MuhuFeedback extends BaseEntity
     /** 用户昵称 */
     private String nickName;
 
+    /** 用户头像 */
+    private String avatar;
+
     public void setId(Long id)
     {
         this.id = id;
@@ -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();
     }
 }

chenhai-system/src/main/java/com/chenhai/muhu/service/impl/MuhuFeedbackServiceImpl.java

@@ -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("用户未登录，无法提交反馈");

chenhai-system/src/main/resources/mapper/muhu/MuhuFeedbackMapper.xml

@@ -19,6 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="createdAt"    column="created_at"    />
         <result property="updatedAt"    column="updated_at"    />
         <result property="nickName"    column="nick_name"    />
+        <result property="avatar"      column="avatar"/>
     </resultMap>
 
     <!-- 修改为关联查询 -->
@@ -37,7 +38,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         f.images,
         f.created_at,
         f.updated_at,
-        u.nick_name  <!-- 从sys_user表关联查询昵称 -->
+        u.nick_name,  <!-- 从sys_user表关联查询昵称 -->
+        u.avatar
         from muhu_feedback f
         left join sys_user u on f.user_id = u.user_id
     </sql>
@@ -58,6 +60,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createdAt != null "> and created_at = #{createdAt}</if>
             <if test="updatedAt != null "> and updated_at = #{updatedAt}</if>
             <if test="nickName != null  and nickName != ''"> and nick_name like concat('%', #{nickName}, '%')</if>
+            <if test="avatar != null "> and avatar = #{avatar}</if>
         </where>
     </select>
 

chenhai-system/src/main/resources/mapper/vet/VetPersonalInfoMapper.xml

@@ -82,7 +82,11 @@
             <if test="iphone != null  and iphone != ''"> and v.iphone like concat('%', #{iphone}, '%')</if>
             <if test="expertType != null  and expertType != ''"> and v.expert_type = #{expertType}</if>
             <if test="email != null  and email != ''"> and v.email = #{email}</if>
-
+            <if test="specialty != null  and specialty != ''"> and v.specialty like concat('%', #{specialty}, '%')</if>
+            <!-- 添加审核状态条件 -->
+            <if test="auditStatus != null and auditStatus != ''">
+                and v.audit_status = #{auditStatus}
+            </if>
 
             <!-- 用户表条件 -->
             <if test="user != null">

chenhai-ui/src/views/system/vet/aduit/index.vue

@@ -107,7 +107,7 @@
         </template>
       </el-table-column>
       <el-table-column label="身份证号" align="center" prop="idCard" width="200px"/>
-      <!--      <el-table-column label="擅长领域" align="center" prop="specialty" width="300px" :show-overflow-tooltip="true"/>-->
+      <el-table-column label="擅长领域" align="center" prop="specialty" width="300px" :show-overflow-tooltip="true"/>
       <!--      <el-table-column label="工作经验" align="center" prop="workExperience" width="100px"/>-->
       <el-table-column label="职称" align="center" prop="title" width="200px"/>
       <el-table-column label="联系电话" align="center" prop="phone" width="200px"/>