From 0117a966938d2f689e90eee907bd12bc9e123a18 Mon Sep 17 00:00:00 2001
From: zzw <wander.zheng@qq.com>
Date: 星期四, 16 十一月 2023 09:32:37 +0800
Subject: [PATCH] 编号
---
modules/mainPart/src/main/java/com/zt/life/modules/project/controller/SoftwareTestOrderController.java | 50 +++++++++++++++++++++-----------------------------
1 files changed, 21 insertions(+), 29 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 0a7579e..89b512c 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
@@ -14,12 +14,12 @@
import com.zt.common.validator.group.UpdateGroup;
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.service.TestAgencyInfoService;
+import com.zt.modules.coderule.service.SysCodeRuleService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -27,6 +27,11 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.HashMap;
+import java.util.Map;
/**
@@ -50,6 +55,8 @@
private SoftwareTestOrderMeasuredService softwareTestOrderMeasuredService;
@Autowired
private TestAgencyInfoService testAgencyInfoService;
+ @Autowired
+ private SysCodeRuleService sysCodeRuleService;
@GetMapping("page")
@ApiOperation("鍒嗛〉")
@@ -66,31 +73,10 @@
return PageResult.ok(softwareTestOrderService.page(queryFilter));
}
- @GetMapping("{id}")
+ @GetMapping("getDto")
@ApiOperation("淇℃伅")
- 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);
-
- 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));
- }
-
-
+ public Result<SoftwareTestOrderDto> getDto(Long projectId,Long orderId) {
+ SoftwareTestOrderDto data = softwareTestOrderService.getDto(projectId, orderId);
return Result.ok(data);
}
@@ -102,10 +88,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();
}
@@ -119,7 +105,7 @@
return Result.ok();
}
- @DeleteMapping
+ @DeleteMapping("deleteOrder")
@ApiOperation("鍒犻櫎")
@LogOperation("鍒犻櫎")
public Result delete(@RequestBody Long[] ids) {
@@ -130,4 +116,10 @@
return Result.ok();
}
+ @GetMapping("exportWord")
+ @ApiOperation("鎵撳嵃娴嬭瘯濮旀墭鍗�")
+ @LogOperation("鎵撳嵃娴嬭瘯濮旀墭鍗�")
+ public void exportWord(Long id, HttpServletRequest request, HttpServletResponse response) {
+ softwareTestOrderService.exportWord(id, request, response);
+ }
}
--
Gitblit v1.9.1