From 86e02f62be1f738aec2a45aba3ab132c24cfd72e Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 12 Jul 2021 17:28:54 +0800
Subject: [PATCH] 1.新增查询组织机构（只包含保安公司）树 2.招聘新增字段是否持证 3.现实表现记录列表数据接口修改
---
src/main/java/org/springblade/modules/system/mapper/DeptMapper.java | 4 ++
src/main/java/org/springblade/modules/performance/entity/Performance.java | 11 +++++
src/main/java/org/springblade/modules/performance/mapper/PerformanceMapper.java | 3 +
src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml | 26 +++++++++++++
src/main/java/org/springblade/modules/system/controller/DeptController.java | 10 +++++
src/main/java/org/springblade/modules/performance/controller/PerformanceController.java | 2 +
src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java | 10 +++++
src/main/java/org/springblade/modules/recruitment/entity/Recruitment.java | 5 ++
src/main/java/org/springblade/modules/system/service/IDeptService.java | 5 ++
src/main/java/org/springblade/modules/performance/mapper/PerformanceMapper.xml | 9 +++-
src/main/java/org/springblade/modules/recruitment/mapper/RecruitmentMapper.xml | 3 +
11 files changed, 85 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/performance/controller/PerformanceController.java b/src/main/java/org/springblade/modules/performance/controller/PerformanceController.java
index 4a0ffd3..69b7df7 100644
--- a/src/main/java/org/springblade/modules/performance/controller/PerformanceController.java
+++ b/src/main/java/org/springblade/modules/performance/controller/PerformanceController.java
@@ -170,4 +170,6 @@
}
+
+
}
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 f1e191f..cdd133c 100644
--- a/src/main/java/org/springblade/modules/performance/entity/Performance.java
+++ b/src/main/java/org/springblade/modules/performance/entity/Performance.java
@@ -75,7 +75,18 @@
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date time;
+
private String departmentid;
+ /**
+ * 保安身份证号码
+ */
+ private String cardid;
+
+ /**
+ * 服务公司名称
+ */
+ @TableField("department_name")
+ private String departmentName;
}
diff --git a/src/main/java/org/springblade/modules/performance/mapper/PerformanceMapper.java b/src/main/java/org/springblade/modules/performance/mapper/PerformanceMapper.java
index 6bc898a..b26cdcd 100644
--- a/src/main/java/org/springblade/modules/performance/mapper/PerformanceMapper.java
+++ b/src/main/java/org/springblade/modules/performance/mapper/PerformanceMapper.java
@@ -18,6 +18,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
import org.springblade.modules.performance.entity.Performance;
import org.springblade.modules.performance.vo.PerformanceVO;
@@ -39,6 +40,6 @@
* @param performance
* @return
*/
- List<PerformanceVO> selectPerformancePage(IPage page, PerformanceVO performance);
+ List<PerformanceVO> selectPerformancePage(IPage page, @Param("performance") PerformanceVO performance);
Map<String, String> queryYearPer(String year);
}
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..8a1d118 100644
--- a/src/main/java/org/springblade/modules/performance/mapper/PerformanceMapper.xml
+++ b/src/main/java/org/springblade/modules/performance/mapper/PerformanceMapper.xml
@@ -15,8 +15,13 @@
</resultMap>
- <select id="selectPerformancePage" resultMap="performanceResultMap">
- select * from sys_performance
+<!-- <select id="selectPerformancePage" resultMap="performanceResultMap">-->
+<!-- select * from sys_performance-->
+<!-- </select>-->
+
+ <!--分页数据-->
+ <select id="selectPerformancePage" resultType="org.springblade.modules.performance.vo.PerformanceVO">
+ select * from sys_performance where cardid = #{performance.cardid}
</select>
diff --git a/src/main/java/org/springblade/modules/recruitment/entity/Recruitment.java b/src/main/java/org/springblade/modules/recruitment/entity/Recruitment.java
index 2f21f0c..1fe639c 100644
--- a/src/main/java/org/springblade/modules/recruitment/entity/Recruitment.java
+++ b/src/main/java/org/springblade/modules/recruitment/entity/Recruitment.java
@@ -158,5 +158,10 @@
private Integer status;
+ /**
+ * 是否持证 1：是 2：否
+ */
+ private Integer permit;
+
}
diff --git a/src/main/java/org/springblade/modules/recruitment/mapper/RecruitmentMapper.xml b/src/main/java/org/springblade/modules/recruitment/mapper/RecruitmentMapper.xml
index a4856a9..0a6cbb3 100644
--- a/src/main/java/org/springblade/modules/recruitment/mapper/RecruitmentMapper.xml
+++ b/src/main/java/org/springblade/modules/recruitment/mapper/RecruitmentMapper.xml
@@ -26,6 +26,9 @@
<if test="recruitment.district!=null">
and sr.district = #{recruitment.district}
</if>
+ <if test="recruitment.permit!=null">
+ and sr.permit = #{recruitment.permit}
+ </if>
<if test="recruitment.education!=null and recruitment.education!=''">
and sr.education = #{recruitment.education}
</if>
diff --git a/src/main/java/org/springblade/modules/system/controller/DeptController.java b/src/main/java/org/springblade/modules/system/controller/DeptController.java
index 7bbfa5d..20e0850 100644
--- a/src/main/java/org/springblade/modules/system/controller/DeptController.java
+++ b/src/main/java/org/springblade/modules/system/controller/DeptController.java
@@ -125,6 +125,16 @@
}
/**
+ * 懒加载获取部门树形结构,不包含顶级管理员公安局
+ */
+ @GetMapping("/security_lazy-tree")
+ @ApiOperation(value = "懒加载树形结构", notes = "树形结构")
+ public R<List<DeptVO>> securityLazyTree(String tenantId, Long parentId, BladeUser bladeUser) {
+ List<DeptVO> tree = deptService.securityLazyTree(Func.toStrWithEmpty(tenantId, bladeUser.getTenantId()), parentId);
+ return R.data(tree);
+ }
+
+ /**
* 懒加载获取部门树形结构
*/
@GetMapping("/lazy-trees")
diff --git a/src/main/java/org/springblade/modules/system/mapper/DeptMapper.java b/src/main/java/org/springblade/modules/system/mapper/DeptMapper.java
index 58aaeb2..bdb5b2b 100644
--- a/src/main/java/org/springblade/modules/system/mapper/DeptMapper.java
+++ b/src/main/java/org/springblade/modules/system/mapper/DeptMapper.java
@@ -81,4 +81,8 @@
List<Map<Object,String>> selectId(String id);
Map<Object,Integer> selectHold(String deptid);
+ /**
+ * 懒加载获取部门树形结构,不包含顶级管理员公安局
+ */
+ List<DeptVO> securityLazyTree(String tenantId, Long parentId);
}
diff --git a/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml b/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml
index 72aa7d8..1d20f11 100644
--- a/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml
@@ -99,6 +99,32 @@
ORDER BY dept.sort
</select>
+ <select id="securityLazyTree" resultMap="treeNodeResultMap" >
+ SELECT
+ dept.id,
+ dept.parent_id,
+ dept.dept_name AS title,
+ dept.id AS "value",
+ dept.id AS "key",
+ (
+ SELECT
+ CASE WHEN count(1) > 0 THEN 1 ELSE 0 END
+ FROM
+ blade_dept
+ WHERE
+ parent_id = dept.id and is_deleted = 0
+ ) AS "has_children"
+ FROM
+ blade_dept dept
+ WHERE
+ dept.parent_id = #{param2} AND dept.is_deleted = 0
+ and dept_category = 1
+ <if test="param1!=null and param1!=''">
+ and dept.tenant_id = #{param1}
+ </if>
+ ORDER BY dept.sort
+ </select>
+
<select id="lazyTrees" resultMap="treeNodeResultMap" >
diff --git a/src/main/java/org/springblade/modules/system/service/IDeptService.java b/src/main/java/org/springblade/modules/system/service/IDeptService.java
index 6886622..3c8cf1c 100644
--- a/src/main/java/org/springblade/modules/system/service/IDeptService.java
+++ b/src/main/java/org/springblade/modules/system/service/IDeptService.java
@@ -125,4 +125,9 @@
List<Map<Object,String>> selectCount(String name);
List<Map<Object,String>> selectId(String id);
Map<Object,Integer> selectHold(String deptid);
+
+ /**
+ * 懒加载获取部门树形结构,不包含顶级管理员公安局
+ */
+ List<DeptVO> securityLazyTree(String tenantId, Long parentId);
}
diff --git a/src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java b/src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java
index ffa2c45..5e5641b 100644
--- a/src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java
+++ b/src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java
@@ -184,4 +184,14 @@
return baseMapper.selectHold(deptid);
}
+ /**
+ * 懒加载获取部门树形结构,不包含顶级管理员公安局
+ */
+ @Override
+ public List<DeptVO> securityLazyTree(String tenantId, Long parentId) {
+ if (AuthUtil.isAdministrator()) {
+ tenantId = StringPool.EMPTY;
+ }
+ return ForestNodeMerger.merge(baseMapper.securityLazyTree(tenantId, parentId));
+ }
}
--
Gitblit v1.9.3