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/performance/entity/Performance.java | 11 +++++++++++
src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml | 3 +++
src/main/java/org/springblade/modules/information/service/IInformationService.java | 1 +
src/main/java/org/springblade/modules/information/controller/InformationController.java | 13 +++++++++++++
src/main/java/org/springblade/modules/performance/mapper/PerformanceMapper.xml | 3 +++
src/main/java/org/springblade/modules/information/mapper/InformationMapper.java | 1 +
src/main/java/org/springblade/modules/information/service/impl/InformationServiceImpl.java | 5 +++++
7 files changed, 37 insertions(+), 0 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..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,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);
// 返回懒加载树更新节点所需字段
@@ -723,4 +727,13 @@
return R.data(maps);
}
+ /**
+ * 单位删除
+ */
+ @PostMapping("/deleteDept")
+ public R deleteDept(String ids) {
+ informationService.deleteDept(ids);
+ return R.success("删除成功");
+ }
+
}
diff --git a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.java b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.java
index 2e08a78..08a67ce 100644
--- a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.java
+++ b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.java
@@ -68,4 +68,5 @@
Map<String, String> queryYearKh(String year,String jurisdiction,String deptid);
Map<String, String> queryYearBanan(String year,String jurisdiction,String deptid);
Map<String, String> queryYearDe(String year,String jurisdiction,String deptid);
+ void deleteDept(String ids);
}
diff --git a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
index 34d1b09..a38542b 100644
--- a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
+++ b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
@@ -795,4 +795,7 @@
and jurisdiction =#{jurisdiction}
</if>
</select>
+ <delete id="deleteDept">
+ delete from blade_dept where id=#{ids}
+ </delete>
</mapper>
diff --git a/src/main/java/org/springblade/modules/information/service/IInformationService.java b/src/main/java/org/springblade/modules/information/service/IInformationService.java
index c01dd2f..f44cde0 100644
--- a/src/main/java/org/springblade/modules/information/service/IInformationService.java
+++ b/src/main/java/org/springblade/modules/information/service/IInformationService.java
@@ -68,4 +68,5 @@
Map selectPcount(String jurisdiction,String deptid);
Map selectWPcount(String jurisdiction,String deptid);
List<Map<Object,Object>> selectIn(String jurisdiction);
+ void deleteDept(String ids);
}
diff --git a/src/main/java/org/springblade/modules/information/service/impl/InformationServiceImpl.java b/src/main/java/org/springblade/modules/information/service/impl/InformationServiceImpl.java
index a9b2681..d84066b 100644
--- a/src/main/java/org/springblade/modules/information/service/impl/InformationServiceImpl.java
+++ b/src/main/java/org/springblade/modules/information/service/impl/InformationServiceImpl.java
@@ -175,5 +175,10 @@
return baseMapper.selectIn(jurisdiction);
}
+ @Override
+ public void deleteDept(String ids) {
+ baseMapper.deleteDept(ids);
+ }
+
}
diff --git a/src/main/java/org/springblade/modules/performance/entity/Performance.java b/src/main/java/org/springblade/modules/performance/entity/Performance.java
index 35893a9..6bf4eeb 100644
--- a/src/main/java/org/springblade/modules/performance/entity/Performance.java
+++ b/src/main/java/org/springblade/modules/performance/entity/Performance.java
@@ -81,6 +81,17 @@
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date time;
private String departmentid;
+ /**
+ * 保安身份证号码
+ */
+ private String cardid;
+
+ /**
+ * 服务公司名称
+ */
+ @TableField("department_name")
+ private String departmentName;
+ private String jurisdiction;
}
diff --git a/src/main/java/org/springblade/modules/performance/mapper/PerformanceMapper.xml b/src/main/java/org/springblade/modules/performance/mapper/PerformanceMapper.xml
index ec89eee..7ea5d9a 100644
--- a/src/main/java/org/springblade/modules/performance/mapper/PerformanceMapper.xml
+++ b/src/main/java/org/springblade/modules/performance/mapper/PerformanceMapper.xml
@@ -12,6 +12,9 @@
<result column="score" property="score"/>
<result column="time" property="time"/>
<result column="departmentid" property="departmentid"/>
+ <result column="jurisdiction" property="jurisdiction"/>
+ <result column="departmentName" property="departmentName"/>
+ <result column="cardid" property="cardid"/>
</resultMap>
--
Gitblit v1.9.3