合同信息增加到处备注

yijiusmile

2021-05-17 00c11e16ac27b31c8d29b3c64afa88082010c33e

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

@@ -7,9 +7,11 @@
import java.util.Optional;

import cc.mrbird.febs.common.core.constant.DicCode;
import cc.mrbird.febs.common.core.entity.constant.FebsConstant;
import cc.mrbird.febs.common.core.entity.system.Dept;
import cc.mrbird.febs.common.core.entity.system.DicItem;
import cc.mrbird.febs.common.core.utils.CastUtil;
import cc.mrbird.febs.common.core.utils.SortUtil;
import cc.mrbird.febs.common.redis.service.RedisService;
import cc.mrbird.febs.server.hr.service.IEmpBaseInfoService;
import cn.hutool.core.util.StrUtil;
@@ -72,7 +74,7 @@
            queryWrapper.like("a.CertificateNumb", empContractinfo.getCertificateNumb());
        }
        if (StringUtils.isNotBlank(empContractinfo.getDeptName())) {
            queryWrapper.like("a.DeptName", empContractinfo.getDeptName());
            queryWrapper.like("b.allDeptName", empContractinfo.getDeptName());
        }
        if (StringUtils.isNotBlank(empContractinfo.getSigningDateStr())) {
            queryWrapper.between("a.SigningDate", empContractinfo.getSigningDateStr().split(",")[0], empContractinfo.getSigningDateStr().split(",")[1]);
@@ -80,14 +82,18 @@
        if (StringUtils.isNotBlank(empContractinfo.getEndDateStr())) {
            queryWrapper.between("a.EndDate", empContractinfo.getEndDateStr().split(",")[0], empContractinfo.getEndDateStr().split(",")[1]);
        }
        if (StringUtils.isNotBlank(empContractinfo.getDeptName())) {
            queryWrapper.like("a.EmpStatus", empContractinfo.getEmpStatus());
        }
        // if (StringUtils.isNotBlank(empContractinfo.getDeptName())) {
        //     queryWrapper.in("a.deptName", empContractinfo.getDeptName());
        // }
        if (StringUtils.isNotBlank(empContractinfo.getContractStatus())) {
            queryWrapper.eq("a.ContractStatus", empContractinfo.getContractStatus());
        }
        if (StringUtils.isNotBlank(empContractinfo.getEmpStatus())) {
            queryWrapper.in("a.EmpStatus", empContractinfo.getEmpStatus().split(","));
        }
        queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
        Page<EmpContractInfo> page = new Page<>(request.getPageNum(), request.getPageSize());
        SortUtil.handlePageSort(request, page, "beginDate", FebsConstant.ORDER_ASC, true);
        IPage<EmpContractInfo> iPage = empContractinfoMapper.selectPageVo(page, queryWrapper);
        List<EmpContractInfo> list = iPage.getRecords();
        //设置字典数据
@@ -168,15 +174,21 @@

    @Override
    @Transactional(rollbackFor = Exception.class)
   public void importEmpContractInfo(List<List<Object>> listObject,List<String>  returnList) {
   public void importEmpContractInfo(List<List<Object>> listObject,List<String>  returnList,List<DicItem> dicItems ) {
      for (List<Object> list : listObject) {
            if (list.size()==0){
            if (list.size()==0||StrUtil.isBlank(list.get(0).toString())){
                continue;
            }
         EmpContractInfo contractInfo = new EmpContractInfo();
         contractInfo.setContractId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
         contractInfo.setEmpNumb(list.get(0).toString());
         List<Dept> depts = CastUtil.castList(redisService.get("depts"), Dept.class);
            if(null == depts){
                depts =remoteDeptService.setDeptRedis();
            }
            if(null == depts){
                depts =remoteDeptService.setDeptRedis();
            }
            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()));
@@ -187,7 +199,7 @@
                returnList.add(StrUtil.format("导入员工合同信息异常: 出现位置第{}行, 原因:{}员工编号不存在",listObject.indexOf(list)+1,list.get(0).toString()));
                continue;
            }
            contractInfo.setDelFlag(2);
            contractInfo.setDelFlag(0);
            contractInfo.setEmpId(empId);
         contractInfo.setDeptName(list.get(1).toString());
         contractInfo.setDeptId(dept.getDeptId());
@@ -205,9 +217,14 @@
            contractInfo.setEndDate(DateUtil.parseDate(list.get(7).toString()));
         }
         if (StringUtils.isNotBlank(list.get(8).toString())) {
            contractInfo.setContractPeriod(Integer.valueOf(list.get(8).toString()));
            contractInfo.setContractPeriod(Float.valueOf(list.get(8).toString()));
         }
         contractInfo.setContractStatus(list.get(9).toString());
            //合同
            DicItem  dicItem =dicItems.parallelStream().filter(j->StrUtil.equalsIgnoreCase(j.getDicCode(),"contractStatus")&&StrUtil.equals(j.getDicItemName(),list.get(9).toString())).findFirst().orElse(null);
            if (null!=dicItem){
                contractInfo.setContractStatus(dicItem.getDicItemCode());
            }

         contractInfo.setTransactor(list.get(10).toString());
         contractInfo.setRemark(list.get(11).toString());