From c0a78b608d90f13fc34018c8d88ddf5c44acdbd7 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Thu, 12 Aug 2021 10:17:09 +0800
Subject: [PATCH] 1.数据源修改 2.单位添加字段

---
 src/main/java/org/springblade/modules/information/controller/InformationController.java |   24 +++++++++++++++++++++++-
 1 files changed, 23 insertions(+), 1 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 223f3dc..2789ebd 100644
--- a/src/main/java/org/springblade/modules/information/controller/InformationController.java
+++ b/src/main/java/org/springblade/modules/information/controller/InformationController.java
@@ -110,6 +110,8 @@
 	@ApiOperation(value = "新增", notes = "传入information")
 	public R save(@Valid @RequestBody Information information) {
 		Dept dept= new Dept();
+		String departmentid = information.getDepartmentid();
+		Long l=Long.parseLong(departmentid);
 		//自招保安公司
 		if(information.getStats().equals("0")){
 			Long i = 1420222768149966850L;
@@ -127,6 +129,7 @@
 			dept.setDeptName(information.getEnterprisename());
 			dept.setAncestors("0,1418458374477549569");
 			dept.setDeptCategory(1);
+
 		}
 		//保安服务公司
 		if(information.getStats().equals("2")){
@@ -146,6 +149,7 @@
 			dept.setAncestors("0,1420222961377357825");
 			dept.setDeptCategory(1);
 		}
+		dept.setId(l);
 		if (iDeptService.submit(dept)) {
 			CacheUtil.clear(SYS_CACHE);
 			// 返回懒加载树更新节点所需字段
@@ -369,7 +373,7 @@
 	}
 
 	/**
-	 * 查询本年所有月份社保金额
+	 * 查询本年所有月份社保金额(公司经济运营趋势)
 	 * @return
 	 */
 	@GetMapping("/queryYearAn")
@@ -723,4 +727,22 @@
 		return R.data(maps);
 	}
 
+	/**
+	 * 单位删除
+	 */
+	@PostMapping("/deleteDept")
+	public R deleteDept(String ids) {
+		informationService.deleteDept(ids);
+		return R.success("删除成功");
+	}
+
+	/**
+	 * 保安员统计
+	 */
+	@PostMapping("/selectLi")
+	public R selectLi(String jurisdiction,String deptid) {
+		List<Map<Object, Object>> list = informationService.selectLi(jurisdiction, deptid);
+		return R.data(list);
+	}
+
 }

--
Gitblit v1.9.3