server/src/main/java/doumeemes/biz/system/impl/SystemUserBizImpl.java
@@ -10,6 +10,7 @@ import doumeemes.core.utils.DateUtil; import doumeemes.core.utils.Utils; import doumeemes.core.utils.excel.EasyExcelUtil; import doumeemes.dao.business.CompanyMapper; import doumeemes.dao.business.CompanyPositionMapper; import doumeemes.dao.business.dto.AutoLoginUserDTO; import doumeemes.dao.business.dto.CompanyInitDataDTO; @@ -78,6 +79,9 @@ private DepartmentExtService departmentExtService; @Autowired private CompanyUserExtMapper companyUserExtMapper; @Autowired private CompanyMapper companyMapper; @Override public void deleteById(Integer id) { @@ -546,10 +550,11 @@ cu.setDeleted(Constants.ZERO); cu.setRootDepartId(loginUser.getRootDepartment().getId()); //限制人数 int limitUserNum = Constants.formatIntegerNum(loginUser.getCompany().getOpenUserNum()); if(limitUserNum > 0){ // int limitUserNum = Constants.formatIntegerNum(loginUser.getCompany().getOpenUserNum()); Company company = companyMapper.selectById(loginUser.getCompany().getId()); if(company.getOpenUserNum() > 0){ //人数限制输入0，表示不限制人数 if(companyUserExtMapper.selectCount(new QueryWrapper<>(cu)) +1 > limitUserNum ){ if(companyUserExtMapper.selectCount(new QueryWrapper<>(cu)) +1 > company.getOpenUserNum() ){ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"用户数量超过购买数量，请联系业务经理续购!"); } } server/src/main/java/doumeemes/dao/ext/vo/WorkorderRecordExportExtListVO.java
@@ -55,7 +55,7 @@ private String qualifiedNum; @ApiModelProperty(value = "检验不合格数量", example = "1") @ExcelColumn(name="检验不合格数量",index = 10,width =15) @ExcelColumn(name="不良数量",index = 10,width =15) private String unqualifiedNum; /* @ApiModelProperty(value = "计划数量") @@ -78,15 +78,26 @@ @ApiModelProperty(value = "报工时长（秒）", example = "1") @ExcelColumn(name="报工时长（秒）",index =12,width =15) private Integer duration; private String duration; @ApiModelProperty(value = "计价方式 0计件 1计时", example = "1") @ExcelColumn(name="计价方式",index =13,width =15, valueMapping =" 0计件 1计时") private String salaryType; @ApiModelProperty(value = "工资单价", example = "1") @ExcelColumn(name="工资单价",index =14,width =15, suffix ="元") private Integer salaryPrice; @ApiModelProperty(value = "设备") @ExcelColumn(name="设备",index =13,width =15) @ExcelColumn(name="设备",index =15,width =15) private String deviceCode; @ApiModelProperty(value = "报工时间") @ExcelColumn(name="报工时间",index =14,width =15) @ExcelColumn(name="报工时间",index =16,width =15) private String createTime; // @ApiModelProperty(value = "设备名称") server/src/main/java/doumeemes/service/business/impl/CompanyOpenServiceImpl.java
@@ -112,7 +112,7 @@ companyLog.setCompanyId(company.getId()); companyLog.setUpdateType(Constants.CompanyUpdateType.UPDATE_VAIL_DATE.getKey()); companyLog.setDetail("有效期从"+format.format(cyResult.getOepnValidDate())+"日调整至"+format.format(companyOpen.getValidDate())+"\n"+ "用户开通人数从"+format.format(cyResult.getOpenUserNum())+"调整至"+format.format(companyOpen.getUserNum())); "用户开通人数从"+cyResult.getOpenUserNum()+"调整至"+companyOpen.getUserNum()); companyLogService.create(companyLog); initRedisCache(company1); server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java
@@ -1754,9 +1754,13 @@ wreev.setDeviceCode(re.getDeviceCode()+"|"+re.getDeviceName()); wreev.setCreateTime(format.format(re.getCreateTime())); wreev.setQualifiedNum(re.getQualifiedNum()+unintname); wreev.setUnqualifiedNum(re.getUnqualifiedNum()+unintname); wreev.setDuration(re.getDuration()); wreev.setQualifiedNum( (Objects.nonNull(re.getQualifiedNum()) ? re.getQualifiedNum() : 0)+unintname); wreev.setUnqualifiedNum((Objects.nonNull(re.getUnqualifiedNum()) ? re.getQualifiedNum() : 0)+unintname); Integer duration = re.getDuration(); Integer h = duration/3600; Integer m = (duration%3600)/60; Integer s = ((duration%3600)%60); wreev.setDuration(h+"小时"+m+"分钟"+s+"秒"); list.add(wreev); }
