From 639ac253f1d3b401ee38e7a0ab5fcde67a1af463 Mon Sep 17 00:00:00 2001 From: yangxinyu Date: Fri, 12 Dec 2025 16:34:08 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E5=9B=9E=E8=B0=83=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=EF=BC=88=E6=9C=AA=E5=AE=8C=E6=88=90=E5=8A=9F=E8=83=BD=EF=BC=8C?= =?UTF-8?q?=E4=BB=85=E4=B8=BA=E7=A9=BA=E5=A3=B3)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/course/api/CourseManageApi.java | 20 +++++++++++-- .../module/course/dto/BPMCallbackDto.java | 30 +++++++++++++++++++ 2 files changed, 48 insertions(+), 2 deletions(-) create mode 100644 servers/boe-server-all/src/main/java/com/xboe/module/course/dto/BPMCallbackDto.java diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseManageApi.java b/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseManageApi.java index 34444e83..ab20dc98 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseManageApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseManageApi.java @@ -694,7 +694,7 @@ public class CourseManageApi extends ApiBaseController{ /** * 25.12.10新增,提交审核到BPM *暂无BPM接口 - * + *非空判断需要加/日志 */ @PostMapping("/bpm-submit") @AutoLog(module = "课程",action = "提交审核到BPM",info = "") @@ -708,7 +708,7 @@ public class CourseManageApi extends ApiBaseController{ String jsonRequestBody = courseManageService.prepareDisableAuditRequest(dto); // TODO: 调用BPM接口 - // BPMResponseDto bpmResponsedto= courseManageService.callBPMInterface(jsonRequestBody); + //BPMResponseDto bpmResponsedto= courseManageService.callBPMInterface(jsonRequestBody); // 构造返回结果 //实际使用中,返回的值从BPM接口返回的JSON中获取 @@ -762,6 +762,7 @@ public class CourseManageApi extends ApiBaseController{ return success(bpmResponsedto); } + } return success(response); } catch (Exception e) { @@ -769,6 +770,21 @@ public class CourseManageApi extends ApiBaseController{ return error("error"); } } + /** + * 25.12.12新增,审核完成的回调接口 + */ + @PostMapping("/audit/callback") + public JsonResponse callbackBPM(@RequestBody BPMCallbackDto dto){ + try { + + + return success(""); + + } catch (Exception e) { + log.error("回调错误",e); + return error("error"); + } + } private String createEmailHtml(String name,String orgId, String orgName,String createBy,String courseName) throws Exception { StringBuffer htmlMsg=new StringBuffer("
"); diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/course/dto/BPMCallbackDto.java b/servers/boe-server-all/src/main/java/com/xboe/module/course/dto/BPMCallbackDto.java new file mode 100644 index 00000000..20f25e24 --- /dev/null +++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/dto/BPMCallbackDto.java @@ -0,0 +1,30 @@ +package com.xboe.module.course.dto; + +import lombok.Data; + +/** + * 25.12.12新增,BPM回调接口入参 + * + */ +@Data +public class BPMCallbackDto { + /** + * 审批流程ID + */ + private String auditId; + /** + * 审核结果,可选值:`success` (通过), `reject` (驳回) + */ + private String auditResult; + /** + * 最终审核意见 + * auditResult为reject时,传最后驳回时的驳回意见 + */ + private String auditComment; + /** + * 最终审核人 + * auditResult为reject时,传最后驳回的用户 + */ + private String lastAuditUser; + +}