From a38a1ac77bb6ac9ea8bf0cf5f5f6b68d0e6e6974 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期二, 02 一月 2024 08:44:10 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/java/com/zt/life/modules/configAuditReport/controller/ConfigAuditReportController.java | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/configAuditReport/controller/ConfigAuditReportController.java b/modules/mainPart/src/main/java/com/zt/life/modules/configAuditReport/controller/ConfigAuditReportController.java
index d0a15c5..12096b6 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/configAuditReport/controller/ConfigAuditReportController.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/configAuditReport/controller/ConfigAuditReportController.java
@@ -15,6 +15,7 @@
import com.zt.life.modules.configAuditReport.dto.ConfigAuditDto;
import com.zt.life.modules.configAuditReport.model.ConfigAuditReport;
import com.zt.life.modules.configAuditReport.service.ConfigAuditReportService;
+import com.zt.life.sys.dto.OssDto;
import com.zt.life.sys.service.SysOssConfigService;
import com.zt.modules.coderule.service.SysCodeRuleService;
import io.swagger.annotations.Api;
@@ -25,6 +26,8 @@
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -56,9 +59,10 @@
@ApiImplicitParam(name = Constant.Q.LIMIT, value = Constant.QV.LIMIT, required = true, dataType = Constant.QT.INT),
@ApiImplicitParam(name = Constant.Q.ORDER_FIELD, value = Constant.QV.ORDER_FIELD, dataType = Constant.QT.STRING),
@ApiImplicitParam(name = Constant.Q.ORDER, value = Constant.QV.ORDER, dataType = Constant.QT.STRING),
- @ApiImplicitParam(name = "code", value = "缂栧彿", dataType = Constant.QT.STRING, format = "code^LK"),
- @ApiImplicitParam(name = "libraryType", value = "搴撶被鍨�", dataType = Constant.QT.STRING, format = "a.library_type^EQ")
-})
+ @ApiImplicitParam(name = "code", value = "缂栧彿", dataType = Constant.QT.STRING, format = "a.code^LK"),
+ @ApiImplicitParam(name = "softwareIdentity", value = "椤圭洰鏍囪瘑", dataType = Constant.QT.STRING, format = "p.software_identity^LK"),
+ @ApiImplicitParam(name = "softwareName", value = "椤圭洰鍚嶇О", dataType = Constant.QT.STRING, format = "p.software_name^LK"),
+ })
public PageResult<ConfigAuditReport> page(@ApiIgnore @QueryParam QueryFilter queryFilter){
return PageResult.ok(configAuditReportService.page(queryFilter));
@@ -68,6 +72,12 @@
@ApiOperation("淇℃伅")
public Result<ConfigAuditDto> getDto(Long projectId, Long reportId) {
ConfigAuditDto data =configAuditReportService.getDto(projectId, reportId);
+ if (reportId!=null) {
+ OssDto ossDto = sysOssConfigService.getOssByBusiType(reportId, "config_audit_report");
+ if (ossDto != null) {
+ data.setFiles(ossDto);
+ }
+ }
return Result.ok(data);
}
@@ -106,4 +116,11 @@
return Result.ok();
}
+ @GetMapping("exportConfigAudit")
+ @ApiOperation("鎵撳嵃瀹℃牳鎶ュ憡")
+ @LogOperation("鎵撳嵃瀹℃牳鎶ュ憡")
+ public void exportConfigAudit(Long id, HttpServletRequest request, HttpServletResponse response) {
+ configAuditReportService.exportConfigAudit(id, request, response);
+ }
+
}
--
Gitblit v1.9.1