档案系统案卷编辑逻辑优化

blade-service/blade-archive/src/main/java/org/springblade/archive/controller/ArchiveFileAutoController.java

@@ -133,13 +133,14 @@ ArchiveFileAutoController extends BladeController {
                     archivesAutoService.save(archive);
                 } else {
                     ArchivesAuto archivesAuto = archivesAutoService.getById(archive.getId());
+                    ArchivesAuto update= new ArchivesAuto();
+                    update.setId(archive.getId());
                     if (archivesAuto!= null ) {
                         if (archivesAuto.getActionType() == 1 || archivesAuto.getActionType() == 2 ) {
-                            throw new ServiceException("【" + archivesAuto.getName() + "】案卷已正在并卷或重组，请稍后再试！");
+                            return R.fail("【" + archivesAuto.getName() + "】案卷已正在并卷或重组，请稍后再试！");
                         }
-                        archive.setAutoFileSort(archivesAuto.getAutoFileSort());
+                        update.setAutoFileSort(archivesAuto.getAutoFileSort());
                     }
-                    archive.setActionType(null);
                     //如果有替换文件，则替换
                     List<ArchivesAutoVO.ApprovalFile> list = archive.getApprovalFileList();
                     if (list != null && list.size() > 0) {
@@ -161,12 +162,20 @@ ArchiveFileAutoController extends BladeController {
                                 archiveFile.setRectification(2);
                             }
                             //只修改档案的文件大小和页数
-                            archive.setPageN(file.getFilePage());
-                            archive.setFileSize(file.getFileSize());
+                            update.setPageN(file.getFilePage());
+                            update.setFileSize(file.getFileSize());
                             archiveFileClient.updateById2(archiveFile);
                         }
                     }
-                    archivesAutoService.updateById(archive);
+                    update.setName(archive.getName());
+                    update.setFileNumber(archive.getFileNumber());
+                    update.setUnit(archive.getUnit());
+                    update.setStorageTime(archive.getStorageTime());
+                    update.setRemark(archive.getRemark());
+                    update.setSecretLevel(archive.getSecretLevel());
+                    update.setStartDate(archive.getStartDate());
+                    update.setEndDate(archive.getEndDate());
+                    archivesAutoService.updateById(update);
 
                 }
             }
@@ -248,16 +257,10 @@ ArchiveFileAutoController extends BladeController {
                 } else {
                     ArchivesAuto archivesAuto = archivesAutoService.getById(archive.getId());
                     if (archivesAuto!= null && (archivesAuto.getActionType() == 1 || archivesAuto.getActionType() == 2)) {
-                        throw new ServiceException("【" + archivesAuto.getName() + "】案卷已正在并卷或重组，请稍后再试！");
+                        return R.fail("【" + archivesAuto.getName() + "】案卷已正在并卷或重组，请稍后再试！");
                     }
-                    archivesAuto = new ArchivesAuto();
-                    archivesAuto.setId(archive.getId());
-                    archivesAuto.setName(archive.getName());
-                    archivesAuto.setFileNumber(archive.getFileNumber());
-                    archivesAuto.setUnit(archive.getUnit());
-                    archivesAuto.setStorageTime(archive.getStorageTime());
-                    archivesAuto.setRemark(archive.getRemark());
-                    archivesAutoService.updateById(archivesAuto);
+                    archive.setActionType(null);
+                    archivesAutoService.updateById(archive);
                 }
             }
         } catch (NumberFormatException e) {

blade-service/blade-archive/src/main/java/org/springblade/archive/controller/ArchiveFileController.java

@@ -400,6 +400,7 @@ public class ArchiveFileController extends BladeController {
                     newVo.setFileNumber(fileVO.getFileNumber());
                     newVo.setFileTime(fileVO.getFileTime());
                     newVo.setDutyUser(fileVO.getDutyUser());
+                    newList.add(newVo);
                 }
                 vo.setList(newList);
             }