From 1772fc5e211f9e9e0ab4cdc6c29b436aac178c2a Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期五, 23 二月 2024 12:19:55 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/java/com/zt/life/modules/baselineRelease/controller/BaselineReleaseController.java | 41 +++++++++++++++++++++--------------------
1 files changed, 21 insertions(+), 20 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/baselineRelease/controller/BaselineReleaseController.java b/modules/mainPart/src/main/java/com/zt/life/modules/baselineRelease/controller/BaselineReleaseController.java
index bf75f90..5d97c7b 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/baselineRelease/controller/BaselineReleaseController.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/baselineRelease/controller/BaselineReleaseController.java
@@ -17,6 +17,7 @@
import com.zt.life.modules.baselineRelease.service.BaselineReleaseService;
import com.zt.life.modules.configItemWarehouse.model.WarehouseConfigItem;
import com.zt.life.modules.configItemWarehouse.service.WarehouseConfigItemService;
+import com.zt.life.modules.project.service.ProjectService;
import com.zt.life.modules.testCheckOrder.dto.CheckOrderDto;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -34,15 +35,18 @@
/**
* baseline_release
*
- * @author zt generator
+ * @author zt generator
* @since 1.0.0 2023-12-18
*/
@RestController
@RequestMapping("/baselineRelease/BaselineRelease/")
-@Api(tags="baseline_release")
+@Api(tags = "baseline_release")
public class BaselineReleaseController {
@Autowired
private BaselineReleaseService baselineReleaseService;
+
+ @Autowired
+ private ProjectService projectService;
@Autowired
private WarehouseConfigItemService configItemService;
@@ -50,15 +54,18 @@
@GetMapping("page")
@ApiOperation("鍒嗛〉")
@ApiImplicitParams({
- @ApiImplicitParam(name = Constant.Q.PAGE, value = Constant.QV.PAGE, required = true, dataType = Constant.QT.INT),
- @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 = "baselineType", value = "鍩虹嚎绫诲瀷", dataType = Constant.QT.STRING, format = "baseline_type^EQ"),
- @ApiImplicitParam(name = "baselineName", value = "鍩虹嚎鍚嶇О", dataType = Constant.QT.STRING, format = "baseline_name^LK") })
- public PageResult<BaselineRelease> page(@ApiIgnore @QueryParam QueryFilter queryFilter){
- return PageResult.ok(baselineReleaseService.page(queryFilter));
+ @ApiImplicitParam(name = Constant.Q.PAGE, value = Constant.QV.PAGE, required = true, dataType = Constant.QT.INT),
+ @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 = "a.code^LK"),
+ @ApiImplicitParam(name = "baselineType", value = "鍩虹嚎绫诲瀷", dataType = Constant.QT.STRING, format = "a.baseline_type^EQ"),
+ @ApiImplicitParam(name = "baselineName", value = "鍩虹嚎鍚嶇О", dataType = Constant.QT.STRING, format = "a.baseline_name^LK"),
+ @ApiImplicitParam(name = "softwareName", value = "椤圭洰鍚嶇О", dataType = Constant.QT.STRING, format = "p.software_name^LK"),
+ @ApiImplicitParam(name = "pageCode", value = "閰嶇疆椤规爣璇�", dataType = Constant.QT.STRING, format = "a.page_code^LK")})
+ public PageResult<BaselineRelease> page(@ApiIgnore @QueryParam QueryFilter queryFilter) {
+ List<BaselineRelease> baselineRelease = baselineReleaseService.page(queryFilter);
+ return PageResult.ok(baselineRelease);
}
@GetMapping("getDto")
@@ -92,24 +99,18 @@
@DeleteMapping("deleteBaseline")
@ApiOperation("鍒犻櫎")
@LogOperation("鍒犻櫎")
- public Result delete(@RequestBody Long[] ids){
+ public Result delete(@RequestBody Long[] ids) {
//鏁堥獙鏁版嵁
AssertUtils.isArrayEmpty(ids, "id");
baselineReleaseService.delete(ids);
+ projectService.deleteItem(ids,"baseline_release_remark","baseline_id");
return Result.ok();
}
- /* @GetMapping("exportBaseline")
+ @GetMapping("exportBaseline")
@ApiOperation("鎵撳嵃鍩虹嚎鍙戝竷涔�")
@LogOperation("鎵撳嵃鍩虹嚎鍙戝竷涔�")
public void exportBaseline(Long id, String pageCode, HttpServletRequest request, HttpServletResponse response) {
baselineReleaseService.exportBaseline(id,pageCode, request, response);
- }*/
-
- @GetMapping("getItemList")
- @ApiOperation("鑾峰彇鍏ュ簱閰嶇疆椤瑰垪琛�")
- public PageResult<WarehouseConfigItem> getItemList(Long projectId, String ids) {
- List<WarehouseConfigItem> resultList = configItemService.warehouseConfigList(projectId,ids);
- return PageResult.ok(resultList);
}
}
--
Gitblit v1.9.1