From 810d10eb373bb181ca0e155d8bed8433fd69ebc0 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期二, 12 十二月 2023 15:50:17 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/java/com/zt/life/modules/configItemChange/controller/ConfigItemChangeController.java | 26 ++++++++++++++++++++++----
1 files changed, 22 insertions(+), 4 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 029432c..bc02474 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;
@@ -27,6 +28,8 @@
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;
@@ -50,6 +53,9 @@
@Autowired
private SysOssConfigService sysOssConfigService;
+
+ @Autowired
+ private WarehouseConfigItemService configItemService;
@GetMapping("page")
@ApiOperation("鍒嗛〉")
@ApiImplicitParams({
@@ -68,10 +74,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 +124,16 @@
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);
+ }
+ @GetMapping("exportConfigChange")
+ @ApiOperation("鎵撳嵃鍙樻洿鐢宠鍗�")
+ @LogOperation("鎵撳嵃鍙樻洿鐢宠鍗�")
+ public void exportConfigChange(Long id, HttpServletRequest request, HttpServletResponse response) {
+ configItemChangeService.exportConfigChange(id,request, response);
+ }
}
--
Gitblit v1.9.1