From 0dff85a422669f41ef6d8e88fa24bf26ca164cbd Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期二, 12 十二月 2023 10:38:03 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/java/com/zt/life/modules/configItemChange/controller/ConfigItemChangeController.java | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/configItemChange/controller/ConfigItemChangeController.java b/modules/mainPart/src/main/java/com/zt/life/modules/configItemChange/controller/ConfigItemChangeController.java
index 8f02d55..a3b5006 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/configItemChange/controller/ConfigItemChangeController.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/configItemChange/controller/ConfigItemChangeController.java
@@ -16,6 +16,7 @@
import com.zt.life.modules.configItemChange.model.ConfigItemChange;
import com.zt.life.modules.configItemChange.service.ConfigItemChangeService;
import com.zt.life.modules.configItemWarehouse.model.WarehouseConfigItem;
+import com.zt.life.modules.configItemWarehouse.service.WarehouseConfigItemService;
import com.zt.life.sys.dto.OssDto;
import com.zt.life.sys.service.SysOssConfigService;
import com.zt.modules.coderule.service.SysCodeRuleService;
@@ -50,6 +51,9 @@
@Autowired
private SysOssConfigService sysOssConfigService;
+
+ @Autowired
+ private WarehouseConfigItemService configItemService;
@GetMapping("page")
@ApiOperation("鍒嗛〉")
@ApiImplicitParams({
@@ -57,7 +61,7 @@
@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 = "code", value = "閰嶇疆椤瑰彉鏇寸紪鍙�", dataType = Constant.QT.STRING, format = "a.code^LK"),
@ApiImplicitParam(name = "projectCode", value = "椤圭洰缂栧彿", dataType = Constant.QT.STRING, format = "p.code^EQ"),
@ApiImplicitParam(name = "softwareName", value = "椤圭洰鍚嶇О", dataType = Constant.QT.STRING, format = "p.software_name^EQ"),
@ApiImplicitParam(name = "libraryType", value = "搴撶被鍨�", dataType = Constant.QT.STRING, format = "a.library_type^EQ") })
@@ -68,10 +72,10 @@
@GetMapping("getDto")
@ApiOperation("淇℃伅")
- public Result<ConfigItemChangeDto> getDto(Long projectId, Long ChangeId) {
- ConfigItemChangeDto data = configItemChangeService.getDto(projectId, ChangeId);
- if (ChangeId!=null) {
- for (WarehouseConfigItem configItem : data.getConfigItemList()) {
+ public Result<ConfigItemChangeDto> getDto(Long projectId, Long changeId) {
+ ConfigItemChangeDto data = configItemChangeService.getDto(projectId, changeId);
+ if (changeId!=null) {
+ for (WarehouseConfigItem configItem : data.getConfigChangeList()) {
Long configItemId = configItem.getId();
OssDto ossDto = sysOssConfigService.getOssByBusiType(configItemId, "config_item_warehouse");
if (ossDto != null) {
@@ -118,4 +122,10 @@
return Result.ok();
}
+ @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