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(); } } 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审核") 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); } } } 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; 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> 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() }
