From 2cf47388b765be947805a51ece7608b27e47650b Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期五, 22 十二月 2023 17:02:21 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderService.java | 15 +++++++++------
1 files changed, 9 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 0450243..8526b69 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
@@ -28,6 +28,7 @@
import java.io.FileNotFoundException;
import java.io.UnsupportedEncodingException;
import java.text.SimpleDateFormat;
+import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.stream.Collectors;
@@ -77,6 +78,9 @@
}
return list;
}
+ public String selectOrderId(Long projectId) {
+ return baseDao.selectOrderId(projectId);
+ }
/**
@@ -94,12 +98,11 @@
if (softwareTestOrderId != null)
baseDao.updateById(softwareTestOrderDto.getSoftwareTestOrder());
else {
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy");
- String year = sdf.format(new Date());
Map<String, String> map = new HashMap<>();
map.put("funCode", "software_test_order");
- map.put("year",year);
- softwareTestOrderDto.getSoftwareTestOrder().setYear(year);
+ 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());
@@ -155,8 +158,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