From 1466ee58f3893b631a0d6711ede0320f252b2657 Mon Sep 17 00:00:00 2001
From: yz <yz_0812@outlook.com>
Date: 星期一, 22 二月 2021 01:36:25 +0800
Subject: [PATCH] 增加接口
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpOccupationalServiceImpl.java | 124 ++++++++++++++++++++++++++++++++++++++--
1 files changed, 116 insertions(+), 8 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 40f1b32..bf459e3 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,22 +1,34 @@
package cc.mrbird.febs.server.hr.service.impl;
-import cc.mrbird.febs.common.core.constant.ModuleCode;
-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.math.BigDecimal;
+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.constant.ModuleCode;
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 java.util.*;
+import cc.mrbird.febs.common.redis.service.RedisService;
+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 cn.hutool.core.date.DateUtil;
+import lombok.RequiredArgsConstructor;
/**
* name:EmpOccupational
@@ -32,6 +44,7 @@
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
class EmpOccupationalServiceImpl extends ServiceImpl<EmpOccupationalMapper, EmpOccupational> implements IEmpOccupationalService {
+ private final RedisService redisService;
private final EmpOccupationalMapper empOccupationalMapper;
private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
.map(u -> u.getUserId().toString())
@@ -41,6 +54,35 @@
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);
}
@@ -56,6 +98,15 @@
@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);
@@ -104,4 +155,61 @@
List<String> list = new ArrayList<>(Arrays.asList(str));
return empOccupationalMapper.momentToNormal(list, operatorId)>0;
}
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void importEmpOccupational(List<List<Object>> listObject) {
+ for (List<Object> list : listObject) {
+ EmpOccupational empOccupational=new EmpOccupational();
+ empOccupational.setOccupationalId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
+ empOccupational.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();
+ empOccupational.setDeptName(list.get(1).toString());
+ empOccupational.setDeptId(deptId);
+ empOccupational.setJobName(list.get(2).toString());
+ empOccupational.setEmpName(list.get(3).toString());
+ empOccupational.setCertificateNumb(list.get(4).toString());
+ if (StringUtils.isNotBlank(list.get(5).toString())) {
+ empOccupational.setInjuredTime(DateUtil.parseDateTime(list.get(5).toString()));
+ }
+ empOccupational.setInjuredAddress(list.get(6).toString());
+ empOccupational.setInjuredPart(list.get(7).toString());
+ empOccupational.setInjuredDescribe(list.get(8).toString());
+ empOccupational.setInjuredDiacrisis(list.get(9).toString());
+ empOccupational.setHospitalName(list.get(10).toString());
+ empOccupational.setTreatmentName(list.get(11).toString());
+ if (StringUtils.isNotBlank(list.get(12).toString())) {
+ empOccupational.setHospitalizatioFlag("未住院".equals(list.get(12).toString()) ? 0 : 1);
+ }
+ if (StringUtils.isNotBlank(list.get(13).toString())) {
+ empOccupational.setBedNumb(Integer.valueOf(list.get(14).toString()));
+ }
+ if (StringUtils.isNotBlank(list.get(14).toString())) {
+ empOccupational.setReportTime(DateUtil.parseDate(list.get(14).toString()));
+ }
+ if (StringUtils.isNotBlank(list.get(15).toString())) {
+ empOccupational.setSubmitTime(DateUtil.parseDate(list.get(15).toString()));
+ }
+ empOccupational.setSbumitBy(list.get(16).toString());
+ if (StringUtils.isNotBlank(list.get(17).toString())) {
+ empOccupational.setExpensesFee(new BigDecimal(list.get(17).toString()));
+ }
+ if (StringUtils.isNotBlank(list.get(18).toString())) {
+ empOccupational.setCompensated(new BigDecimal(list.get(18).toString()));
+ }
+ empOccupational.setExpenseReport(list.get(19).toString());
+ if (StringUtils.isNotBlank(list.get(20).toString())) {
+ empOccupational.setHrDoDate(DateUtil.parseDate(list.get(20).toString()));
+ }
+ if (StringUtils.isNotBlank(list.get(21).toString())) {
+ empOccupational.setSettleStatus("未结案".equals(list.get(21).toString()) ? 0 : 1);
+ }
+ if (StringUtils.isNotBlank(list.get(22).toString())) {
+ empOccupational.setSettleDate(DateUtil.parseDate(list.get(22).toString()));
+ }
+ this.save(empOccupational);
+ }
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0