From cf637bd648a40c4cc00d738785c947f27728f843 Mon Sep 17 00:00:00 2001
From: yz <yz_0812@outlook.com>
Date: 星期一, 22 二月 2021 01:36:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLaborTroubleServiceImpl.java | 77 ++++++++++++++++++++++++++++++++++++++
1 files changed, 77 insertions(+), 0 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLaborTroubleServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLaborTroubleServiceImpl.java
index 0b5e2d4..2636619 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLaborTroubleServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLaborTroubleServiceImpl.java
@@ -2,8 +2,13 @@
import cc.mrbird.febs.common.core.constant.ModuleCode;
import cc.mrbird.febs.server.hr.entity.EmpLaborTrouble;
+import cc.mrbird.febs.server.hr.entity.EmpOccupational;
+import cc.mrbird.febs.server.hr.entity.EmpLaborTrouble;
import cc.mrbird.febs.server.hr.mapper.EmpLaborTroubleMapper;
import cc.mrbird.febs.server.hr.service.IEmpLaborTroubleService;
+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;
@@ -13,9 +18,13 @@
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.math.BigDecimal;
import java.util.*;
/**
@@ -32,6 +41,7 @@
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
class EmpLaborTroubleServiceImpl extends ServiceImpl<EmpLaborTroubleMapper, EmpLaborTrouble> implements IEmpLaborTroubleService {
+ private final RedisService redisService;
private final EmpLaborTroubleMapper empLabortroubleMapper;
private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
.map(u -> u.getUserId().toString())
@@ -41,6 +51,38 @@
public IPage<EmpLaborTrouble> findEmpLabortroubles(QueryRequest request, EmpLaborTrouble empLabortrouble) {
LambdaQueryWrapper<EmpLaborTrouble> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(EmpLaborTrouble::getDelFlag, empLabortrouble.getDelFlag());
+ if (StringUtils.isNotBlank(empLabortrouble.getEmpNumb())) {
+ queryWrapper.like(EmpLaborTrouble::getEmpNumb, empLabortrouble.getEmpNumb());
+ }
+ if (StringUtils.isNotBlank(empLabortrouble.getEmpName())) {
+ queryWrapper.like(EmpLaborTrouble::getEmpName, empLabortrouble.getEmpName());
+ }
+ if (StringUtils.isNotBlank(empLabortrouble.getCertificateNumb())) {
+ queryWrapper.like(EmpLaborTrouble::getCertificateNumb, empLabortrouble.getCertificateNumb());
+ }
+ if (StringUtils.isNotBlank(empLabortrouble.getDeptName())) {
+ queryWrapper.like(EmpLaborTrouble::getDeptName, empLabortrouble.getDeptName());
+ }
+ if (StringUtils.isNotBlank(empLabortrouble.getArbitrationDateStr())) {
+ queryWrapper.between(EmpLaborTrouble::getArbitrationDate, empLabortrouble.getArbitrationDateStr().split(",")[0],
+ empLabortrouble.getArbitrationDateStr().split(",")[1]);
+ }
+ if (StringUtils.isNotBlank(empLabortrouble.getSettleDateStr())) {
+ queryWrapper.between(EmpLaborTrouble::getSettleDate, empLabortrouble.getSettleDateStr().split(",")[0],
+ empLabortrouble.getSettleDateStr().split(",")[1]);
+ }
+ if (StringUtils.isNotBlank(empLabortrouble.getArbitrationType())) {
+ queryWrapper.eq(EmpLaborTrouble::getArbitrationType, empLabortrouble.getArbitrationType());
+ }
+ if (empLabortrouble.getArbitrationStatus() != null && empLabortrouble.getArbitrationStatus() != 0) {
+ queryWrapper.eq(EmpLaborTrouble::getArbitrationStatus, empLabortrouble.getArbitrationStatus());
+ }
+ if (StringUtils.isNotBlank(empLabortrouble.getEmpStatus())) {
+ queryWrapper.eq(EmpLaborTrouble::getEmpStatus, empLabortrouble.getEmpStatus());
+ }
+ if (StringUtils.isNotBlank(empLabortrouble.getArbitrationReason())) {
+ queryWrapper.like(EmpLaborTrouble::getArbitrationReason, empLabortrouble.getArbitrationReason());
+ }
Page<EmpLaborTrouble> page = new Page<>(request.getPageNum(), request.getPageSize());
return this.page(page, queryWrapper);
}
@@ -104,4 +146,39 @@
List<String> list = new ArrayList<>(Arrays.asList(str));
return empLabortroubleMapper.momentToNormal(list, operatorId)>0;
}
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void importEmpLaborTrouble(List<List<Object>> listObject) {
+ for (List<Object> list : listObject) {
+ EmpLaborTrouble empLabortrouble = new EmpLaborTrouble();
+ empLabortrouble.setArbitrationId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
+ empLabortrouble.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();
+ empLabortrouble.setDeptName(list.get(1).toString());
+ empLabortrouble.setDeptId(deptId);
+ empLabortrouble.setJobName(list.get(2).toString());
+ empLabortrouble.setEmpName(list.get(3).toString());
+ empLabortrouble.setCertificateNumb(list.get(4).toString());
+ if (StringUtils.isNotBlank(list.get(5).toString())) {
+ empLabortrouble.setArbitrationDate(DateUtil.parseDateTime(list.get(5).toString()));
+ }
+ empLabortrouble.setArbitrationType(list.get(6).toString());
+ empLabortrouble.setArbitrationReason(list.get(7).toString());
+ empLabortrouble.setReporter(list.get(8).toString());
+ empLabortrouble.setRemark(list.get(9).toString());
+ if (StringUtils.isNotBlank(list.get(10).toString())) {
+ empLabortrouble.setArbitrationPay(new BigDecimal(list.get(10).toString()));
+ }
+ if (StringUtils.isNotBlank(list.get(11).toString())) {
+ empLabortrouble.setArbitrationStatus("未结案".equals(list.get(11).toString()) ? 0 : 1);
+ }
+ if (StringUtils.isNotBlank(list.get(12).toString())) {
+ empLabortrouble.setSettleDate(DateUtil.parseDate(list.get(12).toString()));
+ }
+ this.save(empLabortrouble);
+ }
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0