modules/mainPart/src/main/java/com/zt/life/modules/project/controller/SoftwareTestOrderController.java
@@ -12,13 +12,13 @@ import com.zt.common.validator.group.AddGroup; import com.zt.common.validator.group.DefaultGroup; import com.zt.common.validator.group.UpdateGroup; import com.zt.life.modules.project.dto.ProjectDto; import com.zt.life.modules.project.dto.SoftwareTestOrderDto; import com.zt.life.modules.project.model.SoftwareTestOrder; import com.zt.life.modules.project.model.SoftwareTestOrderMeasured; import com.zt.life.modules.project.service.ProjectService; import com.zt.life.modules.project.service.SoftwareTestOrderDeliverableService; import com.zt.life.modules.project.service.SoftwareTestOrderMeasuredService; import com.zt.life.modules.project.service.SoftwareTestOrderService; import com.zt.life.modules.sysBaseInfo.model.TestAgencyInfo; import com.zt.life.modules.sysBaseInfo.service.TestAgencyInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -27,9 +27,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import springfox.documentation.annotations.ApiIgnore; import javax.servlet.http.HttpServletResponse; import java.util.List; /** @@ -43,9 +40,10 @@ @Api(tags="software_test_order") public class SoftwareTestOrderController { @Autowired private ProjectService projectService; @Autowired private SoftwareTestOrderService softwareTestOrderService; @Autowired private ProjectService projectService; @Autowired private SoftwareTestOrderDeliverableService softwareTestOrderDeliverableService; @Autowired @@ -70,14 +68,29 @@ @GetMapping("{id}") @ApiOperation("信息") public Result<ProjectDto> get(@PathVariable("id") Long id){ ProjectDto data = new ProjectDto(); public Result<SoftwareTestOrderDto> get(@PathVariable("id") Long id, @PathVariable("projectId") Long projectId) { SoftwareTestOrderDto data = new SoftwareTestOrderDto(); if (id != null) { data.setId(id); SoftwareTestOrder softwareTestOrder = softwareTestOrderService.get(id); data.setSoftwareTestOrder(softwareTestOrder); data.setProject(projectService.get(softwareTestOrder.getProjectId())); data.setTestAgencyInfo(testAgencyInfoService.get(softwareTestOrder.getAgencyId())); data.setChildrenTable2(softwareTestOrderDeliverableService.childrenTables(softwareTestOrder.getId())); data.setChildrenTable1(softwareTestOrderMeasuredService.childrenTables(softwareTestOrder.getId())); if (projectId == null) projectId = softwareTestOrder.getProjectId(); data.setTestAgencyInfo(testAgencyInfoService.get(id)); data.setSoftwareTestOrderDeliverableList(softwareTestOrderDeliverableService.childrenTables(id)); data.setSoftwareTestOrderMeasuredList(softwareTestOrderMeasuredService.childrenTables(id)); } else { data.setTestAgencyInfo(testAgencyInfoService.get(10000L)); } if (projectId != null) { data.setProjectId(projectId); data.setProject(projectService.get(projectId)); } return Result.ok(data); } @@ -85,10 +98,13 @@ @PostMapping @ApiOperation("新增") @LogOperation("新增") public Result insert(@RequestBody SoftwareTestOrder softwareTestOrder){ public Result insert(@RequestBody SoftwareTestOrderDto softwareTestOrderDto) { //效验数据 ValidatorUtils.validateEntity(softwareTestOrder, AddGroup.class, DefaultGroup.class); softwareTestOrderService.insert(softwareTestOrder); ValidatorUtils.validateEntity(softwareTestOrderDto.getSoftwareTestOrder(), AddGroup.class, DefaultGroup.class); Boolean result = softwareTestOrderService.save(softwareTestOrderDto); return Result.ok(); } @@ -96,11 +112,10 @@ @PutMapping @ApiOperation("修改") @LogOperation("修改") public Result update(@RequestBody SoftwareTestOrder softwareTestOrder){ public Result update(@RequestBody SoftwareTestOrderDto softwareTestOrderDtor) { //效验数据 ValidatorUtils.validateEntity(softwareTestOrder, UpdateGroup.class, DefaultGroup.class); softwareTestOrderService.update(softwareTestOrder); ValidatorUtils.validateEntity(softwareTestOrderDtor.getSoftwareTestOrder(), UpdateGroup.class, DefaultGroup.class); Boolean result = softwareTestOrderService.save(softwareTestOrderDtor); return Result.ok(); }
File was renamed from modules/mainPart/src/main/java/com/zt/life/modules/project/dto/ProjectDto.java @@ -13,14 +13,15 @@ import java.util.List; @Data public class ProjectDto{ public class SoftwareTestOrderDto { private Long id; private Long projectId; private SoftwareTestOrder softwareTestOrder; private Project project; private TestAgencyInfo TestAgencyInfo; @ApiModelProperty(value = "被测件") private List<SoftwareTestOrderMeasured> childrenTable1 = new ArrayList<>(); private List<SoftwareTestOrderMeasured> softwareTestOrderMeasuredList = new ArrayList<>(); @ApiModelProperty(value = "交付件") private List<SoftwareTestOrderDeliverable> childrenTable2 = new ArrayList<>(); private List<SoftwareTestOrderDeliverable> softwareTestOrderDeliverableList = new ArrayList<>(); }
@@ -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; @@ -17,6 +23,15 @@ */ @Service 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; } } web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue
@@ -77,29 +77,7 @@ return { dataForm: { id: '', projectId: '', optEnviron: '', programLang: '', testBasis: '', testType: '', testStandard: '', startDate: '', endDate: '', testVenue: '', otherRequire: '', testDate: '', deliveryDate: '', testCost: '', articleNature: '', sampleStatus: '', agencyName: '', site: '', businContact: '', businComplaint: '', laborContact: '', labContactNum: '', postalCode: '', fax: '' projectId: '' } } },
