From 52a302b11c08cbc564ff3931038ae57a305a95d6 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期二, 23 一月 2024 09:23:52 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderService.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderService.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderService.java
index bdffbe7..f764c70 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderService.java
@@ -1,5 +1,6 @@
package com.zt.life.modules.project.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;
@@ -22,10 +23,12 @@
import com.zt.modules.coderule.service.SysCodeRuleService;
import com.zt.modules.oss.service.SysOssService;
import com.zt.modules.sys.service.SysDictTypeService;
+import org.apache.tomcat.util.bcel.classfile.Constant;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.zt.common.db.query.QueryFilter;
+import javax.naming.Context;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.FileNotFoundException;
@@ -77,7 +80,9 @@
public List<SoftwareTestOrder> 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<SoftwareTestOrder> list = baseDao.getList(queryFilter.getQueryParams());
if (list != null && list.size() > 0) {
sysOssService.setListOsses(list, "test_order");
@@ -169,12 +174,10 @@
String projectCode = project.getCode();
String softIdentity =project.getSoftwareIdentity();
List<?> testItemResult = baseDao.dictList("testItem_type", projectCode,softIdentity);
- List<?> measuredList = testItemResult;
- data.setMeasuredList((List<SoftwareTestOrderMeasured>) measuredList);
+ data.setMeasuredList((List<SoftwareTestOrderMeasured>) testItemResult);
List<?> productLibraryResult = baseDao.dictList("product_library_file", projectCode,null);
- List<?> deliverableList = productLibraryResult;
- data.setDeliverableList((List<SoftwareTestOrderDeliverable>) deliverableList);
+ data.setDeliverableList((List<SoftwareTestOrderDeliverable>) productLibraryResult);
}
if (projectId != null) {
@@ -246,6 +249,9 @@
measured.setIsMeasuredStr(isMeasuredStr);
}
+ String secretClass = getShowDictList.getShowDictList(dataObj.getProject().getSecretClass(), "secret_class", false);
+ dataObj.getSoftwareTestOrder().setSecretClassStr(secretClass);
+
String sortwareTypeStr = getShowDictList.getShowDictList(dataObj.getProject().getSoftwareType(), "software_type", false);
dataObj.getSoftwareTestOrder().setSortwareTypeStr(sortwareTypeStr);
--
Gitblit v1.9.1