From d6ee0e1e4a5d0c61565b2af954a1845f2022d85f Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 26 Aug 2021 09:08:37 +0800
Subject: [PATCH] 二维码接口修改(中文不识别),保安员查询新增帅选条件

---
 src/main/java/org/springblade/modules/recordk/controller/RecordkController.java |   19 +++++++++++++++----
 1 files changed, 15 insertions(+), 4 deletions(-)

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..da93d93 100644
--- a/src/main/java/org/springblade/modules/recordk/controller/RecordkController.java
+++ b/src/main/java/org/springblade/modules/recordk/controller/RecordkController.java
@@ -97,8 +97,9 @@
 			String id = map.get("id").toString();
 			recordkService.removeByIds(Func.toLongList(id));
 		}
+		recordk.setStorage("1");
 		recordk.setType("2");
-		recordk.setPtype("3");
+		recordk.setPermitime(new Date());
 		return R.status(recordkService.save(recordk));
 	}
 
@@ -111,11 +112,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("暂存成功");
 	}
 
 	/**
@@ -150,4 +155,10 @@
 	}
 
 
+	@PostMapping("/selectIn")
+	public R selectIn(String cardid) {
+		Map map = recordkService.selectIn(cardid);
+		return R.data(map);
+	}
+
 }

--
Gitblit v1.9.3