From 40eb98bcf3028ca1de391ac140f44920eddd9e8b Mon Sep 17 00:00:00 2001
From: zzw <wander.zheng@qq.com>
Date: 星期五, 17 十一月 2023 10:00:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderService.java | 77 ++++++++++++++++++++++++++++++--------
1 files changed, 61 insertions(+), 16 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 9b28ab3..53531b4 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;
@@ -13,6 +15,7 @@
import com.zt.life.modules.project.model.SoftwareTestOrderDeliverable;
import com.zt.life.modules.project.model.SoftwareTestOrderMeasured;
import com.zt.life.modules.sysBaseInfo.service.TestAgencyInfoService;
+import com.zt.life.sys.service.SysOssConfigService;
import com.zt.modules.coderule.service.SysCodeRuleService;
import com.zt.modules.sys.service.SysDictTypeService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -38,7 +41,6 @@
*/
@Service
public class SoftwareTestOrderService extends BaseService<SoftwareTestOrderDao, SoftwareTestOrder> {
-
@Autowired
private ProjectService projectService;
@Autowired
@@ -54,6 +56,11 @@
private SysDictTypeService sysDictTypeService;
@Autowired
private WordFileService wordFileService;
+ @Autowired
+ private GetShowDictList getShowDictList;
+
+ @Autowired
+ private SysOssConfigService sysOssConfigService;
/**
* 鍒嗛〉鏌ヨ
@@ -80,7 +87,6 @@
public Boolean save(SoftwareTestOrderDto softwareTestOrderDto) {
Long softwareTestOrderId = softwareTestOrderDto.getSoftwareTestOrder().getId();
if (softwareTestOrderId != null)
-
baseDao.updateById(softwareTestOrderDto.getSoftwareTestOrder());
else {
Map<String, String> map = new HashMap<>();
@@ -117,6 +123,7 @@
} else {
testAgencyInfoService.update(softwareTestOrderDto.getTestAgencyInfo());
}
+ sysOssConfigService.updateOss(softwareTestOrderDto.getId(), softwareTestOrderDto.getFiles());// 淇濆瓨闄勪欢
return true;
}
@@ -131,19 +138,19 @@
data.setTestAgencyInfo(testAgencyInfoService.get(orderId));
- List<SoftwareTestOrderDeliverable> deliverableList = softwareTestOrderDeliverableService.childrenTables(orderId);
+ List<SoftwareTestOrderDeliverable> deliverableList = softwareTestOrderDeliverableService.getList(orderId);
data.setDeliverableList(deliverableList);
- List<SoftwareTestOrderMeasured> measuredList = softwareTestOrderMeasuredService.childrenTables(orderId);
+ List<SoftwareTestOrderMeasured> measuredList = softwareTestOrderMeasuredService.getList(orderId);
data.setMeasuredList(measuredList);
} 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);
}
@@ -162,26 +169,29 @@
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"))
.collect(Collectors.toList()).get(0);
- List<String> testType11 = new ArrayList<>();
- List<String> testType12 = new ArrayList<>();
- List<String> testType21 = new ArrayList<>();
- List<String> testType22 = new ArrayList<>();
+ List<HashMap<String, Object>> testType11 = new ArrayList<>();
+ List<HashMap<String, Object>> testType12 = new ArrayList<>();
+ 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);
if ((i++) % 2 == 0) {
- testType12.add(desc);
+ testType12.add(stateItem);
} else {
- testType11.add(desc);
+ testType11.add(stateItem);
}
}
@@ -190,10 +200,12 @@
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);
if ((i++) % 2 == 0) {
- testType22.add(desc);
+ testType22.add(stateItem);
} else {
- testType21.add(desc);
+ testType21.add(stateItem);
}
}
@@ -202,9 +214,42 @@
dataObj.getSoftwareTestOrder().setTestType21(testType21);
dataObj.getSoftwareTestOrder().setTestType22(testType22);
+ //閫氱敤瀛楀吀鍒楄〃瀛楃涓茬敓鎴�
+ 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");
+ measured.setIsMeasuredStr(isMeasuredStr);
+ }
+
+
+ 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.getSoftwareTestOrder().getTestLevel().toString(), "test_level");
+ dataObj.getSoftwareTestOrder().setTestLevelStr(testLevelStr);
+
+ 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");
+ dataObj.getSoftwareTestOrder().setArticleNatureStr(articleNatureStr);
+
+ String sampleStatusStr = getShowDictList.getShowDictList(dataObj.getSoftwareTestOrder().getSampleStatus(), "is_or_not");
+ dataObj.getSoftwareTestOrder().setSampleStatusStr(sampleStatusStr);
+
WordFile wordFile = new WordFile();
wordFile.setModulePath("娴嬭瘯濮旀墭鍗�.docx");
- wordFile.setWordName(dataObj.getProject().getSoftwareName()+"_娴嬭瘯濮旀墭鍗�");
+ wordFile.setWordName(dataObj.getProject().getSoftwareName() + "_娴嬭瘯濮旀墭鍗�.docx");
wordFileService.exportWordFile(request, dataObj, wordFile, response);
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
--
Gitblit v1.9.1