fix(bug修复): 部门管理、员工信息查询与显示

luoyb

2021-03-10 f22196a273dae1cc4f67bf6e4806e0e33fae7997

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

@@ -23,6 +23,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.aspectj.weaver.ast.Or;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -59,9 +60,7 @@
    private final EmpAccessoryMapper empAccessoryMapper;
    private final FebsServerHrProperties properties;
    private final IRemoteDeptService remoteDeptService;
    private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
            .map(u -> u.getUserId().toString())
            .orElse("1");

    private final IEmpBaseInfoService empBaseInfoService;
    /**
     * 参数2为数据中心ID 参数1为终端ID
@@ -93,18 +92,7 @@
        if (StrUtil.isNotBlank(vo.getDeptName())) {
            queryWrapper.like("a.deptName", vo.getDeptName());
        }
        // if (StrUtil.isNotBlank(vo.getEmpName())) {
        //     queryWrapper.like("a.empName", vo.getEmpName().split(","));
        // }
        // if (StrUtil.isNotBlank(vo.getEmpNumb())) {
        //     queryWrapper.like("a.empNumb", vo.getEmpNumb().split(","));
        // }
        // if (StrUtil.isNotBlank(vo.getCertificateNumb())) {
        //     queryWrapper.like("a.certificateNumb", vo.getCertificateNumb().split(","));
        // }
        // if (StrUtil.isNotBlank(vo.getDeptName())) {
        //     queryWrapper.like("a.deptName", vo.getDeptName().split(","));
        // }

        if (StrUtil.isNotBlank(vo.getEntryDate())) {
            queryWrapper.between("a.entryDate", vo.getEntryDate().split(",")[0], vo.getEntryDate().split(",")[1]);
        }
@@ -153,6 +141,18 @@
        if (StrUtil.isNotBlank(vo.getPolitics())) {
            queryWrapper.in("a.politics", vo.getPolitics().split(","));
        }
        if (StringUtils.isNotBlank(vo.getHandbookStatus())) {
            queryWrapper.in("a.HandbookStatus", vo.getHandbookStatus().split(","));
        }
        if (StringUtils.isNotBlank(vo.getEmpCardStatus())) {
            queryWrapper.in("a.EmpCardStatus", vo.getEmpCardStatus().split(","));
        }
        if (StringUtils.isNotBlank(vo.getEmpType())) {
            queryWrapper.in("a.empType", vo.getEmpType().split(","));
        }
        if (StringUtils.isNotBlank(vo.getEntryType())) {
            queryWrapper.in("a.entryType", vo.getEntryType().split(","));
        }

        queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
        queryWrapper.orderByAsc("a.deptName,a.empName,a.certificateNumb");
@@ -191,7 +191,7 @@
        Dict dict = MyUtil.filesUpload(file, properties.getUploadSinglePath() + nameAndCertificateNumb, snowflake.nextIdStr());
        EmpAccessory accessory = new EmpAccessory();
        accessory.setCreatetime(new Date());
        accessory.setCreator(operatorId);
        accessory.setCreator(FebsUtil.getUserId());
        accessory.setDelFlag(0);
        accessory.setEmpid(empId);
        accessory.setFilesaddress(dict.getStr("newName"));
@@ -199,7 +199,7 @@
        accessory.setAccessoryid(SequenceUtil.generateId(0L, ModuleCode.HR_FIlE));
        accessory.setFilesname(dict.getStr("fileName"));
        accessory.setLabelid(labelid);
        accessory.setModifier(operatorId);
        accessory.setModifier(FebsUtil.getUserId());
        accessory.setModifytime(new Date());
        accessory.setVersion(0);
        this.save(accessory);
@@ -207,8 +207,14 @@

    @Override
    @Transactional(rollbackFor = Exception.class)
    public void updateEmpAccessory(EmpAccessory empAccessory) {
        this.saveOrUpdate(empAccessory);
    public void updateEmpAccessory(EmpAccessory empAccessory) throws FebsException {
        if ( empAccessory.getFilesname().indexOf(".")<=0){
            throw  new FebsException("文件名格式错误");
        }
        LambdaUpdateWrapper<EmpAccessory> wrapper = new LambdaUpdateWrapper<>();
        wrapper.eq(EmpAccessory::getAccessoryid,empAccessory.getAccessoryid())
                .set(EmpAccessory::getFilesname,empAccessory.getFilesname()).set(EmpAccessory::getFilesformat,  empAccessory.getFilesname().substring( empAccessory.getFilesname().indexOf(".")+1));
        this.update(wrapper);
    }

    @Override
@@ -218,7 +224,7 @@
        LambdaUpdateWrapper<EmpAccessory> wapper = new LambdaUpdateWrapper<>();
        wapper.in(EmpAccessory::getAccessoryid, arr);
        wapper.set(EmpAccessory::getDelFlag, 1);
        wapper.set(EmpAccessory::getModifier, operatorId);
        wapper.set(EmpAccessory::getModifier, FebsUtil.getUserId());
        wapper.set(EmpAccessory::getModifytime, new Date());
        this.update(wapper);

@@ -258,7 +264,7 @@
        String[] arr = accessoryids.split(",");
        LambdaUpdateWrapper<EmpAccessory> wapper = new LambdaUpdateWrapper<>();
        wapper.in(EmpAccessory::getAccessoryid, arr);
        wapper.set(EmpAccessory::getModifier, operatorId);
        wapper.set(EmpAccessory::getModifier, FebsUtil.getUserId());
        wapper.set(EmpAccessory::getModifytime, new Date());
        wapper.set(EmpAccessory::getLabelid, labelid);
        this.update(wapper);
@@ -334,6 +340,8 @@
                    accessory.setLabelid(143007818991617L);
                }else if (file1.getName().indexOf("银行卡")>=0){
                    accessory.setLabelid(143073768130561L);
                }else if (file1.getName().indexOf("回执")>=0){
                    accessory.setLabelid(143073617135617L);
                }else if (file1.getName().indexOf("证")>=0){
                    accessory.setLabelid(143073812170753L);
                }else{