From 8b464ee379c5b35ac8b22b4e5dde25c4f6fb75cf Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 19 Aug 2021 15:03:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/permit/controller/PermitController.java | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 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 5db51e5..0909f0b 100644
--- a/src/main/java/org/springblade/modules/permit/controller/PermitController.java
+++ b/src/main/java/org/springblade/modules/permit/controller/PermitController.java
@@ -17,6 +17,7 @@
package org.springblade.modules.permit.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -112,6 +113,12 @@
@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());
@@ -124,9 +131,18 @@
@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