From 886d9f15b0b6c187739ef4d8fa14698eda4120f7 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Sun, 22 Aug 2021 16:26:16 +0800
Subject: [PATCH] 1.单位

---
 src/main/java/org/springblade/modules/information/controller/InformationController.java |   11 +++++------
 1 files changed, 5 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 bde8cda..91e862c 100644
--- a/src/main/java/org/springblade/modules/information/controller/InformationController.java
+++ b/src/main/java/org/springblade/modules/information/controller/InformationController.java
@@ -105,8 +105,8 @@
 	@GetMapping("/page")
 	@ApiOperationSupport(order = 3)
 	@ApiOperation(value = "分页", notes = "传入information")
-	public R<IPage<Information>> page(Information information, Query query) {
-		IPage<Information> pages = informationService.selectInformationPage(Condition.getPage(query), information);
+	public R<IPage<InformationVO>> page(InformationVO information, Query query) {
+		IPage<InformationVO> pages = informationService.selectInformationPage(Condition.getPage(query), information);
 		return R.data(pages);
 	}
 
@@ -182,13 +182,13 @@
 			String id = kv.get("id").toString();
 			information.setDepartmentid(id);
 		}
-		informationService.insertIn(information);
+		informationService.save(information);
 		String formatStr = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(information.getEstablishtime());
-		Integer id = information.getId();
+		//Integer id = information.getId();
 		String s = "insert into sys_information(id,creditcode,enterprisename,representative,establishtime," +
 			"registeredcapital,organizationcode,registrationnumber,identificationnumber, enterprises, address," +
 			" business,region,registration,industry,departmentid,stats,jurisdiction,representativecell,contacts,contactscell) " +
-			"values(" + "'" + id + "'" + "," + "'" + information.getCreditcode() + "'" + "," + "'" + information.getEnterprisename() + "'" + "," + "'" + information.getRepresentative() + "'" + "," +
+			"values(" + "'" + information.getId() + "'" + "," + "'" + information.getCreditcode() + "'" + "," + "'" + information.getEnterprisename() + "'" + "," + "'" + information.getRepresentative() + "'" + "," +
 			"'" + formatStr + "'" + "," + "'" + information.getRegisteredcapital() + "'" + "," + "'" + information.getOrganizationcode() + "'" + "," + "'" + information.getRegistrationnumber() + "'" + "," +
 			"'" + information.getIdentificationnumber() + "'" + "," + "'" + information.getEnterprises() + "'" + "," + "'" +
 			information.getAddress() + "'" + "," + "'" + information.getBusiness() + "'" + "," + "'" +
@@ -214,7 +214,6 @@
 	@ApiOperationSupport(order = 5)
 	@ApiOperation(value = "修改", notes = "传入information")
 	public R update(@Valid @RequestBody Information information) throws Exception {
-		//arg.test01(arg.url + "/information/update", information);
 		return R.status(informationService.updateById(information));
 	}
 

--
Gitblit v1.9.3