提交首页查询Bug

Alan

2021-02-21 c294865250a10b3b0f5661e1e2e7b127917552c7

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

@@ -61,64 +61,64 @@
    private Snowflake snowflake = IdUtil.getSnowflake(ModuleCode.HR_FIlE, 1);

    @Override
    public IPage<Map<String,Object>> findEmpAccessorys(QueryRequest request, EmpAccessoryVO vo) {
    public IPage<Map<String, Object>> findEmpAccessorys(QueryRequest request, EmpAccessoryVO vo) {
        QueryWrapper<EmpAccessoryVO> queryWrapper = new QueryWrapper<>();
        if (StrUtil.isNotBlank(vo.getEmpName())){
            queryWrapper.like("a.empName",vo.getEmpName());
        if (StrUtil.isNotBlank(vo.getEmpName())) {
            queryWrapper.like("a.empName", vo.getEmpName());
        }
        if (StrUtil.isNotBlank(vo.getEmpNumb())){
            queryWrapper.like("a.empNumb",vo.getEmpNumb());
        if (StrUtil.isNotBlank(vo.getEmpNumb())) {
            queryWrapper.like("a.empNumb", vo.getEmpNumb());
        }
        if (StrUtil.isNotBlank(vo.getCertificateNumb())){
            queryWrapper.like("a.certificateNumb",vo.getCertificateNumb());
        if (StrUtil.isNotBlank(vo.getCertificateNumb())) {
            queryWrapper.like("a.certificateNumb", vo.getCertificateNumb());
        }
        if (StrUtil.isNotBlank(vo.getDeptName())){
            queryWrapper.like("a.deptName",vo.getDeptName());
        if (StrUtil.isNotBlank(vo.getDeptName())) {
            queryWrapper.like("a.deptName", vo.getDeptName());
        }
        if (StrUtil.isNotBlank(vo.getEntryDate())){
            queryWrapper.between("a.entryDate",vo.getEntryDate().split(",")[0],vo.getEntryDate().split(",")[1]);
        if (StrUtil.isNotBlank(vo.getEntryDate())) {
            queryWrapper.between("a.entryDate", vo.getEntryDate().split(",")[0], vo.getEntryDate().split(",")[1]);
        }
        if(StrUtil.isNotBlank(vo.getAge())){
            if(StrUtil.equals(vo.getAge(),"1")){
                queryWrapper.between("a.age",18,29);
            }else if(StrUtil.equals(vo.getAge(),"2")){
                queryWrapper.between("a.age",30,39);
            }else if(StrUtil.equals(vo.getAge(),"3")){
                queryWrapper.between("a.age",40,49);
            }else if(StrUtil.equals(vo.getAge(),"4")){
                queryWrapper.between("a.age",50,59);
            }else if(StrUtil.equals(vo.getAge(),"5")){
                queryWrapper.between("a.age",60,69);
            }else if(StrUtil.equals(vo.getAge(),"6")){
                queryWrapper.ge("a.age",69);
        if (StrUtil.isNotBlank(vo.getAge())) {
            if (StrUtil.equals(vo.getAge(), "1")) {
                queryWrapper.between("a.age", 18, 29);
            } else if (StrUtil.equals(vo.getAge(), "2")) {
                queryWrapper.between("a.age", 30, 39);
            } else if (StrUtil.equals(vo.getAge(), "3")) {
                queryWrapper.between("a.age", 40, 49);
            } else if (StrUtil.equals(vo.getAge(), "4")) {
                queryWrapper.between("a.age", 50, 59);
            } else if (StrUtil.equals(vo.getAge(), "5")) {
                queryWrapper.between("a.age", 60, 69);
            } else if (StrUtil.equals(vo.getAge(), "6")) {
                queryWrapper.ge("a.age", 69);
            }
        }
        if(StrUtil.isNotBlank(vo.getArchivesStatus())){
            if(!StrUtil.equals(vo.getArchivesStatus(),"-1")) {
        if (StrUtil.isNotBlank(vo.getArchivesStatus())) {
            if (!StrUtil.equals(vo.getArchivesStatus(), "-1")) {
                queryWrapper.eq("a.archivesStatus", vo.getArchivesStatus());
            }
        }
        if(StrUtil.isNotBlank(vo.getEducation())){
            if(!StrUtil.equals(vo.getEducation(),"-1")) {
        if (StrUtil.isNotBlank(vo.getEducation())) {
            if (!StrUtil.equals(vo.getEducation(), "-1")) {
                queryWrapper.eq("a.education", vo.getEducation());
            }
        }
        if(StrUtil.isNotBlank(vo.getSex())){
            if(!StrUtil.equals(vo.getSex(),"-1")) {
        if (StrUtil.isNotBlank(vo.getSex())) {
            if (!StrUtil.equals(vo.getSex(), "-1")) {
                queryWrapper.eq("a.sex", vo.getSex());
            }
        }
        if(StrUtil.isNotBlank(vo.getInsuranceType())){
            if(!StrUtil.equals(vo.getInsuranceType(),"-1")) {
        if (StrUtil.isNotBlank(vo.getInsuranceType())) {
            if (!StrUtil.equals(vo.getInsuranceType(), "-1")) {
                queryWrapper.eq("a.insuranceType", vo.getInsuranceType());
            }
        }
        if(StrUtil.isNotBlank(vo.getPolitics())){
            if(!StrUtil.equals(vo.getPolitics(),"-1")) {
        if (StrUtil.isNotBlank(vo.getPolitics())) {
            if (!StrUtil.equals(vo.getPolitics(), "-1")) {
                queryWrapper.eq("a.politics", vo.getPolitics());
            }
        }
        queryWrapper.eq("a.delFlag",0);
        queryWrapper.eq("a.delFlag", 0);
        Page<EmpAccessory> page = new Page<>(request.getPageNum(), request.getPageSize());
        String querySql = empAccessoryMapper.getQuerySql();
        IPage<Map<String, Object>> mapIPage = empAccessoryMapper.selectPageVo(page, queryWrapper, querySql);
@@ -128,7 +128,7 @@
    @Override
    public List<EmpAccessory> findEmpAccessorys(EmpAccessory empAccessory) {
        LambdaQueryWrapper<EmpAccessory> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(EmpAccessory::getDelFlag,0);
        queryWrapper.eq(EmpAccessory::getDelFlag, 0);
        if (null != empAccessory.getLabelid()) {
            queryWrapper.eq(EmpAccessory::getLabelid, empAccessory.getLabelid());
        }
@@ -143,10 +143,10 @@

    @Override
    @Transactional(rollbackFor = Exception.class)
    public void createEmpAccessory(Long labelid, MultipartFile file,Long empId) throws FebsException, IOException {
    public void createEmpAccessory(Long labelid, MultipartFile file, Long empId) throws FebsException, IOException {
        EmpBaseInfo empBaseInfo = empBaseInfoService.getById(empId);
        String nameAndCertificateNumb = empBaseInfo.getEmpName()+"_"+empBaseInfo.getCertificateNumb()+"/";
        Dict dict = MyUtil.filesUpload(file,properties.getUploadSinglePath()+nameAndCertificateNumb,snowflake.nextIdStr());
        String nameAndCertificateNumb = empBaseInfo.getEmpName() + "_" + empBaseInfo.getCertificateNumb() + "/";
        Dict dict = MyUtil.filesUpload(file, properties.getUploadSinglePath() + nameAndCertificateNumb, snowflake.nextIdStr());
        EmpAccessory accessory = new EmpAccessory();
        accessory.setCreatetime(new Date());
        accessory.setCreator(operatorId);