From 9bc6b681dd59e1aa6358d136d6f63a2477b0a49a Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期日, 21 二月 2021 13:17:17 +0800
Subject: [PATCH] fix(在职员工): 关闭档案
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpOccupationalServiceImpl.java | 180 +++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 131 insertions(+), 49 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..1892772 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,70 +1,152 @@
package cc.mrbird.febs.server.hr.service.impl;
-import cc.mrbird.febs.server.hr.entity.EmpOccupational;
-import cc.mrbird.febs.server.hr.mapper.EmpOccupationalMapper;
-import cc.mrbird.febs.server.hr.service.IEmpOccupationalService;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+import java.util.Optional;
+
+import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.annotation.Propagation;
-import lombok.RequiredArgsConstructor;
+import org.springframework.transaction.annotation.Transactional;
+
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
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 java.util.List;
+import cc.mrbird.febs.common.core.constant.ModuleCode;
+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 cc.mrbird.febs.server.hr.entity.EmpOccupational;
+import cc.mrbird.febs.server.hr.mapper.EmpOccupationalMapper;
+import cc.mrbird.febs.server.hr.service.IEmpOccupationalService;
+import lombok.RequiredArgsConstructor;
/**
-*
-* 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());
+ if (StringUtils.isNotBlank(empOccupational.getEmpNumb())) {
+ queryWrapper.like(EmpOccupational::getEmpNumb, empOccupational.getEmpNumb());
+ }
+ if (StringUtils.isNotBlank(empOccupational.getEmpName())) {
+ queryWrapper.like(EmpOccupational::getEmpName, empOccupational.getEmpName());
+ }
+ if (StringUtils.isNotBlank(empOccupational.getCertificateNumb())) {
+ queryWrapper.like(EmpOccupational::getCertificateNumb, empOccupational.getCertificateNumb());
+ }
+ if (StringUtils.isNotBlank(empOccupational.getDeptName())) {
+ queryWrapper.like(EmpOccupational::getDeptName, empOccupational.getDeptName());
+ }
+ if (StringUtils.isNotBlank(empOccupational.getInjuredTimeStr())) {
+ queryWrapper.between(EmpOccupational::getInjuredTime, empOccupational.getInjuredTimeStr().split(",")[0],
+ empOccupational.getInjuredTimeStr().split(",")[1]);
+ }
+ if (StringUtils.isNotBlank(empOccupational.getHrDoDateStr())) {
+ queryWrapper.between(EmpOccupational::getHrDoDate, empOccupational.getHrDoDateStr().split(",")[0],
+ empOccupational.getHrDoDateStr().split(",")[1]);
+ }
+ if (empOccupational.getHospitalizatioFlag() != null && empOccupational.getHospitalizatioFlag() != 0) {
+ queryWrapper.eq(EmpOccupational::getHospitalizatioFlag, empOccupational.getHospitalizatioFlag());
+ }
+ if (empOccupational.getSettleStatus() != null && empOccupational.getSettleStatus() != 0) {
+ queryWrapper.eq(EmpOccupational::getSettleStatus, empOccupational.getSettleStatus());
+ }
+ if (StringUtils.isNotBlank(empOccupational.getEmpStatus())) {
+ queryWrapper.eq(EmpOccupational::getEmpStatus, empOccupational.getEmpStatus());
+ }
+ 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