From 497ee5e5905f1808717ffec2ee2889262d2ba90c Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期四, 07 十二月 2023 17:15:35 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/controller/ItemCirculatOrderController.java | 61 +++++++++++++++++++++++-------
1 files changed, 46 insertions(+), 15 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 e4f716a..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
@@ -12,8 +12,15 @@
import com.zt.common.validator.group.AddGroup;
import com.zt.common.validator.group.DefaultGroup;
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;
+import com.zt.modules.coderule.service.SysCodeRuleService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -22,8 +29,11 @@
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;
+import java.util.Map;
/**
@@ -39,6 +49,15 @@
@Autowired
private ItemCirculatOrderService itemCirculatOrderService;
+ @Autowired
+ private SysCodeRuleService sysCodeRuleService;
+
+ @Autowired
+ private SysOssConfigService sysOssConfigService;
+
+ @Autowired
+ private ItemCirculatOrderTechnicalService technicalService;
+
@GetMapping("page")
@ApiOperation("鍒嗛〉")
@ApiImplicitParams({
@@ -46,43 +65,48 @@
@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 = "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){
return PageResult.ok(itemCirculatOrderService.page(queryFilter));
}
- @GetMapping("{id}")
+ @GetMapping("getDto")
@ApiOperation("淇℃伅")
- public Result<ItemCirculatOrder> get(@PathVariable("id") Long id){
- ItemCirculatOrder data = itemCirculatOrderService.get(id);
-
+ public Result<ItemCirculatOrderDto> getDto(Long projectId, Long circulatOrderid) {
+ ItemCirculatOrderDto data = itemCirculatOrderService.getDto(projectId, circulatOrderid);
return Result.ok(data);
}
@PostMapping
@ApiOperation("鏂板")
@LogOperation("鏂板")
- public Result insert(@RequestBody ItemCirculatOrder itemCirculatOrder){
+ public Result<Long> insert(@RequestBody ItemCirculatOrderDto itemCirculatOrderDto){
//鏁堥獙鏁版嵁
- ValidatorUtils.validateEntity(itemCirculatOrder, AddGroup.class, DefaultGroup.class);
- itemCirculatOrderService.insert(itemCirculatOrder);
-
- return Result.ok();
+ ValidatorUtils.validateEntity(itemCirculatOrderDto.getCirculatOrder(), AddGroup.class, DefaultGroup.class);
+ Map<String, String> map = new HashMap<>();
+ map.put("funCode", "item_circulat_order");
+ map.put("projectId",itemCirculatOrderDto.getProjectId().toString());
+ itemCirculatOrderDto.getCirculatOrder().setCode(sysCodeRuleService.getNewCode(map));
+ Boolean result = itemCirculatOrderService.save(itemCirculatOrderDto);
+ return Result.ok(itemCirculatOrderDto.getCirculatOrder().getId());
}
@PutMapping
@ApiOperation("淇敼")
@LogOperation("淇敼")
- public Result update(@RequestBody ItemCirculatOrder itemCirculatOrder){
+ public Result<Long> update(@RequestBody ItemCirculatOrderDto itemCirculatOrderDto){
//鏁堥獙鏁版嵁
- ValidatorUtils.validateEntity(itemCirculatOrder, UpdateGroup.class, DefaultGroup.class);
- itemCirculatOrderService.update(itemCirculatOrder);
+ ValidatorUtils.validateEntity(itemCirculatOrderDto.getCirculatOrder(), UpdateGroup.class, DefaultGroup.class);
+ Boolean result = itemCirculatOrderService.save(itemCirculatOrderDto);
- return Result.ok();
+ return Result.ok(itemCirculatOrderDto.getCirculatOrder().getId());
}
- @DeleteMapping
+ @DeleteMapping("deleteCirculat")
@ApiOperation("鍒犻櫎")
@LogOperation("鍒犻櫎")
public Result delete(@RequestBody Long[] ids){
@@ -93,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