serverWuhu/src/main/java/com/doumee/api/business/ApplicationInfoController.java
@@ -81,17 +81,11 @@ return ApiResponse.success(null); } @ApiOperation("分页查询") @PostMapping("/page") @RequiresPermissions("business:applicationinfo:query") public ApiResponse<PageData<ApplicationInfo>> findPage (@RequestBody PageWrap<ApplicationInfo> pageWrap) { LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal(); if(Objects.nonNull(loginUserInfo)&&Objects.nonNull(loginUserInfo.getType())&&!Constants.equalsInteger(loginUserInfo.getType(),Constants.ZERO)){ pageWrap.getModel().setStatus(Constants.ZERO); } return ApiResponse.success(applicationInfoService.findPage(pageWrap)); } serverWuhu/src/main/java/com/doumee/api/business/ServerProviderController.java
@@ -87,9 +87,6 @@ @RequiresPermissions("business:serverprovider:query") public ApiResponse<PageData<ServerProvider>> findPage (@RequestBody PageWrap<ServerProvider> pageWrap) { LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal(); if(Objects.nonNull(loginUserInfo)&&Objects.nonNull(loginUserInfo.getType())&&!Constants.equalsInteger(loginUserInfo.getType(),Constants.ZERO)){ pageWrap.getModel().setStatus(Constants.ZERO); } return ApiResponse.success(serverProviderService.findPage(pageWrap)); } serverWuhu/src/main/java/com/doumee/dao/business/model/ApplicationInfo.java
@@ -80,6 +80,10 @@ @ExcelColumn(name="详情(富文本)") private String details; @ApiModelProperty(value = "应用附件") @ExcelColumn(name="应用附件") private String mutifileUrl; @ApiModelProperty(value = "服务商名称", example = "1") @TableField(exist = false) private String serverName; @@ -88,6 +92,12 @@ @TableField(exist = false) private String fullLog; @ApiModelProperty(value = "应用附件全路径", example = "1") @TableField(exist = false) private String fullMutifileUrl; @ApiModelProperty(value = "应用信息", example = "1") @TableField(exist = false) private String applicationInfo; serverWuhu/src/main/java/com/doumee/service/business/impl/ApplicationInfoServiceImpl.java
@@ -148,6 +148,9 @@ throw new BusinessException(ResponseStatus.DATA_EMPTY); } applicationInfo.setFullLog(prefix + applicationInfo.getLogo()); if(StringUtils.isNotBlank(applicationInfo.getMutifileUrl())){ applicationInfo.setFullMutifileUrl(prefix + applicationInfo.getMutifileUrl()); } return applicationInfo; } @@ -183,6 +186,9 @@ String prefix = systemDictDataBiz.queryByCode(Constants.OSS, Constants.RESOURCE_PATH).getCode() + systemDictDataBiz.queryByCode(Constants.OSS, Constants.LOGO_FILE).getCode(); iPage.getRecords().forEach(i->{ i.setFullLog(prefix + i.getLogo()); if(StringUtils.isNotBlank(i.getMutifileUrl())){ i.setFullMutifileUrl(prefix + i.getMutifileUrl()); } }); return PageData.from(iPage); } serverWuhu/src/main/java/com/doumee/service/business/impl/DeclaresServiceImpl.java
@@ -1072,6 +1072,7 @@ queryWrapper.leftJoin(Company.class, Company::getId, Declares::getCompanyId); queryWrapper.leftJoin(ProjectLabel.class, ProjectLabel::getId, Declares::getDiagnoseTypeId); queryWrapper.eq(Declares::getIsdeleted, Constants.ZERO); queryWrapper.ne(Declares::getStatus, Constants.ZERO); queryWrapper.eq(Declares::getProjectId, param.getProjectId()); queryWrapper.apply(param.getAreaId()!=null,"t2.area_id =" +param.getAreaId()); queryWrapper.groupBy(Declares::getDiagnoseTypeId); @@ -1237,6 +1238,7 @@ queryWrapper.leftJoin(Company.class, Company::getId, Declares::getCompanyId); queryWrapper.leftJoin(Areas.class, Areas::getId, Company::getAreaId); queryWrapper.eq(Declares::getIsdeleted, Constants.ZERO); queryWrapper.ne(Declares::getStatus, Constants.ZERO); queryWrapper.eq(Declares::getProjectId, param.getProjectId()); queryWrapper.eq(param.getDiagnoseType()!=null,Declares::getDiagnoseTypeId, param.getDiagnoseTypeId()); queryWrapper.apply(param.getAreaId()!=null,"t1.area_id =" +param.getAreaId()); @@ -2590,6 +2592,7 @@ .leftJoin(DeclareService.class,DeclareService::getDeclareId,Declares::getId) .eq(Declares::getSoId,soId) .eq(DeclareService::getIsdeleted,Constants.ZERO) .ne(DeclareService::getStatus,Constants.ZERO) .groupBy(DeclareService::getDeclareId); List<Map<String, Object>> maps = declareServiceMapper.selectMaps(declareServiceQuery);