From 1686e242b0c63d64db8551fe9d08cd57bd77fb8b Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Mon, 16 Aug 2021 19:21:22 +0800
Subject: [PATCH] 1.许可审批
---
src/main/java/org/springblade/modules/permit/controller/PermitController.java | 28 +++++++++++++++++++++++-----
1 files changed, 23 insertions(+), 5 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 216d740..bc49913 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;
@@ -87,6 +89,7 @@
@ApiOperationSupport(order = 2)
@ApiOperation(value = "分页", notes = "传入permit")
public R<IPage<Permit>> list(Permit permit, Query query) {
+ permit.setStorage("1");
IPage<Permit> pages = permitService.page(Condition.getPage(query), Condition.getQueryWrapper(permit));
return R.data(pages);
}
@@ -109,21 +112,36 @@
@ApiOperationSupport(order = 4)
@ApiOperation(value = "新增", notes = "传入permit")
public R save(@Valid @RequestBody Permit permit) {
+ String cardid = permit.getCardid();
+ Map map = permitService.selectIn(cardid);
+ if (map!=null){
+ String id = map.get("id").toString();
+ permitService.removeByIds(Func.toLongList(id));
+ }
permit.setType("2");
+ permit.setStorage("1");
permit.setPermitime(new Date());
- Map<String, String> param = null;
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));
+ String cardid = permit.getCardid();
+ Map map = permitService.selectIn(cardid);
+ if (map!=null){
+ permit.setStorage("0");
+ permitService.updateById(permit);
+ }
+ else {
+ permit.setStorage("0");
+ permit.setPermitime(new Date());
+ permitService.save(permit);
+ }
+ return R.success("暂存成功");
}
--
Gitblit v1.9.3