From a7ca32e775e76b4e4667d9f9d76739a73fe68ba3 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期三, 17 二月 2021 23:22:49 +0800
Subject: [PATCH] feat(离职考勤实体类): 离职考勤月份修改成不在数据库中存在
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpOccupationalServiceImpl.java | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpOccupationalServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpOccupationalServiceImpl.java
index e9ed8b6..312f041 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpOccupationalServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpOccupationalServiceImpl.java
@@ -40,7 +40,7 @@
@Override
public IPage<EmpOccupational> findEmpOccupationals(QueryRequest request, EmpOccupational empOccupational) {
LambdaQueryWrapper<EmpOccupational> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(EmpOccupational::getDelFlag, 0);
+ queryWrapper.eq(EmpOccupational::getDelFlag, empOccupational.getDelFlag());
Page<EmpOccupational> page = new Page<>(request.getPageNum(), request.getPageSize());
return this.page(page, queryWrapper);
}
@@ -48,7 +48,7 @@
@Override
public List<EmpOccupational> findEmpOccupationals(EmpOccupational empOccupational) {
LambdaQueryWrapper<EmpOccupational> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(EmpOccupational::getDelFlag, 0);
+ queryWrapper.eq(EmpOccupational::getDelFlag, empOccupational.getDelFlag());
return this.baseMapper.selectList(queryWrapper);
}
@@ -56,6 +56,15 @@
@Transactional(rollbackFor = Exception.class)
public void createEmpOccupational(EmpOccupational empOccupational) {
empOccupational.setOccupationalId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
+ if(empOccupational.getSubmitTime()==null){
+ empOccupational.setSubmitTime(empOccupational.getInjuredTime());
+ }
+ if(empOccupational.getReportTime()==null){
+ empOccupational.setReportTime(empOccupational.getInjuredTime());
+ }
+ if(empOccupational.getHrDoDate()==null){
+ empOccupational.setHrDoDate(empOccupational.getInjuredTime());
+ }
empOccupational.setCreator(operatorId);
empOccupational.setModifier(operatorId);
this.save(empOccupational);
@@ -97,4 +106,11 @@
List<String> list = new ArrayList<>(Arrays.asList(str));
empOccupationalMapper.logicDeleteByIds(list, operatorId);
}
+
+ @Override
+ public boolean momentToNormal(String ids) {
+ String[] str = ids.split(",");
+ List<String> list = new ArrayList<>(Arrays.asList(str));
+ return empOccupationalMapper.momentToNormal(list, operatorId)>0;
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0