From 1249ac088787abb46bc60a241531e2b4fcc961fe Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期一, 13 十一月 2023 10:38:57 +0800
Subject: [PATCH] Changes
---
modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderService.java | 73 +++++++++++++++++++++++++++++++++++-
1 files changed, 71 insertions(+), 2 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 6526c7b..b69fe1c 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
@@ -2,21 +2,41 @@
import com.zt.common.service.BaseService;
import com.zt.life.modules.project.dao.SoftwareTestOrderDao;
+import com.zt.life.modules.project.dto.SoftwareTestOrderDto;
import com.zt.life.modules.project.model.SoftwareTestOrder;
+import com.zt.life.modules.project.model.SoftwareTestOrderDeliverable;
+import com.zt.life.modules.project.model.SoftwareTestOrderMeasured;
+import com.zt.life.modules.sysBaseInfo.service.TestAgencyInfoService;
+import com.zt.modules.coderule.service.SysCodeRuleService;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.zt.common.db.query.QueryFilter;
+
import javax.annotation.Resource;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
/**
* software_test_order
*
- * @author zt generator
+ * @author zt generator
* @since 1.0.0 2023-11-08
*/
@Service
-public class SoftwareTestOrderService extends BaseService<SoftwareTestOrderDao, SoftwareTestOrder> {
+public class SoftwareTestOrderService extends BaseService<SoftwareTestOrderDao, SoftwareTestOrder> {
+
+ @Autowired
+ private ProjectService projectService;
+ @Autowired
+ private SoftwareTestOrderDeliverableService softwareTestOrderDeliverableService;
+ @Autowired
+ private SoftwareTestOrderMeasuredService softwareTestOrderMeasuredService;
+ @Autowired
+ private TestAgencyInfoService testAgencyInfoService;
+ @Autowired
+ private SysCodeRuleService sysCodeRuleService;
/**
* 鍒嗛〉鏌ヨ
@@ -28,6 +48,7 @@
return baseDao.getList(queryFilter.getQueryParams());
}
+
/**
* 鍒犻櫎
*
@@ -37,4 +58,52 @@
super.deleteLogic(ids);
}
+
+ public Boolean save(SoftwareTestOrderDto softwareTestOrderDto) {
+ Long softwareTestOrderId = softwareTestOrderDto.getSoftwareTestOrder().getId();
+ if (softwareTestOrderId != null)
+ baseDao.updateById(softwareTestOrderDto.getSoftwareTestOrder());
+ else {
+ Map<String, String> map = new HashMap<>();
+ map.put("funCode", "software_test_order");
+ softwareTestOrderDto.getSoftwareTestOrder().setCode(sysCodeRuleService.getNewCode(map));
+ baseDao.insert(softwareTestOrderDto.getSoftwareTestOrder());
+ softwareTestOrderId = softwareTestOrderDto.getSoftwareTestOrder().getId();
+ }
+
+ for (SoftwareTestOrderMeasured softwareTestOrderMeasured : softwareTestOrderDto.getSoftwareTestOrderMeasuredList()) {
+ softwareTestOrderMeasured.setOrderId(softwareTestOrderId);
+ if (softwareTestOrderMeasured.getId() != null) {
+ softwareTestOrderMeasuredService.update(softwareTestOrderMeasured);
+ } else {
+ softwareTestOrderMeasuredService.insert(softwareTestOrderMeasured);
+ }
+ }
+
+ for (SoftwareTestOrderDeliverable softwareTestOrderDeliverable : softwareTestOrderDto.getSoftwareTestOrderDeliverableList()) {
+ softwareTestOrderDeliverable.setOrderId(softwareTestOrderId);
+ if (softwareTestOrderDeliverable.getId() != null) {
+ softwareTestOrderDeliverableService.update(softwareTestOrderDeliverable);
+ } else {
+ softwareTestOrderDeliverableService.insert(softwareTestOrderDeliverable);
+ }
+ }
+
+ if (softwareTestOrderDto.getTestAgencyInfo().getId() == 10000) {
+ softwareTestOrderDto.getTestAgencyInfo().setId(softwareTestOrderId);
+ testAgencyInfoService.insert(softwareTestOrderDto.getTestAgencyInfo());
+ } else {
+ testAgencyInfoService.update(softwareTestOrderDto.getTestAgencyInfo());
+ }
+ return true;
+ }
+
+
+ public List<SoftwareTestOrderDeliverable> deliverableDict() {
+ return baseDao.getdeliverableDictList();
+ }
+
+ public List<SoftwareTestOrderMeasured> MeasuredDict() {
+ return baseDao.getMeasuredDictList();
+ }
}
--
Gitblit v1.9.1