From cd3aa6f42a148f6d94b2f405a737638c6352fca2 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期五, 08 十二月 2023 11:08:50 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/java/com/zt/life/modules/configItemChange/dto/ConfigItemChangeDto.java | 2
modules/mainPart/src/main/java/com/zt/life/modules/configItemChange/controller/ConfigItemChangeController.java | 20 +++++++++
modules/mainPart/src/main/java/com/zt/life/modules/configItemChange/service/ConfigItemChangeService.java | 54 ++++++++++-----------------
web/src/views/modules/configItemChange/ConfigItemChange.vue | 2
modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/model/WarehouseConfigItem.java | 2
web/src/views/modules/configItemChange/configItemList.vue | 4 +-
6 files changed, 44 insertions(+), 40 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 5c40a41..8770c48 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({
@@ -71,7 +75,7 @@
public Result<ConfigItemChangeDto> getDto(Long projectId, Long changeId) {
ConfigItemChangeDto data = configItemChangeService.getDto(projectId, changeId);
if (changeId!=null) {
- for (WarehouseConfigItem configItem : data.getConfigItemList()) {
+ for (WarehouseConfigItem configItem : data.getConfigChangeList()) {
Long configItemId = configItem.getId();
OssDto ossDto = sysOssConfigService.getOssByBusiType(configItemId, "config_item_warehouse");
if (ossDto != null) {
@@ -118,4 +122,18 @@
return Result.ok();
}
+ @GetMapping("getItemList")
+ @ApiOperation("鑾峰彇鍏ュ簱閰嶇疆椤瑰垪琛�")
+ public Result<List<WarehouseConfigItem>> getItemList(Long projectId) {
+ List<WarehouseConfigItem> resultList = configItemService.warehouseConfigList(projectId);
+ return Result.ok(resultList);
+ }
+
+ @PostMapping("importItemList")
+ @ApiOperation("瀵煎叆鍏ュ簱閰嶇疆椤瑰垪琛�")
+ public Result importItemList(@RequestBody List<WarehouseConfigItem> WarehouseConfigItem,Long changeId) {
+ configItemChangeService.importItemList(WarehouseConfigItem,changeId);
+ return Result.ok();
+ }
+
}
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/configItemChange/dto/ConfigItemChangeDto.java b/modules/mainPart/src/main/java/com/zt/life/modules/configItemChange/dto/ConfigItemChangeDto.java
index ec71f9d..c8e86ef 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/configItemChange/dto/ConfigItemChangeDto.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/configItemChange/dto/ConfigItemChangeDto.java
@@ -26,7 +26,7 @@
private FlowInfoDto flowInfoDto;
@ApiModelProperty(value = "鍙樻洿閰嶇疆椤�")
- private List<WarehouseConfigItem> configItemList = new ArrayList<>();
+ private List<WarehouseConfigItem> configChangeList = new ArrayList<>();
@ApiModelProperty(value = "CM瀹℃牳")
private List<WarehouseCmAudit> cmAuditList = new ArrayList<>();
@ApiModelProperty(value = "QA瀹℃牳")
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/configItemChange/service/ConfigItemChangeService.java b/modules/mainPart/src/main/java/com/zt/life/modules/configItemChange/service/ConfigItemChangeService.java
index 6c43a73..ccef14c 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/configItemChange/service/ConfigItemChangeService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/configItemChange/service/ConfigItemChangeService.java
@@ -82,8 +82,8 @@
}
public Boolean save(ConfigItemChangeDto configItemDto) {
- Long warehouseId = configItemDto.getConfigItemChange().getId();
- if (warehouseId != null)
+ Long changeId = configItemDto.getConfigItemChange().getId();
+ if (changeId != null)
baseDao.updateById(configItemDto.getConfigItemChange());
else {
Map<String, String> map = new HashMap<>();
@@ -92,31 +92,12 @@
configItemDto.getConfigItemChange().setProjectId(configItemDto.getProjectId());
configItemDto.getConfigItemChange().setCode(sysCodeRuleService.getNewCode(map));
baseDao.insert(configItemDto.getConfigItemChange());
- warehouseId = configItemDto.getConfigItemChange().getId();
+ changeId = configItemDto.getConfigItemChange().getId();
}
- for (WarehouseConfigItem configItem : configItemDto.getConfigItemList()) {
- configItem.setWarehouseId(warehouseId);
- if (configItem.getId() != null) {
- if (configItem.getCheckId()!=null){
- String code ="719CTC-09-ST";
- String projectCode = configItemDto.getProject().getCode();
- if (configItem.getItemName().equals("杞欢娴嬭瘯璁″垝")){
- code=code+"P";
- }else if (configItem.getItemName().equals("杞欢娴嬭瘯璇存槑")){
- code=code+"D";
- }else if (configItem.getItemName().equals("杞欢娴嬭瘯璁板綍")){
- code=code+"H";
- }else if (configItem.getItemName().equals("杞欢娴嬭瘯鎶ュ憡")){
- code=code+"R";
- }
- configItem.setItemIdentify(code+"-"+projectCode);
- }
- configItemService.update(configItem);
- } else {
- configItem.setWarehouseId(warehouseId);
- configItemService.insert(configItem);
- }
+ for (WarehouseConfigItem configItem : configItemDto.getConfigChangeList()) {
+ configItem.setWarehouseId(changeId);
+ configItemService.update(configItem);
Long checkId = configItem.getCheckId();
if (checkId != null) {
TestCheckOrder testCheckOrder = testCheckOrderService.get(checkId);
@@ -130,21 +111,21 @@
}
for (WarehouseCmAudit cmAudit : configItemDto.getCmAuditList()) {
- cmAudit.setWarehouseId(warehouseId);
+ cmAudit.setWarehouseId(changeId);
if (cmAudit.getId() != null) {
cmAuditService.update(cmAudit);
} else {
- cmAudit.setWarehouseId(warehouseId);
+ cmAudit.setWarehouseId(changeId);
cmAuditService.insert(cmAudit);
}
}
for (WarehouseQaAudit qaAudit : configItemDto.getQaAuditList()) {
- qaAudit.setWarehouseId(warehouseId);
+ qaAudit.setWarehouseId(changeId);
if (qaAudit.getId() != null) {
qaAuditService.update(qaAudit);
} else {
- qaAudit.setWarehouseId(warehouseId);
+ qaAudit.setWarehouseId(changeId);
qaAuditService.insert(qaAudit);
}
}
@@ -175,8 +156,8 @@
data.setCmAuditList(CmAuditList);
List<WarehouseQaAudit> QaAuditList = qaAuditService.getList(changeId);
data.setQaAuditList(QaAuditList);
- List<WarehouseConfigItem> ConfigItemList = configItemService.getList(changeId);
- data.setConfigItemList(ConfigItemList);
+ List<WarehouseConfigItem> configChangeList = configItemService.getList(changeId);
+ data.setConfigChangeList(configChangeList);
} else {
ConfigItemChange configItemChange = new ConfigItemChange();
@@ -187,9 +168,6 @@
List<?> qaList = baseDao.itemList("change_qa_audit");
List<?> QaAuditList = qaList;
data.setQaAuditList((List<WarehouseQaAudit>) QaAuditList);
- List<?> resultList = configItemService.warehouseConfigList(projectId);
- List<?> ConfigItemList = resultList;
- data.setConfigItemList((List<WarehouseConfigItem>) ConfigItemList);
}
if (projectId != null) {
@@ -200,4 +178,12 @@
return data;
}
+ public void importItemList(List<WarehouseConfigItem> warehouseConfigItem,Long changeId) {
+ for (WarehouseConfigItem configItem : warehouseConfigItem) {
+ configItem.setWarehouseId(changeId);
+ configItem.setItemIdentify("");
+ configItem.setRetrospectVersion(configItem.getItemIdentify());
+ configItemService.insert(configItem);
+ }
+ }
}
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/model/WarehouseConfigItem.java b/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/model/WarehouseConfigItem.java
index e88a426..f4c6685 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/model/WarehouseConfigItem.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/model/WarehouseConfigItem.java
@@ -45,7 +45,7 @@
private String version;
@ApiModelProperty(value = "涓婃函鐗�")
- private Integer retrospectVersion;
+ private String retrospectVersion;
@ApiModelProperty(value = "瀵嗙骇")
private String secretClass;
diff --git a/web/src/views/modules/configItemChange/ConfigItemChange.vue b/web/src/views/modules/configItemChange/ConfigItemChange.vue
index 85c8f9c..b843011 100644
--- a/web/src/views/modules/configItemChange/ConfigItemChange.vue
+++ b/web/src/views/modules/configItemChange/ConfigItemChange.vue
@@ -1,6 +1,6 @@
<template>
<div class="fa-card-a">
- <zt-table-wraper query-url="/configItemChange/ConfigItemChange/page" delete-url="/configItemChange/ConfigItemChange/deleteConfigItem" v-slot="{ table }">
+ <zt-table-wraper query-url="/configItemChange/ConfigItemChange/page" delete-url="/configItemChange/ConfigItemChange/deleteConfigChange" v-slot="{ table }">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="table.query()">
<el-form-item>
<el-input v-model="dataForm.code" placeholder="璇疯緭鍏ラ厤缃」鍏ュ簱缂栧彿" clearable></el-input>
diff --git a/web/src/views/modules/configItemChange/configItemList.vue b/web/src/views/modules/configItemChange/configItemList.vue
index 2d3322c..b88d4b4 100644
--- a/web/src/views/modules/configItemChange/configItemList.vue
+++ b/web/src/views/modules/configItemChange/configItemList.vue
@@ -2,7 +2,7 @@
<zt-dialog ref="dialog" column="2" title="閫夋嫨閰嶇疆椤�" :hasConfirm="true" @confirm="formSubmit" :append-to-body="true">
<el-card shadow="never" class="aui-card--fill">
<div class="mod-project-project}">
- <zt-table-wraper ref="tableObj" v-slot="{ table }">
+ <zt-table-wraper ref="tableObj" v-slot="{ table }" query-url="/configItemChange/ConfigItemChange/getItemList">
<el-table
:data="dataList"
height="100px"
@@ -63,7 +63,7 @@
console.log(this.dataForm.checkBoxList,'this.dataForm.checkList 閫変腑鐨勫垪琛ㄦ暟鎹�')
},
async formSubmit(){
- let res = await this.$http.post('/configItemWarehouse/ConfigItemWarehouse/', this.dataForm)
+ let res = await this.$http.post('/configItemChange/ConfigItemChange/importItemList', this.dataForm)
await this.$tip.success()
this.$refs.dialog.close()
}
--
Gitblit v1.9.1