From 9b31782deaeaa36efb013f538c99d8f5df94eed4 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期五, 08 十二月 2023 15:52:04 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/java/com/zt/life/modules/configItemChange/controller/ConfigItemChangeController.java | 11 +----
modules/mainPart/src/main/java/com/zt/life/modules/configItemChange/service/ConfigItemChangeService.java | 8 ----
web/packages/components/zt-table-wraper/src/zt-table-wraper.vue | 2 +
modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/model/WarehouseConfigItem.java | 6 +++
modules/mainPart/src/main/java/com/zt/life/modules/project/controller/ProjectController.java | 4 +-
web/src/views/modules/configItemChange/ConfigItemChange-AddOrUpdate.vue | 13 +++++-
web/src/views/modules/configItemChange/configItemList.vue | 23 +++++++----
web/src/views/modules/configItemWarehouse/ConfigItemWarehouse-AddOrUpdate.vue | 2
modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/service/ConfigItemWarehouseService.java | 1
modules/mainPart/src/main/resources/mapper/configItemWarehouse/WarehouseConfigItemDao.xml | 35 ++++++++++-------
10 files changed, 58 insertions(+), 47 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 8770c48..7d116e1 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
@@ -124,16 +124,9 @@
@GetMapping("getItemList")
@ApiOperation("鑾峰彇鍏ュ簱閰嶇疆椤瑰垪琛�")
- public Result<List<WarehouseConfigItem>> getItemList(Long projectId) {
+ public PageResult<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();
+ return PageResult.ok(resultList);
}
}
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 ccef14c..6ab29bf 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
@@ -178,12 +178,4 @@
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 f4c6685..d84cd7d 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
@@ -26,6 +26,9 @@
@ApiModelProperty(value = "鍏ュ簱ID")
private Long warehouseId;
+ @ApiModelProperty(value = "椤圭洰宸ョ▼ID")
+ private Long projectId;
+
@ApiModelProperty(value = "妫�鏌ュ崟ID")
private Long checkId;
@@ -50,6 +53,9 @@
@ApiModelProperty(value = "瀵嗙骇")
private String secretClass;
+ @ApiModelProperty(value = "鏄惁閫夋嫨")
+ private Long SelectId;
+
@TableField(exist = false)
@ApiModelProperty(value = "闄勪欢")
private OssDto files;
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/service/ConfigItemWarehouseService.java b/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/service/ConfigItemWarehouseService.java
index 70554ce..234f400 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/service/ConfigItemWarehouseService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/service/ConfigItemWarehouseService.java
@@ -120,6 +120,7 @@
configItemService.update(configItem);
} else {
configItem.setWarehouseId(warehouseId);
+ configItem.setProjectId(configItemDto.getConfigItemWarehouse().getProjectId());
configItemService.insert(configItem);
}
Long checkId = configItem.getCheckId();
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/ProjectController.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/ProjectController.java
index a19671b..3ebe39f 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/ProjectController.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/ProjectController.java
@@ -66,8 +66,8 @@
@ApiImplicitParam(name = "tableName", value = "鍔熻兘琛�", dataType = Constant.QT.STRING)
})
public PageResult<Project> page(@ApiIgnore @QueryParam QueryFilter queryFilter) {
-
- return PageResult.ok(projectService.page(queryFilter));
+ List<Project> Project =projectService.page(queryFilter);
+ return PageResult.ok(Project);
}
@GetMapping("{id}")
diff --git a/modules/mainPart/src/main/resources/mapper/configItemWarehouse/WarehouseConfigItemDao.xml b/modules/mainPart/src/main/resources/mapper/configItemWarehouse/WarehouseConfigItemDao.xml
index 50b7939..95fb716 100644
--- a/modules/mainPart/src/main/resources/mapper/configItemWarehouse/WarehouseConfigItemDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/configItemWarehouse/WarehouseConfigItemDao.xml
@@ -18,37 +18,42 @@
</select>
<select id="itemList" resultType="com.zt.life.modules.configItemWarehouse.model.WarehouseConfigItem">
SELECT p.secret_class,
- SUBSTRING(m.name, LOCATE('杞欢', m.name) , LENGTH(m.name)) AS itemName,
- m.identify AS version,
- m.name AS Item_identify
+ SUBSTRING(m.name, LOCATE('杞欢', m.name), LENGTH(m.name)) AS itemName,
+ m.identify AS version,
+ m.name AS Item_identify
FROM software_test_order s
JOIN software_test_order_measured m ON s.project_id = ${projectId}
JOIN project p ON p.id = ${projectId}
WHERE s.is_delete = 0
- AND s.id = m.order_id
+ AND s.id = m.order_id
UNION
- SELECT NULL AS secretClass,
+ SELECT NULL AS secretClass,
'杞欢娴嬭瘯濮旀墭鍗�' AS itemName,
- NULL AS version,
- s.code AS itemIdentify
+ NULL AS version,
+ s.code AS itemIdentify
FROM software_test_order s
WHERE s.is_delete = 0
- AND s.project_id = ${projectId}
+ AND s.project_id = ${projectId}
UNION
- SELECT NULL AS secretClass,
+ SELECT NULL AS secretClass,
'鐗╁搧娴佽浆鍗�' AS itemName,
- NULL AS version,
- i.code AS itemIdentify
+ NULL AS version,
+ i.code AS itemIdentify
FROM item_circulat_order i
WHERE i.is_delete = 0
- AND i.project_id = ${projectId}
+ AND i.project_id = ${projectId}
</select>
<select id="warehouseList" resultType="com.zt.life.modules.configItemWarehouse.model.WarehouseConfigItem">
- select a.*
+ select a.item_name,a.item_identify,a.version as retrospect_version,a.secret_class,a.project_id,a.id as select_id
from config_item_warehouse_detail a
- JOIN config_item_warehouse w ON w.project_id = ${projectId}
WHERE a.is_delete = 0
- AND w.id = a.warehouse_id
+ and a.project_id = ${projectId}
+ <if test="warehouse_id!=null">
+ AND id not in (select id from config_item_warehouse_detail where is_delete = 0 and warehouse_id = ${warehouseId})
+ </if>
+ <if test="selectIds!=null">
+ AND id not in (${selectIds})
+ </if>
</select>
</mapper>
diff --git a/web/packages/components/zt-table-wraper/src/zt-table-wraper.vue b/web/packages/components/zt-table-wraper/src/zt-table-wraper.vue
index 296f51e..afaf596 100644
--- a/web/packages/components/zt-table-wraper/src/zt-table-wraper.vue
+++ b/web/packages/components/zt-table-wraper/src/zt-table-wraper.vue
@@ -212,12 +212,14 @@
this.total = 0
return this.$tip.error(res.msg)
}
+ console.log(res.data,'res.data')
this.dataList = this.paging ? res.data.list : res.data
this.total = this.paging ? res.data.total : 0
if (this.editLimit && this.editPage) {
this.editLimit = ''
this.editPage = ''
}
+ console.log(this.dataList,'this.dataList')
this.$emit('dataLoaded', this.dataList)
this.$emit('fatherMethod')
}
diff --git a/web/src/views/modules/configItemChange/ConfigItemChange-AddOrUpdate.vue b/web/src/views/modules/configItemChange/ConfigItemChange-AddOrUpdate.vue
index 03fa1df..30d0c9b 100644
--- a/web/src/views/modules/configItemChange/ConfigItemChange-AddOrUpdate.vue
+++ b/web/src/views/modules/configItemChange/ConfigItemChange-AddOrUpdate.vue
@@ -38,7 +38,7 @@
<div class="el-border-left" style="width: calc(100% - 120px)">
<div class="table-container">
<el-table ref="tableConfigItemList" class="el-software el-margin-top-bot"
- style="width: 99%;margin-left: 5px" border :data="dataForm.configItemList"
+ style="width: 99%;margin-left: 5px" border :data="dataForm.configChangeList"
stripe>
<el-table-column prop="no" align="center" width="60" label="搴忓彿">
<template slot-scope="scope">
@@ -51,7 +51,7 @@
<span v-else>{{row.itemName}}</span>
</template>
</el-table-column>
- <el-table-column prop="itemDentify" align="center" min-width="290" label="閰嶇疆椤规爣璇�">
+ <el-table-column prop="itemIdentify" align="center" min-width="290" label="閰嶇疆椤规爣璇�">
<template v-slot="{ row }">
<el-input v-if="showAddAndEdit" v-model="row.itemIdentify" placeholder="閰嶇疆椤规爣璇�"></el-input>
<span v-else>{{row.itemIdentify}}</span>
@@ -284,7 +284,7 @@
</div>
</div>
<add-or-update-check ref="addOrUpdate" @recall="setCheckId"/>
- <ConfigItemList ref="configItemList"></ConfigItemList>
+ <ConfigItemList ref="configItemList" @getChangeItemList="getChangeItemList"></ConfigItemList>
</el-form>
</zt-dialog>
</template>
@@ -408,6 +408,13 @@
// tableBody.scrollTop = tableBody.scrollHeight;
// })
},
+ getChangeItemList(data){
+ console.log(data.configChangeList,'getChangeItemList(data)')
+ if(data.configChangeList){
+ this.dataForm.configChangeList=this.dataForm.configChangeList.concat(data.configChangeList)
+ }
+ console.log(this.dataForm.configChangeList,'this.dataForm.configChangeList')
+ },
openCheckOrderWin(row) {
console.log(row, "openCheckOrderWin(row)")
row.projectId = this.dataForm.projectId
diff --git a/web/src/views/modules/configItemChange/configItemList.vue b/web/src/views/modules/configItemChange/configItemList.vue
index d05b334..c84d2dc 100644
--- a/web/src/views/modules/configItemChange/configItemList.vue
+++ b/web/src/views/modules/configItemChange/configItemList.vue
@@ -2,7 +2,9 @@
<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 :dataForm="dataForm" ref="tableObj" v-slot="{ table }" query-url="/configItemChange/ConfigItemChange/getItemList">
+ <zt-table-wraper :dataForm="dataForm" ref="tableObj" v-slot="{ table }" query-url="/configItemChange/ConfigItemChange/getItemList"
+ @dataLoaded="dataLoaded"
+ >
<el-table
:data="table.dataList"
height="100px"
@@ -17,7 +19,7 @@
</el-table-column>
<el-table-column prop="itemName" width="200" label="閰嶇疆椤瑰悕绉�">
</el-table-column>
- <el-table-column prop="itemDentify" align="center" min-width="290" label="閰嶇疆椤规爣璇�">
+ <el-table-column prop="itemIdentify" align="center" min-width="290" label="閰嶇疆椤规爣璇�">
</el-table-column>
<el-table-column prop="version" align="center" width="120" label="鐗堟湰">
</el-table-column>
@@ -45,7 +47,7 @@
dataForm: {
id:'',
projectId:'',
- checkBoxList:[],
+ configChangeList:[],
}
}
},
@@ -54,20 +56,23 @@
this.dataForm.projectId = projectId
this.dataForm.id = id
console.log(this.dataForm,'this.dataForm.id')
- // this.$nextTick(()=>{
- // this.$refs.tableObj.query()
- // })
+ this.$nextTick(()=>{
+ this.$refs.tableObj.query()
+ })
},
indexFormat(index) {
return index += 1
},
+ dataLoaded(data){
+ console.log(data,'data dataLoaded')
+ },
changeRow(selection){
- this.dataForm.checkBoxList = selection
- console.log(this.dataForm.checkBoxList,'this.dataForm.checkList 閫変腑鐨勫垪琛ㄦ暟鎹�')
+ this.dataForm.configChangeList = selection
+ console.log(this.dataForm.configChangeList,'this.dataForm.checkList 閫変腑鐨勫垪琛ㄦ暟鎹�')
},
async formSubmit(){
console.log(this.dataForm,'this.dataForm')
- let res = await this.$http.post('/configItemChange/ConfigItemChange/importItemList', this.dataForm)
+ this.$emit('getChangeItemList',this.dataForm)
await this.$tip.success()
this.$refs.dialog.close()
}
diff --git a/web/src/views/modules/configItemWarehouse/ConfigItemWarehouse-AddOrUpdate.vue b/web/src/views/modules/configItemWarehouse/ConfigItemWarehouse-AddOrUpdate.vue
index 9fa34a7..adca568 100644
--- a/web/src/views/modules/configItemWarehouse/ConfigItemWarehouse-AddOrUpdate.vue
+++ b/web/src/views/modules/configItemWarehouse/ConfigItemWarehouse-AddOrUpdate.vue
@@ -51,7 +51,7 @@
<span v-else>{{row.itemName}}</span>
</template>
</el-table-column>
- <el-table-column prop="itemDentify" align="center" min-width="290" label="閰嶇疆椤规爣璇�">
+ <el-table-column prop="itemIdentify" align="center" min-width="290" label="閰嶇疆椤规爣璇�">
<template v-slot="{ row }">
<el-input v-if="showAddAndEdit" v-model="row.itemIdentify" placeholder="閰嶇疆椤规爣璇�"></el-input>
<span v-else>{{row.itemIdentify}}</span>
--
Gitblit v1.9.1