From e8fd53aa4496307d00a2818dbaab3d489ad5902d Mon Sep 17 00:00:00 2001 From: "zangch@mesnac.com" Date: Wed, 12 Nov 2025 14:26:47 +0800 Subject: [PATCH] =?UTF-8?q?refactor(erp):=20=E8=B0=83=E6=95=B4=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E8=AE=A1=E5=88=92=E9=98=B6=E6=AE=B5=E6=8E=92=E5=BA=8F?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将 ErpProjectPlanStage 实体类中的 sortOrder 字段类型从 Long 改为 Integer - 同步修改 Bo 和 Vo 类中对应的 sortOrder 字段类型 - 调整代码顺序，确保业务逻辑清晰执行 --- .../java/org/dromara/oa/erp/domain/ErpProjectPlanStage.java | 2 +- .../org/dromara/oa/erp/domain/bo/ErpProjectPlanStageBo.java | 2 +- .../org/dromara/oa/erp/domain/vo/ErpProjectPlanStageVo.java | 2 +- .../dromara/oa/erp/service/impl/ErpProjectPlanServiceImpl.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpProjectPlanStage.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpProjectPlanStage.java index 2a89b4a1..eec21538 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpProjectPlanStage.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpProjectPlanStage.java @@ -107,7 +107,7 @@ public class ErpProjectPlanStage extends TenantEntity { /** * 排序号 */ - private Long sortOrder; + private Integer sortOrder; /** * 备注 diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpProjectPlanStageBo.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpProjectPlanStageBo.java index 687f4c7f..5dadcb76 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpProjectPlanStageBo.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpProjectPlanStageBo.java @@ -106,7 +106,7 @@ public class ErpProjectPlanStageBo extends BaseEntity { /** * 排序号 */ - private Long sortOrder; + private Integer sortOrder; /** * 备注 diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpProjectPlanStageVo.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpProjectPlanStageVo.java index 8c915889..6230e098 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpProjectPlanStageVo.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpProjectPlanStageVo.java @@ -132,7 +132,7 @@ public class ErpProjectPlanStageVo implements Serializable { * 排序号 */ @ExcelProperty(value = "排序号") - private Long sortOrder; + private Integer sortOrder; /** * 备注 diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectPlanServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectPlanServiceImpl.java index 892c87d3..c7c2c4d5 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectPlanServiceImpl.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectPlanServiceImpl.java @@ -283,12 +283,12 @@ public class ErpProjectPlanServiceImpl implements IErpProjectPlanService { if(isValid){ //TODO 做一些业务上的校验,判断是否需要校验 } - List businessIds = ids.stream().toList(); // 先删除子表 planStageMapper.delete(Wrappers.lambdaQuery() .in(ErpProjectPlanStage::getProjectPlanId, ids)); baseMapper.deleteByIds(ids); //删除工作流 + List businessIds = ids.stream().toList(); return remoteWorkflowService.deleteInstance(businessIds); }