From 0117a966938d2f689e90eee907bd12bc9e123a18 Mon Sep 17 00:00:00 2001
From: zzw <wander.zheng@qq.com>
Date: 星期四, 16 十一月 2023 09:32:37 +0800
Subject: [PATCH] 编号
---
modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderService.java | 27 +++++++++++++++------------
1 files changed, 15 insertions(+), 12 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..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
@@ -80,7 +80,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<>();
@@ -131,10 +130,10 @@
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);
@@ -168,20 +167,22 @@
.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 +191,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);
}
}
@@ -204,7 +207,7 @@
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