From dc60071d490879633da257052fcbc24b2e71f3b2 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Wed, 21 Dec 2022 17:01:03 +0800
Subject: [PATCH] 延期申请工作流

---
 src/main/java/org/springblade/modules/application/controller/ApplicationController.java |   66 ++++++++++++++++++++++++++++++++
 1 files changed, 65 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/application/controller/ApplicationController.java b/src/main/java/org/springblade/modules/application/controller/ApplicationController.java
index a9a3b0e..cba6aa7 100644
--- a/src/main/java/org/springblade/modules/application/controller/ApplicationController.java
+++ b/src/main/java/org/springblade/modules/application/controller/ApplicationController.java
@@ -24,19 +24,25 @@
 import javax.validation.Valid;
 
 import org.springblade.Application;
+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.*;
 import org.springblade.modules.enterprise.entity.EnterpriseEntity;
+import org.springblade.modules.reject.entity.RejectEntity;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.modules.application.vo.ApplicationVO;
 import org.springblade.modules.application.wrapper.ApplicationWrapper;
 import org.springblade.modules.application.service.IApplicationService;
 import org.springblade.core.boot.ctrl.BladeController;
+
+import java.util.List;
 
 /**
  * 申请表 控制器
@@ -74,6 +80,16 @@
 	}
 
 	/**
+	 * 申请表 查询全部
+	 */
+	@GetMapping("/getAll")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入application")
+	public R<List<ApplicationVO>> getAll(ApplicationVO applicationVO) {
+		return R.data(applicationService.getAll(applicationVO));
+	}
+
+	/**
 	 * 申请表 自定义分页
 	 */
 	@GetMapping("/page")
@@ -100,7 +116,7 @@
 	@PostMapping("/saveVo")
 	@ApiOperationSupport(order = 4)
 	@ApiOperation(value = "自定义新增", notes = "传入applicationVo")
-	public R save(@Valid @RequestBody ApplicationEntity application, @RequestBody BasicInfoEntity basicInfoEntity, @RequestBody CarEntity carEntity,
+	public R saveVo(@Valid @RequestBody ApplicationEntity application, @RequestBody BasicInfoEntity basicInfoEntity, @RequestBody CarEntity carEntity,
 				  @RequestBody PlanEntity planEntity, @RequestBody SchemeEntity schemeEntity, @RequestBody GoodsEntity goodsEntity) {
 		return R.status(applicationService.saveVo(application,basicInfoEntity,carEntity,planEntity,schemeEntity,goodsEntity));
 	}
@@ -146,5 +162,53 @@
 		return R.status(applicationService.deleteLogic(Func.toLongList(ids)));
 	}
 
+	//================================工作流========================================
+	/**
+	 * 申请表  工作流开始
+	 */
+	@PostMapping("/start-process")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "工作流开始", notes = "传入applicationVo")
+	public R startProcess(@Valid @RequestBody ApplicationEntity application, @RequestBody BasicInfoEntity basicInfoEntity, @RequestBody CarEntity carEntity,
+						  @RequestBody PlanEntity planEntity, @RequestBody SchemeEntity schemeEntity, @RequestBody GoodsEntity goodsEntity) {
+		return R.status(applicationService.startProcess(application,basicInfoEntity,carEntity,planEntity,schemeEntity,goodsEntity));
+	}
 
+	/**
+	 * 详情
+	 *
+	 * @param businessId 主键
+	 */
+	@GetMapping("/process-detail")
+	public R<ApplicationVO> detail(Long businessId) {
+		ApplicationEntity detail = applicationService.getById(businessId);
+		ApplicationVO applicationVO = applicationService.getVo(detail);
+		applicationVO.getFlow().setAssigneeName(UserCache.getUser(detail.getCreateUser()).getName());
+		return R.data(applicationVO);
+	}
+
+	/**
+	 * 审批人员完成任务
+	 *
+	 * @param flow 审核信息
+	 */
+	@PostMapping("complete-task")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "审批人员完成任务", notes = "传入流程信息")
+	public R completeTask(@ApiParam("任务信息") @RequestBody BladeFlow flow, @RequestBody ApplicationEntity applicationEntity, @RequestBody RejectEntity rejectEntity) {
+		return R.status(applicationService.completeTask(flow,applicationEntity,rejectEntity));
+	}
+
+	/**
+	 * 申请人员完成任务
+	 *
+	 * @param flow 审核信息
+	 */
+	@PostMapping("user-complete-task")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "申请人员完成任务", notes = "传入流程信息")
+	public R userCompleteTask(@ApiParam("任务信息") @RequestBody BladeFlow flow, @RequestBody ApplicationEntity applicationEntity,@RequestBody BasicInfoEntity basicInfoEntity,
+							  @RequestBody CarEntity carEntity, @RequestBody PlanEntity planEntity, @RequestBody SchemeEntity schemeEntity, @RequestBody GoodsEntity goodsEntity, @RequestBody RejectEntity rejectEntity) {
+		return R.status(applicationService.userCompleteTask(flow,applicationEntity,basicInfoEntity,carEntity,planEntity,schemeEntity,goodsEntity,rejectEntity));
+	}
 }

--
Gitblit v1.9.3