From ec5237992ac60b6eb0df07ad3f5038b52a582882 Mon Sep 17 00:00:00 2001 From: jinlin <jinlin> Date: 星期五, 10 十一月 2023 11:42:26 +0800 Subject: [PATCH] Changes --- modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderService.java | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 54 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 0c32f2e..0d66775 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,9 +2,15 @@ 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 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.List; @@ -12,11 +18,20 @@ /** * 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; /** * 鍒嗛〉鏌ヨ @@ -38,4 +53,41 @@ super.deleteLogic(ids); } + + public Boolean save(SoftwareTestOrderDto softwareTestOrderDto) { + Long softwareTestOrderId = softwareTestOrderDto.getSoftwareTestOrder().getId(); + if (softwareTestOrderId != null) + baseDao.updateById(softwareTestOrderDto.getSoftwareTestOrder()); + else { + 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; + } + } -- Gitblit v1.9.1