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/revoke/controller/RevokeController.java | 13 +++++++++----
src/main/java/org/springblade/modules/permit/controller/PermitController.java | 10 +++++++---
src/main/java/org/springblade/modules/recordk/controller/RecordkController.java | 10 +++++++---
src/main/java/org/springblade/modules/record/controller/RecordController.java | 11 ++++++++---
4 files changed, 31 insertions(+), 13 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 9024a14..bc49913 100644
--- a/src/main/java/org/springblade/modules/permit/controller/PermitController.java
+++ b/src/main/java/org/springblade/modules/permit/controller/PermitController.java
@@ -133,11 +133,15 @@
String cardid = permit.getCardid();
Map map = permitService.selectIn(cardid);
if (map!=null){
+ permit.setStorage("0");
permitService.updateById(permit);
}
- permit.setStorage("0");
- permit.setPermitime(new Date());
- return R.status(permitService.save(permit));
+ else {
+ permit.setStorage("0");
+ permit.setPermitime(new Date());
+ permitService.save(permit);
+ }
+ return R.success("暂存成功");
}
diff --git a/src/main/java/org/springblade/modules/record/controller/RecordController.java b/src/main/java/org/springblade/modules/record/controller/RecordController.java
index b407f89..afa795b 100644
--- a/src/main/java/org/springblade/modules/record/controller/RecordController.java
+++ b/src/main/java/org/springblade/modules/record/controller/RecordController.java
@@ -109,11 +109,16 @@
String cardid = record.getCardid();
Map map = recordService.selectIn(cardid);
if (map!=null){
+ record.setStorage("0");
recordService.updateById(record);
}
- record.setType("2");
- record.setPtype("2");
- return R.status(recordService.save(record));
+ else {
+ record.setStorage("0");
+ record.setType("2");
+ record.setPtype("2");
+ recordService.save(record);
+ }
+ return R.success("暂存成功");
}
/**
diff --git a/src/main/java/org/springblade/modules/recordk/controller/RecordkController.java b/src/main/java/org/springblade/modules/recordk/controller/RecordkController.java
index 751b515..833fbbe 100644
--- a/src/main/java/org/springblade/modules/recordk/controller/RecordkController.java
+++ b/src/main/java/org/springblade/modules/recordk/controller/RecordkController.java
@@ -111,11 +111,15 @@
String cardid = recordk.getCardid();
Map map = recordkService.selectIn(cardid);
if (map!=null){
+ recordk.setStorage("0");
recordkService.updateById(recordk);
}
- recordk.setStorage("0");
- recordk.setPermitime(new Date());
- return R.status(recordkService.save(recordk));
+ else {
+ recordk.setStorage("0");
+ recordk.setPermitime(new Date());
+ recordkService.save(recordk);
+ }
+ return R.success("暂存成功");
}
/**
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 7cd7ea8..8010514 100644
--- a/src/main/java/org/springblade/modules/revoke/controller/RevokeController.java
+++ b/src/main/java/org/springblade/modules/revoke/controller/RevokeController.java
@@ -112,12 +112,17 @@
String cardid = revoke.getCardid();
Map map = revokeService.selectIn(cardid);
if (map!=null){
+ revoke.setStorage("0");
revokeService.updateById(revoke);
}
- revoke.setType("2");
- revoke.setPtype("4");
- revoke.setPermitime(new Date());
- return R.status(revokeService.save(revoke));
+ else {
+ revoke.setStorage("0");
+ revoke.setType("2");
+ revoke.setPtype("4");
+ revoke.setPermitime(new Date());
+ revokeService.save(revoke);
+ }
+ return R.success("暂存成功");
}
/**
--
Gitblit v1.9.3