From 0fe6ffac952b2c19bc96e5543ac10672389af508 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期四, 16 十一月 2023 14:28:54 +0800
Subject: [PATCH] Changes
---
modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderService.java | 44 +++++++++++++++++++++++++++++++++++++-------
1 files changed, 37 insertions(+), 7 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 55097bb..aaa5e63 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,10 +1,12 @@
package com.zt.life.modules.project.service;
import com.zt.common.service.BaseService;
+import com.zt.common.utils.CommonUtils;
import com.zt.core.sys.dto.DictDto;
import com.zt.core.sys.dto.DictItemDto;
import com.zt.core.sys.dto.DictLeafDto;
import com.zt.life.export.dto.WordFile;
+import com.zt.life.modules.mainPart.utils.GetShowDictList;
import com.zt.life.export.service.WordFileService;
import com.zt.life.modules.project.dao.SoftwareTestOrderDao;
import com.zt.life.modules.project.dto.SoftwareTestOrderDto;
@@ -38,7 +40,6 @@
*/
@Service
public class SoftwareTestOrderService extends BaseService<SoftwareTestOrderDao, SoftwareTestOrder> {
-
@Autowired
private ProjectService projectService;
@Autowired
@@ -54,6 +55,8 @@
private SysDictTypeService sysDictTypeService;
@Autowired
private WordFileService wordFileService;
+ @Autowired
+ private GetShowDictList getShowDictList;
/**
* 鍒嗛〉鏌ヨ
@@ -138,11 +141,11 @@
} else {
Project project = projectService.get(projectId);
String projectCode = project.getCode();
- List<?> testItemResult = baseDao.dictList("testItem_type",projectCode);
+ List<?> testItemResult = baseDao.dictList("testItem_type", projectCode);
List<?> measuredList = testItemResult;
data.setMeasuredList((List<SoftwareTestOrderMeasured>) measuredList);
- List<?> productLibraryResult = baseDao.dictList("product_library_file",projectCode);
+ List<?> productLibraryResult = baseDao.dictList("product_library_file", projectCode);
List<?> deliverableList = productLibraryResult;
data.setDeliverableList((List<SoftwareTestOrderDeliverable>) deliverableList);
}
@@ -161,7 +164,7 @@
public void exportWord(Long id, HttpServletRequest request, HttpServletResponse response) {
try {
SoftwareTestOrderDto dataObj = this.getDto(null, id);
-
+ //鐗规畩鍒楄〃鐢熸垚
List<DictDto> userDicts = sysDictTypeService.getUserDicts();
DictDto testType1Dict = userDicts.stream()
.filter(c -> c.getDictType().equals("test_type1"))
@@ -172,13 +175,14 @@
List<HashMap<String, Object>> testType21 = new ArrayList<>();
List<HashMap<String, Object>> testType22 = new ArrayList<>();
+
int i = 0;
String testType = "," + dataObj.getSoftwareTestOrder().getTestType1() + ",";
for (DictItemDto dictItemDto : ((DictLeafDto) testType1Dict).getDataList()) {
String value = dictItemDto.getDictValue();
String desc = (testType.contains("," + value + ",") ? "鈽�" : "鈻�") + dictItemDto.getDictLabel();
HashMap<String, Object> stateItem = new HashMap<>();
- stateItem.put("item",desc);
+ stateItem.put("item", desc);
if ((i++) % 2 == 0) {
testType12.add(stateItem);
} else {
@@ -192,7 +196,7 @@
String value = dictItemDto.getDictValue();
String desc = (testType.contains("," + value + ",") ? "鈽�" : "鈻�") + dictItemDto.getDictLabel();
HashMap<String, Object> stateItem = new HashMap<>();
- stateItem.put("item",desc);
+ stateItem.put("item", desc);
if ((i++) % 2 == 0) {
testType22.add(stateItem);
} else {
@@ -205,9 +209,35 @@
dataObj.getSoftwareTestOrder().setTestType21(testType21);
dataObj.getSoftwareTestOrder().setTestType22(testType22);
+ //閫氱敤瀛楀吀鍒楄〃瀛楃涓茬敓鎴�
+ String criticalLevelStr = getShowDictList.getShowDictList(dataObj.getProject().getCriticalLevel().toString(),"critical_level");
+ dataObj.getSoftwareTestOrder().setCriticalLevelStr(criticalLevelStr);
+
+
+ String sortwareTypeStr = getShowDictList.getShowDictList(dataObj.getProject().getSoftwareType(),"software_type");
+ dataObj.getSoftwareTestOrder().setSortwareTypeStr(sortwareTypeStr);
+
+ String testBasisStr = getShowDictList.getShowDictList(dataObj.getSoftwareTestOrder().getTestBasis(),"test_basis");
+ dataObj.getSoftwareTestOrder().setTestBasisStr(testBasisStr);
+
+ String testStandardStr = getShowDictList.getShowDictList(dataObj.getSoftwareTestOrder().getTestStandard(),"test_standard");
+ dataObj.getSoftwareTestOrder().setTestStandardStr(testStandardStr);
+
+ String testLevelStr = getShowDictList.getShowDictList(dataObj.getProject().getTestLevel().toString(),"test_level");
+ dataObj.getSoftwareTestOrder().setTestLevelStr(testLevelStr);
+
+ String otherRequireStr = getShowDictList.getShowDictList(dataObj.getSoftwareTestOrder().getOtherRequire(),"other_require");
+ dataObj.getSoftwareTestOrder().setOtherRequireStr(otherRequireStr);
+
+ String articleNatureStr = getShowDictList.getShowDictList(dataObj.getSoftwareTestOrder().getArticleNature(),"article_nature");
+ dataObj.getSoftwareTestOrder().setArticleNatureStr(articleNatureStr);
+
+ String sampleStatusStr = getShowDictList.getShowDictList(dataObj.getSoftwareTestOrder().getSampleStatus(),"sample_status");
+ dataObj.getSoftwareTestOrder().setSampleStatusStr(sampleStatusStr);
+
WordFile wordFile = new WordFile();
wordFile.setModulePath("娴嬭瘯濮旀墭鍗�.docx");
- wordFile.setWordName(dataObj.getProject().getSoftwareName()+"_娴嬭瘯濮旀墭鍗�.docx");
+ wordFile.setWordName(dataObj.getProject().getSoftwareName() + "_娴嬭瘯濮旀墭鍗�.docx");
wordFileService.exportWordFile(request, dataObj, wordFile, response);
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
--
Gitblit v1.9.1