From a72d1a009bc4068e1ba2890a9730223b9528c2f2 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期五, 26 二月 2021 21:23:21 +0800
Subject: [PATCH] Merge branch 'lybfixbug'
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpResignServiceImpl.java | 174 +++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 131 insertions(+), 43 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpResignServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpResignServiceImpl.java
index b02aa3b..687f61e 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpResignServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpResignServiceImpl.java
@@ -1,8 +1,13 @@
package cc.mrbird.febs.server.hr.service.impl;
+import cc.mrbird.febs.common.core.constant.ModuleCode;
+import cc.mrbird.febs.server.hr.entity.EmpResign;
import cc.mrbird.febs.server.hr.entity.EmpResign;
import cc.mrbird.febs.server.hr.mapper.EmpResignMapper;
import cc.mrbird.febs.server.hr.service.IEmpResignService;
+import cn.hutool.core.date.DateUtil;
+
+import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.annotation.Propagation;
@@ -12,59 +17,142 @@
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.entity.system.Dept;
+import cc.mrbird.febs.common.core.utils.CastUtil;
+import cc.mrbird.febs.common.core.utils.FebsUtil;
+import cc.mrbird.febs.common.core.utils.SequenceUtil;
+import cc.mrbird.febs.common.redis.service.RedisService;
-import java.util.List;
+import java.util.*;
/**
-*
-* name:EmpResign
-* package:cc.mrbird.febs.server.hr.controller
-* description:员工辞职申请服务接口实现
-*
-* @author luoyibo
-* @date 2021-01-24 20:35:08
-* @since JDK1.8
-*/
+ * name:EmpResign
+ * package:cc.mrbird.febs.server.hr.controller
+ * description:员工辞职申请服务接口实现
+ *
+ * @author luoyibo
+ * @date 2021-01-31 11:26:18
+ * @since JDK1.8
+ */
@Service
@RequiredArgsConstructor
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
-public class EmpResignServiceImpl extends ServiceImpl
-<EmpResignMapper, EmpResign> implements IEmpResignService {
+class EmpResignServiceImpl extends ServiceImpl<EmpResignMapper, EmpResign> implements IEmpResignService {
-private final EmpResignMapper empResignMapper;
+ private final RedisService redisService;
+ private final EmpResignMapper empResignMapper;
+ private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
+ .map(u -> u.getUserId().toString())
+ .orElse("1");
-@Override
-public IPage<EmpResign> findEmpResigns(QueryRequest request, EmpResign empResign) {
-LambdaQueryWrapper<EmpResign> queryWrapper = new LambdaQueryWrapper<>();
-// TODO 设置查询条件
-Page<EmpResign> page = new Page<>(request.getPageNum(), request.getPageSize());
-return this.page(page, queryWrapper);
-}
+ @Override
+ public IPage<EmpResign> findEmpResigns(QueryRequest request, EmpResign empResign) {
+ LambdaQueryWrapper<EmpResign> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(EmpResign::getDelFlag, empResign.getDelFlag());
+ Page<EmpResign> page = new Page<>(request.getPageNum(), request.getPageSize());
+ if (StringUtils.isNotBlank(empResign.getEmpNumb())) {
+ queryWrapper.like(EmpResign::getEmpNumb, empResign.getEmpNumb());
+ }
+ if (StringUtils.isNotBlank(empResign.getEmpName())) {
+ queryWrapper.like(EmpResign::getEmpName, empResign.getEmpName());
+ }
+ if (StringUtils.isNotBlank(empResign.getCertificateNumb())) {
+ queryWrapper.like(EmpResign::getCertificateNumb, empResign.getCertificateNumb());
+ }
+ if (StringUtils.isNotBlank(empResign.getDeptName())) {
+ queryWrapper.like(EmpResign::getDeptName, empResign.getDeptName());
+ }
+ if (StringUtils.isNotBlank(empResign.getApplayDateStr())) {
+ queryWrapper.between(EmpResign::getApplayDate, empResign.getApplayDateStr().split(",")[0], empResign.getApplayDateStr().split(",")[1]);
+ }
+ if (StringUtils.isNotBlank(empResign.getReason())) {
+ queryWrapper.like(EmpResign::getReason, empResign.getReason());
+ }
+ return this.page(page, queryWrapper);
+ }
-@Override
-public List<EmpResign> findEmpResigns(EmpResign empResign) {
-LambdaQueryWrapper<EmpResign> queryWrapper = new LambdaQueryWrapper<>();
-// TODO 设置查询条件
-return this.baseMapper.selectList(queryWrapper);
-}
+ @Override
+ public List<EmpResign> findEmpResigns(EmpResign empResign) {
+ LambdaQueryWrapper<EmpResign> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(EmpResign::getDelFlag, empResign.getDelFlag());
+ return this.baseMapper.selectList(queryWrapper);
+ }
-@Override
-@Transactional(rollbackFor = Exception.class)
-public void createEmpResign(EmpResign empResign) {
-this.save(empResign);
-}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void createEmpResign(EmpResign empResign) {
+ empResign.setResignId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
+ empResign.setCreator(operatorId);
+ empResign.setModifier(operatorId);
+ this.save(empResign);
+ }
-@Override
-@Transactional(rollbackFor = Exception.class)
-public void updateEmpResign(EmpResign empResign) {
-this.saveOrUpdate(empResign);
-}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void updateEmpResign(EmpResign empResign) {
+ EmpResign dbData = this.getById(empResign.getResignId());
+ empResign.setCreateTime(dbData.getCreateTime());
+ empResign.setCreator(dbData.getCreator());
+ empResign.setDelFlag(dbData.getDelFlag());
+ empResign.setModifyTime(new Date());
+ empResign.setModifier(operatorId);
+ this.saveOrUpdate(empResign);
+ }
-@Override
-@Transactional(rollbackFor = Exception.class)
-public void deleteEmpResign(EmpResign empResign) {
-LambdaQueryWrapper<EmpResign> wapper = new LambdaQueryWrapper<>();
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void deleteEmpResign(EmpResign empResign) {
+ LambdaQueryWrapper<EmpResign> 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 logicDelEmpResign(String ids) {
+ String[] str = ids.split(",");
+ List<String> list = new ArrayList<>(Arrays.asList(str));
+ empResignMapper.logicDeleteByIds(list, operatorId);
+ }
+
+ @Override
+ public boolean momentToNormal(String ids) {
+ String[] str = ids.split(",");
+ List<String> list = new ArrayList<>(Arrays.asList(str));
+ return empResignMapper.momentToNormal(list, operatorId)>0;
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void importEmpResign(List<List<Object>> listObject) {
+ for (List<Object> list : listObject) {
+ EmpResign resign = new EmpResign();
+ resign.setResignId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
+ resign.setEmpNumb(list.get(0).toString());
+ List<Dept> depts = CastUtil.castList(redisService.get("depts"), Dept.class);
+ Long deptId = depts.stream().filter(d -> d.getDeptName().equals(list.get(1).toString())).findFirst().get()
+ .getDeptId();
+ resign.setDeptName(list.get(1).toString());
+ resign.setDeptId(deptId);
+ resign.setJobName(list.get(2).toString());
+ resign.setEmpName(list.get(3).toString());
+ resign.setCertificateNumb(list.get(4).toString());
+ if (StringUtils.isNotBlank(list.get(5).toString())) {
+ resign.setApplayDate(DateUtil.parseDate(list.get(5).toString()));
+ }
+ resign.setReason(list.get(6).toString());
+ resign.setReporter(list.get(7).toString());
+ resign.setRemark(list.get(8).toString());
+ this.save(resign);
+ }
+ }
+}
\ No newline at end of file
--
Gitblit v1.8.0