From d4e35652a8a879c9e53016eeb1e3e9018c716502 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 12 Aug 2021 10:08:55 +0800
Subject: [PATCH] 用户新增字段是否培训报名，培训公司查询接口修改
---
src/main/java/org/springblade/modules/information/controller/InformationController.java | 46 ++++++++++++++++++++++++++++++++++++++--------
1 files changed, 38 insertions(+), 8 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 21b7e87..4b19187 100644
--- a/src/main/java/org/springblade/modules/information/controller/InformationController.java
+++ b/src/main/java/org/springblade/modules/information/controller/InformationController.java
@@ -28,16 +28,22 @@
import org.springblade.common.utils.arg;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.cache.utils.CacheUtil;
+import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.support.Kv;
import org.springblade.modules.information.entity.Information;
+import org.springblade.modules.information.excel.InforExcel;
+import org.springblade.modules.information.excel.InforImporter;
import org.springblade.modules.information.service.IInformationService;
import org.springblade.modules.information.vo.InformationVO;
import org.springblade.modules.system.entity.Dept;
+import org.springblade.modules.system.excel.UserExcel;
+import org.springblade.modules.system.excel.UserImporter;
import org.springblade.modules.system.service.IDeptService;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
import javax.validation.Valid;
import java.io.File;
@@ -101,6 +107,18 @@
return R.data(pages);
}
+
+ /**
+ * 培训公司信息查询
+ */
+ @GetMapping("/security-page")
+ public R<IPage<InformationVO>> securityPage(InformationVO information, Query query) {
+ IPage<InformationVO> pages = informationService.securityPage(Condition.getPage(query), information);
+ return R.data(pages);
+ }
+
+
+
/**
* 新增
*/
@@ -154,7 +172,7 @@
information.setDepartmentid(id);
}
String json=JSON.toJSONString(information);
- com.util.OutJson.createJsonFile(json,"d:/anbao/information/","informationSave");
+ //com.util.OutJson.createJsonFile(json,"d:/anbao/information/","informationSave");
//arg.test01(arg.url + "/information/save", information);
return R.status(informationService.save(information));
}
@@ -263,14 +281,26 @@
return R.data(list);
}
- public static void main(String[] args) {
- Information information = new Information();
- information.setAddress("2");
- information.setDepartmentid("123");
- String json=JSON.toJSONString(information);//关键
- com.util.OutJson.createJsonFile(json,"d:/anbao/information/","informationSave");
- System.out.println("生成文件完成！");
+ /**
+ * 导入单位信息
+ */
+ @PostMapping("import-informaton")
+ @ApiOperationSupport(order = 12)
+ @ApiOperation(value = "导入单位", notes = "传入excel")
+ public R importUser(MultipartFile file, Integer isCovered) {
+ InforImporter inforImporter = new InforImporter(informationService, false);
+ ExcelUtil.save(file, inforImporter, InforExcel.class);
+ return R.success("操作成功");
}
+// public static void main(String[] args) {
+// Information information = new Information();
+// information.setAddress("2");
+// information.setDepartmentid("123");
+// String json=JSON.toJSONString(information);//关键
+// com.util.OutJson.createJsonFile(json,"d:/anbao/information/","informationSave");
+// System.out.println("生成文件完成！");
+// }
+
}
--
Gitblit v1.9.3