From 6bd7ffcfcb0b5fb8dd1a5e95e78b07d9bb161f19 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 19 Aug 2021 12:06:15 +0800
Subject: [PATCH] 1.用户注册接口修改 2.保安公司列表查询接口修改
---
src/main/java/org/springblade/modules/record/controller/RecordController.java | 39 +++++++++++++++++++++++++++++++++++++++
1 files changed, 39 insertions(+), 0 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 6d8f717..0ac59e2 100644
--- a/src/main/java/org/springblade/modules/record/controller/RecordController.java
+++ b/src/main/java/org/springblade/modules/record/controller/RecordController.java
@@ -33,6 +33,8 @@
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
+import java.util.Date;
+import java.util.Map;
/**
* 控制器
@@ -88,7 +90,39 @@
@ApiOperationSupport(order = 4)
@ApiOperation(value = "新增", notes = "传入record")
public R save(@Valid @RequestBody Record record) {
+ String cardid = record.getCardid();
+ Map map = recordService.selectIn(cardid);
+ if (map!=null){
+ String id = map.get("id").toString();
+ recordService.removeByIds(Func.toLongList(id));
+ }
+ record.setStorage("1");
+ record.setPermitime(new Date());
return R.status(recordService.save(record));
+ }
+
+ /**
+ * 暂存
+ */
+ @PostMapping("/rocordsave")
+ @ApiOperationSupport(order = 4)
+ @ApiOperation(value = "新增", notes = "传入record")
+ public R rocordsave(@Valid @RequestBody Record record) {
+ String cardid = record.getCardid();
+ Map map = recordService.selectIn(cardid);
+ if (map!=null){
+ record.setStorage("0");
+ record.setPermitime(new Date());
+ recordService.updateById(record);
+ }
+ else {
+ record.setStorage("0");
+ record.setType("2");
+ record.setPtype("2");
+ record.setPermitime(new Date());
+ recordService.save(record);
+ }
+ return R.success("暂存成功");
}
/**
@@ -123,4 +157,9 @@
}
+ @PostMapping("/selectIn")
+ public R selectIn(String cardid) {
+ Map map = recordService.selectIn(cardid);
+ return R.data(map);
+ }
}
--
Gitblit v1.9.3