Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmMes

jiangping

2023-08-25 6baf2c39511f7364bb7c7f8071228317aab21203

Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmMes

 server/src/main/java/doumeemes/biz/system/impl/SystemUserBizImpl.java

@@ -166,6 +166,18 @@
        if(plansList == null || plansList.size()==0){
            throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "导入数据内容有误！");
        }
        //添加企业员工关联关系
        CompanyUser cuw = new CompanyUser();
        cuw.setDeleted(Constants.ZERO);
        cuw.setRootDepartId(user.getRootDepartment().getId());
        Company company = companyMapper.selectById(user.getCompany().getId());
        if(company.getOpenUserNum() > 0){
            //人数限制输入0，表示不限制人数
            if(companyUserExtMapper.selectCount(new QueryWrapper<>(cuw)) + plansList.size() > company.getOpenUserNum() ){
                throw  new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"用户数量超过购买数量，请联系业务经理续购!");
            }
        }

        CompanyPosition cp = new CompanyPosition();
        cp.setDeleted(Constants.ZERO);
        cp.setCompanyId(user.getCompany().getId());

 server/src/main/java/doumeemes/service/business/impl/UnqualifiedRecordServiceImpl.java

@@ -151,8 +151,8 @@
        MPJLambdaWrapper<UnqualifiedRecord> mpjLambdaWrapper = new MPJLambdaWrapper<>();
        mpjLambdaWrapper.selectAll(UnqualifiedRecord.class);
        mpjLambdaWrapper.selectAs(Workorder::getCode, UnqualifiedRecord::getWorkOrderCode);
        mpjLambdaWrapper.selectAs(Material::getCode, UnqualifiedRecord::getMaterialName);
        mpjLambdaWrapper.selectAs(Workorder::getCode, UnqualifiedRecord::getMaterialCode);
        mpjLambdaWrapper.selectAs(Material::getName, UnqualifiedRecord::getMaterialName);
        mpjLambdaWrapper.selectAs(Material::getCode, UnqualifiedRecord::getMaterialCode);
        mpjLambdaWrapper.selectAs(Procedures::getName, UnqualifiedRecord::getProceduresName);
        mpjLambdaWrapper.selectAs(Category::getName, UnqualifiedRecord::getCategoryName);
        mpjLambdaWrapper.selectAs(SystemUser::getRealname, UnqualifiedRecord::getCreateUserName);

 server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java

@@ -1755,7 +1755,7 @@
                wreev.setDeviceCode(re.getDeviceCode()+"|"+re.getDeviceName());
                wreev.setCreateTime(format.format(re.getCreateTime()));
                wreev.setQualifiedNum( (Objects.nonNull(re.getQualifiedNum()) ? re.getQualifiedNum() : 0)+unintname);
                wreev.setUnqualifiedNum((Objects.nonNull(re.getUnqualifiedNum()) ? re.getQualifiedNum() : 0)+unintname);
                wreev.setUnqualifiedNum((Objects.nonNull(re.getUnqualifiedNum()) ? re.getUnqualifiedNum() : 0)+unintname);
                Integer duration = re.getDuration();
                if (Objects.nonNull(duration)){
                    Integer h = duration/3600;
@@ -1766,7 +1766,7 @@
                    wreev.setDuration("-");
                }
                wreev.setSalaryType(re.getSalaryType());
                wreev.setSalaryPrice(re.getSalaryPrice());
                wreev.setSalaryPrice(re.getSalary());
                list.add(wreev);

        }