From b089cb398c59be1aa2c12c6b0be7652a9edb3612 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期三, 13 十二月 2023 12:33:05 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderService.java | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 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 463b19e..ecdd3f3 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
@@ -27,10 +27,9 @@
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;
-import java.util.Map;
+import java.text.SimpleDateFormat;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
import java.util.stream.Collectors;
@@ -98,6 +97,9 @@
else {
Map<String, String> map = new HashMap<>();
map.put("funCode", "software_test_order");
+ map.put("projectId",softwareTestOrderDto.getProjectId().toString());
+ /* DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+ softwareTestOrderDto.getSoftwareTestOrder().getEntrustSignDate();*/
softwareTestOrderDto.getSoftwareTestOrder().setProjectId(softwareTestOrderDto.getProjectId());
softwareTestOrderDto.getSoftwareTestOrder().setCode(sysCodeRuleService.getNewCode(map));
baseDao.insert(softwareTestOrderDto.getSoftwareTestOrder());
@@ -153,8 +155,8 @@
} else {
Project project = projectService.get(projectId);
String projectCode = project.getCode();
- String softName =project.getSoftwareName();
- List<?> testItemResult = baseDao.dictList("testItem_type", projectCode,softName);
+ String softIdentity =project.getSoftwareIdentity();
+ List<?> testItemResult = baseDao.dictList("testItem_type", projectCode,softIdentity);
List<?> measuredList = testItemResult;
data.setMeasuredList((List<SoftwareTestOrderMeasured>) measuredList);
@@ -223,7 +225,7 @@
dataObj.getSoftwareTestOrder().setTestType22(testType22);
//閫氱敤瀛楀吀鍒楄〃瀛楃涓茬敓鎴�
- String criticalLevelStr = getShowDictList.getShowDictList(dataObj.getProject().getCriticalLevel().toString(), "critical_level", false);
+ String criticalLevelStr = getShowDictList.getShowDictList(dataObj.getProject().getCriticalLevel(), "critical_level", false);
dataObj.getSoftwareTestOrder().setCriticalLevelStr(criticalLevelStr);
for (SoftwareTestOrderMeasured measured : dataObj.getMeasuredList()) {
@@ -241,7 +243,7 @@
String testStandardStr = getShowDictList.getShowDictList(dataObj.getSoftwareTestOrder().getTestStandard(), "test_standard", true);
dataObj.getSoftwareTestOrder().setTestStandardStr(testStandardStr);
- String testLevelStr = getShowDictList.getShowDictList(dataObj.getSoftwareTestOrder().getTestLevel().toString(), "test_level", false);
+ String testLevelStr = getShowDictList.getShowDictList(dataObj.getSoftwareTestOrder().getTestLevel(), "test_level", false);
dataObj.getSoftwareTestOrder().setTestLevelStr(testLevelStr);
String test = dataObj.getSoftwareTestOrder().getOtherRequire();
--
Gitblit v1.9.1