From be643d854741ac1869ee77cdba3df51de39ffe3d Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期一, 22 九月 2025 17:01:06 +0800
Subject: [PATCH] 应用添加 应用附件
---
serverWuhu/src/main/java/com/doumee/service/business/impl/ApplicationInfoServiceImpl.java | 6 ++++++
serverWuhu/src/main/java/com/doumee/dao/business/model/ApplicationInfo.java | 10 ++++++++++
serverWuhu/src/main/java/com/doumee/api/business/ServerProviderController.java | 3 ---
serverWuhu/src/main/java/com/doumee/service/business/impl/DeclaresServiceImpl.java | 3 +++
serverWuhu/src/main/java/com/doumee/api/business/ApplicationInfoController.java | 6 ------
5 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/serverWuhu/src/main/java/com/doumee/api/business/ApplicationInfoController.java b/serverWuhu/src/main/java/com/doumee/api/business/ApplicationInfoController.java
index a8b8237..a202996 100644
--- a/serverWuhu/src/main/java/com/doumee/api/business/ApplicationInfoController.java
+++ b/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));
}
diff --git a/serverWuhu/src/main/java/com/doumee/api/business/ServerProviderController.java b/serverWuhu/src/main/java/com/doumee/api/business/ServerProviderController.java
index 25cf696..d0d1141 100644
--- a/serverWuhu/src/main/java/com/doumee/api/business/ServerProviderController.java
+++ b/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));
}
diff --git a/serverWuhu/src/main/java/com/doumee/dao/business/model/ApplicationInfo.java b/serverWuhu/src/main/java/com/doumee/dao/business/model/ApplicationInfo.java
index 3df6317..8ba0cb9 100644
--- a/serverWuhu/src/main/java/com/doumee/dao/business/model/ApplicationInfo.java
+++ b/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;
diff --git a/serverWuhu/src/main/java/com/doumee/service/business/impl/ApplicationInfoServiceImpl.java b/serverWuhu/src/main/java/com/doumee/service/business/impl/ApplicationInfoServiceImpl.java
index e7ca3ae..fc5a12c 100644
--- a/serverWuhu/src/main/java/com/doumee/service/business/impl/ApplicationInfoServiceImpl.java
+++ b/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);
}
diff --git a/serverWuhu/src/main/java/com/doumee/service/business/impl/DeclaresServiceImpl.java b/serverWuhu/src/main/java/com/doumee/service/business/impl/DeclaresServiceImpl.java
index 4c4bc9b..f7744a1 100644
--- a/serverWuhu/src/main/java/com/doumee/service/business/impl/DeclaresServiceImpl.java
+++ b/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);
--
Gitblit v1.9.3