From 4fa826960b4a4d758733715a19ce0d2abdf77ba7 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 31 Dec 2021 18:25:35 +0800
Subject: [PATCH] 新增学历统计接口
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 2 +
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 4 ++
src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml | 26 +++++++++++++
src/main/java/org/springblade/modules/information/service/IInformationService.java | 10 +++++
src/main/java/org/springblade/modules/information/controller/InformationController.java | 13 ++++++
src/main/java/org/springblade/modules/system/controller/UserController.java | 33 ++++++++++++++++
src/main/java/org/springblade/modules/information/mapper/InformationMapper.java | 8 ++++
src/main/java/org/springblade/modules/system/mapper/UserMapper.java | 2 +
src/main/java/org/springblade/modules/system/service/IUserService.java | 1
src/main/java/org/springblade/modules/information/service/impl/InformationServiceImpl.java | 13 ++++++
10 files changed, 112 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 2912373..b3e4e4a 100644
--- a/src/main/java/org/springblade/modules/information/controller/InformationController.java
+++ b/src/main/java/org/springblade/modules/information/controller/InformationController.java
@@ -429,6 +429,8 @@
return R.data(list);
}
+
+
/**
* 导入单位信息
*/
@@ -532,4 +534,15 @@
return R.data(list);
}
+ /**
+ * 查询学历统计信息
+ * @param deptid 部门id
+ * @param jurisdiction 辖区
+ * @return
+ */
+ @PostMapping("/getEducationStatistics")
+ public R getEducationStatistics(String deptid, String jurisdiction) {
+ return R.data(informationService.getEducationStatistics(deptid, jurisdiction));
+ }
+
}
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 015ca4c..6757705 100644
--- a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.java
+++ b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.java
@@ -215,4 +215,12 @@
* @return
*/
List<List> selectUIn(IPage<List> page, String deptid, String name, String hold, String photo, String examinationtype, String dispatch, String soil);
+
+ /**
+ * 查询学历统计信息
+ * @param deptid 部门id
+ * @param jurisdiction 辖区
+ * @return
+ */
+ List<Map<String, Object>> getEducationStatistics(@Param("deptId") String deptid, @Param("jurisdiction") String jurisdiction);
}
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 92b4446..e266e75 100644
--- a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
+++ b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
@@ -1314,4 +1314,30 @@
</if>
</select>
+ <!--查询学历统计信息-->
+ <select id="getEducationStatistics" resultType="java.util.HashMap">
+ SELECT
+ ifnull(b.num,0) value,a.dict_value name
+ FROM
+ ( SELECT dict_key, dict_value FROM blade_dict_biz WHERE CODE = "educationType" AND parent_id = 1442114073897521153 ) a
+ LEFT JOIN (
+ SELECT
+ count( * ) num,
+ education
+ FROM
+ blade_user bu
+ left join blade_dept bd on bu.dept_id = bd.id
+ left join sys_information si on si.departmentid = bd.id
+ left join sys_jurisdiction sj on sj.id = si.jurisdiction
+ where 1=1
+ <if test="jurisdiction!=null and jurisdiction != '' and jurisdiction!='1372091709474910209'">
+ and (sj.id = #{jurisdiction} or sj.parent_id = #{jurisdiction})
+ </if>
+ <if test="deptId!=null and deptId != ''">
+ and bu.dept_id = #{deptId}
+ </if>
+ GROUP BY
+ education ) b ON a.dict_key = b.education
+ </select>
+
</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 5223584..f92c950 100644
--- a/src/main/java/org/springblade/modules/information/service/IInformationService.java
+++ b/src/main/java/org/springblade/modules/information/service/IInformationService.java
@@ -126,4 +126,14 @@
* @return
*/
IPage selectUIn(IPage<List> page, String deptid, String name, String hold, String photo, String examinationtype, String dispatch, String soil);
+
+
+
+ /**
+ * 查询学历统计信息
+ * @param deptid 部门id
+ * @param jurisdiction 辖区
+ * @return
+ */
+ Object getEducationStatistics(String deptid, String jurisdiction);
}
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 d9ab352..d74ad20 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
@@ -407,4 +407,17 @@
public IPage selectUIn(IPage<List> page, String deptid, String name, String hold, String photo, String examinationtype, String dispatch, String soil) {
return page.setRecords(baseMapper.selectUIn(page,deptid, name, hold, photo, examinationtype, dispatch,soil));
}
+
+ /**
+ * 查询学历统计信息
+ * @param deptid 部门id
+ * @param jurisdiction 辖区
+ * @return
+ */
+ @Override
+ public Object getEducationStatistics(String deptid, String jurisdiction) {
+ //查询学历分布情况，按学历分组统计对应的人数
+ List<Map<String,Object>> mapList = baseMapper.getEducationStatistics(deptid,jurisdiction);
+ return mapList;
+ }
}
diff --git a/src/main/java/org/springblade/modules/system/controller/UserController.java b/src/main/java/org/springblade/modules/system/controller/UserController.java
index 1d6b810..1975482 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -1419,4 +1419,37 @@
// ExcelUtil.export(response, "保安员导入数据模板", "保安员数据表", list, UserExcel.class);
}
+
+ /**
+ * 保安员账号校验
+ * @param user
+ * @return
+ */
+ @GetMapping("/checkAccount")
+ public void checkAccount(User user) {
+ //根据身份证号查询用户
+ User user1 = new User();
+ user1.setAccount(user.getCardid());
+ user1.setIsDeleted(0);
+ user1.setStatus(1);
+ User user2 = userService.getOne(Condition.getQueryWrapper(user1));
+ if (null!=user2){
+ //判断是单位否一致
+ if (null!=user.getDeptId() && !user.getDeptId().equals("")) {
+ if (!user2.getDeptId().equals(user.getDeptId())) {
+ throw new ServiceException(StringUtil.format("当前用户 [{}] 已在其他单位录入!", user.getCardid()));
+ } else {
+ throw new ServiceException(StringUtil.format("当前用户 [{}] 已存在!", user.getCardid()));
+ }
+ }else {
+ //没有传 deptId 的情况
+ throw new ServiceException(StringUtil.format("当前用户 [{}] 已存在!", user.getCardid()));
+ }
+ }
+ }
+
+
+
+
+
}
diff --git a/src/main/java/org/springblade/modules/system/mapper/UserMapper.java b/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
index f0526e8..9db23a7 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
@@ -248,4 +248,6 @@
* @param experienceList
*/
void batchExperienceList(@Param("list") List<Experience> experienceList);
+
+
}
diff --git a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
index b17eb39..b028bd7 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -893,4 +893,6 @@
</foreach>
</insert>
+
+
</mapper>
diff --git a/src/main/java/org/springblade/modules/system/service/IUserService.java b/src/main/java/org/springblade/modules/system/service/IUserService.java
index 0a13cb1..d842d6e 100644
--- a/src/main/java/org/springblade/modules/system/service/IUserService.java
+++ b/src/main/java/org/springblade/modules/system/service/IUserService.java
@@ -365,4 +365,5 @@
* @return
*/
List<Map<String, Object>> selectEquipent();
+
}
diff --git a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
index ff2e674..8e44bba 100644
--- a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
+++ b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
@@ -23,6 +23,7 @@
import com.google.zxing.WriterException;
import lombok.AllArgsConstructor;
import org.apache.commons.lang3.StringUtils;
+import org.apache.ibatis.annotations.Param;
import org.springblade.common.cache.SysCache;
import org.springblade.common.constant.AgeUtil;
import org.springblade.common.constant.CommonConstant;
@@ -1694,4 +1695,7 @@
public List<Map<String, Object>> selectEquipent() {
return baseMapper.selectEquipent();
}
+
+
+
}
--
Gitblit v1.9.3