From 1c7cb9c300fda246db57ef5c43d118c7eaef22d6 Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期一, 01 三月 2021 20:15:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpDimissionAttendServiceImpl.java | 193 +++++++++++++++++++++++++++++++++++++----------
1 files changed, 150 insertions(+), 43 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpDimissionAttendServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpDimissionAttendServiceImpl.java
index 476ca0c..d0ddb58 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpDimissionAttendServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpDimissionAttendServiceImpl.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.EmpBaseInfo;
+import cc.mrbird.febs.server.hr.entity.EmpDimissionAttend;
import cc.mrbird.febs.server.hr.entity.EmpDimissionAttend;
import cc.mrbird.febs.server.hr.mapper.EmpDimissionAttendMapper;
import cc.mrbird.febs.server.hr.service.IEmpDimissionAttendService;
+
+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,161 @@
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.math.BigDecimal;
+import java.util.*;
/**
-*
-* name:EmpDimissionattend
-* package:cc.mrbird.febs.server.hr.controller
-* description:离职当月考勤服务接口实现
-*
-* @author luoyibo
-* @date 2021-01-24 20:35:38
-* @since JDK1.8
-*/
+ * name:EmpDimissionattend
+ * package:cc.mrbird.febs.server.hr.controller
+ * description:离职当月考勤服务接口实现
+ *
+ * @author luoyibo
+ * @date 2021-01-31 11:26:04
+ * @since JDK1.8
+ */
@Service
@RequiredArgsConstructor
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
-public class EmpDimissionAttendServiceImpl extends ServiceImpl
-<EmpDimissionAttendMapper, EmpDimissionAttend> implements IEmpDimissionAttendService {
+class EmpDimissionAttendServiceImpl extends ServiceImpl<EmpDimissionAttendMapper, EmpDimissionAttend> implements IEmpDimissionAttendService {
-private final EmpDimissionAttendMapper empDimissionattendMapper;
+ private final RedisService redisService;
+ private final EmpDimissionAttendMapper empDimissionattendMapper;
+ private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
+ .map(u -> u.getUserId().toString())
+ .orElse("1");
-@Override
-public IPage<EmpDimissionAttend> findEmpDimissionattends(QueryRequest request, EmpDimissionAttend empDimissionattend) {
-LambdaQueryWrapper<EmpDimissionAttend> queryWrapper = new LambdaQueryWrapper<>();
-// TODO 设置查询条件
-Page<EmpDimissionAttend> page = new Page<>(request.getPageNum(), request.getPageSize());
-return this.page(page, queryWrapper);
-}
+ @Override
+ public IPage<EmpDimissionAttend> findEmpDimissionattends(QueryRequest request, EmpDimissionAttend empDimissionattend) {
+ LambdaQueryWrapper<EmpDimissionAttend> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(EmpDimissionAttend::getDelFlag, empDimissionattend.getDelFlag());
+ if (StringUtils.isNotBlank(empDimissionattend.getEmpNumb())) {
+ queryWrapper.like(EmpDimissionAttend::getEmpNumb, empDimissionattend.getEmpNumb());
+ }
+ if (StringUtils.isNotBlank(empDimissionattend.getEmpName())) {
+ queryWrapper.like(EmpDimissionAttend::getEmpName, empDimissionattend.getEmpName());
+ }
+ if (StringUtils.isNotBlank(empDimissionattend.getCertificateNumb())) {
+ queryWrapper.like(EmpDimissionAttend::getCertificateNumb, empDimissionattend.getCertificateNumb());
+ }
+ if (StringUtils.isNotBlank(empDimissionattend.getDeptName())) {
+ queryWrapper.like(EmpDimissionAttend::getDeptName, empDimissionattend.getDeptName());
+ }
+ if (StringUtils.isNotBlank(empDimissionattend.getAttendYear())) {
+ queryWrapper.like(EmpDimissionAttend::getAttendYear, empDimissionattend.getAttendYear());
+ }
+ if (StringUtils.isNotBlank(empDimissionattend.getAttendMonth())) {
+ queryWrapper.like(EmpDimissionAttend::getAttendMonth, empDimissionattend.getAttendMonth());
+ }
+ if (StringUtils.isNotBlank(empDimissionattend.getDeductStr())) {
+ queryWrapper.like(EmpDimissionAttend::getDeduct, empDimissionattend.getDeductStr());
+ }
+ if (StringUtils.isNotBlank(empDimissionattend.getEmpStatus())) {
+ queryWrapper.eq(EmpDimissionAttend::getEmpStatus, empDimissionattend.getEmpStatus());
+ }
+ Page<EmpDimissionAttend> page = new Page<>(request.getPageNum(), request.getPageSize());
+ return this.page(page, queryWrapper);
+ }
-@Override
-public List<EmpDimissionAttend> findEmpDimissionattends(EmpDimissionAttend empDimissionattend) {
-LambdaQueryWrapper<EmpDimissionAttend> queryWrapper = new LambdaQueryWrapper<>();
-// TODO 设置查询条件
-return this.baseMapper.selectList(queryWrapper);
-}
+ @Override
+ public List<EmpDimissionAttend> findEmpDimissionattends(EmpDimissionAttend empDimissionattend) {
+ LambdaQueryWrapper<EmpDimissionAttend> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(EmpDimissionAttend::getDelFlag, empDimissionattend.getDelFlag());
+ return this.baseMapper.selectList(queryWrapper);
+ }
-@Override
-@Transactional(rollbackFor = Exception.class)
-public void createEmpDimissionattend(EmpDimissionAttend empDimissionattend) {
-this.save(empDimissionattend);
-}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void createEmpDimissionattend(EmpDimissionAttend empDimissionattend) {
+ empDimissionattend.setDimissionAttendId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
+ empDimissionattend.setCreator(operatorId);
+ empDimissionattend.setModifier(operatorId);
+ this.save(empDimissionattend);
+ }
-@Override
-@Transactional(rollbackFor = Exception.class)
-public void updateEmpDimissionattend(EmpDimissionAttend empDimissionattend) {
-this.saveOrUpdate(empDimissionattend);
-}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void updateEmpDimissionattend(EmpDimissionAttend empDimissionattend) {
+ EmpDimissionAttend dbData = this.getById(empDimissionattend.getDimissionAttendId());
+ empDimissionattend.setCreateTime(dbData.getCreateTime());
+ empDimissionattend.setCreator(dbData.getCreator());
+ empDimissionattend.setDelFlag(dbData.getDelFlag());
+ empDimissionattend.setModifyTime(new Date());
+ empDimissionattend.setModifier(operatorId);
+ this.saveOrUpdate(empDimissionattend);
+ }
-@Override
-@Transactional(rollbackFor = Exception.class)
-public void deleteEmpDimissionattend(EmpDimissionAttend empDimissionattend) {
-LambdaQueryWrapper<EmpDimissionAttend> wapper = new LambdaQueryWrapper<>();
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void deleteEmpDimissionattend(EmpDimissionAttend empDimissionattend) {
+ LambdaQueryWrapper<EmpDimissionAttend> 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 logicDelEmpDimissionattend(String ids) {
+ String[] str = ids.split(",");
+ List<String> list = new ArrayList<>(Arrays.asList(str));
+ empDimissionattendMapper.logicDeleteByIds(list, operatorId);
+ }
+
+ @Override
+ public boolean momentToNormal(String ids) {
+ String[] str = ids.split(",");
+ List<String> list = new ArrayList<>(Arrays.asList(str));
+ return empDimissionattendMapper.momentToNormal(list, operatorId)>0;
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void importEmpDimissionAttend(List<List<Object>> listObject) {
+ for (List<Object> list : listObject) {
+ EmpDimissionAttend dimissionAttend = new EmpDimissionAttend();
+ dimissionAttend.setDimissionAttendId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
+ dimissionAttend.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();
+ dimissionAttend.setDeptName(list.get(1).toString());
+ dimissionAttend.setDeptId(deptId);
+ dimissionAttend.setJobName(list.get(2).toString());
+ dimissionAttend.setEmpName(list.get(3).toString());
+ dimissionAttend.setCertificateNumb(list.get(4).toString());
+ dimissionAttend.setAttendMonth(list.get(5).toString());
+ if (StringUtils.isNotBlank(list.get(6).toString())) {
+ dimissionAttend.setAttendDays(new BigDecimal(list.get(6).toString()));
+ }
+ if (StringUtils.isNotBlank(list.get(7).toString())) {
+ dimissionAttend.setOvertimeDay(new BigDecimal(list.get(7).toString()));
+ }
+ if (StringUtils.isNotBlank(list.get(8).toString())) {
+ dimissionAttend.setOvertimeHour(new BigDecimal(list.get(8).toString()));
+ }
+ dimissionAttend.setDeduct(list.get(9).toString());
+ if (StringUtils.isNotBlank(list.get(10).toString())) {
+ dimissionAttend.setLeaveDay(new BigDecimal(list.get(10).toString()));
+ }
+ if (StringUtils.isNotBlank(list.get(11).toString())) {
+ dimissionAttend.setAbsenteeism(new BigDecimal(list.get(11).toString()));
+ }
+ dimissionAttend.setRemark(list.get(12).toString());
+ this.save(dimissionAttend);
+ }
+ }
+}
\ No newline at end of file
--
Gitblit v1.8.0