1、将质量文件的保存和修改方法分开

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<QualityFileAssistent> 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)

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.*;
-import org.springblade.file.entity.QualityFileAssistent;
-import org.springblade.file.entity.QualityFileDeptRel;
-import org.springblade.file.entity.QualityStorageFileRel;
 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<QualityFileMapper, Q
         qualityFile.setActiveDeptIds(resultDeptStr);
 
         // 新增或修改质量文件主表
+       //qualityFileService.saveOrUpdate(qualityFile);
         long fileId = RandomUtils.nextLong();
         qualityFile.setId(fileId);
-       // qualityFileService.saveOrUpdate(qualityFile);
 
         QualityFileAssistent assistent = new QualityFileAssistent();
         assistent.setVersion(1);
@@ -133,16 +130,14 @@ public class QualityFileServiceImpl extends BaseServiceImpl<QualityFileMapper, Q
 //        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(QualityStorageFileRelDTO::getStorageFileId).collect(Collectors.toSet()));
         //重新保存文件与存储关联关系
         qualityStorageFileRelService.saveBatch(new ArrayList<>(fileRels));
 
         qualityFile.setPageCount(pageCount);
 
-        if(qualityFile.getId() != null){
+        qualityFile.setStatus(1);
-            qualityFile.setId(RandomUtils.nextLong());
+        qualityFileService.save(qualityFile);
-        }
-        qualityFileService.saveOrUpdate(qualityFile);
 
         return true;
     }