From 7416356c7658db835e3e47dbb93f49b7e0cd762b Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期二, 05 十二月 2023 17:30:11 +0800
Subject: [PATCH] 6
---
modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/controller/ItemCirculatOrderController.java | 25 ++++++++++++-------------
1 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/controller/ItemCirculatOrderController.java b/modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/controller/ItemCirculatOrderController.java
index 1866021..240c223 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/controller/ItemCirculatOrderController.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/controller/ItemCirculatOrderController.java
@@ -29,6 +29,7 @@
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.List;
@@ -77,22 +78,13 @@
@ApiOperation("淇℃伅")
public Result<ItemCirculatOrderDto> getDto(Long projectId, Long circulatOrderid) {
ItemCirculatOrderDto data = itemCirculatOrderService.getDto(projectId, circulatOrderid);
- if (circulatOrderid!=null) {
- for (ItemCirculatOrderTechnical technical : technicalService.getList(circulatOrderid)) {
- Long technicalId = technical.getId();
- OssDto ossDto = sysOssConfigService.getOssByBusiType(technicalId, "circulat_order");
- if (ossDto != null) {
- technical.setFiles(ossDto);
- }
- }
- }
return Result.ok(data);
}
@PostMapping
@ApiOperation("鏂板")
@LogOperation("鏂板")
- public Result insert(@RequestBody ItemCirculatOrderDto itemCirculatOrderDto){
+ public Result<Long> insert(@RequestBody ItemCirculatOrderDto itemCirculatOrderDto){
//鏁堥獙鏁版嵁
ValidatorUtils.validateEntity(itemCirculatOrderDto.getCirculatOrder(), AddGroup.class, DefaultGroup.class);
Map<String, String> map = new HashMap<>();
@@ -100,18 +92,18 @@
map.put("projectId",itemCirculatOrderDto.getProjectId().toString());
itemCirculatOrderDto.getCirculatOrder().setCode(sysCodeRuleService.getNewCode(map));
Boolean result = itemCirculatOrderService.save(itemCirculatOrderDto);
- return Result.ok();
+ return Result.ok(itemCirculatOrderDto.getCirculatOrder().getId());
}
@PutMapping
@ApiOperation("淇敼")
@LogOperation("淇敼")
- public Result update(@RequestBody ItemCirculatOrderDto itemCirculatOrderDto){
+ public Result<Long> update(@RequestBody ItemCirculatOrderDto itemCirculatOrderDto){
//鏁堥獙鏁版嵁
ValidatorUtils.validateEntity(itemCirculatOrderDto.getCirculatOrder(), UpdateGroup.class, DefaultGroup.class);
Boolean result = itemCirculatOrderService.save(itemCirculatOrderDto);
- return Result.ok();
+ return Result.ok(itemCirculatOrderDto.getCirculatOrder().getId());
}
@DeleteMapping("deleteCirculat")
@@ -125,4 +117,11 @@
return Result.ok();
}
+ @GetMapping("exportCirculatOrder")
+ @ApiOperation("鎵撳嵃鐗╁搧娴佽浆鍗�")
+ @LogOperation("鎵撳嵃鐗╁搧娴佽浆鍗�")
+ public void exportCirculatOrder(Long id, HttpServletRequest request, HttpServletResponse response) {
+ itemCirculatOrderService.exportCirculatOrder(id, request, response);
+ }
+
}
--
Gitblit v1.9.1