Merge branch 'lybfix20210302'

luoyb

2021-03-02 f961867e0e1ca3251928b1134eb66549a6a89ee3

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpDimissionAttendServiceImpl.java

@@ -17,9 +17,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.*;

/**
@@ -36,6 +40,7 @@
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
class EmpDimissionAttendServiceImpl extends ServiceImpl<EmpDimissionAttendMapper, EmpDimissionAttend> implements IEmpDimissionAttendService {

   private final RedisService redisService;
    private final EmpDimissionAttendMapper empDimissionattendMapper;
    private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
            .map(u -> u.getUserId().toString())
@@ -132,4 +137,41 @@
        List<String> list = new ArrayList<>(Arrays.asList(str));
        return empDimissionattendMapper.momentToNormal(list, operatorId)>0;
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
   public void importEmpDimissionAttend(List<List<Object>> listObject) {
      for (List<Object> list : listObject) {
         EmpDimissionAttend dimissionAttend = new EmpDimissionAttend();
         dimissionAttend.setDimissionAttendId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
         dimissionAttend.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();
         dimissionAttend.setDeptName(list.get(1).toString());
         dimissionAttend.setDeptId(deptId);
         dimissionAttend.setJobName(list.get(2).toString());
         dimissionAttend.setEmpName(list.get(3).toString());
         dimissionAttend.setCertificateNumb(list.get(4).toString());
         dimissionAttend.setAttendMonth(list.get(5).toString());
         if (StringUtils.isNotBlank(list.get(6).toString())) {
            dimissionAttend.setAttendDays(new BigDecimal(list.get(6).toString()));
         }
         if (StringUtils.isNotBlank(list.get(7).toString())) {
            dimissionAttend.setOvertimeDay(new BigDecimal(list.get(7).toString()));
         }
         if (StringUtils.isNotBlank(list.get(8).toString())) {
            dimissionAttend.setOvertimeHour(new BigDecimal(list.get(8).toString()));
         }
         dimissionAttend.setDeduct(list.get(9).toString());
         if (StringUtils.isNotBlank(list.get(10).toString())) {
            dimissionAttend.setLeaveDay(new BigDecimal(list.get(10).toString()));
         }
         if (StringUtils.isNotBlank(list.get(11).toString())) {
            dimissionAttend.setAbsenteeism(new BigDecimal(list.get(11).toString()));
         }
         dimissionAttend.setRemark(list.get(12).toString());
         this.save(dimissionAttend);
      }
   }
}