From 8b464ee379c5b35ac8b22b4e5dde25c4f6fb75cf Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 19 Aug 2021 15:03:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/record/controller/RecordController.java | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 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 b407f89..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,7 @@
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
+import java.util.Date;
import java.util.Map;
/**
@@ -95,7 +96,8 @@
String id = map.get("id").toString();
recordService.removeByIds(Func.toLongList(id));
}
- record.setStorage("0");
+ record.setStorage("1");
+ record.setPermitime(new Date());
return R.status(recordService.save(record));
}
@@ -109,11 +111,18 @@
String cardid = record.getCardid();
Map map = recordService.selectIn(cardid);
if (map!=null){
+ record.setStorage("0");
+ record.setPermitime(new Date());
recordService.updateById(record);
}
- record.setType("2");
- record.setPtype("2");
- return R.status(recordService.save(record));
+ else {
+ record.setStorage("0");
+ record.setType("2");
+ record.setPtype("2");
+ record.setPermitime(new Date());
+ recordService.save(record);
+ }
+ return R.success("暂存成功");
}
/**
@@ -148,4 +157,9 @@
}
+ @PostMapping("/selectIn")
+ public R selectIn(String cardid) {
+ Map map = recordService.selectIn(cardid);
+ return R.data(map);
+ }
}
--
Gitblit v1.9.3