From d89ef43c4713adf26f74b796653d1dd15ff1f81a Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期三, 29 十一月 2023 16:37:47 +0800
Subject: [PATCH] 6
---
modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/controller/ItemCirculatOrderController.java | 27 +++++++++++++++++++--------
1 files changed, 19 insertions(+), 8 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 2a1cebe..70405bf 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
@@ -14,7 +14,9 @@
import com.zt.common.validator.group.UpdateGroup;
import com.zt.life.modules.itemCirculatOrder.dto.ItemCirculatOrderDto;
import com.zt.life.modules.itemCirculatOrder.model.ItemCirculatOrder;
+import com.zt.life.modules.itemCirculatOrder.model.ItemCirculatOrderTechnical;
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.sys.dto.OssDto;
import com.zt.life.sys.service.SysOssConfigService;
@@ -52,6 +54,9 @@
@Autowired
private SysOssConfigService sysOssConfigService;
+ @Autowired
+ private ItemCirculatOrderTechnicalService technicalService;
+
@GetMapping("page")
@ApiOperation("鍒嗛〉")
@ApiImplicitParams({
@@ -59,7 +64,10 @@
@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 = "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")
+ })
public PageResult<ItemCirculatOrder> page(@ApiIgnore @QueryParam QueryFilter queryFilter){
return PageResult.ok(itemCirculatOrderService.page(queryFilter));
@@ -70,9 +78,12 @@
public Result<ItemCirculatOrderDto> getDto(Long projectId, Long circulatOrderid) {
ItemCirculatOrderDto data = itemCirculatOrderService.getDto(projectId, circulatOrderid);
if (circulatOrderid!=null) {
- OssDto ossDto = sysOssConfigService.getOssByBusiType(circulatOrderid, "circulat_order");
- if (ossDto != null) {
- data.setFiles(ossDto);
+ 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);
@@ -81,7 +92,7 @@
@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<>();
@@ -89,18 +100,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")
--
Gitblit v1.9.1