From 639bc12e3fcca3b3290349fce00336a4dfae1c9d Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期一, 13 十一月 2023 11:30:38 +0800
Subject: [PATCH] Changes
---
modules/mainPart/src/main/java/com/zt/life/modules/project/controller/SoftwareTestOrderController.java | 28 +++++++++++++++++++++++++---
1 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/SoftwareTestOrderController.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/SoftwareTestOrderController.java
index 88146dc..a67576f 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/SoftwareTestOrderController.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/SoftwareTestOrderController.java
@@ -21,6 +21,7 @@
import com.zt.life.modules.project.service.SoftwareTestOrderMeasuredService;
import com.zt.life.modules.project.service.SoftwareTestOrderService;
import com.zt.life.modules.sysBaseInfo.service.TestAgencyInfoService;
+import com.zt.modules.coderule.service.SysCodeRuleService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -29,7 +30,10 @@
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
/**
@@ -53,6 +57,8 @@
private SoftwareTestOrderMeasuredService softwareTestOrderMeasuredService;
@Autowired
private TestAgencyInfoService testAgencyInfoService;
+ @Autowired
+ private SysCodeRuleService sysCodeRuleService;
@GetMapping("page")
@ApiOperation("鍒嗛〉")
@@ -86,12 +92,28 @@
List<SoftwareTestOrderDeliverable> deliverableList = softwareTestOrderDeliverableService.childrenTables(orderId);
if (deliverableList.isEmpty()) {
deliverableList = softwareTestOrderService.deliverableDict();
+ deliverableList = deliverableList.stream()
+ .peek(deliverable -> {
+ if (deliverable.getIdentify() == null) {
+ // 淇敼 identify 瀛楁鐨勫�间负鏂板��
+ deliverable.setIdentify("1.0.0");
+ }
+ })
+ .collect(Collectors.toList());
}
data.setSoftwareTestOrderDeliverableList(deliverableList);
List<SoftwareTestOrderMeasured> measuredList = softwareTestOrderMeasuredService.childrenTables(orderId);
if (measuredList.isEmpty()) {
measuredList = softwareTestOrderService.MeasuredDict();
+ measuredList = measuredList.stream()
+ .peek(measured -> {
+ if (measured.getIdentify() == null) {
+ // 淇敼 identify 瀛楁鐨勫�间负鏂板��
+ measured.setIdentify("1.0.0");
+ }
+ })
+ .collect(Collectors.toList());
}
data.setSoftwareTestOrderMeasuredList(measuredList);} else {
data.setTestAgencyInfo(testAgencyInfoService.get(10000L));
@@ -113,10 +135,10 @@
//鏁堥獙鏁版嵁
ValidatorUtils.validateEntity(softwareTestOrderDto.getSoftwareTestOrder(), AddGroup.class, DefaultGroup.class);
-
+ Map<String,String> map = new HashMap<>();
+ map.put("funCode","software_test_order");
+ softwareTestOrderDto.getSoftwareTestOrder().setCode(sysCodeRuleService.getNewCode(map));
Boolean result = softwareTestOrderService.save(softwareTestOrderDto);
-
-
return Result.ok();
}
--
Gitblit v1.9.1