From 3633b2237bf5b42a6acbae74ac8b76bb8853b3c0 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Fri, 13 Aug 2021 11:24:25 +0800
Subject: [PATCH] 1.许可审批

---
 src/main/java/org/springblade/modules/permit/controller/PermitController.java |   24 +++++++++++++++++++++++-
 1 files changed, 23 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/permit/controller/PermitController.java b/src/main/java/org/springblade/modules/permit/controller/PermitController.java
index 2883567..21aa0c5 100644
--- a/src/main/java/org/springblade/modules/permit/controller/PermitController.java
+++ b/src/main/java/org/springblade/modules/permit/controller/PermitController.java
@@ -37,6 +37,8 @@
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.BladeUser;
+import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.modules.permit.entity.Permit;
@@ -109,13 +111,33 @@
 	@ApiOperationSupport(order = 4)
 	@ApiOperation(value = "新增", notes = "传入permit")
 	public R save(@Valid @RequestBody Permit permit) {
+		BladeUser user = AuthUtil.getUser();
 		permit.setType("2");
+		permit.setStorage("1");
 		permit.setPermitime(new Date());
-		Map<String, String> param = null;
+		permit.setDeptid(user.getDeptId());
 		return R.status(permitService.save(permit));
 	}
 
 	/**
+	 *暂存
+	 */
+	@PostMapping("/storage")
+	@ApiOperation(value = "新增", notes = "传入permit")
+	public R storage(@Valid @RequestBody Permit permit) {
+		permit.setStorage("0");
+		permit.setPermitime(new Date());
+		return R.status(permitService.save(permit));
+	}
+
+
+	@PostMapping("/selectIn")
+	public R selectIn(String cardid) {
+		Map map = permitService.selectIn(cardid);
+		return R.data(map);
+	}
+
+	/**
 	 * 修改
 	 */
 	@PostMapping("/update")

--
Gitblit v1.9.3