From aca3faffd3e2450254f6701efcbd272e1c0561c3 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期三, 17 二月 2021 16:54:07 +0800
Subject: [PATCH] feat(员工信息service): 信息录入时身份证校验
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpBaseInfoService.java | 11 +++++++++++
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBaseInfo.java | 2 +-
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java | 19 +++++++++++++++++--
febs-server/febs-server-hr/src/main/resources/bootstrap.yml | 6 +++---
4 files changed, 32 insertions(+), 6 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBaseInfo.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBaseInfo.java
index 0f94667..0e20f03 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBaseInfo.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBaseInfo.java
@@ -49,7 +49,7 @@
private Long deptId = 0L;
@FieldInfo(name = "deptName", type = "varchar", explain = "部门名称")
- @TableField(exist = false)
+ @TableField("deptName")
private String deptName = "";
@NotBlank(message = "{required}")
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpBaseInfoService.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpBaseInfoService.java
index 4b32ac4..63c6390 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpBaseInfoService.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpBaseInfoService.java
@@ -88,4 +88,15 @@
* @author: luoyibo
*/
boolean momentToNormal(String ids);
+
+ /**
+ *
+ * 获取指定人员信息
+ *
+ * date 2021-02-17 08:12
+ * @author: luoyibo
+ * @param empBaseInfo 获取条件
+ * @return cc.mrbird.febs.server.hr.entity.EmpBaseInfo
+ */
+ EmpBaseInfo getEmpBaseInfo(EmpBaseInfo empBaseInfo);
}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java
index 452d945..9e13191 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java
@@ -150,10 +150,15 @@
@Override
@Transactional(rollbackFor = Exception.class)
public void createEmpBaseInfo(EmpBaseInfo empBaseInfo) {
- empBaseInfo.setEmpId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
+ EmpBaseInfo dbInfo = this.getEmpBaseInfo(empBaseInfo);
+ if(dbInfo==null) {
+ empBaseInfo.setEmpId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
+ } else{
+ empBaseInfo.setEmpId(dbInfo.getEmpId());
+ }
empBaseInfo.setCreator(operatorId);
empBaseInfo.setModifier(operatorId);
- this.save(empBaseInfo);
+ this.saveOrUpdate(empBaseInfo);
}
@Override
@@ -232,4 +237,14 @@
List<String> list = new ArrayList<>(Arrays.asList(str));
return empBaseInfoMapper.momentToNormal(list, operatorId) > 0;
}
+
+ @Override
+ public EmpBaseInfo getEmpBaseInfo(EmpBaseInfo empBaseInfo) {
+ QueryWrapper<EmpBaseInfo> queryWrapper = new QueryWrapper<>();
+ if(StringUtils.isEmpty(empBaseInfo.getCertificateNumb())){
+ queryWrapper.lambda().eq(EmpBaseInfo::getCertificateNumb, empBaseInfo.getCertificateNumb());
+ }
+
+ return this.getOne(queryWrapper);
+ }
}
\ No newline at end of file
diff --git a/febs-server/febs-server-hr/src/main/resources/bootstrap.yml b/febs-server/febs-server-hr/src/main/resources/bootstrap.yml
index 459c528..621e447 100644
--- a/febs-server/febs-server-hr/src/main/resources/bootstrap.yml
+++ b/febs-server/febs-server-hr/src/main/resources/bootstrap.yml
@@ -4,12 +4,12 @@
cloud:
nacos:
config:
- server-addr: ${nacos.url:120.24.23.155}:8848
+ server-addr: ${nacos.url}:8848
group: DEFAULT_GROUP
- prefix: febs-server-hr
+ prefix: febs-server-Hr
file-extension: yaml
discovery:
- server-addr: ${nacos.url:120.24.23.155}:8848
+ server-addr: ${nacos.url}:8848
logging:
level:
--
Gitblit v1.8.0