From 6af5b3def3f511a19c7ccff6f223ef239b178d48 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期四, 16 十一月 2023 15:57:26 +0800
Subject: [PATCH] Changes
---
modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderService.java | 22 ++++++++++++++--------
1 files changed, 14 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 aaa5e63..80d1e5e 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
@@ -210,29 +210,35 @@
dataObj.getSoftwareTestOrder().setTestType22(testType22);
//閫氱敤瀛楀吀鍒楄〃瀛楃涓茬敓鎴�
- String criticalLevelStr = getShowDictList.getShowDictList(dataObj.getProject().getCriticalLevel().toString(),"critical_level");
+ String criticalLevelStr = getShowDictList.getShowDictList(dataObj.getProject().getCriticalLevel().toString(), "critical_level");
dataObj.getSoftwareTestOrder().setCriticalLevelStr(criticalLevelStr);
+ for (SoftwareTestOrderMeasured measured : dataObj.getMeasuredList()) {
+ String value = measured.getIsMeasured();
+ String isMeasuredStr = getShowDictList.getShowDictList(value, "is_or_not");
+ SoftwareTestOrderMeasured newMeasured = new SoftwareTestOrderMeasured();
+ }
- String sortwareTypeStr = getShowDictList.getShowDictList(dataObj.getProject().getSoftwareType(),"software_type");
+ String sortwareTypeStr = getShowDictList.getShowDictList(dataObj.getProject().getSoftwareType(), "software_type");
dataObj.getSoftwareTestOrder().setSortwareTypeStr(sortwareTypeStr);
- String testBasisStr = getShowDictList.getShowDictList(dataObj.getSoftwareTestOrder().getTestBasis(),"test_basis");
+ String testBasisStr = getShowDictList.getShowDictList(dataObj.getSoftwareTestOrder().getTestBasis(), "test_basis");
dataObj.getSoftwareTestOrder().setTestBasisStr(testBasisStr);
- String testStandardStr = getShowDictList.getShowDictList(dataObj.getSoftwareTestOrder().getTestStandard(),"test_standard");
+ String testStandardStr = getShowDictList.getShowDictList(dataObj.getSoftwareTestOrder().getTestStandard(), "test_standard");
dataObj.getSoftwareTestOrder().setTestStandardStr(testStandardStr);
- String testLevelStr = getShowDictList.getShowDictList(dataObj.getProject().getTestLevel().toString(),"test_level");
+ String testLevelStr = getShowDictList.getShowDictList(dataObj.getSoftwareTestOrder().getTestLevel().toString(), "test_level");
dataObj.getSoftwareTestOrder().setTestLevelStr(testLevelStr);
- String otherRequireStr = getShowDictList.getShowDictList(dataObj.getSoftwareTestOrder().getOtherRequire(),"other_require");
+ String test =dataObj.getSoftwareTestOrder().getOtherRequire();
+ String otherRequireStr = getShowDictList.getShowDictList(test, "other_require");
dataObj.getSoftwareTestOrder().setOtherRequireStr(otherRequireStr);
- String articleNatureStr = getShowDictList.getShowDictList(dataObj.getSoftwareTestOrder().getArticleNature(),"article_nature");
+ String articleNatureStr = getShowDictList.getShowDictList(dataObj.getSoftwareTestOrder().getArticleNature(), "article_nature");
dataObj.getSoftwareTestOrder().setArticleNatureStr(articleNatureStr);
- String sampleStatusStr = getShowDictList.getShowDictList(dataObj.getSoftwareTestOrder().getSampleStatus(),"sample_status");
+ String sampleStatusStr = getShowDictList.getShowDictList(dataObj.getSoftwareTestOrder().getSampleStatus(), "is_or_not");
dataObj.getSoftwareTestOrder().setSampleStatusStr(sampleStatusStr);
WordFile wordFile = new WordFile();
--
Gitblit v1.9.1