From 08363052cecb30230a2c8b3eba791ca8d1be00a5 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 31 Aug 2021 15:32:38 +0800
Subject: [PATCH] 二维码生成地址修改,保安证编码生成修改

---
 src/main/java/org/springblade/modules/revoke/controller/RevokeController.java |    7 +++----
 1 files changed, 3 insertions(+), 4 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 8d4643e..b333f12 100644
--- a/src/main/java/org/springblade/modules/revoke/controller/RevokeController.java
+++ b/src/main/java/org/springblade/modules/revoke/controller/RevokeController.java
@@ -70,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);
 	}
@@ -101,14 +102,13 @@
 		}
 		revoke.setStorage("1");
 		revoke.setType("2");
-		revoke.setPtype("6");
 		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)" +
+			"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() + "'" + "," + "'"
@@ -119,7 +119,7 @@
 			+ revoke.getType() + "'" + "," +
 			"'" + pertime + "'" + "," + "'" + revoke.getDeptid() + "'" + "," + "'" + revoke.getPtype() + "'" + "," +
 			"'" + revoke.getRepresentativecell() + "'" + "," + "'" + revoke.getContacts() + "'" + "," + "'" + revoke.getContactscell() + "'" + "," +
-			"'" + revoke.getReason() + "'" + "," + "'" + revoke.getJurisdiction() + "'" + ")";
+			"'" + revoke.getReason() + "'" + "," + "'" + revoke.getJurisdiction() + "'" +"," + "'" + revoke.getCardid() + "'"+ ")";
 		FtpUtil.sqlFileUpload(s);
 		return R.success("成功");
 	}
@@ -140,7 +140,6 @@
 		} else {
 			revoke.setStorage("0");
 			revoke.setType("2");
-			revoke.setPtype("6");
 			revoke.setPermitime(new Date());
 			revokeService.save(revoke);
 		}

--
Gitblit v1.9.3