From 6bd7ffcfcb0b5fb8dd1a5e95e78b07d9bb161f19 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 19 Aug 2021 12:06:15 +0800
Subject: [PATCH] 1.用户注册接口修改 2.保安公司列表查询接口修改
---
src/main/java/org/springblade/modules/information/controller/InformationController.java | 25 +++++++++++++++++++++++--
1 files changed, 23 insertions(+), 2 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 17d3dd0..1220323 100644
--- a/src/main/java/org/springblade/modules/information/controller/InformationController.java
+++ b/src/main/java/org/springblade/modules/information/controller/InformationController.java
@@ -107,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);
+ }
+
+
+
/**
* 新增
*/
@@ -149,6 +161,15 @@
dept.setTenantId("000000");
dept.setDeptName(information.getEnterprisename());
dept.setAncestors("0,1420222961377357825");
+ dept.setDeptCategory(1);
+ }
+ //跨区域保安公司
+ if (information.getStats().equals("4")) {
+ Long i = 1425366663452196865L;
+ dept.setParentId(i);
+ dept.setTenantId("000000");
+ dept.setDeptName(information.getEnterprisename());
+ dept.setAncestors("0,1425366663452196865");
dept.setDeptCategory(1);
}
if (iDeptService.submit(dept)) {
@@ -275,8 +296,8 @@
@PostMapping("import-informaton")
@ApiOperationSupport(order = 12)
@ApiOperation(value = "导入单位", notes = "传入excel")
- public R importUser(MultipartFile file, Integer isCovered,String deptid,String jurisdiction) {
- InforImporter inforImporter = new InforImporter(informationService, false,deptid,jurisdiction);
+ public R importUser(MultipartFile file, Integer isCovered) {
+ InforImporter inforImporter = new InforImporter(informationService, false);
ExcelUtil.save(file, inforImporter, InforExcel.class);
return R.success("操作成功");
}
--
Gitblit v1.9.3