From c21bf35f523ee1430fc5fa02ab1b4171492009b6 Mon Sep 17 00:00:00 2001
From: wente <329538422@qq.com>
Date: 星期五, 12 一月 2024 17:12:30 +0800
Subject: [PATCH] 项目表

---
 modules/mainPart/src/main/java/com/zt/life/modules/baselineRelease/controller/BaselineReleaseController.java |   36 ++++++++++++++++--------------------
 1 files changed, 16 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..ecc7945 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
@@ -34,12 +34,12 @@
 /**
  * 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;
@@ -50,15 +50,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 +95,17 @@
     @DeleteMapping("deleteBaseline")
     @ApiOperation("鍒犻櫎")
     @LogOperation("鍒犻櫎")
-    public Result delete(@RequestBody Long[] ids){
+    public Result delete(@RequestBody Long[] ids) {
         //鏁堥獙鏁版嵁
         AssertUtils.isArrayEmpty(ids, "id");
         baselineReleaseService.delete(ids);
 
         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