From c864fec5f798a1aabcde877469886dd0dc90d092 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 02 Jan 2023 13:54:18 +0800
Subject: [PATCH] 申请表getAll接口可以根据通行证状态查询
---
src/main/java/org/springblade/modules/applicationDelay/controller/ApplicationDelayController.java | 37 +++++++++++++++++++++++++++++++++++++
1 files changed, 37 insertions(+), 0 deletions(-)
diff --git a/src/main/java/org/springblade/modules/applicationDelay/controller/ApplicationDelayController.java b/src/main/java/org/springblade/modules/applicationDelay/controller/ApplicationDelayController.java
index f9a2b5f..e2d1bdb 100644
--- a/src/main/java/org/springblade/modules/applicationDelay/controller/ApplicationDelayController.java
+++ b/src/main/java/org/springblade/modules/applicationDelay/controller/ApplicationDelayController.java
@@ -23,11 +23,16 @@
import lombok.AllArgsConstructor;
import javax.validation.Valid;
+import org.springblade.common.cache.UserCache;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
+import org.springblade.flow.core.entity.BladeFlow;
+import org.springblade.flow.demo.leave.entity.ProcessLeave;
+import org.springblade.modules.application.entity.ApplicationEntity;
+import org.springblade.modules.application.vo.ApplicationVO;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.modules.applicationDelay.entity.ApplicationDelayEntity;
@@ -121,6 +126,38 @@
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
return R.status(applicationDelayService.deleteLogic(Func.toLongList(ids)));
}
+ //=======================工作流===================================
+ /**
+ * 开始任务
+ *
+ * @param applicationDelayEntity 延期信息
+ */
+ @PostMapping("start-process")
+ public R startProcess(@RequestBody ApplicationDelayVO applicationDelayEntity) {
+ return R.status(applicationDelayService.startProcess(applicationDelayEntity));
+ }
+ /**
+ * 完成任务
+ *
+ * @param flow 延期信息
+ */
+ @PostMapping("complete-task")
+ @ApiOperationSupport(order = 7)
+ @ApiOperation(value = "完成任务", notes = "传入流程信息")
+ public R completeTask(@ApiParam("任务信息") @RequestBody BladeFlow flow) {
+ return R.status(applicationDelayService.completeTask(flow));
+ }
+ /**
+ * 详情
+ *
+ * @param businessId 主键
+ */
+ @GetMapping("/process-detail")
+ public R<ApplicationDelayEntity> detail(Long businessId) {
+ ApplicationDelayEntity detail = applicationDelayService.getById(businessId);
+ detail.getFlow().setAssigneeName(UserCache.getUser(detail.getCreateUser()).getName());
+ return R.data(detail);
+ }
}
--
Gitblit v1.9.3