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/recordk/controller/RecordkController.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 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 d46c82f..7f52d9f 100644
--- a/src/main/java/org/springblade/modules/recordk/controller/RecordkController.java
+++ b/src/main/java/org/springblade/modules/recordk/controller/RecordkController.java
@@ -69,6 +69,7 @@
@ApiOperationSupport(order = 2)
@ApiOperation(value = "分页", notes = "传入recordk")
public R<IPage<Recordk>> list(Recordk recordk, Query query) {
+ recordk.setStorage("1");
IPage<Recordk> pages = recordkService.page(Condition.getPage(query), Condition.getQueryWrapper(recordk));
return R.data(pages);
}
@@ -92,14 +93,14 @@
@ApiOperation(value = "新增", notes = "传入recordk")
public R save(@Valid @RequestBody Recordk recordk) {
String cardid = recordk.getCardid();
- Map map = recordkService.selectIn(cardid);
+ String ptype = recordk.getPtype();
+ Map map = recordkService.selectIn(cardid,ptype);
if (map!=null){
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,7 +112,8 @@
@ApiOperation(value = "新增", notes = "传入permit")
public R recorkstorage(@Valid @RequestBody Recordk recordk) {
String cardid = recordk.getCardid();
- Map map = recordkService.selectIn(cardid);
+ String ptype = recordk.getPtype();
+ Map map = recordkService.selectIn(cardid,ptype);
if (map!=null){
recordk.setStorage("0");
recordkService.updateById(recordk);
@@ -157,8 +159,8 @@
@PostMapping("/selectIn")
- public R selectIn(String cardid) {
- Map map = recordkService.selectIn(cardid);
+ public R selectIn(String cardid,String type) {
+ Map map = recordkService.selectIn(cardid,type);
return R.data(map);
}
--
Gitblit v1.9.3