From 1d92d1ba80928578b54a9baba13e9c2cdd12d9e9 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期三, 22 十一月 2023 14:20:53 +0800
Subject: [PATCH] Changes
---
modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderService.java | 9 +++------
1 files changed, 3 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..a5a0624 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
@@ -94,12 +94,9 @@
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());
softwareTestOrderDto.getSoftwareTestOrder().setProjectId(softwareTestOrderDto.getProjectId());
softwareTestOrderDto.getSoftwareTestOrder().setCode(sysCodeRuleService.getNewCode(map));
baseDao.insert(softwareTestOrderDto.getSoftwareTestOrder());
@@ -155,8 +152,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