From 6b16970be7fb17852ed5ace7928394542a77e056 Mon Sep 17 00:00:00 2001 From: yitonglei Date: Mon, 26 Sep 2022 13:50:01 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=B0=86=E8=B4=A8=E9=87=8F=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E7=9A=84=E4=BF=9D=E5=AD=98=E5=92=8C=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=96=B9=E6=B3=95=E5=88=86=E5=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../file/controller/QualityFileController.java | 17 +++++++++++++++-- .../service/impl/QualityFileServiceImpl.java | 15 +++++---------- 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/lab-service/lab-file/src/main/java/org/springblade/file/controller/QualityFileController.java b/lab-service/lab-file/src/main/java/org/springblade/file/controller/QualityFileController.java index f9de910..e23fb75 100644 --- a/lab-service/lab-file/src/main/java/org/springblade/file/controller/QualityFileController.java +++ b/lab-service/lab-file/src/main/java/org/springblade/file/controller/QualityFileController.java @@ -127,11 +127,24 @@ public class QualityFileController extends BladeController { @ApiOperation(value = "修改", notes = "传入qualityFile") public R update(@Valid @RequestBody QualityFile qualityFile) { - return R.status(qualityFileService.updateFile(qualityFile)); + boolean b = qualityFileService.updateFile(qualityFile); + //子文件激活状态修改 + if(b){ + LambdaQueryWrapper assisWrapper = new LambdaQueryWrapper<>(); + assisWrapper.eq(QualityFileAssistent::getQualityFileId , qualityFile.getId()); + QualityFileAssistent ass = new QualityFileAssistent(); + ass.setStatus(0); + b = qualityFileAssistentService.update(ass, assisWrapper); + + assisWrapper.eq(QualityFileAssistent::getVersion, qualityFile.getVersion()); + ass.setStatus(1); + b = qualityFileAssistentService.update(ass, assisWrapper); + } + return R.status(b); } /** - * 新增或修改 质量文件 + * 新增质量文件 */ @PostMapping("/submit") @ApiOperationSupport(order = 6) diff --git a/lab-service/lab-file/src/main/java/org/springblade/file/service/impl/QualityFileServiceImpl.java b/lab-service/lab-file/src/main/java/org/springblade/file/service/impl/QualityFileServiceImpl.java index 3b51933..5dc4311 100644 --- a/lab-service/lab-file/src/main/java/org/springblade/file/service/impl/QualityFileServiceImpl.java +++ b/lab-service/lab-file/src/main/java/org/springblade/file/service/impl/QualityFileServiceImpl.java @@ -23,10 +23,7 @@ import org.springblade.core.tool.utils.Func; import org.springblade.core.tool.utils.StringUtil; import org.springblade.file.dto.QualityFileDTO; import org.springblade.file.dto.QualityStorageFileRelDTO; -import org.springblade.file.entity.QualityFile; -import org.springblade.file.entity.QualityFileAssistent; -import org.springblade.file.entity.QualityFileDeptRel; -import org.springblade.file.entity.QualityStorageFileRel; +import org.springblade.file.entity.*; import org.springblade.file.service.*; import org.springblade.file.vo.QualityFileVO; import org.springblade.file.mapper.QualityFileMapper; @@ -107,9 +104,9 @@ public class QualityFileServiceImpl extends BaseServiceImpl dto.setQualityFileId(qualityFileId)); - int pageCount = storageFileService.countPageCount(fileRels.stream().map(QualityStorageFileRel::getStorageFileId).collect(Collectors.toSet())); + int pageCount = storageFileService.countPageCount(fileRels.stream().map(QualityStorageFileRelDTO::getStorageFileId).collect(Collectors.toSet())); //重新保存文件与存储关联关系 qualityStorageFileRelService.saveBatch(new ArrayList<>(fileRels)); qualityFile.setPageCount(pageCount); - if(qualityFile.getId() != null){ - qualityFile.setId(RandomUtils.nextLong()); - } - qualityFileService.saveOrUpdate(qualityFile); + qualityFile.setStatus(1); + qualityFileService.save(qualityFile); return true; }