From f66856f80d0db11adff5c6dd5f86aa375f86c199 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Wed, 25 Aug 2021 15:28:19 +0800
Subject: [PATCH] 1.备案

---
 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 80ba7a0..272ad62 100644
--- a/src/main/java/org/springblade/modules/record/controller/RecordController.java
+++ b/src/main/java/org/springblade/modules/record/controller/RecordController.java
@@ -93,7 +93,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));
@@ -116,7 +117,7 @@
 			record.getAddress() + "'" + "," + "'" + record.getBusiness() + "'" + "," + "'" +
 			record.getRegion() + "'" + "," + "'" + record.getRegistration() + "'" + "," + "'" + record.getIndustry() + "'" + "," + "'" + record.getType() + "'" + "," + "'" + pertime + "'" + "," + "'" + record.getDeptid() + "'" + "," + "'" + record.getPtype() + "'" + "," +
 			"'" + record.getRepresentativecell() + "'" + "," + "'" + record.getContacts() + "'" + "," + "'" + record.getContactscell() + "'" + "," +
-			"'" + record.getPerid() + "'" + "," + "'" + record.getOffices() + "'" + "," + "'" + offtime + "'" + "'" + "," + "'" + record.getJurisdiction() + "'" + ")";
+			"'" + record.getPerid() + "'" + "," + "'" + record.getOffices() + "'" + "," + "'" + offtime + "'" + "," + "'" + record.getJurisdiction() + "'" + ")";
 		FtpUtil.sqlFileUpload(s);
 		return R.success("成功");
 	}
@@ -129,7 +130,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());
@@ -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