From 09e19d4defad238ecf28a5749a4ce64904fa76b0 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期三, 21 二月 2024 15:33:25 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/controller/ItemCirculatOrderController.java | 36 ++++++++++++++++++++----------------
1 files changed, 20 insertions(+), 16 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..89c825e 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
@@ -18,6 +18,7 @@
import com.zt.life.modules.itemCirculatOrder.service.ItemCirculatOrderService;
import com.zt.life.modules.itemCirculatOrder.service.ItemCirculatOrderTechnicalService;
import com.zt.life.modules.project.dto.SoftwareTestOrderDto;
+import com.zt.life.modules.project.service.ProjectService;
import com.zt.life.sys.dto.OssDto;
import com.zt.life.sys.service.SysOssConfigService;
import com.zt.modules.coderule.service.SysCodeRuleService;
@@ -29,6 +30,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;
@@ -52,6 +54,9 @@
private SysCodeRuleService sysCodeRuleService;
@Autowired
+ private ProjectService projectService;
+
+ @Autowired
private SysOssConfigService sysOssConfigService;
@Autowired
@@ -64,9 +69,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^LK"),
+ @ApiImplicitParam(name = "softwareIdentity", value = "鐗╁搧缂栧彿", dataType = Constant.QT.STRING, format = "p.software_identity^LK")
})
public PageResult<ItemCirculatOrder> page(@ApiIgnore @QueryParam QueryFilter queryFilter){
@@ -77,15 +82,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);
}
@@ -99,7 +95,7 @@
map.put("funCode", "item_circulat_order");
map.put("projectId",itemCirculatOrderDto.getProjectId().toString());
itemCirculatOrderDto.getCirculatOrder().setCode(sysCodeRuleService.getNewCode(map));
- Boolean result = itemCirculatOrderService.save(itemCirculatOrderDto);
+ Long result = itemCirculatOrderService.save(itemCirculatOrderDto);
return Result.ok(itemCirculatOrderDto.getCirculatOrder().getId());
}
@@ -109,9 +105,9 @@
public Result<Long> update(@RequestBody ItemCirculatOrderDto itemCirculatOrderDto){
//鏁堥獙鏁版嵁
ValidatorUtils.validateEntity(itemCirculatOrderDto.getCirculatOrder(), UpdateGroup.class, DefaultGroup.class);
- Boolean result = itemCirculatOrderService.save(itemCirculatOrderDto);
-
- return Result.ok(itemCirculatOrderDto.getCirculatOrder().getId());
+ Long result = itemCirculatOrderService.save(itemCirculatOrderDto);
+//杩斿洖鐨勬槸椤圭洰鍏ュ簱鐨処D
+ return Result.ok(result);
}
@DeleteMapping("deleteCirculat")
@@ -121,8 +117,16 @@
//鏁堥獙鏁版嵁
AssertUtils.isArrayEmpty(ids, "id");
itemCirculatOrderService.delete(ids);
+ projectService.deleteItem(ids,"item_circulat_order_technical","circulat_order_id");
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