From e0f8279e826a8db35d01893741cd66e4c7cb4a0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=99=93=E8=BF=AA?= <2596750866@qq.com> Date: Fri, 20 Dec 2024 09:36:39 +0800 Subject: [PATCH] =?UTF-8?q?[feat]=20=E5=93=81=E8=B4=A8=E7=AE=A1=E7=90=86?= =?UTF-8?q?=20=E5=88=B6=E7=A8=8B=E6=A3=80=E9=AA=8C=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=88=B6=E7=A8=8B=E6=A3=80=E9=AA=8C=E5=90=AF=E5=8A=A8=E6=B5=81?= =?UTF-8?q?=E7=A8=8Bservice=E6=96=B9=E6=B3=95=E5=92=8C=E5=AE=A1=E6=89=B9?= =?UTF-8?q?=E5=AE=8C=E6=88=90controller=E6=8E=A5=E5=8F=A3=E4=B8=AD?= =?UTF-8?q?=E5=AE=A1=E6=89=B9=E6=A8=A1=E5=9E=8B=E5=90=8D=E7=A7=B0=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/QualityManufacturingCheckoutController.java | 2 +- .../service/impl/QualityManufacturingCheckoutServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/quality/controller/QualityManufacturingCheckoutController.java b/ruoyi-admin/src/main/java/com/ruoyi/quality/controller/QualityManufacturingCheckoutController.java index b5c619b8..e40e78ce 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/quality/controller/QualityManufacturingCheckoutController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/quality/controller/QualityManufacturingCheckoutController.java @@ -307,7 +307,7 @@ public class QualityManufacturingCheckoutController extends BaseController String instanceId = manufacturingCheckoutVO.getInstanceId(); //获取实例类型 String instanceType = manufacturingCheckoutVO.getInstanceType(); - boolean approvedFlag = processService.complete(taskId, instanceId, manufacturingCheckoutVO.getApplyTitle(), manufacturingCheckoutVO.getManufacturingCheckoutCode(), "qualityOrderReport", new HashMap(), request); + boolean approvedFlag = processService.complete(taskId, instanceId, manufacturingCheckoutVO.getApplyTitle(), manufacturingCheckoutVO.getManufacturingCheckoutCode(), "manufacturingCheckout", new HashMap(), request); QualityManufacturingCheckoutVO tempCheckOutVO = qualityManufacturingCheckoutService.selectQualityManufacturingCheckoutById(manufacturingCheckoutVO.getManufacturingCheckoutId()); // 如果任务已结束更新业务表状态 boolean processIsFinish = processService.judgeProcessIsFinish(instanceId); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/quality/service/impl/QualityManufacturingCheckoutServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/quality/service/impl/QualityManufacturingCheckoutServiceImpl.java index a39f3345..0805c41a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/quality/service/impl/QualityManufacturingCheckoutServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/quality/service/impl/QualityManufacturingCheckoutServiceImpl.java @@ -611,7 +611,7 @@ public class QualityManufacturingCheckoutServiceImpl implements IQualityManufact private ProcessInstance startProcessInstance(String applyTitle, String instanceType, QualityManufacturingCheckoutVO manufacturingCheckoutVO, SysUser user) { Long reportId = manufacturingCheckoutVO.getManufacturingCheckoutId(); String businessKey = reportId.toString(); // 实体类 ID,作为流程的业务 key - String key = "qualityOrderReport"; + String key = "manufacturingCheckout"; Map variables = new HashMap<>(); // 构造authority传参 buildAuthority(user, variables);