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/record/controller/RecordController.java |   53 +++++++++++++++++++++++++++++++++--------------------
 1 files changed, 33 insertions(+), 20 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 85ab88b..d6b60ab 100644
--- a/src/main/java/org/springblade/modules/record/controller/RecordController.java
+++ b/src/main/java/org/springblade/modules/record/controller/RecordController.java
@@ -123,19 +123,20 @@
 		record.setType("2");
 		record.setPermitime(new Date());
 		recordService.save(record);
-		String offtime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(record.getOfficetime());
-		String pertime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(record.getPermitime());
-		String s = "insert into sys_record(id,creditCode,enterpriseName,representative,establishtime," +
-			"registeredCapital,organizationCode,registrationNumber,identificationNumber,enterprises," +
-			"address,business,region,registration,industry,type,permitime,deptid,ptype,representativecell,contacts,contactscell,perid,offices,officetime,jurisdiction,cardid)" +
-			"values(" + "'" + record.getId() + "'" + "," + "'" + record.getCreditcode() + "'" + "," + "'" + record.getEnterprisename() + "'" + "," + "'"+ record.getRepresentative() + "'" + "," + "'" + record.getRegisteredcapital() + "'" + "," + "'"
-			+ record.getOrganizationcode() + "'" + "," + "'" + record.getRegistrationnumber() + "'" + "," +
-			"'" + record.getIdentificationnumber() + "'" + "," + "'" + record.getEnterprises() + "'" + "," + "'" +
-			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.getCardid() + "'"+ ")";
-		FtpUtil.sqlFileUpload(s);
+//		String offtime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(record.getOfficetime());
+//		String pertime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(record.getPermitime());
+//		String s = "insert into sys_record(id,enterpriseName,representative," +
+//			"address,business,registration,industry,type,permitime,ptype,representativecell,contacts,contactscell,perid,offices,officetime,jurisdiction,cardid,storage,overtime)" +
+//			"values(" + "'" + record.getId() + "'"+ "," + "'" + record.getEnterprisename() + "'" + "," +
+//			"'" + record.getRepresentative() + "'"+ "," + "'" +
+//			record.getAddress() + "'" + "," + "'" + record.getBusiness() + "'" + "," + "'" + record.getRegistration() + "'" + "," + "'" + record.getIndustry() + "'" + "," + "'" + record.getType() + "'" + "," + "'" + pertime + "'" + "," + "'" + record.getPtype() + "'" + "," +
+//			"'" + record.getRepresentativecell() + "'" + "," + "'" + record.getContacts() + "'" + "," + "'" + record.getContactscell() + "'" + "," +"'" + record.getPerid() + "'" + "," + "'" + record.getOffices() + "'" + "," +
+//			"'" + offtime + "'" + "," + "'" + record.getJurisdiction() + "'" +
+//			"," + "'" + record.getCardid() + "'"+
+//			"," + "'" + record.getStorage() + "'"+
+//			"," + "'" + new SimpleDateFormat("yyyy-MM-dd").format(record.getOvertime()) + "'"
+//			+ ")";
+//		FtpUtil.sqlFileUpload(s);
 		return R.success("成功");
 	}
 
@@ -171,7 +172,7 @@
 	public R update(@Valid @RequestBody Record record) {
 		//审核通过
 		if (record.getType().equals("0")) {
-			//新增组织机构和单位信息
+		/*	//新增组织机构和单位信息
 			Information information =new Information();
 			information.setCreditcode(record.getCreditcode());
 			information.setEnterprisename(record.getEnterprisename());
@@ -222,16 +223,28 @@
 			userService.saveOrUpdate(user);
 			//把附件添加单位id
 			attachService.updat(information.getDepartmentid(),record.getCardid());
-			String s1 = "update sys_permit set type = " + "'" + 0 + "'" +",approve = " + "'" + record.getApprove() + "'"+
+			String s1 = "update sys_record set type = " + "'" + record.getType() + "'" +
+				",papprove = " + "'" + record.getPapprove() + "'"+
+				",xapprove = " + "'" + record.getXapprove() + "'"+
+				",sapprove = " + "'" + record.getSapprove() + "'"+
+				",popinion = " + "'" + record.getPopinion() + "'"+
+				",sopinion = " + "'" + record.getSopinion() + "'"+
+				",xopinion = " + "'" + record.getXopinion() + "'"+
 				" " +"where id = " + "'" + record.getId() + "'";
-			FtpUtil.sqlFileUpload(s1);
+			FtpUtil.sqlFileUpload(s1);*/
 		}
 		else {
-			String s1 = "update sys_permit set type = " + "'" + 1 + "'" +",approve = " + "'" + record.getApprove() + "'"+
-				" " +"where id = " + "'" + record.getId() + "'";
-			FtpUtil.sqlFileUpload(s1);
+//			String s1 = "update sys_record set type = " + "'" + record.getType() + "'" +
+//				",papprove = " + "'" + record.getPapprove() + "'"+
+//				",xapprove = " + "'" + record.getXapprove() + "'"+
+//				",sapprove = " + "'" + record.getSapprove() + "'"+
+//				",popinion = " + "'" + record.getPopinion() + "'"+
+//				",sopinion = " + "'" + record.getSopinion() + "'"+
+//				",xopinion = " + "'" + record.getXopinion() + "'"+
+//				" " +"where id = " + "'" + record.getId() + "'";
+//			FtpUtil.sqlFileUpload(s1);
 		}
-		return R.status(recordService.updateById(record));
+		return R.status(recordService.saveOrUpdate(record));
 	}
 
 	/**

--
Gitblit v1.9.3