From 0d99d26f39e055ee17fdbf2c5cbd1daf695c4310 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 13 Sep 2021 21:28:42 +0800
Subject: [PATCH] 报名新增,报名查询,报名清册,培训报名,培训报名查询修改

---
 src/main/java/org/springblade/modules/information/controller/InformationController.java |   31 +++++++++++++++++++++++++------
 1 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/springblade/modules/information/controller/InformationController.java b/src/main/java/org/springblade/modules/information/controller/InformationController.java
index a564b5c..0a5f3ba 100644
--- a/src/main/java/org/springblade/modules/information/controller/InformationController.java
+++ b/src/main/java/org/springblade/modules/information/controller/InformationController.java
@@ -23,6 +23,7 @@
 import lombok.AllArgsConstructor;
 import com.alibaba.fastjson.JSON;
 import org.springblade.common.cache.DictCache;
+import org.springblade.common.constant.FtpConstant;
 import org.springblade.common.enums.DictEnum;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.cache.utils.CacheUtil;
@@ -120,6 +121,15 @@
 		return R.data(pages);
 	}
 
+	/**
+	 * 培训公司信息查询,下拉
+	 */
+	@GetMapping("/train-unit-tree")
+	public List<InformationVO> trainUnitTree(InformationVO information) {
+		List<InformationVO> pages = informationService.trainUnitTree(information);
+		return pages;
+	}
+
 
 	/**
 	 * 新增
@@ -208,14 +218,23 @@
 	@ApiOperation(value = "修改", notes = "传入information")
 	public R update(@Valid @RequestBody Information information) throws Exception {
 		informationService.updateById(information);
-		String ip = "http://192.168.0.108";
-		String businessLicense = information.getBusinessLicense().substring(26, information.getBusinessLicense().length());
-		String licence = information.getLicence().substring(26, information.getLicence().length());
+		String businessLicense=null;
+		String licence=null;
+		String format="";
+		if(information.getBusinessLicense()!=null && !"".equals(information.getBusinessLicense())){
+			 businessLicense = information.getBusinessLicense().substring(26, information.getBusinessLicense().length());
+		}
+		if(information.getLicence()!=null && !"".equals(information.getLicence())){
+			 licence = information.getLicence().substring(26, information.getLicence().length());
+		}
+		if (information.getEstablishtime()!=null && !"".equals(information.getEstablishtime())){
+			 format = new SimpleDateFormat("yyyy-MM-dd").format(information.getEstablishtime());
+		}
 		//内网同步
 		String s1 = "update sys_information set creditcode = " + "'" + information.getCreditcode() + "'" +
 			",enterprisename = " + "'" + information.getEnterprisename() + "'" +
 			",representative = " + "'" + information.getRepresentative() + "'" +
-			",establishtime = " + "'" + new SimpleDateFormat("yyyy-MM-dd").format(information.getEstablishtime()) + "'" +
+			",establishtime = " + "'" + format + "'" +
 			",registeredcapital = " + "'" + information.getRegisteredcapital() + "'" +
 			",organizationcode = " + "'" + information.getOrganizationcode() + "'" +
 			",registrationnumber = " + "'" + information.getRegistrationnumber() + "'" +
@@ -231,8 +250,8 @@
 			",representativecell = " + "'" + information.getRepresentativecell() + "'" +
 			",contacts = " + "'" + information.getContacts() + "'" +
 			",contactscell = " + "'" + information.getContactscell() + "'" +
-			",business_License = " + "'" + ip + businessLicense + "'" +
-			",licence = " + "'" + ip + licence + "'" +
+			",business_License = " + "'" + FtpConstant.ip + businessLicense + "'" +
+			",licence = " + "'" + FtpConstant.ip + licence + "'" +
 			" " + "where id = " + "'" + information.getId() + "'";
 		FtpUtil.sqlFileUpload(s1);
 		return R.success("修改成功");

--
Gitblit v1.9.3