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/EmpInsuranceServiceImpl.java | 231 +++++++++++++++++++++++++++++++++++----------------------
1 files changed, 142 insertions(+), 89 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpInsuranceServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpInsuranceServiceImpl.java
index 42d8e87..8e01fe4 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpInsuranceServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpInsuranceServiceImpl.java
@@ -1,12 +1,14 @@
package cc.mrbird.febs.server.hr.service.impl;
import cc.mrbird.febs.common.core.constant.ModuleCode;
+import cc.mrbird.febs.common.core.exception.FebsException;
import cc.mrbird.febs.server.hr.entity.EmpBaseInfo;
import cc.mrbird.febs.server.hr.entity.EmpInsurance;
import cc.mrbird.febs.server.hr.entity.EmpUnemployment;
import cc.mrbird.febs.server.hr.entity.EmpInsurance;
import cc.mrbird.febs.server.hr.mapper.EmpInsuranceMapper;
import cc.mrbird.febs.server.hr.service.IEmpInsuranceService;
+import cn.hutool.core.date.DateUtil;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
@@ -18,8 +20,11 @@
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.*;
@@ -36,101 +41,149 @@
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
class EmpInsuranceServiceImpl extends ServiceImpl<EmpInsuranceMapper, EmpInsurance> implements IEmpInsuranceService {
- private final EmpInsuranceMapper empInsuranceMapper;
- private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser()).map(u -> u.getUserId().toString())
- .orElse("1");
+ private final RedisService redisService;
+ private final EmpInsuranceMapper empInsuranceMapper;
+ private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser()).map(u -> u.getUserId().toString())
+ .orElse("1");
- @Override
- public IPage<EmpInsurance> findEmpInsurances(QueryRequest request, EmpInsurance empInsurance) {
- LambdaQueryWrapper<EmpInsurance> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(EmpInsurance::getDelFlag, empInsurance.getDelFlag());
- if (StringUtils.isNotBlank(empInsurance.getEmpNumb())) {
- queryWrapper.like(EmpInsurance::getEmpNumb, empInsurance.getEmpNumb());
- }
- if (StringUtils.isNotBlank(empInsurance.getEmpName())) {
- queryWrapper.like(EmpInsurance::getEmpName, empInsurance.getEmpName());
- }
- if (StringUtils.isNotBlank(empInsurance.getCertificateNumb())) {
- queryWrapper.like(EmpInsurance::getCertificateNumb, empInsurance.getCertificateNumb());
- }
- if (StringUtils.isNotBlank(empInsurance.getDeptName())) {
- queryWrapper.like(EmpInsurance::getDeptName, empInsurance.getDeptName());
- }
- if (StringUtils.isNotBlank(empInsurance.getApplayDateStr())) {
- queryWrapper.between(EmpInsurance::getApplayDate, empInsurance.getApplayDateStr().split(",")[0],
- empInsurance.getApplayDateStr().split(",")[1]);
- }
- if (StringUtils.isNotBlank(empInsurance.getInsuranceGaers())) {
- queryWrapper.eq(EmpInsurance::getInsuranceGaers, empInsurance.getInsuranceGaers());
- }
- if (empInsurance.getReportStatus() != null && empInsurance.getReportStatus() != 0) {
- queryWrapper.eq(EmpInsurance::getReportStatus, empInsurance.getReportStatus());
- }
- if (StringUtils.isNotBlank(empInsurance.getEmpStatus())) {
- queryWrapper.eq(EmpInsurance::getEmpStatus, empInsurance.getEmpStatus());
- }
+ @Override
+ public IPage<EmpInsurance> findEmpInsurances(QueryRequest request, EmpInsurance empInsurance) {
+ LambdaQueryWrapper<EmpInsurance> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(EmpInsurance::getDelFlag, empInsurance.getDelFlag());
+ if (StringUtils.isNotBlank(empInsurance.getEmpNumb())) {
+ queryWrapper.like(EmpInsurance::getEmpNumb, empInsurance.getEmpNumb());
+ }
+ if (StringUtils.isNotBlank(empInsurance.getEmpName())) {
+ queryWrapper.like(EmpInsurance::getEmpName, empInsurance.getEmpName());
+ }
+ if (StringUtils.isNotBlank(empInsurance.getCertificateNumb())) {
+ queryWrapper.like(EmpInsurance::getCertificateNumb, empInsurance.getCertificateNumb());
+ }
+ if (StringUtils.isNotBlank(empInsurance.getDeptName())) {
+ queryWrapper.like(EmpInsurance::getDeptName, empInsurance.getDeptName());
+ }
+ if (StringUtils.isNotBlank(empInsurance.getApplayDateStr())) {
+ queryWrapper.between(EmpInsurance::getApplayDate, empInsurance.getApplayDateStr().split(",")[0],
+ empInsurance.getApplayDateStr().split(",")[1]);
+ }
+ if (StringUtils.isNotBlank(empInsurance.getInsuranceGaers())) {
+ queryWrapper.eq(EmpInsurance::getInsuranceGaers, empInsurance.getInsuranceGaers());
+ }
+ if (empInsurance.getReportStatus() != null && empInsurance.getReportStatus() != 0) {
+ queryWrapper.eq(EmpInsurance::getReportStatus, empInsurance.getReportStatus());
+ }
+ if (StringUtils.isNotBlank(empInsurance.getEmpStatus())) {
+ queryWrapper.eq(EmpInsurance::getEmpStatus, empInsurance.getEmpStatus());
+ }
- Page<EmpInsurance> page = new Page<>(request.getPageNum(), request.getPageSize());
- return this.page(page, queryWrapper);
- }
+ Page<EmpInsurance> page = new Page<>(request.getPageNum(), request.getPageSize());
+ return this.page(page, queryWrapper);
+ }
- @Override
- public List<EmpInsurance> findEmpInsurances(EmpInsurance empInsurance) {
- LambdaQueryWrapper<EmpInsurance> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(EmpInsurance::getDelFlag, empInsurance.getDelFlag());
- return this.baseMapper.selectList(queryWrapper);
- }
+ @Override
+ public List<EmpInsurance> findEmpInsurances(EmpInsurance empInsurance) {
+ LambdaQueryWrapper<EmpInsurance> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(EmpInsurance::getDelFlag, empInsurance.getDelFlag());
+ return this.baseMapper.selectList(queryWrapper);
+ }
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void createEmpInsurance(EmpInsurance empInsurance) {
- empInsurance.setInsuranceId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
- empInsurance.setCreator(operatorId);
- empInsurance.setModifier(operatorId);
- this.save(empInsurance);
- }
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void createEmpInsurance(EmpInsurance empInsurance) throws FebsException {
+ LambdaQueryWrapper<EmpInsurance> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+ lambdaQueryWrapper.eq(EmpInsurance::getEmpId, empInsurance.getEmpId());
+ lambdaQueryWrapper.eq(EmpInsurance::getApplayDate, empInsurance.getApplayDate());
+ lambdaQueryWrapper.eq(EmpInsurance::getDelFlag, 0);
+ if (this.count(lambdaQueryWrapper) > 0) {
+ throw new FebsException("此人已在本日期申请过社保");
+ }
+ empInsurance.setInsuranceId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
+ empInsurance.setCreator(operatorId);
+ empInsurance.setModifier(operatorId);
+ this.save(empInsurance);
+ }
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void updateEmpInsurance(EmpInsurance empInsurance) {
- EmpInsurance dbData = this.getById(empInsurance.getInsuranceId());
- empInsurance.setCreateTime(dbData.getCreateTime());
- empInsurance.setCreator(dbData.getCreator());
- empInsurance.setDelFlag(dbData.getDelFlag());
- empInsurance.setModifyTime(new Date());
- empInsurance.setModifier(operatorId);
- this.saveOrUpdate(empInsurance);
- }
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void updateEmpInsurance(EmpInsurance empInsurance) throws FebsException {
+ LambdaQueryWrapper<EmpInsurance> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+ lambdaQueryWrapper.eq(EmpInsurance::getEmpId, empInsurance.getEmpId());
+ lambdaQueryWrapper.eq(EmpInsurance::getApplayDate, empInsurance.getApplayDate());
+ lambdaQueryWrapper.eq(EmpInsurance::getDelFlag, 0);
+ lambdaQueryWrapper.ne(EmpInsurance::getInsuranceId,empInsurance.getInsuranceId());
+ if (this.count(lambdaQueryWrapper) > 0) {
+ throw new FebsException("此人已在本日期申请过社保");
+ }
+ EmpInsurance dbData = this.getById(empInsurance.getInsuranceId());
+ empInsurance.setCreateTime(dbData.getCreateTime());
+ empInsurance.setCreator(dbData.getCreator());
+ empInsurance.setDelFlag(dbData.getDelFlag());
+ empInsurance.setModifyTime(new Date());
+ empInsurance.setModifier(operatorId);
+ this.saveOrUpdate(empInsurance);
+ }
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void deleteEmpInsurance(EmpInsurance empInsurance) {
- LambdaQueryWrapper<EmpInsurance> wrapper = new LambdaQueryWrapper<>();
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void deleteEmpInsurance(EmpInsurance empInsurance) {
+ LambdaQueryWrapper<EmpInsurance> wrapper = new LambdaQueryWrapper<>();
// TODO 设置删除条件
- this.remove(wrapper);
- }
+ 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 logicDelEmpInsurance(String ids) {
- String[] str = ids.split(",");
- List<String> list = new ArrayList<>(Arrays.asList(str));
- empInsuranceMapper.logicDeleteByIds(list, operatorId);
- }
+ /**
+ * 根据Id批量逻辑删除记录
+ * <p>
+ * date 2021-01-28 10:48
+ *
+ * @param ids 待删除Id
+ * @return void
+ * @author: luoyibo
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void logicDelEmpInsurance(String ids) {
+ String[] str = ids.split(",");
+ List<String> list = new ArrayList<>(Arrays.asList(str));
+ empInsuranceMapper.logicDeleteByIds(list, operatorId);
+ }
- @Override
- public boolean momentToNormal(String ids) {
- String[] str = ids.split(",");
- List<String> list = new ArrayList<>(Arrays.asList(str));
- return empInsuranceMapper.momentToNormal(list, operatorId) > 0;
- }
-}
\ No newline at end of file
+ @Override
+ public boolean momentToNormal(String ids) {
+ String[] str = ids.split(",");
+ List<String> list = new ArrayList<>(Arrays.asList(str));
+ return empInsuranceMapper.momentToNormal(list, operatorId) > 0;
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void importEmpInsurance(List<List<Object>> listObject) {
+ for (List<Object> list : listObject) {
+ EmpInsurance empInsurance = new EmpInsurance();
+ empInsurance.setInsuranceId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
+ empInsurance.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();
+ empInsurance.setDeptName(list.get(1).toString());
+ empInsurance.setDeptId(deptId);
+ empInsurance.setJobName(list.get(2).toString());
+ empInsurance.setEmpName(list.get(3).toString());
+ empInsurance.setCertificateNumb(list.get(4).toString());
+ if (StringUtils.isNotBlank(list.get(5).toString())) {
+ empInsurance.setApplayDate(DateUtil.parseDate(list.get(5).toString()));
+ }
+ empInsurance.setProposer(list.get(6).toString());
+ empInsurance.setInsuranceGaers(list.get(7).toString());
+ if (StringUtils.isNotBlank(list.get(8).toString())) {
+ empInsurance.setReportStatus("未报告".equals(list.get(8).toString()) ? 0 : 1);
+ }
+ if (StringUtils.isNotBlank(list.get(8).toString())) {
+ empInsurance.setApplayStatus("未申请".equals(list.get(8).toString()) ? 0 : 1);
+ }
+ empInsurance.setAuditor(list.get(9).toString());
+ empInsurance.setRemark(list.get(10).toString());
+ this.save(empInsurance);
+ }
+ }
+}
--
Gitblit v1.8.0