From bc8ff037b8f01268a0a032d0ad8d503c48d5e9f8 Mon Sep 17 00:00:00 2001
From: wente <329538422@qq.com>
Date: 星期五, 08 十二月 2023 11:32:32 +0800
Subject: [PATCH] 配置变更表
---
modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderService.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 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 5a5327a..ecdd3f3 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
@@ -27,10 +27,9 @@
import javax.servlet.http.HttpServletResponse;
import java.io.FileNotFoundException;
import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.text.SimpleDateFormat;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
import java.util.stream.Collectors;
@@ -98,6 +97,9 @@
else {
Map<String, String> map = new HashMap<>();
map.put("funCode", "software_test_order");
+ map.put("projectId",softwareTestOrderDto.getProjectId().toString());
+ /* DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+ softwareTestOrderDto.getSoftwareTestOrder().getEntrustSignDate();*/
softwareTestOrderDto.getSoftwareTestOrder().setProjectId(softwareTestOrderDto.getProjectId());
softwareTestOrderDto.getSoftwareTestOrder().setCode(sysCodeRuleService.getNewCode(map));
baseDao.insert(softwareTestOrderDto.getSoftwareTestOrder());
@@ -153,8 +155,8 @@
} else {
Project project = projectService.get(projectId);
String projectCode = project.getCode();
- String softName =project.getSoftwareName();
- List<?> testItemResult = baseDao.dictList("testItem_type", projectCode,softName);
+ String softIdentity =project.getSoftwareIdentity();
+ List<?> testItemResult = baseDao.dictList("testItem_type", projectCode,softIdentity);
List<?> measuredList = testItemResult;
data.setMeasuredList((List<SoftwareTestOrderMeasured>) measuredList);
--
Gitblit v1.9.1