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/EmpOccupationalServiceImpl.java | 132 +++++++++++++++++++++++++++++--------------
1 files changed, 89 insertions(+), 43 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 1d77baf..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
@@ -1,5 +1,6 @@
package cc.mrbird.febs.server.hr.service.impl;
+import cc.mrbird.febs.common.core.constant.ModuleCode;
import cc.mrbird.febs.server.hr.entity.EmpOccupational;
import cc.mrbird.febs.server.hr.mapper.EmpOccupationalMapper;
import cc.mrbird.febs.server.hr.service.IEmpOccupationalService;
@@ -12,59 +13,104 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import cc.mrbird.febs.common.core.entity.QueryRequest;
+import cc.mrbird.febs.common.core.utils.FebsUtil;
+import cc.mrbird.febs.common.core.utils.SequenceUtil;
-import java.util.List;
+import java.util.*;
/**
-*
-* name:EmpOccupational
-* package:cc.mrbird.febs.server.hr.controller
-* description:员工工伤案件服务接口实现
-*
-* @author luoyibo
-* @date 2021-01-24 20:35:24
-* @since JDK1.8
-*/
+ * name:EmpOccupational
+ * package:cc.mrbird.febs.server.hr.controller
+ * description:员工工伤案件服务接口实现
+ *
+ * @author luoyibo
+ * @date 2021-01-31 11:26:32
+ * @since JDK1.8
+ */
@Service
@RequiredArgsConstructor
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
-public class EmpOccupationalServiceImpl extends ServiceImpl
-<EmpOccupationalMapper, EmpOccupational> implements IEmpOccupationalService {
+class EmpOccupationalServiceImpl extends ServiceImpl<EmpOccupationalMapper, EmpOccupational> implements IEmpOccupationalService {
-private final EmpOccupationalMapper empOccupationalMapper;
+ private final EmpOccupationalMapper empOccupationalMapper;
+ private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
+ .map(u -> u.getUserId().toString())
+ .orElse("1");
-@Override
-public IPage<EmpOccupational> findEmpOccupationals(QueryRequest request, EmpOccupational empOccupational) {
-LambdaQueryWrapper<EmpOccupational> queryWrapper = new LambdaQueryWrapper<>();
-// TODO 设置查询条件
-Page<EmpOccupational> page = new Page<>(request.getPageNum(), request.getPageSize());
-return this.page(page, queryWrapper);
-}
+ @Override
+ public IPage<EmpOccupational> findEmpOccupationals(QueryRequest request, EmpOccupational empOccupational) {
+ LambdaQueryWrapper<EmpOccupational> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(EmpOccupational::getDelFlag, empOccupational.getDelFlag());
+ Page<EmpOccupational> page = new Page<>(request.getPageNum(), request.getPageSize());
+ return this.page(page, queryWrapper);
+ }
-@Override
-public List<EmpOccupational> findEmpOccupationals(EmpOccupational empOccupational) {
-LambdaQueryWrapper<EmpOccupational> queryWrapper = new LambdaQueryWrapper<>();
-// TODO 设置查询条件
-return this.baseMapper.selectList(queryWrapper);
-}
+ @Override
+ public List<EmpOccupational> findEmpOccupationals(EmpOccupational empOccupational) {
+ LambdaQueryWrapper<EmpOccupational> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(EmpOccupational::getDelFlag, empOccupational.getDelFlag());
+ return this.baseMapper.selectList(queryWrapper);
+ }
-@Override
-@Transactional(rollbackFor = Exception.class)
-public void createEmpOccupational(EmpOccupational empOccupational) {
-this.save(empOccupational);
-}
+ @Override
+ @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);
+ }
-@Override
-@Transactional(rollbackFor = Exception.class)
-public void updateEmpOccupational(EmpOccupational empOccupational) {
-this.saveOrUpdate(empOccupational);
-}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void updateEmpOccupational(EmpOccupational empOccupational) {
+ EmpOccupational dbData = this.getById(empOccupational.getOccupationalId());
+ empOccupational.setCreateTime(dbData.getCreateTime());
+ empOccupational.setCreator(dbData.getCreator());
+ empOccupational.setDelFlag(dbData.getDelFlag());
+ empOccupational.setModifyTime(new Date());
+ empOccupational.setModifier(operatorId);
+ this.saveOrUpdate(empOccupational);
+ }
-@Override
-@Transactional(rollbackFor = Exception.class)
-public void deleteEmpOccupational(EmpOccupational empOccupational) {
-LambdaQueryWrapper<EmpOccupational> wapper = new LambdaQueryWrapper<>();
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void deleteEmpOccupational(EmpOccupational empOccupational) {
+ LambdaQueryWrapper<EmpOccupational> wrapper = new LambdaQueryWrapper<>();
// TODO 设置删除条件
-this.remove(wapper);
-}
-}
+ this.remove(wrapper);
+ }
+
+ /**
+ * 根据Id批量逻辑删除记录
+ * <p>
+ * date 2021-01-28 10:48
+ *
+ * @param ids 待删除Id
+ * @return void
+ * @author: luoyibo
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void logicDelEmpOccupational(String ids) {
+ String[] str = ids.split(",");
+ 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