feat(审批流程): 添加审批人字段以记录审批人信息

在审批流程中，新增了审批人字段`audit_name`，用于记录审批人的姓名。同时，在审批通过和驳回的逻辑中，增加了根据用户ID获取审批人姓名的功能，确保审批人信息能够正确记录和展示。

agileboot-domain/src/main/java/com/agileboot/domain/shop/approval/ReturnApprovalApplicationService.java

@@ -1,6 +1,7 @@
 package com.agileboot.domain.shop.approval;
 
 import com.agileboot.common.constant.PayApiConstants;
+import com.agileboot.common.constant.WeixinConstants;
 import com.agileboot.common.core.page.PageDTO;
 import com.agileboot.domain.cabinet.cell.model.CabinetCellModel;
 import com.agileboot.domain.cabinet.cell.model.CabinetCellModelFactory;
@@ -11,6 +12,7 @@ import com.agileboot.domain.qywx.api.QywxApiUtil;
 import com.agileboot.domain.qywx.api.response.NewsArticle;
 import com.agileboot.domain.qywx.authCorpInfo.AuthCorpInfoApplicationService;
 import com.agileboot.domain.qywx.authCorpInfo.db.QyAuthCorpInfoEntity;
+import com.agileboot.domain.qywx.user.db.QyUserEntity;
 import com.agileboot.domain.qywx.user.db.QyUserService;
 import com.agileboot.domain.shop.approval.command.AddReturnApprovalCommand;
 import com.agileboot.domain.shop.approval.command.UpdateReturnApprovalCommand;
@@ -42,6 +44,7 @@ import java.util.stream.Collectors;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 /**
@@ -154,6 +157,14 @@ public class ReturnApprovalApplicationService {
             }
         }
 
+        // 审批人信息
+        if (StringUtils.isNotBlank(command.getUserid())) {
+            QyUserEntity qyUserEntity = qyUserService.getUserByUserId(command.getUserid(), WeixinConstants.corpid);
+            if (null != qyUserEntity) {
+                model.setAuditName(qyUserEntity.getName());
+            }
+        }
+
         // 更新审批状态为通过
         model.validateApprovalStatus();
         model.setAuditImages(command.getAuditImages());
@@ -247,7 +258,14 @@ public class ReturnApprovalApplicationService {
     public void rejectApproval(UpdateReturnApprovalCommand command) {
         ReturnApprovalModel model = modelFactory.loadById(command.getApprovalId());
         model.validateApprovalStatus();
-        
+
+        // 审批人信息
+        if (StringUtils.isNotBlank(command.getUserid())) {
+            QyUserEntity qyUserEntity = qyUserService.getUserByUserId(command.getUserid(), WeixinConstants.corpid);
+            if (null != qyUserEntity) {
+                model.setAuditName(qyUserEntity.getName());
+            }
+        }
         // 更新审批状态为驳回
         model.setStatus(3);
         model.setAuditImages(command.getAuditImages());

agileboot-domain/src/main/java/com/agileboot/domain/shop/approval/command/UpdateReturnApprovalCommand.java

@@ -13,4 +13,5 @@ public class UpdateReturnApprovalCommand extends AddReturnApprovalCommand {
     @PositiveOrZero
     private Long approvalId;
 
+    private String userid;
 }

agileboot-domain/src/main/java/com/agileboot/domain/shop/approval/db/ReturnApprovalEntity.java

@@ -72,6 +72,10 @@ public class ReturnApprovalEntity extends BaseEntity<ReturnApprovalEntity> {
     @TableField("audit_remark")
     private String auditRemark;
 
+    @ApiModelProperty("审批人")
+    @TableField("audit_name")
+    private String auditName;
+
     @ApiModelProperty("审批状态(1待审核 2已通过 3已驳回)")
     @TableField("`status`")
     private Integer status;

agileboot-domain/src/main/java/com/agileboot/domain/shop/approval/dto/ReturnApprovalDTO.java

@@ -65,6 +65,9 @@ public class ReturnApprovalDTO {
     @ExcelColumn(name = "审核说明")
     private String auditRemark;
 
+    @ExcelColumn(name = "审批人")
+    private String auditName;
+
     @ExcelColumn(name = "审批状态(1待审核 2已通过 3已驳回)")
     private Integer status;
 

sql/20250328_return_approval.sql

@@ -11,6 +11,7 @@ CREATE TABLE `return_approval` (
   `audit_images` VARCHAR(2048) NULL COMMENT '审核图片路径数组',
   `return_remark` VARCHAR(1024) NULL COMMENT '归还说明',
   `audit_remark` VARCHAR(1024) NULL COMMENT '审核说明',
+  `audit_name` varchar(30) DEFAULT NULL COMMENT '审批人',
   `status` TINYINT NOT NULL DEFAULT 1 COMMENT '审批状态(1待审核 2已通过 3已驳回)',
   `creator_id` BIGINT NOT NULL DEFAULT 0 COMMENT '创建者ID',
   `create_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',