From 298655c560cd54e088d6e11affda9d169f5e2b5f Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 26 Aug 2021 16:34:00 +0800
Subject: [PATCH] 导入接口修改
---
src/main/java/org/springblade/modules/record/controller/RecordController.java | 12 +++++++-----
1 files changed, 7 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..45e43c1 100644
--- a/src/main/java/org/springblade/modules/record/controller/RecordController.java
+++ b/src/main/java/org/springblade/modules/record/controller/RecordController.java
@@ -70,6 +70,7 @@
@ApiOperationSupport(order = 2)
@ApiOperation(value = "分页", notes = "传入record")
public R<IPage<Record>> list(Record record, Query query) {
+ record.setStorage("1");
IPage<Record> pages = recordService.page(Condition.getPage(query), Condition.getQueryWrapper(record));
return R.data(pages);
}
@@ -93,7 +94,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 +131,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 +140,6 @@
} else {
record.setStorage("0");
record.setType("2");
- record.setPtype("2");
record.setPermitime(new Date());
recordService.save(record);
}
@@ -177,8 +179,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