From 35c2236d4a3203d93689b57588e413991d41b858 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期五, 05 二月 2021 20:37:49 +0800
Subject: [PATCH] fix(人力微服务): 信息录入
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpContractInfoServiceImpl.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpContractInfoServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpContractInfoServiceImpl.java
index 4900ebc..fbc23d5 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpContractInfoServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpContractInfoServiceImpl.java
@@ -40,7 +40,7 @@
@Override
public IPage<EmpContractInfo> findEmpContractinfos(QueryRequest request, EmpContractInfo empContractinfo) {
LambdaQueryWrapper<EmpContractInfo> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(EmpContractInfo::getDelFlag, 0);
+ queryWrapper.eq(EmpContractInfo::getDelFlag, empContractinfo.getDelFlag());
Page<EmpContractInfo> page = new Page<>(request.getPageNum(), request.getPageSize());
return this.page(page, queryWrapper);
}
@@ -48,7 +48,7 @@
@Override
public List<EmpContractInfo> findEmpContractinfos(EmpContractInfo empContractinfo) {
LambdaQueryWrapper<EmpContractInfo> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(EmpContractInfo::getDelFlag, 0);
+ queryWrapper.eq(EmpContractInfo::getDelFlag, empContractinfo.getDelFlag());
return this.baseMapper.selectList(queryWrapper);
}
@@ -56,6 +56,9 @@
@Transactional(rollbackFor = Exception.class)
public void createEmpContractinfo(EmpContractInfo empContractinfo) {
empContractinfo.setContractId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
+ if(empContractinfo.getBeginDate()==null){
+ empContractinfo.setBeginDate(empContractinfo.getSigningDate());
+ }
empContractinfo.setCreator(operatorId);
empContractinfo.setModifier(operatorId);
this.save(empContractinfo);
@@ -97,4 +100,11 @@
List<String> list = new ArrayList<>(Arrays.asList(str));
empContractinfoMapper.logicDeleteByIds(list, operatorId);
}
+
+ @Override
+ public boolean momentToNormal(String ids) {
+ String[] str = ids.split(",");
+ List<String> list = new ArrayList<>(Arrays.asList(str));
+ return empContractinfoMapper.momentToNormal(list, operatorId)>0;
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0