From cc057177b2fb17aee9a173a6adbabdc578fd74c7 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Mon, 06 Dec 2021 10:30:44 +0800
Subject: [PATCH] 1.许可

---
 src/main/java/org/springblade/modules/revoke/controller/RevokeController.java |   63 ++++++++++++++++++++++++++++++-
 1 files changed, 60 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/springblade/modules/revoke/controller/RevokeController.java b/src/main/java/org/springblade/modules/revoke/controller/RevokeController.java
index 6867fd4..ed15467 100644
--- a/src/main/java/org/springblade/modules/revoke/controller/RevokeController.java
+++ b/src/main/java/org/springblade/modules/revoke/controller/RevokeController.java
@@ -27,16 +27,19 @@
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.modules.FTP.FtpUtil;
 import org.springblade.modules.revoke.entity.Revoke;
 import org.springblade.modules.revoke.service.IRevokeService;
 import org.springblade.modules.revoke.vo.RevokeVO;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.Map;
 
 /**
- *  控制器
+ * 控制器
  *
  * @author BladeX
  * @since 2021-07-12
@@ -67,6 +70,7 @@
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入revoke")
 	public R<IPage<Revoke>> list(Revoke revoke, Query query) {
+		revoke.setStorage("1");
 		IPage<Revoke> pages = revokeService.page(Condition.getPage(query), Condition.getQueryWrapper(revoke));
 		return R.data(pages);
 	}
@@ -89,9 +93,57 @@
 	@ApiOperationSupport(order = 4)
 	@ApiOperation(value = "新增", notes = "传入revoke")
 	public R save(@Valid @RequestBody Revoke revoke) {
+		String cardid = revoke.getCardid();
+		String type = revoke.getPtype();
+		Map map = revokeService.selectIn(cardid,type);
+		if (map != null) {
+			String id = map.get("id").toString();
+			revokeService.removeByIds(Func.toLongList(id));
+		}
+		revoke.setStorage("1");
 		revoke.setType("2");
-		revoke.setCtime(new Date());
-		return R.status(revokeService.save(revoke));
+		revoke.setPermitime(new Date());
+		revokeService.save(revoke);
+//		String formatStr = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(revoke.getEstablishtime());
+//		String pertime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(revoke.getPermitime());
+//		String s = "insert into sys_revoke(id,creditCode,enterpriseName,representative,establishTime," +
+//			"registeredCapital,organizationCode,registrationNumber,identificationNumber,enterprises," +
+//			"address,business,region,registration,industry,type,permitime,deptid,ptype,representativecell,contacts,contactscell,reason,jurisdiction,cardid)" +
+//			"values(" + "'" + revoke.getId() + "'" + "," + "'" + revoke.getCreditcode() + "'" + "," + "'" + revoke.getEnterprisename() + "'" + "," + "'"
+//			+ revoke.getRepresentative() + "'" + "," +
+//			"'" + formatStr + "'" + "," + "'" + revoke.getRegisteredcapital() + "'" + "," + "'"
+//			+ revoke.getOrganizationcode() + "'" + "," + "'" + revoke.getRegistrationnumber() + "'" + "," +
+//			"'" + revoke.getIdentificationnumber() + "'" + "," + "'" + revoke.getEnterprises() + "'" + "," + "'" +
+//			revoke.getAddress() + "'" + "," + "'" + revoke.getBusiness() + "'" + "," + "'" +
+//			revoke.getRegion() + "'" + "," + "'" + revoke.getRegistration() + "'" + "," + "'" + revoke.getIndustry() + "'" + "," + "'"
+//			+ revoke.getType() + "'" + "," +
+//			"'" + pertime + "'" + "," + "'" + revoke.getDeptid() + "'" + "," + "'" + revoke.getPtype() + "'" + "," +
+//			"'" + revoke.getRepresentativecell() + "'" + "," + "'" + revoke.getContacts() + "'" + "," + "'" + revoke.getContactscell() + "'" + "," +
+//			"'" + revoke.getReason() + "'" + "," + "'" + revoke.getJurisdiction() + "'" +"," + "'" + revoke.getCardid() + "'"+ ")";
+//		FtpUtil.sqlFileUpload(s);
+		return R.success("成功");
+	}
+
+	/**
+	 * 暂存
+	 */
+	@PostMapping("/revokesave")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入revoke")
+	public R revokesave(@Valid @RequestBody Revoke revoke) {
+		String cardid = revoke.getCardid();
+		String type = revoke.getPtype();
+		Map map = revokeService.selectIn(cardid,type);
+		if (map != null) {
+			revoke.setStorage("0");
+			revokeService.updateById(revoke);
+		} else {
+			revoke.setStorage("0");
+			revoke.setType("2");
+			revoke.setPermitime(new Date());
+			revokeService.save(revoke);
+		}
+		return R.success("暂存成功");
 	}
 
 	/**
@@ -125,5 +177,10 @@
 		return R.status(revokeService.removeByIds(Func.toLongList(ids)));
 	}
 
+	@PostMapping("/selectIn")
+	public R selectIn(String cardid,String type) {
+		Map map = revokeService.selectIn(cardid,type);
+		return R.data(map);
+	}
 
 }

--
Gitblit v1.9.3