From b3024fd012fc39bc0cbe52a5775748df428fe5ee Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期五, 12 三月 2021 09:22:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBadRecordServiceImpl.java | 219 ++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 177 insertions(+), 42 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBadRecordServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBadRecordServiceImpl.java
index 56d7e7f..2ee0b96 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBadRecordServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBadRecordServiceImpl.java
@@ -1,8 +1,23 @@
package cc.mrbird.febs.server.hr.service.impl;
+import cc.mrbird.febs.common.core.constant.ModuleCode;
+import cc.mrbird.febs.common.core.entity.constant.FebsConstant;
+import cc.mrbird.febs.common.core.entity.constant.StringConstant;
+import cc.mrbird.febs.common.core.exception.FebsException;
+import cc.mrbird.febs.common.core.utils.SortUtil;
+import cc.mrbird.febs.server.hr.constant.MyConstant;
+import cc.mrbird.febs.server.hr.entity.EmpAccidentCases;
import cc.mrbird.febs.server.hr.entity.EmpBadRecord;
+import cc.mrbird.febs.server.hr.entity.EmpBadRecord;
+import cc.mrbird.febs.server.hr.feign.IRemoteDeptService;
import cc.mrbird.febs.server.hr.mapper.EmpBadRecordMapper;
import cc.mrbird.febs.server.hr.service.IEmpBadRecordService;
+import cc.mrbird.febs.server.hr.service.IEmpBaseInfoService;
+import cn.hutool.core.date.DateUtil;
+
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+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 +27,179 @@
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:EmpBadrecord
-* package:cc.mrbird.febs.server.hr.controller
-* description:员工不良记录信息服务接口实现
-*
-* @author luoyibo
-* @date 2021-01-24 20:35:55
-* @since JDK1.8
-*/
+ * name:EmpBadrecord
+ * package:cc.mrbird.febs.server.hr.controller
+ * description:员工不良记录信息服务接口实现
+ *
+ * @author luoyibo
+ * @date 2021-01-31 11:26:42
+ * @since JDK1.8
+ */
@Service
@RequiredArgsConstructor
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
-public class EmpBadRecordServiceImpl extends ServiceImpl
-<EmpBadRecordMapper, EmpBadRecord> implements IEmpBadRecordService {
+class EmpBadRecordServiceImpl extends ServiceImpl<EmpBadRecordMapper, EmpBadRecord> implements IEmpBadRecordService {
-private final EmpBadRecordMapper empBadrecordMapper;
+ private final RedisService redisService;
+ private final EmpBadRecordMapper empBadrecordMapper;
+ private final IEmpBaseInfoService empBaseInfoService;
+ private final IRemoteDeptService remoteDeptService;
+ private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
+ .map(u -> u.getUserId().toString())
+ .orElse("1");
-@Override
-public IPage<EmpBadRecord> findEmpBadrecords(QueryRequest request, EmpBadRecord empBadrecord) {
-LambdaQueryWrapper<EmpBadRecord> queryWrapper = new LambdaQueryWrapper<>();
-// TODO 设置查询条件
-Page<EmpBadRecord> page = new Page<>(request.getPageNum(), request.getPageSize());
-return this.page(page, queryWrapper);
-}
+ @Override
+ public IPage<EmpBadRecord> findEmpBadrecords(QueryRequest request, EmpBadRecord empBadrecord) {
+ QueryWrapper<EmpBadRecord> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("a.delFlag", empBadrecord.getDelFlag());
+ if (StringUtils.isNotBlank(empBadrecord.getEmpNumb())) {
+ queryWrapper.like("a.EmpNumb", empBadrecord.getEmpNumb());
+ }
+ if (StringUtils.isNotBlank(empBadrecord.getEmpName())) {
+ queryWrapper.like("a.EmpName", empBadrecord.getEmpName());
+ }
+ if (StringUtils.isNotBlank(empBadrecord.getCertificateNumb())) {
+ queryWrapper.like("a.CertificateNumb", empBadrecord.getCertificateNumb());
+ }
+ if (StringUtils.isNotBlank(empBadrecord.getDeptName())) {
+ queryWrapper.like("a.DeptName", empBadrecord.getDeptName());
+ }
+ if (StringUtils.isNotBlank(empBadrecord.getBadDateStr())) {
+ queryWrapper.between("a.badDate", empBadrecord.getBadDateStr().split(",")[0],empBadrecord.getBadDateStr().split(",")[1]);
+ }
+ if (StringUtils.isNotBlank(empBadrecord.getBadContent())) {
+ queryWrapper.like("a.badContent", empBadrecord.getBadContent());
+ }
+ if (StringUtils.isNotBlank(empBadrecord.getEmpStatus())) {
+ queryWrapper.in("b.EmpStatus", empBadrecord.getEmpStatus().split(","));
+ } else {
+ queryWrapper.in("b.EmpStatus", 0);
+ }
+ queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
+ Page<EmpBadRecord> page = new Page<>(request.getPageNum(), request.getPageSize());
+ SortUtil.handlePageSort(request, page, "createTime", FebsConstant.ORDER_DESC, true);
+ return empBadrecordMapper.selectPageVo(page, queryWrapper);
+ }
-@Override
-public List<EmpBadRecord> findEmpBadrecords(EmpBadRecord empBadrecord) {
-LambdaQueryWrapper<EmpBadRecord> queryWrapper = new LambdaQueryWrapper<>();
-// TODO 设置查询条件
-return this.baseMapper.selectList(queryWrapper);
-}
+ @Override
+ public List<EmpBadRecord> findEmpBadrecords(EmpBadRecord empBadrecord) {
+ LambdaQueryWrapper<EmpBadRecord> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(EmpBadRecord::getDelFlag, empBadrecord.getDelFlag());
+ return this.baseMapper.selectList(queryWrapper);
+ }
-@Override
-@Transactional(rollbackFor = Exception.class)
-public void createEmpBadrecord(EmpBadRecord empBadrecord) {
-this.save(empBadrecord);
-}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void createEmpBadrecord(EmpBadRecord empBadrecord) throws FebsException {
+ LambdaQueryWrapper<EmpBadRecord> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+ lambdaQueryWrapper.eq(EmpBadRecord::getEmpId, empBadrecord.getEmpId());
+ lambdaQueryWrapper.eq(EmpBadRecord::getBadDate, empBadrecord.getBadDate());
+ lambdaQueryWrapper.ne(EmpBadRecord::getDelFlag,1);
+ if (this.count(lambdaQueryWrapper) > 0) {
+ throw new FebsException(MyConstant.MESSAGE);
+ }
+ empBadrecord.setBadId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
+ empBadrecord.setCreator(operatorId);
+ empBadrecord.setModifier(operatorId);
+ this.save(empBadrecord);
+ }
-@Override
-@Transactional(rollbackFor = Exception.class)
-public void updateEmpBadrecord(EmpBadRecord empBadrecord) {
-this.saveOrUpdate(empBadrecord);
-}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void updateEmpBadrecord(EmpBadRecord empBadrecord) throws FebsException {
+ LambdaQueryWrapper<EmpBadRecord> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+ lambdaQueryWrapper.eq(EmpBadRecord::getEmpId, empBadrecord.getEmpId());
+ lambdaQueryWrapper.eq(EmpBadRecord::getBadDate, empBadrecord.getBadDate());
+ lambdaQueryWrapper.ne(EmpBadRecord::getDelFlag,1);
+ lambdaQueryWrapper.ne(EmpBadRecord::getBadId,empBadrecord.getBadId());
+ if (this.count(lambdaQueryWrapper) > 0) {
+ throw new FebsException(MyConstant.MESSAGE);
+ }
+ EmpBadRecord dbData = this.getById(empBadrecord.getBadId());
+ empBadrecord.setCreateTime(dbData.getCreateTime());
+ empBadrecord.setCreator(dbData.getCreator());
+ empBadrecord.setDelFlag(dbData.getDelFlag());
+ empBadrecord.setModifyTime(new Date());
+ empBadrecord.setModifier(operatorId);
+ this.saveOrUpdate(empBadrecord);
+ }
-@Override
-@Transactional(rollbackFor = Exception.class)
-public void deleteEmpBadRecord(EmpBadRecord empBadrecord) {
-LambdaQueryWrapper<EmpBadRecord> wapper = new LambdaQueryWrapper<>();
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void deleteEmpBadrecord(EmpBadRecord empBadrecord) {
+ LambdaQueryWrapper<EmpBadRecord> 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 logicDelEmpBadrecord(String ids) {
+ String[] str = ids.split(",");
+ List<String> list = new ArrayList<>(Arrays.asList(str));
+ empBadrecordMapper.logicDeleteByIds(list, operatorId);
+ }
+
+ @Override
+ public boolean momentToNormal(String ids) {
+ String[] str = ids.split(",");
+ List<String> list = new ArrayList<>(Arrays.asList(str));
+ return empBadrecordMapper.momentToNormal(list, operatorId) > 0;
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void importEmpBadRecord(List<List<Object>> listObject,List<String> returnList) {
+ for (List<Object> list : listObject) {
+ if (list.size()==0){
+ continue;
+ }
+ EmpBadRecord empBadrecord=new EmpBadRecord();
+ empBadrecord.setBadId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
+ empBadrecord.setEmpNumb(list.get(0).toString());
+ List<Dept> depts = CastUtil.castList(redisService.get("depts"), Dept.class);
+ Dept dept = depts.stream().filter(d -> d.getDeptName().equals(list.get(1).toString())).findFirst().orElse(null);
+ if (null == dept) {
+ returnList.add(StrUtil.format("导入员工不良记录信息异常: 出现位置第{}行, 原因:{}部门不存在",listObject.indexOf(list)+1,list.get(1).toString()));
+ continue;
+ }
+ Long empId = empBaseInfoService.getEmpIdByEmpNumb(list.get(0).toString());
+ if (null == empId){
+ returnList.add(StrUtil.format("导入员工不良记录信息异常: 出现位置第{}行, 原因:{}员工编号不存在",listObject.indexOf(list)+1,list.get(0).toString()));
+ continue;
+ }
+ empBadrecord.setDelFlag(2);
+ empBadrecord.setEmpId(empId);
+ empBadrecord.setDeptName(list.get(1).toString());
+ empBadrecord.setDeptId(dept.getDeptId());
+ empBadrecord.setJobName(list.get(2).toString());
+ empBadrecord.setEmpName(list.get(3).toString());
+ empBadrecord.setCertificateNumb(list.get(4).toString());
+ if (StringUtils.isNotBlank(list.get(5).toString())) {
+ empBadrecord.setBadDate(DateUtil.parseDateTime(list.get(5).toString()));
+ }
+ empBadrecord.setBadContent(list.get(6).toString());
+ empBadrecord.setReporter(list.get(7).toString());
+ empBadrecord.setRemark(list.get(8).toString());
+ this.save(empBadrecord);
+ }
+ }
}
--
Gitblit v1.8.0