From f491d30b0a69148bd0991b3d5b1c4cf9f8216949 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期五, 12 一月 2024 09:52:39 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/java/com/zt/life/modules/qaAuditReport/service/QaAuditReportService.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/qaAuditReport/service/QaAuditReportService.java b/modules/mainPart/src/main/java/com/zt/life/modules/qaAuditReport/service/QaAuditReportService.java
index adcec6a..f7fe2cb 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/qaAuditReport/service/QaAuditReportService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/qaAuditReport/service/QaAuditReportService.java
@@ -3,6 +3,8 @@
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;
@@ -69,7 +71,6 @@
@Autowired
private QaAuditReportIncongruentService incongruentService;
-
@Autowired
private WorkflowService workflowService;
/**
@@ -79,6 +80,9 @@
* @return
*/
public List<QaAuditReport> page(QueryFilter queryFilter) {
+ User user = UserContext.getUser();
+ Integer secretClass = user.getSecretClass();
+ queryFilter.getQueryParams().put("secretClass",secretClass);
List<QaAuditReport> list = baseDao.getList(queryFilter.getQueryParams());
if (list != null && list.size() > 0) {
workflowService.getRunFlow(list, "qashbg");
@@ -98,6 +102,11 @@
public QaAuditReportDto getDto(Long projectId, Long reportId) {
QaAuditReportDto data = new QaAuditReportDto();
+ Map<String, String> map = new HashMap<>();
+ map.put("contract", "鍚堝悓璇勫闃舵");
+ map.put("require", "娴嬭瘯闇�姹傚垎鏋愪笌绛栧垝闃舵");
+ map.put("execute", "娴嬭瘯璁捐銆佸疄鐜颁笌鎵ц闃舵");
+ map.put("summary", "娴嬭瘯鎬荤粨闃舵");
if (reportId != null) {
data.setId(reportId);
QaAuditReport auditReport = this.get(reportId);
@@ -113,6 +122,10 @@
List<QaAuditReportIncongruent> incongruentList = incongruentService.createList(projectId);
data.setIncongruentList(incongruentList);
}
+ for (QaAuditReportIncongruent incongruent : data.getIncongruentList()) {
+ String type = map.get(incongruent.getDiscoveryPhase());
+ incongruent.setDiscoveryPhase(type);
+ }
if (projectId != null) {
data.setProjectId(projectId);
data.setProject(projectService.get(projectId));
--
Gitblit v1.9.1