首页查询修复bug

孔祥富

2021-02-28 50c9692f448343777dd0dcd4fee00fe2baf7dec0

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

@@ -6,6 +6,12 @@
import java.util.List;
import java.util.Optional;

import cc.mrbird.febs.common.core.constant.DicCode;
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.redis.service.RedisService;
import cc.mrbird.febs.server.hr.entity.EmpPhysicalExam;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
@@ -24,6 +30,7 @@
import cc.mrbird.febs.server.hr.entity.EmpContractInfo;
import cc.mrbird.febs.server.hr.mapper.EmpContractInfoMapper;
import cc.mrbird.febs.server.hr.service.IEmpContractInfoService;
import cn.hutool.core.date.DateUtil;
import lombok.RequiredArgsConstructor;

/**
@@ -40,6 +47,7 @@
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
class EmpContractInfoServiceImpl extends ServiceImpl<EmpContractInfoMapper, EmpContractInfo> implements IEmpContractInfoService {

    private final RedisService redisService;
    private final EmpContractInfoMapper empContractinfoMapper;
    private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
            .map(u -> u.getUserId().toString())
@@ -62,10 +70,10 @@
            queryWrapper.like(EmpContractInfo::getDeptName, empContractinfo.getDeptName());
        }
        if (StringUtils.isNotBlank(empContractinfo.getSigningDateStr())) {
           queryWrapper.between(EmpContractInfo::getSigningDate, empContractinfo.getSigningDateStr().split(",")[0],  empContractinfo.getSigningDateStr().split(",")[1]);
            queryWrapper.between(EmpContractInfo::getSigningDate, empContractinfo.getSigningDateStr().split(",")[0], empContractinfo.getSigningDateStr().split(",")[1]);
        }
        if (StringUtils.isNotBlank(empContractinfo.getEndDateStr())) {
           queryWrapper.between(EmpContractInfo::getEndDate, empContractinfo.getEndDateStr().split(",")[0],  empContractinfo.getEndDateStr().split(",")[1]);
            queryWrapper.between(EmpContractInfo::getEndDate, empContractinfo.getEndDateStr().split(",")[0], empContractinfo.getEndDateStr().split(",")[1]);
        }
        if (StringUtils.isNotBlank(empContractinfo.getDeptName())) {
            queryWrapper.like(EmpContractInfo::getEmpStatus, empContractinfo.getEmpStatus());
@@ -74,7 +82,19 @@
            queryWrapper.eq(EmpContractInfo::getContractStatus, empContractinfo.getContractStatus());
        }
        Page<EmpContractInfo> page = new Page<>(request.getPageNum(), request.getPageSize());
        return this.page(page, queryWrapper);
        IPage<EmpContractInfo> iPage = this.page(page, queryWrapper);
        List<EmpContractInfo> list = iPage.getRecords();
        //设置字典数据
        List<DicItem> dicItems = CastUtil.castList(redisService.get("dicItems"), DicItem.class);
        list.forEach(p -> {
            p.setContractStatusName(dicItems.stream()
                    .filter(k -> DicCode.CONTRACTSTATUS.equals(k.getDicCode()) && k.getDicItemCode().equals(p.getContractStatus()))
                    .findFirst()
                    .map(DicItem::getDicItemName)
                    .orElse("新签"));
        });
        iPage.setRecords(list);
        return iPage;
    }

    @Override
@@ -88,7 +108,7 @@
    @Transactional(rollbackFor = Exception.class)
    public void createEmpContractinfo(EmpContractInfo empContractinfo) {
        empContractinfo.setContractId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
        if(empContractinfo.getBeginDate()==null){
        if (empContractinfo.getBeginDate() == null) {
            empContractinfo.setBeginDate(empContractinfo.getSigningDate());
        }
        empContractinfo.setCreator(operatorId);
@@ -137,6 +157,37 @@
    public boolean momentToNormal(String ids) {
        String[] str = ids.split(",");
        List<String> list = new ArrayList<>(Arrays.asList(str));
        return empContractinfoMapper.momentToNormal(list, operatorId)>0;
        return empContractinfoMapper.momentToNormal(list, operatorId) > 0;
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
   public void importEmpContractInfo(List<List<Object>> listObject) {
      for (List<Object> list : listObject) {
         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);
         Long deptId = depts.stream().filter(d -> d.getDeptName().equals(list.get(1).toString())).findFirst().get()
               .getDeptId();
         contractInfo.setDeptName(list.get(1).toString());
         contractInfo.setDeptId(deptId);
         contractInfo.setJobName(list.get(2).toString());
         contractInfo.setEmpName(list.get(3).toString());
         contractInfo.setCertificateNumb(list.get(4).toString());
         if (StringUtils.isNotBlank(list.get(5).toString())) {
            contractInfo.setSigningDate(DateUtil.parseDate(list.get(5).toString()));
         }
         if (StringUtils.isNotBlank(list.get(6).toString())) {
            contractInfo.setEndDate(DateUtil.parseDate(list.get(6).toString()));
         }
         if (StringUtils.isNotBlank(list.get(7).toString())) {
            contractInfo.setContractPeriod(Integer.valueOf(list.get(7).toString()));
         }
         contractInfo.setContractStatus(list.get(8).toString());
         contractInfo.setTransactor(list.get(9).toString());
         contractInfo.setRemark(list.get(10).toString());
         this.save(contractInfo);
      }
   }
}