From f2767f4dfa4a17c0a89e584047db4e3d7d91666d Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 27 Aug 2021 15:21:33 +0800
Subject: [PATCH] 派遣记录,单位修改

---
 src/main/java/org/springblade/modules/permit/controller/PermitController.java |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 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 5ddacf5..6b1f426 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));
@@ -145,7 +146,7 @@
 		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,jurisdiction)" +
+			"address,business,region,registration,industry,type,permitime,deptid,ptype,representativecell,contacts,contactscell,jurisdiction,cardid)" +
 			"values(" + "'" + permit.getId() + "'" + "," + "'" + permit.getCreditcode() + "'" + "," + "'" + permit.getEnterprisename() + "'" + "," + "'"
 			+ permit.getRepresentative() + "'" + "," +
 			"'" + formatStr + "'" + "," + "'" + permit.getRegisteredcapital() + "'" + "," + "'"
@@ -155,7 +156,9 @@
 			permit.getRegion() + "'" + "," + "'" + permit.getRegistration() + "'" + "," + "'" + permit.getIndustry()+ "'" + "," + "'"
 			+ permit.getType() + "'" + "," +
 			"'" + pertime + "'" + "," + "'" + permit.getDeptid() + "'" + "," + "'" + permit.getPtype() + "'" + "," +
-			"'" + permit.getRepresentativecell() + "'" + "," + "'" + permit.getContacts() + "'" + "," + "'" + permit.getContactscell() + "'"+"," + "'" + permit.getJurisdiction() + "'"+")" ;
+			"'" + permit.getRepresentativecell() + "'" + "," + "'" + permit.getContacts() + "'" + "," + "'"
+			+ permit.getContactscell() + "'"+"," + "'" + permit.getJurisdiction() + "'"+
+			"," + "'" + permit.getCardid() + "'"+")" ;
 		FtpUtil.sqlFileUpload(s);
 		return R.success("新增成功");
 	}
@@ -167,7 +170,8 @@
 	@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);
@@ -181,8 +185,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);
 	}
 

--
Gitblit v1.9.3