From b230858cc0d2ee4fdb177c91c4e11cdf3dd57364 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期四, 18 二月 2021 07:15:33 +0800
Subject: [PATCH] Merge branch 'lybDevelop'
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpWorkExperienceServiceImpl.java | 143 +++++++++++++++++++++++++++++++++--------------
1 files changed, 99 insertions(+), 44 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpWorkExperienceServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpWorkExperienceServiceImpl.java
index d99b2a9..f989db5 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpWorkExperienceServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpWorkExperienceServiceImpl.java
@@ -1,8 +1,14 @@
package cc.mrbird.febs.server.hr.service.impl;
+import cc.mrbird.febs.common.core.constant.ModuleCode;
+import cc.mrbird.febs.common.core.utils.FebsUtil;
+import cc.mrbird.febs.common.core.utils.SequenceUtil;
+import cc.mrbird.febs.server.hr.entity.EmpBaseInfo;
import cc.mrbird.febs.server.hr.entity.EmpWorkExperience;
import cc.mrbird.febs.server.hr.mapper.EmpWorkExperienceMapper;
import cc.mrbird.febs.server.hr.service.IEmpWorkExperienceService;
+
+import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.annotation.Propagation;
@@ -13,58 +19,107 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import cc.mrbird.febs.common.core.entity.QueryRequest;
-import java.util.List;
+import java.util.*;
/**
-*
-* name:EmpWorkexperinece
-* package:cc.mrbird.febs.server.hr.controller
-* description:员工工作经历服务接口实现
-*
-* @author luoyibo
-* @date 2021-01-24 20:35:04
-* @since JDK1.8
-*/
+ * name:EmpWorkexperience
+ * package:cc.mrbird.febs.server.hr.controller
+ * description:员工工作经历服务接口实现
+ *
+ * @author luoyibo
+ * @date 2021-01-28 12:33:31
+ * @since JDK1.8
+ */
@Service
@RequiredArgsConstructor
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
-public class EmpWorkExperienceServiceImpl extends ServiceImpl
-<EmpWorkExperienceMapper, EmpWorkExperience> implements IEmpWorkExperienceService {
+class EmpWorkExperienceServiceImpl extends ServiceImpl<EmpWorkExperienceMapper, EmpWorkExperience> implements IEmpWorkExperienceService {
-private final EmpWorkExperienceMapper empWorkExperienceMapper;
+ private final EmpWorkExperienceMapper empWorkexperienceMapper;
+ private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
+ .map(u -> u.getUserId().toString())
+ .orElse("1");
-@Override
-public IPage<EmpWorkExperience> findEmpWorkexperineces(QueryRequest request, EmpWorkExperience empWorkexperinece) {
-LambdaQueryWrapper<EmpWorkExperience> queryWrapper = new LambdaQueryWrapper<>();
-// TODO 设置查询条件
-Page<EmpWorkExperience> page = new Page<>(request.getPageNum(), request.getPageSize());
-return this.page(page, queryWrapper);
-}
+ @Override
+ public IPage<EmpWorkExperience> findEmpWorkExperiences(QueryRequest request, EmpWorkExperience empWorkexperience) {
+ LambdaQueryWrapper<EmpWorkExperience> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(EmpWorkExperience::getDelFlag,empWorkexperience.getDelFlag());
+ if (StringUtils.isNotBlank(empWorkexperience.getEmpNumb())) {
+ queryWrapper.like(EmpWorkExperience::getEmpNumb, empWorkexperience.getEmpNumb());
+ }
+ if (StringUtils.isNotBlank(empWorkexperience.getEmpName())) {
+ queryWrapper.like(EmpWorkExperience::getEmpName, empWorkexperience.getEmpName());
+ }
+ if (StringUtils.isNotBlank(empWorkexperience.getCertificateNumb())) {
+ queryWrapper.like(EmpWorkExperience::getCertificateNumb, empWorkexperience.getCertificateNumb());
+ }
+ if (StringUtils.isNotBlank(empWorkexperience.getEmpStatus())) {
+ queryWrapper.eq(EmpWorkExperience::getEmpStatus, empWorkexperience.getEmpStatus());
+ }
+ Page<EmpWorkExperience> page = new Page<>(request.getPageNum(), request.getPageSize());
+ return this.page(page, queryWrapper);
+ }
-@Override
-public List<EmpWorkExperience> findEmpWorkexperineces(EmpWorkExperience empWorkexperinece) {
-LambdaQueryWrapper<EmpWorkExperience> queryWrapper = new LambdaQueryWrapper<>();
-// TODO 设置查询条件
-return this.baseMapper.selectList(queryWrapper);
-}
+ @Override
+ public List<EmpWorkExperience> findEmpWorkExperiences(EmpWorkExperience empWorkexperience) {
+ LambdaQueryWrapper<EmpWorkExperience> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(EmpWorkExperience::getDelFlag,empWorkexperience.getDelFlag());
+ return this.baseMapper.selectList(queryWrapper);
+ }
-@Override
-@Transactional(rollbackFor = Exception.class)
-public void createEmpWorkexperinece(EmpWorkExperience empWorkexperinece) {
-this.save(empWorkexperinece);
-}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void createEmpWorkExperience(EmpWorkExperience empWorkexperience) {
+ empWorkexperience.setWorkExperienceId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
+ empWorkexperience.setDeptId(1L);
+ empWorkexperience.setJobId(1L);
+ empWorkexperience.setCreator(operatorId);
+ empWorkexperience.setModifier(operatorId);
+ this.save(empWorkexperience);
+ }
-@Override
-@Transactional(rollbackFor = Exception.class)
-public void updateEmpWorkexperinece(EmpWorkExperience empWorkexperinece) {
-this.saveOrUpdate(empWorkexperinece);
-}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void updateEmpWorkExperience(EmpWorkExperience empWorkexperience) {
+ EmpWorkExperience dbData = this.getById(empWorkexperience.getWorkExperienceId());
+ empWorkexperience.setCreateTime(dbData.getCreateTime());
+ empWorkexperience.setCreator(dbData.getCreator());
+ empWorkexperience.setDelFlag(dbData.getDelFlag());
+ empWorkexperience.setModifyTime(new Date());
+ empWorkexperience.setModifier(operatorId);
+ this.saveOrUpdate(empWorkexperience);
+ }
-@Override
-@Transactional(rollbackFor = Exception.class)
-public void deleteEmpWorkexperinece(EmpWorkExperience empWorkexperinece) {
-LambdaQueryWrapper<EmpWorkExperience> wapper = new LambdaQueryWrapper<>();
-// TODO 设置删除条件
-this.remove(wapper);
-}
-}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void deleteEmpWorkExperience(EmpWorkExperience empWorkexperience) {
+ LambdaQueryWrapper<EmpWorkExperience> wapper = new LambdaQueryWrapper<>();
+ // TODO 设置删除条件
+ this.remove(wapper);
+ }
+
+ /**
+ * 根据Id批量逻辑删除记录
+ * <p>
+ * date 2021-01-28 10:48
+ *
+ * @param ids 待删除Id
+ * @return void
+ * @author: luoyibo
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void logicDelEmpWorkExperience(String ids) {
+ List<String> list = new ArrayList<>();
+ String[] str = ids.split(",");
+ list.addAll(Arrays.asList(str));
+ empWorkexperienceMapper.logicDeleteByIds(list, operatorId);
+ }
+
+ @Override
+ public boolean momentToNormal(String ids) {
+ String[] str = ids.split(",");
+ List<String> list = new ArrayList<>(Arrays.asList(str));
+ return empWorkexperienceMapper.momentToNormal(list, operatorId)>0;
+ }
+}
\ No newline at end of file
--
Gitblit v1.8.0