通告主认证

ruoyi-admin/src/main/java/com/ruoyi/member/controller/MemberApplyController.java

@@ -76,15 +76,20 @@ public class MemberApplyController extends BaseController {
     }
 
 
-
     /**
-     * 修改通告主认证申请
-     */
+     * 审核通告主信息
+     *
+     * @param memberApply {@link MemberApplyVO}
+     * @return com.ruoyi.common.core.domain.AjaxResult
+     * @author PQZ
+     * @date 11:47 2025/3/18
+     **/
     @PreAuthorize("@ss.hasPermi('member:apply:edit')")
     @Log(title = "通告主认证申请", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody MemberApply memberApply) {
-        return toAjax(memberApplyService.updateById(memberApply));
+    public AjaxResult edit(@RequestBody MemberApplyVO memberApply) {
+        memberApplyService.checkMemberApply(memberApply);
+        return toAjax(true);
     }
 
 }

ruoyi-admin/src/main/java/com/ruoyi/member/service/IMemberApplyService.java

@@ -24,4 +24,13 @@ public interface IMemberApplyService extends IService<MemberApply> {
      * @date 9:53 2025/3/18
      **/
     IPage<MemberApplyVO> queryListPage(MemberApplyVO memberApply, Page<MemberApply> page);
+
+    /**
+     * 审核通告主
+     *
+     * @param memberApply {@link MemberApplyVO}
+     * @author PQZ
+     * @date 11:50 2025/3/18
+     **/
+    void checkMemberApply(MemberApplyVO memberApply);
 }

ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberApplyServiceImpl.java

@@ -1,10 +1,12 @@
 package com.ruoyi.member.service.impl;
 
+import java.util.Date;
 import java.util.List;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.member.vo.MemberApplyVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -39,4 +41,23 @@ public class MemberApplyServiceImpl extends ServiceImpl<MemberApplyMapper,Member
     public IPage<MemberApplyVO> queryListPage(MemberApplyVO memberApply, Page<MemberApply> page) {
         return memberApplyMapper.queryListPage(memberApply,page);
     }
+
+    /**
+     * 审核通告主
+     *
+     * @param memberApply {@link MemberApplyVO}
+     * @author PQZ
+     * @date 11:50 2025/3/18
+     **/
+    @Override
+    public void checkMemberApply(MemberApplyVO memberApply) {
+        //获取当前登录用户id
+        Long userId = SecurityUtils.getUserId();
+        //当前时间
+        Date nowDate = new Date();
+        memberApply.setApprovalUserId(userId);
+        memberApply.setApprovalTime(nowDate);
+        updateById(memberApply);
+        //// TODO: 2025/3/18 审核成功之后更新会员表状态
+    }
 }

ruoyi-admin/src/main/resources/mapper/member/MemberApplyMapper.xml

@@ -32,9 +32,11 @@
             del_flag=0
             <if test="entity.nickname != null  and entity.nickname != ''"> and nickname like concat('%', #{entity.nickname}, '%')</if>
             <if test="entity.identityType != null  and entity.identityType != ''"> and identity_type = #{entity.identityType}</if>
-            <if test="entity.approvalStatus != null  and entity.approvalStatus != ''"> and approval_status = #{entity.approvalStatus}</if>
+
             <if test="entity.approvalTime != null "> and approval_time = #{entity.approvalTime}</if>
             <if test="entity.startTime != null and entity.endTime != null"> and create_time between #{entity.startTime} and #{entity.endTime}</if>
+            <if test="entity.approvalStatus == 10"> and approval_status != 0</if>
+            <if test="entity.approvalStatus != null  and entity.approvalStatus != '' and entity.approvalStatus != 10"> and approval_status = #{entity.approvalStatus}</if>
         </where>
     </select>
 

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/DlBaseEntity.java

@@ -4,15 +4,11 @@ import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Data;
 import org.apache.ibatis.type.JdbcType;
 
 import java.io.Serializable;
 import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
 
 /**
  * Entity基类--点亮