modules/mainPart/src/main/java/com/zt/life/modules/project/controller/EnvironController.java
@@ -102,15 +102,15 @@ @PutMapping @ApiOperation("修改") @LogOperation("修改") public Result update(@RequestBody Environ environ) { public Result update(@RequestBody SoftwareTestOrderDto softwareTestOrderDto) { //效验数据 ValidatorUtils.validateEntity(environ, UpdateGroup.class, DefaultGroup.class); environService.update(environ); ValidatorUtils.validateEntity(softwareTestOrderDto, UpdateGroup.class, DefaultGroup.class); Boolean result = environService.save(softwareTestOrderDto); return Result.ok(); } @DeleteMapping @DeleteMapping("deleteEnviron") @ApiOperation("删除") @LogOperation("删除") public Result delete(@RequestBody Long[] ids) { @@ -121,4 +121,14 @@ return Result.ok(); } @PostMapping("uploadDiagram") @ApiOperation("上传测试环境图片") @LogOperation("上传测试环境图片") public Result uploadDiagram(@RequestBody Long[] ids) { //效验数据 AssertUtils.isArrayEmpty(ids, "id"); environService.delete(ids); return Result.ok(); } } modules/mainPart/src/main/java/com/zt/life/modules/project/model/EnvironHardwareResources.java
@@ -31,7 +31,7 @@ private String itemName; @ApiModelProperty(value = "用途") private String usage; private String purposes; @ApiModelProperty(value = "状态") private String state; modules/mainPart/src/main/java/com/zt/life/modules/project/model/EnvironSoftwareResources.java
@@ -34,7 +34,7 @@ private String version; @ApiModelProperty(value = "用途") private String usage; private String purposes; @ApiModelProperty(value = "提供单位") private String provideUnit; modules/mainPart/src/main/java/com/zt/life/modules/project/service/EnvironService.java
@@ -54,9 +54,9 @@ public SoftwareTestOrderDto getDto(Long environId, Long projectId) { SoftwareTestOrderDto data = new SoftwareTestOrderDto(); if (environId != null) { data.setId(environId); Environ environ = this.get(environId); data.setEnviron(environ); data.setTestAgencyInfo(testAgencyInfoService.get(environId)); projectId = environ.getProjectId(); List<EnvironSoftwareResources> softwareResourcesList = environSoftwareResourcesService.getList(environId); @@ -68,16 +68,15 @@ List<EnvironAnalysis> environAnalysesList = environAnalysisService.getList(environId); data.setEnvironAnalysisList(environAnalysesList); } else { Project project = projectService.get(projectId); Environ environ = new Environ(); Environ environ =new Environ(); data.setEnviron(environ); data.getEnviron().setSoftwareName(project.getSoftwareName()); data.getEnviron().setSoftwareIdentity(project.getSoftwareIdentity()); data.getEnviron().setProjectId(projectId); } if (projectId != null) { data.setProjectId(projectId); data.setProject(projectService.get(projectId)); } if (data.getTestAgencyInfo() == null) data.getEnviron().setAgencyName(testAgencyInfoService.get(10000L).getAgencyName()); data.getEnviron().setSite(testAgencyInfoService.get(10000L).getSite()); data.setTestAgencyInfo(testAgencyInfoService.get(10000L)); return data; } @@ -147,7 +146,12 @@ environAnalysisService.insert(environAnalysis); } } if (softwareTestOrderDto.getTestAgencyInfo().getId() == 10000) { softwareTestOrderDto.getTestAgencyInfo().setId(environId); testAgencyInfoService.insert(softwareTestOrderDto.getTestAgencyInfo()); } else { testAgencyInfoService.update(softwareTestOrderDto.getTestAgencyInfo()); } sysOssConfigService.updateOss(softwareTestOrderDto.getId(), softwareTestOrderDto.getFiles());// 保存附件 return true; } modules/mainPart/src/main/resources/mapper/project/EnvironHardwareResourcesDao.xml
@@ -8,8 +8,8 @@ from environ_hardware_resources a <where> a.is_delete = 0 <if test="whereSql!=null"> and ${whereSql} <if test="environId!=null"> and environ_id = ${environId} </if> </where> <if test="orderBySql!=null"> modules/mainPart/src/main/resources/mapper/project/EnvironSoftwareResourcesDao.xml
@@ -8,8 +8,8 @@ from environ_software_resources a <where> a.is_delete = 0 <if test="whereSql!=null"> and ${whereSql} <if test="environId!=null"> and environ_id = ${environId} </if> </where> <if test="orderBySql!=null"> web/src/views/modules/project/Environ-AddOrUpdate.vue
@@ -8,16 +8,16 @@ </div> <div style="border: 1px solid rgba(0,0,0,.2);width: 99%" class="confirmDAuto DConfirmForm"> <el-form-item class="marginTopAndMarginBottom" label="专业实验室名称" style="width: 49%"> <el-input v-model="dataForm.environ.agencyName" placeholder="专业实验室名称"></el-input> <el-input v-model="dataForm.testAgencyInfo.agencyName" placeholder="专业实验室名称"></el-input> </el-form-item> <el-form-item class="marginTopAndMarginBottom" label="测试地点" style="width: 49%"> <el-input v-model="dataForm.environ.site" placeholder="测试地点"></el-input> <el-input v-model="dataForm.testAgencyInfo.site" placeholder="测试地点"></el-input> </el-form-item> <el-form-item label="被测软件" style="width: 49%"> <el-input v-model="dataForm.environ.softwareName" placeholder="被测软件"></el-input> <el-input v-model="dataForm.project.softwareName" placeholder="被测软件"></el-input> </el-form-item> <el-form-item label="版本" style="width: 49%"> <el-input v-model="dataForm.environ.softwareIdentity" placeholder="版本"></el-input> <el-input v-model="dataForm.project.softwareIdentity" placeholder="版本"></el-input> </el-form-item> <div class="el-flexConfigDialog el-form-border"> <div class="DFormWidth DAlign DHold"> @@ -28,7 +28,7 @@ <div class="table-container"> <el-table class="el-software el-margin-top-bot" height="150" border :data="dataForm.softwareResourcesList" stripe> <el-table-column prop="code" align="center" width="80" label="序号"> <el-table-column prop="no" align="center" width="80" label="序号"> <template slot-scope="scope"> <span v-html="indexFormat(scope.$index)"></span> </template> @@ -43,9 +43,9 @@ <el-input v-model="row.version" placeholder="版本"></el-input> </template> </el-table-column> <el-table-column prop="use" align="center" width="180" label="用途"> <el-table-column prop="purposes" align="center" width="180" label="用途"> <template v-slot="{ row }"> <el-input v-model="row.usage" placeholder="用途"></el-input> <el-input v-model="row.purposes" placeholder="用途"></el-input> </template> </el-table-column> <el-table-column prop="unit" label="提供单位" width="180" align="center"> @@ -63,15 +63,15 @@ <div class="table-container"> <el-table class="el-software el-margin-top-bot" height="150" border :data="dataForm.hardwareResourcesList" stripe> <el-table-column prop="code" align="center" width="80" label="序号"></el-table-column> <el-table-column prop="no" align="center" width="80" label="序号"></el-table-column> <el-table-column prop="itemName" min-width="300" label="硬件和固件项目名称"> <template v-slot="{ row }"> <el-input v-model="row.itemName" placeholder="硬件和固件项目名称"></el-input> </template> </el-table-column> <el-table-column prop="usage" align="center" width="180" label="用途"> <el-table-column prop="purposes" align="center" width="180" label="用途"> <template v-slot="{ row }"> <el-input v-model="row.usage" placeholder="用途"></el-input> <el-input v-model="row.purposes" placeholder="用途"></el-input> </template> </el-table-column> <el-table-column prop="number" align="center" width="80" label="数量"> @@ -117,7 +117,7 @@ <div class="table-container"> <el-table class="el-software el-margin-top-bot" height="150" border :data="dataForm.environAnalysisList" stripe> <el-table-column prop="code" align="center" width="80" label="序号"></el-table-column> <el-table-column prop="no" align="center" width="80" label="序号"></el-table-column> <el-table-column prop="realEnviron" min-width="300" label="真实环境"> <template v-slot="{ row }"> <el-input v-model="row.realEnviron" placeholder="真实环境"></el-input> @@ -205,11 +205,7 @@ dataForm: { id: '', environ:{ code: '', agencyName:'', site:'', softwareName:'', softwareIdentity:'', code: '1', hardSoftwareRes: '', testEnvirontDiagram: '', establishStaff:'', @@ -222,6 +218,14 @@ isVirusScan: '', virusDatabaseVersion: '', }, project: { softwareIdentity: '', softwareName: '', }, testAgencyInfo: { agencyName:'', site:'', }, softwareResourcesList:[], hardwareResourcesList:[], environAnalysisList:[]
