From 8bc6a1ab901245b3397ed90893e328ef61f596cc Mon Sep 17 00:00:00 2001
From: maxiangong <298222784@qq.com>
Date: Tue, 9 Jun 2026 17:17:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=96=E5=8D=8F=E7=BB=93=E7=AE=97-=E6=88=91?=
 =?UTF-8?q?=E7=9A=84=E5=BE=85=E5=8A=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/MesApprovalRecordServiceImpl.java   | 12 ++++++------
 .../impl/OemStatementApprovalServiceImpl.java        |  2 ++
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/common/service/impl/MesApprovalRecordServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/common/service/impl/MesApprovalRecordServiceImpl.java
index 0ac3cb8e1..304a3f451 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/common/service/impl/MesApprovalRecordServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/common/service/impl/MesApprovalRecordServiceImpl.java
@@ -145,12 +145,12 @@ public class MesApprovalRecordServiceImpl extends BaseServiceImpl<MesApprovalRec
     @Override
     public void updateApproval(Long bizId, String bizType, Long approvalUser, Date approvalTime) {
         MesApprovalRecordEntity entity = getByBiz(bizId, bizType);
-        if (entity == null || entity.getStatus() != 1) {
+        if (entity == null || entity.getStatus() != ApprovalStatusConstant.WAITING) {
             return;
         }
         MesApprovalRecordEntity upd = new MesApprovalRecordEntity();
         upd.setId(entity.getId());
-        upd.setStatus(2);
+        upd.setStatus(ApprovalStatusConstant.PASS);
         this.updateById(upd);
 
         MesApprovalFlowEntity flowQuery = new MesApprovalFlowEntity();
@@ -173,7 +173,7 @@ public class MesApprovalRecordServiceImpl extends BaseServiceImpl<MesApprovalRec
             if (nextFlow != null) {
                 MesApprovalRecordEntity save = new MesApprovalRecordEntity();
                 BeanUtils.copyProperties(entity, save);
-                save.setStatus(1);
+                save.setStatus(ApprovalStatusConstant.WAITING);
                 save.setCreateUser(approvalUser);
                 save.setCreateTime(approvalTime);
                 save.setId(null);
@@ -195,12 +195,12 @@ public class MesApprovalRecordServiceImpl extends BaseServiceImpl<MesApprovalRec
     @Override
     public void removeApproval(Long bizId, String bizType) {
         MesApprovalRecordEntity entity = getByBiz(bizId, bizType);
-        if (entity == null || entity.getStatus() != 1) {
+        if (entity == null || entity.getStatus() != ApprovalStatusConstant.WAITING) {
             return;
         }
         MesApprovalRecordEntity upd = new MesApprovalRecordEntity();
         upd.setId(entity.getId());
-        upd.setStatus(2);
+        upd.setStatus(ApprovalStatusConstant.REJECT);
         this.updateById(upd);
         MesApprovalFlowEntity flowQuery = new MesApprovalFlowEntity();
         flowQuery.setBizId(bizId);
@@ -214,6 +214,6 @@ public class MesApprovalRecordServiceImpl extends BaseServiceImpl<MesApprovalRec
         return this.getOne(new LambdaQueryWrapper<MesApprovalRecordEntity>()
                 .eq(MesApprovalRecordEntity::getBizType, bizType)
                 .eq(MesApprovalRecordEntity::getBizId, bizId)
-                .eq(MesApprovalRecordEntity::getStatus, 1));
+                .eq(MesApprovalRecordEntity::getStatus, ApprovalStatusConstant.WAITING));
     }
 }
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/common/service/impl/OemStatementApprovalServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/common/service/impl/OemStatementApprovalServiceImpl.java
index 4aa684e6e..d5910a02b 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/common/service/impl/OemStatementApprovalServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/common/service/impl/OemStatementApprovalServiceImpl.java
@@ -1,6 +1,7 @@
 package org.springblade.desk.common.service.impl;
 
 import jakarta.annotation.Resource;
+import org.springblade.desk.common.constant.ApprovalStatusConstant;
 import org.springblade.desk.common.enums.MesApprovalRecordBizTypeEnum;
 import org.springblade.desk.common.pojo.entity.MesApprovalFlowEntity;
 import org.springblade.desk.common.pojo.entity.MesApprovalRecordEntity;
@@ -53,6 +54,7 @@ public class OemStatementApprovalServiceImpl implements ApprovalRecordDetailStra
         approvalRecord.setBizId(bizId);
         approvalRecord.setBizType(getBizType());
         approvalRecord.setContent(getBizType());
+        approvalRecord.setStatus(ApprovalStatusConstant.WAITING);
         mesApprovalRecordService.save(approvalRecord);
         // 创建审批流程
         OemSettlementApprovalEntity oemSettlementApproval = oemSettlementApprovalService.getById(bizId);