From b27d06b8f0b805efd16e28fd80a57a0ed8a053ce Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期三, 21 二月 2024 15:31:31 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/java/com/zt/life/modules/qaAuditReport/service/QaAuditReportService.java | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 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 f7fe2cb..b0c3ba5 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
@@ -24,6 +24,7 @@
import com.zt.life.sys.service.SysOssConfigService;
import com.zt.modules.coderule.service.SysCodeRuleService;
import com.zt.modules.oss.service.SysOssService;
+import com.zt.modules.sys.service.SysUserService;
import com.zt.modules.workflow.dto.FlowInfoDto;
import com.zt.modules.workflow.service.WorkflowService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -73,6 +74,9 @@
@Autowired
private WorkflowService workflowService;
+
+ @Autowired
+ private SysUserService sysUserService;
/**
* 鍒嗛〉鏌ヨ
*
@@ -82,7 +86,9 @@
public List<QaAuditReport> page(QueryFilter queryFilter) {
User user = UserContext.getUser();
Integer secretClass = user.getSecretClass();
+ Long deptId = user.getDeptId();
queryFilter.getQueryParams().put("secretClass",secretClass);
+ queryFilter.getQueryParams().put("deptId",deptId);
List<QaAuditReport> list = baseDao.getList(queryFilter.getQueryParams());
if (list != null && list.size() > 0) {
workflowService.getRunFlow(list, "qashbg");
@@ -177,6 +183,12 @@
try {
QaAuditReportDto dataObj = this.getDto(null, id);
+ String projectLeaderId=dataObj.getProject().getProjectLeader();
+ String projectConfigerId=dataObj.getProject().getProjectTesters();
+ String projectTestersId=dataObj.getProject().getProjectConfiger();
+ dataObj.getProject().setProjectLeader(sysUserService.getNames(projectLeaderId));
+ dataObj.getProject().setProjectTesters(sysUserService.getNames(projectTestersId));
+ dataObj.getProject().setProjectConfiger(sysUserService.getNames(projectConfigerId));
String CheckerPath = "鏂囦欢鍥剧墖:" + getFilesPath.getSignPath(Convert.toLong(dataObj.getAuditReport().getCheckerId()));
dataObj.getAuditReport().setChecker(CheckerPath);
String SupervisorPath = "鏂囦欢鍥剧墖:" + getFilesPath.getSignPath(Convert.toLong(dataObj.getAuditReport().getSupervisorId()));
--
Gitblit v1.9.1