From 733edfcd6ad1c38dcf4aa761a417f4e4bfd754b2 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Fri, 27 Aug 2021 11:05:44 +0800
Subject: [PATCH] 1.许可审批
---
src/main/java/org/springblade/modules/revoke/controller/RevokeController.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/springblade/modules/revoke/controller/RevokeController.java b/src/main/java/org/springblade/modules/revoke/controller/RevokeController.java
index 2dca31c..9597958 100644
--- a/src/main/java/org/springblade/modules/revoke/controller/RevokeController.java
+++ b/src/main/java/org/springblade/modules/revoke/controller/RevokeController.java
@@ -70,6 +70,7 @@
@ApiOperationSupport(order = 2)
@ApiOperation(value = "分页", notes = "传入revoke")
public R<IPage<Revoke>> list(Revoke revoke, Query query) {
+ revoke.setStorage("1");
IPage<Revoke> pages = revokeService.page(Condition.getPage(query), Condition.getQueryWrapper(revoke));
return R.data(pages);
}
@@ -93,14 +94,14 @@
@ApiOperation(value = "新增", notes = "传入revoke")
public R save(@Valid @RequestBody Revoke revoke) {
String cardid = revoke.getCardid();
- Map map = revokeService.selectIn(cardid);
+ String type = revoke.getPtype();
+ Map map = revokeService.selectIn(cardid,type);
if (map != null) {
String id = map.get("id").toString();
revokeService.removeByIds(Func.toLongList(id));
}
revoke.setStorage("1");
revoke.setType("2");
- revoke.setPtype("6");
revoke.setPermitime(new Date());
revokeService.save(revoke);
String formatStr = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(revoke.getEstablishtime());
@@ -131,14 +132,14 @@
@ApiOperation(value = "新增", notes = "传入revoke")
public R revokesave(@Valid @RequestBody Revoke revoke) {
String cardid = revoke.getCardid();
- Map map = revokeService.selectIn(cardid);
+ String type = revoke.getPtype();
+ Map map = revokeService.selectIn(cardid,type);
if (map != null) {
revoke.setStorage("0");
revokeService.updateById(revoke);
} else {
revoke.setStorage("0");
revoke.setType("2");
- revoke.setPtype("6");
revoke.setPermitime(new Date());
revokeService.save(revoke);
}
@@ -177,8 +178,8 @@
}
@PostMapping("/selectIn")
- public R selectIn(String cardid) {
- Map map = revokeService.selectIn(cardid);
+ public R selectIn(String cardid,String type) {
+ Map map = revokeService.selectIn(cardid,type);
return R.data(map);
}
--
Gitblit v1.9.3