From 1368918fcda9d88bea653cc3a134b245a338d84c Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期三, 15 十一月 2023 10:07:14 +0800
Subject: [PATCH] Changes
---
modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderService.java | 62 ++++++++++--------------------
1 files changed, 21 insertions(+), 41 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 707c2a7..31ac0db 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
@@ -14,12 +14,10 @@
import com.zt.life.modules.sysBaseInfo.service.TestAgencyInfoService;
import com.zt.modules.coderule.service.SysCodeRuleService;
import com.zt.modules.sys.service.SysDictTypeService;
-import lombok.val;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.zt.common.db.query.QueryFilter;
-import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.FileNotFoundException;
@@ -63,7 +61,8 @@
* @return
*/
public List<SoftwareTestOrder> page(QueryFilter queryFilter) {
- return baseDao.getList(queryFilter.getQueryParams());
+ List<SoftwareTestOrder> list = baseDao.getList(queryFilter.getQueryParams());
+ return list;
}
@@ -84,6 +83,7 @@
else {
Map<String, String> map = new HashMap<>();
map.put("funCode", "software_test_order");
+ softwareTestOrderDto.getSoftwareTestOrder().setProjectId(softwareTestOrderDto.getProjectId());
softwareTestOrderDto.getSoftwareTestOrder().setCode(sysCodeRuleService.getNewCode(map));
baseDao.insert(softwareTestOrderDto.getSoftwareTestOrder());
softwareTestOrderId = softwareTestOrderDto.getSoftwareTestOrder().getId();
@@ -94,6 +94,7 @@
if (softwareTestOrderMeasured.getId() != null) {
softwareTestOrderMeasuredService.update(softwareTestOrderMeasured);
} else {
+ softwareTestOrderMeasured.setOrderId(softwareTestOrderId);
softwareTestOrderMeasuredService.insert(softwareTestOrderMeasured);
}
}
@@ -103,6 +104,7 @@
if (softwareTestOrderDeliverable.getId() != null) {
softwareTestOrderDeliverableService.update(softwareTestOrderDeliverable);
} else {
+ softwareTestOrderDeliverable.setOrderId(softwareTestOrderId);
softwareTestOrderDeliverableService.insert(softwareTestOrderDeliverable);
}
}
@@ -116,61 +118,39 @@
return true;
}
- public SoftwareTestOrderDto getDto(Long orderId, Long projectId) {
+ 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);
-
- if (projectId == null)
- projectId = softwareTestOrder.getProjectId();
+ projectId = softwareTestOrder.getProjectId();
data.setTestAgencyInfo(testAgencyInfoService.get(orderId));
+
List<SoftwareTestOrderDeliverable> deliverableList = softwareTestOrderDeliverableService.childrenTables(orderId);
- if (deliverableList.isEmpty()) {
- deliverableList = this.deliverableDict();
- deliverableList = deliverableList.stream()
- .peek(deliverable -> {
- if (deliverable.getIdentify() == null) {
- // 淇敼 identify 瀛楁鐨勫�间负鏂板��
- deliverable.setIdentify("1.0.0");
- }
- })
- .collect(Collectors.toList());
- }
data.setDeliverableList(deliverableList);
List<SoftwareTestOrderMeasured> measuredList = softwareTestOrderMeasuredService.childrenTables(orderId);
- if (measuredList.isEmpty()) {
- measuredList = this.MeasuredDict();
- measuredList = measuredList.stream()
- .peek(measured -> {
- if (measured.getIdentify() == null) {
- // 淇敼 identify 瀛楁鐨勫�间负鏂板��
- measured.setIdentify("1.0.0");
- }
- })
- .collect(Collectors.toList());
- }
data.setMeasuredList(measuredList);
} else {
- data.setTestAgencyInfo(testAgencyInfoService.get(10000L));
+ List<?> testItemResult = baseDao.dictList("testItem_type");
+ List<?> measuredList = testItemResult;
+ data.setMeasuredList((List<SoftwareTestOrderMeasured>) measuredList);
+
+ List<?> productLibraryResult = baseDao.dictList("product_library_file");
+ 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));
}
return data;
- }
-
-
- public List<SoftwareTestOrderDeliverable> deliverableDict() {
- return baseDao.getdeliverableDictList();
- }
-
- public List<SoftwareTestOrderMeasured> MeasuredDict() {
- return baseDao.getMeasuredDictList();
}
public void exportWord(Long id, HttpServletRequest request, HttpServletResponse response) {
@@ -193,7 +173,7 @@
String testType = "," + dataObj.getSoftwareTestOrder().getTestType1() + ",";
for (DictItemDto dictItemDto : ((DictLeafDto) testType1Dict).getDataList()) {
String value = dictItemDto.getDictValue();
- String desc = (testType.contains("," + value + ",")?"鈽�":"鈻�")+dictItemDto.getDictLabel();
+ String desc = (testType.contains("," + value + ",") ? "鈽�" : "鈻�") + dictItemDto.getDictLabel();
if ((i++) % 2 == 0) {
testType12.add(desc);
} else {
@@ -205,7 +185,7 @@
testType = "," + dataObj.getSoftwareTestOrder().getTestType2() + ",";
for (DictItemDto dictItemDto : ((DictLeafDto) testType1Dict).getDataList()) {
String value = dictItemDto.getDictValue();
- String desc = (testType.contains("," + value + ",")?"鈽�":"鈻�")+dictItemDto.getDictLabel();
+ String desc = (testType.contains("," + value + ",") ? "鈽�" : "鈻�") + dictItemDto.getDictLabel();
if ((i++) % 2 == 0) {
testType22.add(desc);
} else {
--
Gitblit v1.9.1