From 1772fc5e211f9e9e0ab4cdc6c29b436aac178c2a Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期五, 23 二月 2024 12:19:55 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/java/com/zt/life/modules/configAuditReport/service/ConfigAuditReportService.java | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 50 insertions(+), 6 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/configAuditReport/service/ConfigAuditReportService.java b/modules/mainPart/src/main/java/com/zt/life/modules/configAuditReport/service/ConfigAuditReportService.java
index ba65030..cd8b0ea 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/configAuditReport/service/ConfigAuditReportService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/configAuditReport/service/ConfigAuditReportService.java
@@ -1,7 +1,11 @@
package com.zt.life.modules.configAuditReport.service;
+import cn.hutool.core.convert.Convert;
import com.zt.common.service.BaseService;
import com.zt.common.utils.CommonUtils;
+import com.zt.core.context.User;
+import com.zt.core.context.UserContext;
+import com.zt.life.export.dto.WordFile;
import com.zt.life.export.service.WordFileService;
import com.zt.life.modules.baselineRelease.dto.BaselineDto;
import com.zt.life.modules.baselineRelease.model.BaselineRelease;
@@ -20,6 +24,7 @@
import com.zt.life.modules.mainPart.utils.GetFilesPath;
import com.zt.life.modules.mainPart.utils.GetShowDictList;
import com.zt.life.modules.project.model.Project;
+import com.zt.life.modules.project.model.SoftwareTestOrder;
import com.zt.life.modules.project.model.SoftwareTestOrderDeliverable;
import com.zt.life.modules.project.model.SoftwareTestOrderMeasured;
import com.zt.life.modules.project.service.ProjectService;
@@ -37,6 +42,10 @@
import org.springframework.stereotype.Service;
import com.zt.common.db.query.QueryFilter;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.FileNotFoundException;
+import java.io.UnsupportedEncodingException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -75,8 +84,6 @@
@Autowired
private WordFileService wordFileService;
- @Autowired
- private GetFilesPath getFilesPath;
/**
* 鍒嗛〉鏌ヨ
*
@@ -84,7 +91,16 @@
* @return
*/
public List<ConfigAuditReport> page(QueryFilter queryFilter) {
- return baseDao.getList(queryFilter.getQueryParams());
+ User user = UserContext.getUser();
+ Integer secretClass = user.getSecretClass();
+ Long deptId = user.getDeptId();
+ queryFilter.getQueryParams().put("secretClass",secretClass);
+ queryFilter.getQueryParams().put("deptId",deptId);
+ List<ConfigAuditReport> list = baseDao.getList(queryFilter.getQueryParams());
+ if (list != null && list.size() > 0) {
+ sysOssService.setListOsses(list, "config_audit_report");
+ }
+ return list;
}
/**
@@ -111,9 +127,8 @@
} else {
ConfigAuditReport auditReport = new ConfigAuditReport();
data.setAuditReport(auditReport);
- List<?> contentResult = contentService.dictList("config_check_item");
- List<?> contentList = contentResult;
- data.setContentList((List<ConfigAuditReportContent>) contentList);
+ List<ConfigAuditReportContent> contentList = contentService.dictList("config_check_item");
+ data.setContentList(contentList);
}
if (projectId != null) {
data.setProjectId(projectId);
@@ -149,14 +164,43 @@
}
}
+ int i=0;
for (ConfigAuditReportProblem problem : configAuditDto.getProblemList()) {
+ i++;
problem.setReportId(reportId);
+ problem.setNo(i);
if (problem.getId() != null) {
problemService.update(problem);
} else {
problemService.insert(problem);
}
}
+ sysOssConfigService.updateOss(configAuditDto.getId(), configAuditDto.getFiles());// 淇濆瓨闄勪欢
return true;
}
+
+ public void exportConfigAudit(Long id, HttpServletRequest request, HttpServletResponse response) {
+ try {
+ ConfigAuditDto dataObj = this.getDto(null, id);
+ //閫氱敤瀛楀吀鍒楄〃瀛楃涓茬敓鎴�
+ for (ConfigAuditReportContent content : dataObj.getContentList()) {
+ String value = content.getAuditResult();
+ String auditResult = getShowDictList.getShowDictList(value, "status_tag", false);
+ content.setAuditResult(auditResult);
+ }
+ for (ConfigAuditReportProblem problem : dataObj.getProblemList()) {
+ String value = problem.getIsNotTrue();
+ String IsNotTrue = getShowDictList.getShowDictList(value, "is_or_not", false);
+ problem.setIsNotTrue(IsNotTrue);
+ }
+ WordFile wordFile = new WordFile();
+ wordFile.setModulePath("閰嶇疆瀹℃牳鎶ュ憡.docx");
+ wordFile.setWordName(dataObj.getProject().getSoftwareName() + "_閰嶇疆瀹℃牳鎶ュ憡.docx");
+ wordFileService.exportWordFile(request, dataObj, wordFile, response);
+ } catch (UnsupportedEncodingException e) {
+ e.printStackTrace();
+ } catch (FileNotFoundException e) {
+ e.printStackTrace();
+ }
+ }
}
--
Gitblit v1.9.1