ソースを参照

是否打页码

huangtf 2 年 前
コミット
243234d4ee

+ 5 - 0
blade-service-api/blade-archive-api/src/main/java/org/springblade/archive/entity/ArchiveProjectConfig.java

@@ -33,4 +33,9 @@ public class ArchiveProjectConfig extends BaseEntity {
      */
     private String factorType;
 
+    //是否打页码
+    public boolean isPage() {
+        return  getFactorType().contains("5");
+    }
+
 }

+ 6 - 0
blade-service-api/blade-archive-api/src/main/java/org/springblade/archive/entity/ArchivesAuto.java

@@ -163,4 +163,10 @@ public class ArchivesAuto extends BaseEntity {
 	private String filingUnit;
 
 	private Integer isLock;  //案卷锁定  0未锁  1已锁定    (已锁定的案卷,自动归档执行不再拆卷重新组卷)
+
+	//是否是影音
+	public boolean isMedia() {
+		return (this.getCarrierType()!= null &&
+				this.getCarrierType().equals("5"));
+	}
 }

+ 10 - 2
blade-service/blade-archive/src/main/java/org/springblade/archive/service/impl/ArchiveAutoPdfServiceImpl.java

@@ -243,9 +243,17 @@ public class ArchiveAutoPdfServiceImpl implements IArchiveAutoPdfService {
      * @param waitArchiveFiles
      */
     public void builtFilePageNo(ArchivesAuto archivesAuto,List<ArchiveFile> waitArchiveFiles){
+
+        Long projectId = archivesAuto.getProjectId();
+
+        ArchiveProjectConfig config = archiveProjectConfigService.getByProjectIdOrNew(projectId);
+        //是否打页码
+        if (!config.isPage()) {
+            return;
+        }
+
         //声影的要不要打码
-        if (archivesAuto.getCarrierType()!= null &&
-                archivesAuto.getCarrierType().equals("5")) {
+        if (archivesAuto.isMedia()) {
             return;
         }
 

+ 1 - 1
blade-service/blade-archive/src/main/java/org/springblade/archive/service/impl/ArchiveProjectConfigServiceImpl.java

@@ -25,7 +25,7 @@ public class ArchiveProjectConfigServiceImpl extends BaseServiceImpl<ArchiveProj
             config = new ArchiveProjectConfig();
             config.setTenantId(AuthUtil.getTenantId());
             config.setProjectId(projectId);
-            config.setFactorType("1,2,3,4"); // 设置默认值
+            config.setFactorType("1,2,3,4,5"); // 设置默认值
             config.setProjectType(3);
             this.save(config); // 保存到数据库
         }