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/permit/controller/PermitController.java |   51 ++++++++++-----------------------------------------
 1 files changed, 10 insertions(+), 41 deletions(-)

diff --git a/src/main/java/org/springblade/modules/permit/controller/PermitController.java b/src/main/java/org/springblade/modules/permit/controller/PermitController.java
index b611221..e895d74 100644
--- a/src/main/java/org/springblade/modules/permit/controller/PermitController.java
+++ b/src/main/java/org/springblade/modules/permit/controller/PermitController.java
@@ -132,7 +132,8 @@
 	@ApiOperation(value = "新增", notes = "传入permit")
 	public R save(@Valid @RequestBody Permit permit) throws FileNotFoundException {
 		String cardid = permit.getCardid();
-		Map map = permitService.selectIn(cardid);
+		String type = permit.getPtype();
+		Map map = permitService.selectIn(cardid,type);
 		if (map != null) {
 			String id = map.get("id").toString();
 			permitService.removeByIds(Func.toLongList(id));
@@ -142,9 +143,10 @@
 		permit.setPermitime(new Date());
 		permitService.save(permit);
 		String formatStr = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(permit.getEstablishtime());
+		String pertime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(permit.getPermitime());
 		String s = "insert into sys_permit(id,creditCode,enterpriseName,representative,establishTime," +
 			"registeredCapital,organizationCode,registrationNumber,identificationNumber,enterprises," +
-			"address,business,region,registration,industry,type,permitime,deptid,ptype,representativecell,contacts,contactscell)" +
+			"address,business,region,registration,industry,type,permitime,deptid,ptype,representativecell,contacts,contactscell,jurisdiction)" +
 			"values(" + "'" + permit.getId() + "'" + "," + "'" + permit.getCreditcode() + "'" + "," + "'" + permit.getEnterprisename() + "'" + "," + "'"
 			+ permit.getRepresentative() + "'" + "," +
 			"'" + formatStr + "'" + "," + "'" + permit.getRegisteredcapital() + "'" + "," + "'"
@@ -153,8 +155,8 @@
 			permit.getAddress() + "'" + "," + "'" + permit.getBusiness() + "'" + "," + "'" +
 			permit.getRegion() + "'" + "," + "'" + permit.getRegistration() + "'" + "," + "'" + permit.getIndustry()+ "'" + "," + "'"
 			+ permit.getType() + "'" + "," +
-			"'" + permit.getPermitime() + "'" + "," + "'" + permit.getDeptid() + "'" + "," + "'" + permit.getPtype() + "'" + "," +
-			"'" + permit.getRepresentativecell() + "'" + "," + "'" + permit.getContacts() + "'" + "," + "'" + permit.getContactscell() + "'"+")" ;
+			"'" + pertime + "'" + "," + "'" + permit.getDeptid() + "'" + "," + "'" + permit.getPtype() + "'" + "," +
+			"'" + permit.getRepresentativecell() + "'" + "," + "'" + permit.getContacts() + "'" + "," + "'" + permit.getContactscell() + "'"+"," + "'" + permit.getJurisdiction() + "'"+")" ;
 		FtpUtil.sqlFileUpload(s);
 		return R.success("新增成功");
 	}
@@ -166,38 +168,11 @@
 	@ApiOperation(value = "新增", notes = "传入permit")
 	public R storage(@Valid @RequestBody Permit permit) {
 		String cardid = permit.getCardid();
-		Map map = permitService.selectIn(cardid);
+		String type = permit.getPtype();
+		Map map = permitService.selectIn(cardid,type);
 		if (map != null) {
 			permit.setStorage("0");
 			permitService.updateById(permit);
-//			String formatStr = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(permit.getEstablishtime());
-//			String s1 =
-//				"update sys_permit set creditCode = " + "'" + permit.getCreditcode()+ "'"
-//					+ ",enterpriseName = " + "'" + permit.getEnterprisename()+"'"
-//					+ ",representative = " + "'" + permit.getRepresentative()+"'"
-//					+ ",establishTime = " + "'" + formatStr+"'"
-//					+ ",registeredCapital = " + "'" + permit.getRegisteredcapital()+"'"
-//					+ ",organizationCode = " + "'" + permit.getOrganizationcode()+"'"
-//					+ ",registrationNumber = " + "'" +permit.getRegistrationnumber()+"'"
-//					+ ",identificationNumber = " + "'" + permit.getIdentificationnumber()+"'"
-//					+ ",enterprises = " + "'" + permit.getEnterprises()+"'"
-//					+ ",address = " + "'" + permit.getAddress()+"'"
-//					+ ",business = " + "'" + permit.getBusiness()+"'"
-//					+ ",region = " + "'" + permit.getRegion()+"'"
-//					+ ",registration = " + "'" +permit.getRegistration()+"'"
-//					+ ",industry = " + "'" +permit.getIndustry()+"'"
-//					+ ",type = " + "'" +permit.getType()+"'"
-//					+ ",politicaloutlook = " + "'" +user.getPoliticaloutlook()+"'"
-//					+ ",healstats = " + "'" +user.getHealstats()+"'"
-//					+ ",height = " + "'" +user.getHeight()+"'"
-//					+ ",address = " + "'" +user.getAddress()+"'"
-//					+ ",registered = " + "'" +user.getRegistered()+"'"
-//					+ ",rtime = " + "'" +rtime+"'"
-//					+ ",securitynumber = " + "'" +user.getSecuritynumber()+"'"
-//					+ ",hold = " + "'" +user.getHold()+"'"
-//					+ ",jurisdiction = " + "'" +user.getJurisdiction()+"'"
-//					+ " " +"where id = " + "'" + user.getId() + "'";
-//			FtpUtil.sqlFileUpload(s1);
 		} else {
 			permit.setStorage("0");
 			permit.setPermitime(new Date());
@@ -208,8 +183,8 @@
 
 
 	@PostMapping("/selectIn")
-	public R selectIn(String cardid) {
-		Map map = permitService.selectIn(cardid);
+	public R selectIn(String cardid ,String type) {
+		Map map = permitService.selectIn(cardid,type);
 		return R.data(map);
 	}
 
@@ -242,11 +217,5 @@
 	@ApiOperation(value = "删除", notes = "传入ids")
 	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
 		return R.status(permitService.removeByIds(Func.toLongList(ids)));
-	}
-
-	public static void main(String[] args) {
-		String id = "1";
-		String s = "delete from	sys_permit where id=" + id + ";";
-		System.out.println(s);
 	}
 }

--
Gitblit v1.9.3