From cea0deacb7c614918d213fe3a18c9fa1abf09dc8 Mon Sep 17 00:00:00 2001
From: yijiusmile <253281376@qq.com>
Date: 星期三, 17 二月 2021 00:05:17 +0800
Subject: [PATCH] 完善员工智搜
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccidentCasesServiceImpl.java | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccidentCasesServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccidentCasesServiceImpl.java
index 8f50d00..3916048 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccidentCasesServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccidentCasesServiceImpl.java
@@ -40,7 +40,7 @@
@Override
public IPage<EmpAccidentCases> findEmpAccidentcasess(QueryRequest request, EmpAccidentCases empAccidentcases) {
LambdaQueryWrapper<EmpAccidentCases> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(EmpAccidentCases::getDelFlag, 0);
+ queryWrapper.eq(EmpAccidentCases::getDelFlag, empAccidentcases.getDelFlag());
Page<EmpAccidentCases> page = new Page<>(request.getPageNum(), request.getPageSize());
return this.page(page, queryWrapper);
}
@@ -48,7 +48,7 @@
@Override
public List<EmpAccidentCases> findEmpAccidentcasess(EmpAccidentCases empAccidentcases) {
LambdaQueryWrapper<EmpAccidentCases> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(EmpAccidentCases::getDelFlag, 0);
+ queryWrapper.eq(EmpAccidentCases::getDelFlag, empAccidentcases.getDelFlag());
return this.baseMapper.selectList(queryWrapper);
}
@@ -56,6 +56,15 @@
@Transactional(rollbackFor = Exception.class)
public void createEmpAccidentcases(EmpAccidentCases empAccidentcases) {
empAccidentcases.setAccidentId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
+ if(empAccidentcases.getReprotTime()==null){
+ empAccidentcases.setReprotTime(empAccidentcases.getInjuredTime());
+ }
+ if(empAccidentcases.getSubmitTime()==null){
+ empAccidentcases.setSubmitTime(empAccidentcases.getInjuredTime());
+ }
+ if(empAccidentcases.getHrDoDate()==null){
+ empAccidentcases.setHrDoDate(empAccidentcases.getInjuredTime());
+ }
empAccidentcases.setCreator(operatorId);
empAccidentcases.setModifier(operatorId);
this.save(empAccidentcases);
@@ -92,9 +101,16 @@
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public void logicDelEmpAccidentcases(String ids) {
+ public void logicDelEmpAccidentCases(String ids) {
String[] str = ids.split(",");
List<String> list = new ArrayList<>(Arrays.asList(str));
empAccidentcasesMapper.logicDeleteByIds(list, operatorId);
}
+
+ @Override
+ public boolean momentToNormal(String ids) {
+ String[] str = ids.split(",");
+ List<String> list = new ArrayList<>(Arrays.asList(str));
+ return empAccidentcasesMapper.momentToNormal(list, operatorId) > 0;
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0