From 46fb684ba924ada80ed9c0a57ef7151efe432149 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期三, 13 十二月 2023 15:44:33 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/controller/ItemCirculatOrderController.java | 23 +++++++++++------------
1 files changed, 11 insertions(+), 12 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 70405bf..33b4cc1 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;
@@ -64,9 +65,9 @@
@ApiImplicitParam(name = Constant.Q.LIMIT, value = Constant.QV.LIMIT, required = true, dataType = Constant.QT.INT),
@ApiImplicitParam(name = Constant.Q.ORDER_FIELD, value = Constant.QV.ORDER_FIELD, dataType = Constant.QT.STRING),
@ApiImplicitParam(name = Constant.Q.ORDER, value = Constant.QV.ORDER, dataType = Constant.QT.STRING),
- @ApiImplicitParam(name = "code", value = "鐗╁搧娴佽浆鍗曠紪鍙�", dataType = Constant.QT.STRING, format = "code^LK"),
- @ApiImplicitParam(name = "softwareName", value = "鐗╁搧鍚嶇О", dataType = Constant.QT.STRING, format = "software_name^EQ"),
- @ApiImplicitParam(name = "softwareIdentity", value = "鐗╁搧缂栧彿", dataType = Constant.QT.STRING, format = "software_identity^EQ")
+ @ApiImplicitParam(name = "code", value = "鐗╁搧娴佽浆鍗曠紪鍙�", dataType = Constant.QT.STRING, format = "a.code^LK"),
+ @ApiImplicitParam(name = "softwareName", value = "鐗╁搧鍚嶇О", dataType = Constant.QT.STRING, format = "p.software_name^EQ"),
+ @ApiImplicitParam(name = "softwareIdentity", value = "鐗╁搧缂栧彿", dataType = Constant.QT.STRING, format = "p.software_identity^EQ")
})
public PageResult<ItemCirculatOrder> page(@ApiIgnore @QueryParam QueryFilter queryFilter){
@@ -77,15 +78,6 @@
@ApiOperation("淇℃伅")
public Result<ItemCirculatOrderDto> getDto(Long projectId, Long circulatOrderid) {
ItemCirculatOrderDto data = itemCirculatOrderService.getDto(projectId, circulatOrderid);
- if (circulatOrderid!=null) {
- for (ItemCirculatOrderTechnical technical : data.getTechnicalList()) {
- Long technicalId = technical.getId();
- OssDto ossDto = sysOssConfigService.getOssByBusiType(technicalId, "circulat_order");
- if (ossDto != null) {
- technical.setFiles(ossDto);
- }
- }
- }
return Result.ok(data);
}
@@ -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