From 97f4c8f1aeea0b973d302d25bbf60c82dddf9a8d Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Thu, 26 Aug 2021 09:56:50 +0800
Subject: [PATCH] 1.备案

---
 src/main/java/org/springblade/modules/record/controller/RecordController.java |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

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 cca2d00..9c0fac7 100644
--- a/src/main/java/org/springblade/modules/record/controller/RecordController.java
+++ b/src/main/java/org/springblade/modules/record/controller/RecordController.java
@@ -93,7 +93,8 @@
 	@ApiOperation(value = "新增", notes = "传入record")
 	public R save(@Valid @RequestBody Record record) {
 		String cardid = record.getCardid();
-		Map map = recordService.selectIn(cardid);
+		String type = record.getPtype();
+		Map map = recordService.selectIn(cardid,type);
 		if (map != null) {
 			String id = map.get("id").toString();
 			recordService.removeByIds(Func.toLongList(id));
@@ -129,7 +130,8 @@
 	@ApiOperation(value = "新增", notes = "传入record")
 	public R rocordsave(@Valid @RequestBody Record record) {
 		String cardid = record.getCardid();
-		Map map = recordService.selectIn(cardid);
+		String type = record.getPtype();
+		Map map = recordService.selectIn(cardid,type);
 		if (map != null) {
 			record.setStorage("0");
 			record.setPermitime(new Date());
@@ -137,7 +139,6 @@
 		} else {
 			record.setStorage("0");
 			record.setType("2");
-			record.setPtype("2");
 			record.setPermitime(new Date());
 			recordService.save(record);
 		}
@@ -177,8 +178,8 @@
 
 
 	@PostMapping("/selectIn")
-	public R selectIn(String cardid) {
-		Map map = recordService.selectIn(cardid);
+	public R selectIn(String cardid,String type) {
+		Map map = recordService.selectIn(cardid,type);
 		return R.data(map);
 	}
 }

--
Gitblit v1.9.3