From b26fa47a83c05779eb686283f6bde81717ee00e4 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Thu, 29 Jul 2021 08:46:45 +0800
Subject: [PATCH] 1.统计接口调整
---
src/main/java/org/springblade/modules/information/controller/InformationController.java | 72 +++++++++++++++++++++++++++++------
1 files changed, 59 insertions(+), 13 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 8dfb514..6f84261 100644
--- a/src/main/java/org/springblade/modules/information/controller/InformationController.java
+++ b/src/main/java/org/springblade/modules/information/controller/InformationController.java
@@ -110,12 +110,46 @@
@ApiOperation(value = "新增", notes = "传入information")
public R save(@Valid @RequestBody Information information) {
Dept dept= new Dept();
- Long i = 1413470343230877697L;
- dept.setParentId(i);
- dept.setTenantId("000000");
- dept.setDeptName(information.getEnterprisename());
- dept.setAncestors("0,1413470343230877697");
- dept.setDeptCategory(1);
+ String departmentid = information.getDepartmentid();
+ Long l=Long.parseLong(departmentid);
+ //自招保安公司
+ if(information.getStats().equals("0")){
+ Long i = 1420222768149966850L;
+ dept.setParentId(i);
+ dept.setTenantId("000000");
+ dept.setDeptName(information.getEnterprisename());
+ dept.setAncestors("0,1420222768149966850");
+ dept.setDeptCategory(1);
+ }
+ //保安培训公司
+ if(information.getStats().equals("1")){
+ Long i = 1418458374477549569L;
+ dept.setParentId(i);
+ dept.setTenantId("000000");
+ dept.setDeptName(information.getEnterprisename());
+ dept.setAncestors("0,1418458374477549569");
+ dept.setDeptCategory(1);
+
+ }
+ //保安服务公司
+ if(information.getStats().equals("2")){
+ Long i = 1413470343230877697L;
+ dept.setParentId(i);
+ dept.setTenantId("000000");
+ dept.setDeptName(information.getEnterprisename());
+ dept.setAncestors("0,1413470343230877697");
+ dept.setDeptCategory(1);
+ }
+ //武装守押公司
+ if(information.getStats().equals("3")){
+ Long i = 1420222961377357825L;
+ dept.setParentId(i);
+ dept.setTenantId("000000");
+ dept.setDeptName(information.getEnterprisename());
+ dept.setAncestors("0,1420222961377357825");
+ dept.setDeptCategory(1);
+ }
+ dept.setId(l);
if (iDeptService.submit(dept)) {
CacheUtil.clear(SYS_CACHE);
// 返回懒加载树更新节点所需字段
@@ -154,10 +188,10 @@
@PostMapping("/remove")
@ApiOperationSupport(order = 8)
@ApiOperation(value = "删除", notes = "传入ids")
- public R remove(String creditcode) {
- informationService.deleteIn(creditcode);
- informationService.deleteSh(creditcode);
- informationService.deleteMe(creditcode);
+ public R remove(String ids) {
+ informationService.deleteIn(ids);
+ informationService.deleteSh(ids);
+ informationService.deleteMe(ids);
return R.success("删除成功");
}
@@ -196,7 +230,7 @@
int wcznumber = 0;//总的未持证数量
String title = list.get(i).get("title");//部门名称
Map<String, Object> map = new HashMap<String, Object>();
- Map<Object, Integer> objectStringMap = iDeptService.selectHold(String.valueOf(list.get(i).get("jurisdiction")));
+ Map<Object, Object> objectStringMap = iDeptService.selectHold(String.valueOf(list.get(i).get("jurisdiction")));
if (objectStringMap==null) {
map.put("name", title);
map.put("cz", cznumber);
@@ -204,8 +238,10 @@
lists.add(map);
}
else {
- cznumber = objectStringMap.get("cz");
- wcznumber = objectStringMap.get("wcz");
+ String cz = objectStringMap.get("cz").toString();
+ cznumber = Integer.valueOf(cz);
+ String wcz = objectStringMap.get("wcz").toString();
+ wcznumber = Integer.valueOf(wcz);
map.put("name", title);
map.put("cz", cznumber);
map.put("wcz", wcznumber);
@@ -690,4 +726,14 @@
List<Map<Object, Object>> maps = informationService.selectIn(jurisdiction);
return R.data(maps);
}
+
+ /**
+ * 单位删除
+ */
+ @PostMapping("/deleteDept")
+ public R deleteDept(String ids) {
+ informationService.deleteDept(ids);
+ return R.success("删除成功");
+ }
+
}
--
Gitblit v1.9.3