From 20e0cfe035bf3f5f0d3271889693b7742f7108de Mon Sep 17 00:00:00 2001
From: maxiangong <298222784@qq.com>
Date: Thu, 28 May 2026 13:33:19 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=A4=96=E5=8D=8F=E7=BB=93=E7=AE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/springblade/desk/oem/pojo/vo/PriceSheetVO.java    | 6 +++---
 .../desk/oem/service/impl/OemStatementServiceImpl.java    | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/oem/pojo/vo/PriceSheetVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/oem/pojo/vo/PriceSheetVO.java
index 1a5aba6e9..b95e0232f 100644
--- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/oem/pojo/vo/PriceSheetVO.java
+++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/oem/pojo/vo/PriceSheetVO.java
@@ -52,10 +52,10 @@ public class PriceSheetVO {
     private String stairflag;
 
     /**
-     * 阶梯价标记key
+     * 阶梯价标记value
      */
-    @Schema(description = "阶梯价标记key")
-    private String stairflagkey;
+    @Schema(description = "阶梯价标记value")
+    private String stairflagvalue;
 
     /**
      * 阶梯上限
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/oem/service/impl/OemStatementServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/oem/service/impl/OemStatementServiceImpl.java
index 3630b02d0..1cad64f28 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/oem/service/impl/OemStatementServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/oem/service/impl/OemStatementServiceImpl.java
@@ -2067,11 +2067,11 @@ public class OemStatementServiceImpl extends BaseServiceImpl<OemStatementMapper,
     private boolean ruleTieredPricing(StatementVO statementVO, PriceSheetVO priceSheet) {
         //匹配阶梯价
         // 非阶梯价直接返回
-        if ("1".equals(priceSheet.getStairflagkey())) {
+        if ("1".equals(priceSheet.getStairflag())) {
             return true;
         }
         // 单批阶梯价（按件数）
-        else if ("4".equals(priceSheet.getStairflagkey())) {
+        else if ("4".equals(priceSheet.getStairflag())) {
             try {
                 double makeQty = statementVO.getMakeQty().doubleValue();
                 double lower = Double.parseDouble(priceSheet.getLower());
@@ -2082,7 +2082,7 @@ public class OemStatementServiceImpl extends BaseServiceImpl<OemStatementMapper,
             }
         }
         // 单批阶梯价（按单件面积）
-        else if ("5".equals(priceSheet.getStairflagkey())) {
+        else if ("5".equals(priceSheet.getStairflag())) {
             try {
                 double ypArea = statementVO.getYpArea().doubleValue();
                 double lower = Double.parseDouble(priceSheet.getLower());
@@ -2093,7 +2093,7 @@ public class OemStatementServiceImpl extends BaseServiceImpl<OemStatementMapper,
             }
         }
         // 单批阶梯价（按单批面积）
-        else if ("6".equals(priceSheet.getStairflagkey())) {
+        else if ("6".equals(priceSheet.getStairflag())) {
             try {
                 double totalArea = statementVO.getTotalArea().doubleValue();
                 double lower = Double.parseDouble(priceSheet.getLower());

From 0f4e3876b24838bd3155af65f5ab3bc0f4876794 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E4=B9=BE=E7=BF=94?= <z982093659@qq.com>
Date: Thu, 28 May 2026 13:47:04 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=AE=A1=E6=89=B9=E7=BB=93=E6=9E=9C?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../process/service/impl/FmProjectApplicationServiceImpl.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/process/service/impl/FmProjectApplicationServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/process/service/impl/FmProjectApplicationServiceImpl.java
index d43a073e0..e29089c9e 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/process/service/impl/FmProjectApplicationServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/process/service/impl/FmProjectApplicationServiceImpl.java
@@ -253,7 +253,7 @@ public class FmProjectApplicationServiceImpl extends BaseServiceImpl<FmProjectAp
                 Objects.isNull(fmProjectApplication.getApprovalStatus())) {
             throw new RuntimeException("参数错误");
         }
-        if (!fmProjectApplication.getApprovalStatus().equals(FmProjectApplicationEntity.ApprovalStatusEnum.STATUS_REJECTED.getCode()) ||
+        if (!fmProjectApplication.getApprovalStatus().equals(FmProjectApplicationEntity.ApprovalStatusEnum.STATUS_REJECTED.getCode()) &&
                 !fmProjectApplication.getApprovalStatus().equals(FmProjectApplicationEntity.ApprovalStatusEnum.STATUS_IN_PROGRESS.getCode())) {
             throw new RuntimeException("审批结果参数错误");
         }

From 1e49b7634bbd66d187668c1e94264ce8503079fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E4=B9=BE=E7=BF=94?= <z982093659@qq.com>
Date: Thu, 28 May 2026 15:07:24 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=BA=8F=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../process/service/impl/FmProjectMilestoneServiceImpl.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/process/service/impl/FmProjectMilestoneServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/process/service/impl/FmProjectMilestoneServiceImpl.java
index 1e39472fb..4e5277516 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/process/service/impl/FmProjectMilestoneServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/process/service/impl/FmProjectMilestoneServiceImpl.java
@@ -350,9 +350,9 @@ public class FmProjectMilestoneServiceImpl extends BaseServiceImpl<FmProjectMile
         if (Objects.isNull(fmProjectMilestone.getExecuteResult())) {
             throw new RuntimeException("请选择执行结果");
         }
-        if (StrUtil.isEmpty(fmProjectMilestone.getPaIndex())) {
-            throw new RuntimeException("请填写序号");
-        }
+        //if (StrUtil.isEmpty(fmProjectMilestone.getPaIndex())) {
+        //    throw new RuntimeException("请填写序号");
+        //}
         FmProjectApplicationEntity fmProjectApplication = fmProjectMilestone.getFmProjectApplication();
         if (BeanUtil.isEmpty(fmProjectApplication) || Objects.isNull(fmProjectApplication.getId())) {
             throw new RuntimeException("参数异常");