From c9424db1c23fcddd6f4eabdb5e3ef51d2c208613 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 24 Aug 2021 16:09:49 +0800
Subject: [PATCH] 派遣记录,单位数据内网推送

---
 src/main/java/org/springblade/modules/revoke/controller/RevokeController.java |   39 ++++++++++++++++++++++++++++++++++++++-
 1 files changed, 38 insertions(+), 1 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 6867fd4..410f74b 100644
--- a/src/main/java/org/springblade/modules/revoke/controller/RevokeController.java
+++ b/src/main/java/org/springblade/modules/revoke/controller/RevokeController.java
@@ -34,6 +34,7 @@
 
 import javax.validation.Valid;
 import java.util.Date;
+import java.util.Map;
 
 /**
  *  控制器
@@ -89,9 +90,40 @@
 	@ApiOperationSupport(order = 4)
 	@ApiOperation(value = "新增", notes = "传入revoke")
 	public R save(@Valid @RequestBody Revoke revoke) {
+		String cardid = revoke.getCardid();
+		Map map = revokeService.selectIn(cardid);
+		if (map!=null){
+			String id = map.get("id").toString();
+			revokeService.removeByIds(Func.toLongList(id));
+		}
+		revoke.setStorage("1");
 		revoke.setType("2");
-		revoke.setCtime(new Date());
+		revoke.setPtype("6");
+		revoke.setPermitime(new Date());
 		return R.status(revokeService.save(revoke));
+	}
+
+	/**
+	 *暂存
+	 */
+	@PostMapping("/revokesave")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入revoke")
+	public R revokesave(@Valid @RequestBody Revoke revoke) {
+		String cardid = revoke.getCardid();
+		Map map = revokeService.selectIn(cardid);
+		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);
+		}
+		return R.success("暂存成功");
 	}
 
 	/**
@@ -125,5 +157,10 @@
 		return R.status(revokeService.removeByIds(Func.toLongList(ids)));
 	}
 
+	@PostMapping("/selectIn")
+	public R selectIn(String cardid) {
+		Map map = revokeService.selectIn(cardid);
+		return R.data(map);
+	}
 
 }

--
Gitblit v1.9.3