From fbdc3cb5768e3484648edf3ff96df03c881e78fa Mon Sep 17 00:00:00 2001
From: zzw <wander.zheng@qq.com>
Date: 星期四, 16 十一月 2023 09:32:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderService.java | 115 ++++++++++++++++++++++++++++++---------------------------
1 files changed, 61 insertions(+), 54 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 31ac0db..55097bb 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
@@ -8,6 +8,7 @@
import com.zt.life.export.service.WordFileService;
import com.zt.life.modules.project.dao.SoftwareTestOrderDao;
import com.zt.life.modules.project.dto.SoftwareTestOrderDto;
+import com.zt.life.modules.project.model.Project;
import com.zt.life.modules.project.model.SoftwareTestOrder;
import com.zt.life.modules.project.model.SoftwareTestOrderDeliverable;
import com.zt.life.modules.project.model.SoftwareTestOrderMeasured;
@@ -118,89 +119,95 @@
return true;
}
- public SoftwareTestOrderDto getDto(Long projectId,Long orderId) {
+ public SoftwareTestOrderDto getDto(Long projectId, Long orderId) {
SoftwareTestOrderDto data = new SoftwareTestOrderDto();
if (orderId != null) {
data.setId(orderId);
SoftwareTestOrder softwareTestOrder = this.get(orderId);
data.setSoftwareTestOrder(softwareTestOrder);
+
projectId = softwareTestOrder.getProjectId();
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 {
- List<?> testItemResult = baseDao.dictList("testItem_type");
+ Project project = projectService.get(projectId);
+ String projectCode = project.getCode();
+ List<?> testItemResult = baseDao.dictList("testItem_type",projectCode);
List<?> measuredList = testItemResult;
data.setMeasuredList((List<SoftwareTestOrderMeasured>) measuredList);
- List<?> productLibraryResult = baseDao.dictList("product_library_file");
+ List<?> productLibraryResult = baseDao.dictList("product_library_file",projectCode);
List<?> deliverableList = productLibraryResult;
data.setDeliverableList((List<SoftwareTestOrderDeliverable>) deliverableList);
}
-
- if (data.getTestAgencyInfo() == null)
- data.setTestAgencyInfo(testAgencyInfoService.get(10000L));
if (projectId != null) {
data.setProjectId(projectId);
data.setProject(projectService.get(projectId));
}
+
+ if (data.getTestAgencyInfo() == null)
+ data.setTestAgencyInfo(testAgencyInfoService.get(10000L));
+
return data;
}
public void exportWord(Long id, HttpServletRequest request, HttpServletResponse response) {
- WordFile wordFile = new WordFile();
- wordFile.setModulePath("aaaa");
- wordFile.setWordName("aaa");
- SoftwareTestOrderDto dataObj = this.getDto(id, null);
-
- 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<>();
-
- 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();
- if ((i++) % 2 == 0) {
- testType12.add(desc);
- } else {
- testType11.add(desc);
- }
- }
-
- i = 0;
- testType = "," + dataObj.getSoftwareTestOrder().getTestType2() + ",";
- for (DictItemDto dictItemDto : ((DictLeafDto) testType1Dict).getDataList()) {
- String value = dictItemDto.getDictValue();
- String desc = (testType.contains("," + value + ",") ? "鈽�" : "鈻�") + dictItemDto.getDictLabel();
- if ((i++) % 2 == 0) {
- testType22.add(desc);
- } else {
- testType21.add(desc);
- }
- }
-
- dataObj.getSoftwareTestOrder().setTestType11(testType11);
- dataObj.getSoftwareTestOrder().setTestType12(testType12);
- dataObj.getSoftwareTestOrder().setTestType21(testType21);
- dataObj.getSoftwareTestOrder().setTestType22(testType22);
-
- List<Object> measuredList = new ArrayList<>();
-
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<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(stateItem);
+ } else {
+ testType11.add(stateItem);
+ }
+ }
+
+ i = 0;
+ testType = "," + dataObj.getSoftwareTestOrder().getTestType2() + ",";
+ 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(stateItem);
+ } else {
+ testType21.add(stateItem);
+ }
+ }
+
+ dataObj.getSoftwareTestOrder().setTestType11(testType11);
+ dataObj.getSoftwareTestOrder().setTestType12(testType12);
+ dataObj.getSoftwareTestOrder().setTestType21(testType21);
+ dataObj.getSoftwareTestOrder().setTestType22(testType22);
+
+ WordFile wordFile = new WordFile();
+ wordFile.setModulePath("娴嬭瘯濮旀墭鍗�.docx");
+ wordFile.setWordName(dataObj.getProject().getSoftwareName()+"_娴嬭瘯濮旀墭鍗�.docx");
wordFileService.exportWordFile(request, dataObj, wordFile, response);
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
--
Gitblit v1.9.1