From ffab76344576bdd096fbe1b0c9fb31bd110c41ca Mon Sep 17 00:00:00 2001
From: yz <yz_0812@outlook.com>
Date: 星期二, 09 三月 2021 01:05:50 +0800
Subject: [PATCH] 修改bug
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpOccupationalServiceImpl.java | 296 +++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 248 insertions(+), 48 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 1d77baf..46b8305 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,70 +1,270 @@
package cc.mrbird.febs.server.hr.service.impl;
-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 cc.mrbird.febs.common.core.constant.DicCode;
+import cc.mrbird.febs.common.core.entity.system.DicItem;
+import cc.mrbird.febs.common.core.exception.FebsException;
+import cc.mrbird.febs.server.hr.constant.MyConstant;
+import cc.mrbird.febs.server.hr.entity.EmpAccidentCases;
+import cc.mrbird.febs.server.hr.entity.EmpBaseInfo;
+import cc.mrbird.febs.server.hr.service.IEmpBaseInfoService;
+import cn.hutool.core.util.StrUtil;
+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.conditions.query.QueryWrapper;
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.entity.QueryRequest;
-import java.util.List;
+import cc.mrbird.febs.common.core.constant.ModuleCode;
+import cc.mrbird.febs.common.core.entity.QueryRequest;
+import cc.mrbird.febs.common.core.entity.constant.StringConstant;
+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 cc.mrbird.febs.server.hr.entity.EmpOccupational;
+import cc.mrbird.febs.server.hr.feign.IRemoteDeptService;
+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
-* package:cc.mrbird.febs.server.hr.controller
-* description:员工工伤案件服务接口实现
-*
-* @author luoyibo
-* @date 2021-01-24 20:35:24
-* @since JDK1.8
-*/
+ * name:EmpOccupational
+ * package:cc.mrbird.febs.server.hr.controller
+ * description:员工工伤案件服务接口实现
+ *
+ * @author luoyibo
+ * @date 2021-01-31 11:26:32
+ * @since JDK1.8
+ */
@Service
@RequiredArgsConstructor
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
-public class EmpOccupationalServiceImpl extends ServiceImpl
-<EmpOccupationalMapper, EmpOccupational> implements IEmpOccupationalService {
+class EmpOccupationalServiceImpl extends ServiceImpl<EmpOccupationalMapper, EmpOccupational> implements IEmpOccupationalService {
-private final EmpOccupationalMapper empOccupationalMapper;
+ private final RedisService redisService;
+ private final EmpOccupationalMapper empOccupationalMapper;
+ 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<EmpOccupational> findEmpOccupationals(QueryRequest request, EmpOccupational empOccupational) {
-LambdaQueryWrapper<EmpOccupational> queryWrapper = new LambdaQueryWrapper<>();
-// TODO 设置查询条件
-Page<EmpOccupational> page = new Page<>(request.getPageNum(), request.getPageSize());
-return this.page(page, queryWrapper);
-}
+ @Override
+ public IPage<EmpOccupational> findEmpOccupationals(QueryRequest request, EmpOccupational empOccupational) {
+ QueryWrapper<EmpOccupational> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("a.DelFlag", empOccupational.getDelFlag());
+ if (StringUtils.isNotBlank(empOccupational.getEmpNumb())) {
+ queryWrapper.like("a.EmpNumb", empOccupational.getEmpNumb());
+ }
+ if (StringUtils.isNotBlank(empOccupational.getEmpName())) {
+ queryWrapper.like("a.EmpName", empOccupational.getEmpName());
+ }
+ if (StringUtils.isNotBlank(empOccupational.getCertificateNumb())) {
+ queryWrapper.like("a.CertificateNumb", empOccupational.getCertificateNumb());
+ }
+ if (StringUtils.isNotBlank(empOccupational.getDeptName())) {
+ queryWrapper.like("a.DeptName", empOccupational.getDeptName());
+ }
+ if (StringUtils.isNotBlank(empOccupational.getInjuredTimeStr())) {
+ queryWrapper.between("a.InjuredTime", empOccupational.getInjuredTimeStr().split(",")[0],
+ empOccupational.getInjuredTimeStr().split(",")[1]);
+ }
+ if (StringUtils.isNotBlank(empOccupational.getHrDoDateStr())) {
+ queryWrapper.between("a.HrDoDate", empOccupational.getHrDoDateStr().split(",")[0],
+ empOccupational.getHrDoDateStr().split(",")[1]);
+ }
+ if (empOccupational.getHospitalizatioFlag() != null && empOccupational.getHospitalizatioFlag() != 0) {
+ queryWrapper.eq("a.HospitalizatioFlag", empOccupational.getHospitalizatioFlag());
+ }
+ if (empOccupational.getSettleStatus() != null && empOccupational.getSettleStatus() != 0) {
+ queryWrapper.eq("a.SettleStatus", empOccupational.getSettleStatus());
+ }
+ if (StringUtils.isNotBlank(empOccupational.getEmpStatus())) {
+ queryWrapper.in("a.EmpStatus", empOccupational.getEmpStatus().split(","));
+ }
+ queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
+ Page<EmpOccupational> page = new Page<>(request.getPageNum(), request.getPageSize());
+ IPage<EmpOccupational> pageList = empOccupationalMapper.selectPageVo(page, queryWrapper);
+ List<EmpOccupational> list = pageList.getRecords();
+ //处理数据字典
+ pageList.setRecords(covertDicItemName(list));
+ return pageList;
+ }
-@Override
-public List<EmpOccupational> findEmpOccupationals(EmpOccupational empOccupational) {
-LambdaQueryWrapper<EmpOccupational> queryWrapper = new LambdaQueryWrapper<>();
-// TODO 设置查询条件
-return this.baseMapper.selectList(queryWrapper);
-}
+ @Override
+ public List<EmpOccupational> findEmpOccupationals(EmpOccupational empOccupational) {
+ LambdaQueryWrapper<EmpOccupational> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(EmpOccupational::getDelFlag, empOccupational.getDelFlag());
+ List<EmpOccupational> list = this.baseMapper.selectList(queryWrapper);
+ return covertDicItemName(list);
+ }
-@Override
-@Transactional(rollbackFor = Exception.class)
-public void createEmpOccupational(EmpOccupational empOccupational) {
-this.save(empOccupational);
-}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void createEmpOccupational(EmpOccupational empOccupational) throws FebsException {
+ LambdaQueryWrapper<EmpOccupational> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+ lambdaQueryWrapper.eq(EmpOccupational::getEmpId, empOccupational.getEmpId());
+ lambdaQueryWrapper.eq(EmpOccupational::getInjuredTime, empOccupational.getInjuredTime());
+ lambdaQueryWrapper.ne(EmpOccupational::getDelFlag,1);
+ if (this.count(lambdaQueryWrapper) > 0) {
+ throw new FebsException(MyConstant.MESSAGE);
+ }
-@Override
-@Transactional(rollbackFor = Exception.class)
-public void updateEmpOccupational(EmpOccupational empOccupational) {
-this.saveOrUpdate(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);
+ }
-@Override
-@Transactional(rollbackFor = Exception.class)
-public void deleteEmpOccupational(EmpOccupational empOccupational) {
-LambdaQueryWrapper<EmpOccupational> wapper = new LambdaQueryWrapper<>();
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void updateEmpOccupational(EmpOccupational empOccupational) {
+ EmpOccupational dbData = this.getById(empOccupational.getOccupationalId());
+ empOccupational.setCreateTime(dbData.getCreateTime());
+ empOccupational.setCreator(dbData.getCreator());
+ empOccupational.setDelFlag(dbData.getDelFlag());
+ empOccupational.setModifyTime(new Date());
+ empOccupational.setModifier(operatorId);
+ this.saveOrUpdate(empOccupational);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void deleteEmpOccupational(EmpOccupational empOccupational) {
+ LambdaQueryWrapper<EmpOccupational> 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 logicDelEmpOccupational(String ids) {
+ String[] str = ids.split(",");
+ List<String> list = new ArrayList<>(Arrays.asList(str));
+ empOccupationalMapper.logicDeleteByIds(list, operatorId);
+ }
+
+ @Override
+ public boolean momentToNormal(String ids) {
+ String[] str = ids.split(",");
+ 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,List<String> returnList) {
+ for (List<Object> list : listObject) {
+ if (list.size()==0){
+ continue;
+ }
+ 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);
+ 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;
+ }
+ EmpBaseInfo empBaseInfo = empBaseInfoService.getEmpBaseInfoByEmpNumb(list.get(0).toString());
+ if (null == empBaseInfo){
+ returnList.add(StrUtil.format("导入员工工伤案件异常: 出现位置第{}行, 原因:{}员工编号不存在",listObject.indexOf(list)+1,list.get(0).toString()));
+ continue;
+ }
+ empOccupational.setDelFlag(2);
+ empOccupational.setEmpId(empBaseInfo.getEmpId());
+ empOccupational.setDeptName(list.get(1).toString());
+ empOccupational.setDeptId(dept.getDeptId());
+ 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(list.get(13).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()));
+ }
+ empOccupational.setEmpStatus(empBaseInfo.getEmpStatus());
+ this.save(empOccupational);
+ }
+ }
+
+ private List<EmpOccupational> covertDicItemName(List<EmpOccupational> list){
+ List<DicItem> dicItems = CastUtil.castList(redisService.get("dicItems"), DicItem.class);
+ list.parallelStream().forEachOrdered(p -> {
+ // 设置结案状态
+ p.setSettleStatusName(dicItems.stream()
+ .filter(k -> DicCode.SETTLE_STATUS.equals(k.getDicCode()) && k.getDicItemCode().equals(p.getSettleStatus().toString()))
+ .findFirst()
+ .map(DicItem::getDicItemName)
+ .orElse(""));
+ });
+
+ return list;
+ }
}
--
Gitblit v1.8.0