From 2b8483bae74265186266fcb04fdc431712cc5779 Mon Sep 17 00:00:00 2001 From: swj <1211312234@qq.com> Date: Wed, 21 Sep 2022 21:05:14 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E6=96=87=E4=BB=B6=E7=82=B9?= =?UTF-8?q?=E5=87=BB=E5=B7=A6=E4=BE=A7=E9=83=A8=E9=97=A8=E4=B8=8D=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E5=AF=B9=E5=BA=94=E8=B4=A8=E9=87=8F=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../springblade/file/dto/QualityFileDTO.java | 2 +- .../springblade/file/entity/QualityFile.java | 3 ++- .../file/entity/QualityFileDeptRel.java | 2 +- .../file/mapper/QualityFileMapper.xml | 6 ++--- .../service/impl/QualityFileServiceImpl.java | 24 +++++++++++++------ 5 files changed, 24 insertions(+), 13 deletions(-) diff --git a/lab-service-api/lab-file-api/src/main/java/org/springblade/file/dto/QualityFileDTO.java b/lab-service-api/lab-file-api/src/main/java/org/springblade/file/dto/QualityFileDTO.java index fc51496..4e8605f 100644 --- a/lab-service-api/lab-file-api/src/main/java/org/springblade/file/dto/QualityFileDTO.java +++ b/lab-service-api/lab-file-api/src/main/java/org/springblade/file/dto/QualityFileDTO.java @@ -42,7 +42,7 @@ public class QualityFileDTO extends QualityFile { @ApiModelProperty(value = "部门ids") @NotNull @NotEmpty - private Set deptIds; + private Set deptIds; @ApiModelProperty(value = "文件") @NotNull diff --git a/lab-service-api/lab-file-api/src/main/java/org/springblade/file/entity/QualityFile.java b/lab-service-api/lab-file-api/src/main/java/org/springblade/file/entity/QualityFile.java index a370eb5..c05af17 100644 --- a/lab-service-api/lab-file-api/src/main/java/org/springblade/file/entity/QualityFile.java +++ b/lab-service-api/lab-file-api/src/main/java/org/springblade/file/entity/QualityFile.java @@ -75,5 +75,6 @@ public class QualityFile extends BaseEntity implements Serializable { @NotNull private Long categoryId; - + @ApiModelProperty(value = "在用的部门ids") + private String activeDeptIds; } diff --git a/lab-service-api/lab-file-api/src/main/java/org/springblade/file/entity/QualityFileDeptRel.java b/lab-service-api/lab-file-api/src/main/java/org/springblade/file/entity/QualityFileDeptRel.java index 7521374..01ba881 100644 --- a/lab-service-api/lab-file-api/src/main/java/org/springblade/file/entity/QualityFileDeptRel.java +++ b/lab-service-api/lab-file-api/src/main/java/org/springblade/file/entity/QualityFileDeptRel.java @@ -56,6 +56,6 @@ public class QualityFileDeptRel extends BaseEntity implements Serializable { * 质量文件类型id */ @ApiModelProperty(value = "质量文件类型id") - private Long deptId; + private String deptId; } diff --git a/lab-service/lab-file/src/main/java/org/springblade/file/mapper/QualityFileMapper.xml b/lab-service/lab-file/src/main/java/org/springblade/file/mapper/QualityFileMapper.xml index f108f91..b2e9962 100644 --- a/lab-service/lab-file/src/main/java/org/springblade/file/mapper/QualityFileMapper.xml +++ b/lab-service/lab-file/src/main/java/org/springblade/file/mapper/QualityFileMapper.xml @@ -23,12 +23,12 @@ 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 53a67f8..30e884c 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 @@ -37,6 +37,8 @@ import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springframework.transaction.annotation.Transactional; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; import java.util.ArrayList; import java.util.List; import java.util.Set; @@ -94,23 +96,31 @@ public class QualityFileServiceImpl extends BaseServiceImpl deptIds1 = qualityFile.getDeptIds(); + String resultDeptStr = ""; + for (String s : deptIds1) { + resultDeptStr += s + ","; + } + qualityFile.setActiveDeptIds(resultDeptStr); + + // 新增和修改质量文件主表 qualityFileService.saveOrUpdate(qualityFile); + Long qualityFileId = qualityFile.getId(); qualityFileDeptRelService.removeByQualityFileId(qualityFileId); - Set deptIds = qualityFile.getDeptIds(); - qualityFileDeptRelService.saveBatch(deptIds.stream() - .map(deptId -> QualityFileDeptRel.builder().qualityFileId(qualityFileId).deptId(deptId).build()) - .collect(Collectors.toList())); + + Set deptIds = qualityFile.getDeptIds(); + qualityFileDeptRelService.saveBatch(deptIds.stream().map(deptId -> QualityFileDeptRel.builder().qualityFileId(qualityFileId).deptId(deptId).build()).collect(Collectors.toList())); Set fileRels = qualityFile.getFiles(); qualityStorageFileRelService.removeByQualityFileId(qualityFileId); fileRels.forEach(dto -> dto.setQualityFileId(qualityFileId)); - int pageCount = storageFileService.countPageCount(fileRels.stream() - .map(QualityStorageFileRel::getStorageFileId) - .collect(Collectors.toSet())); + int pageCount = storageFileService.countPageCount(fileRels.stream().map(QualityStorageFileRel::getStorageFileId).collect(Collectors.toSet())); qualityStorageFileRelService.saveBatch(new ArrayList<>(fileRels)); qualityFile.setPageCount(pageCount);