Merge branch 'lk20230530'

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

@@ -337,7 +337,7 @@ public class ArchivesAutoController extends BladeController {
 			//先验证当前项目是否在自动组卷中，组卷中直接返回
 			ProjectInfo projectInfo = projectClient.getById(String.valueOf(projectId));
 			Integer isArchivesAuto = projectInfo.getIsArchivesAuto();
-			if(isArchivesAuto!=null && isArchivesAuto==1){
+			if(isArchivesAuto!=null && isArchivesAuto!=0){
 				return R.fail("当前项目已经在自动组卷中,请耐心等待");
 			}
 			log.info("开始自动组卷....");

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

@@ -315,6 +315,14 @@ public class ArchiveAutoPdfServiceImpl implements IArchiveAutoPdfService {
             String coords = config.getCoords();
             String formula = config.getFormula();
 
+            if("Archive['startDate']~Archive['endDate']".equals(formula)){
+                Object archive = variables.get("Archive");
+                ArchivesAuto auto=(ArchivesAuto)archive;
+                if(auto.getStartDate()==null && auto.getEndDate()==null){
+                    formula="";
+                }
+            }
+
             if(variables.containsKey("ArchiveFile") && variables.get("ArchiveFile") instanceof List
                     && formula.indexOf("ArchiveFile") >= 0){
 
@@ -330,6 +338,15 @@ public class ArchiveAutoPdfServiceImpl implements IArchiveAutoPdfService {
         if (multiLineconfig != null) {
             String coords = multiLineconfig.getCoords();
             String formula = multiLineconfig.getFormula();
+
+            if("Archive['startDate']~Archive['endDate']".equals(formula)){
+                Object archive = variables.get("Archive");
+                ArchivesAuto auto=(ArchivesAuto)archive;
+                if(auto.getStartDate()==null && auto.getEndDate()==null){
+                    formula="";
+                }
+            }
+
             handleArchiveFile(coords, formula, variables, file_path, excelUrl, dataInfo,urls,fileName, archivesAuto.getProjectId());
 
         }else {

blade-service/blade-archive/src/main/java/org/springblade/archive/service/impl/ArchivesAutoServiceImpl.java

@@ -412,8 +412,14 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 		Map<String,List<ArchiveFile>> boxMap = new LinkedHashMap<>();
 
 		archiveAutoMethod3(list3,boxMap);//单独组卷
+		//设置完成度30%
+		projectClient.updateIsArchivesAutoById(projectId,30);
 		archiveAutoMethod2(list2,projectId,boxMap);//分类组卷
+		//设置完成度50%
+		projectClient.updateIsArchivesAutoById(projectId,50);
 		archiveAutoMethod1(list1,boxMap);//默认组卷
+		//设置完成度70%
+		projectClient.updateIsArchivesAutoById(projectId,70);
 		archiveAutoMethodBox(boxMap);//分盒组卷
 	}
 
@@ -1658,12 +1664,20 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 				//将项目未锁定案卷拆卷
 				log.info("[自动组卷]{}","开始对未锁定案卷拆卷。projectId："+projectId+"-contractId:"+contractId+"-nodeId:"+nodeId);
 				splitArchvies(projectId,contractId,nodeId);
+				//设置完成度10%
+				projectClient.updateIsArchivesAutoById(projectId,10);
+
 				//项目自动组卷入口
 				log.info("[自动组卷]{}","开始自动组卷。projectId："+projectId+"-contractId:"+contractId+"-nodeId:"+nodeId);
 				archiveAutoMethod(projectId,contractId,nodeId);
+				//设置完成度80%
+				projectClient.updateIsArchivesAutoById(projectId,80);
+
 				//刷新项目档号
 				log.info("[自动组卷]{}","开始刷新组卷档号。projectId："+projectId+"-contractId:"+contractId+"-nodeId:"+nodeId);
 				refreshFileNumberNoSlipt(projectId,contractId,nodeId);
+
+
 				//设置自动组卷结束
 				projectClient.updateIsArchivesAutoById(projectId,0);
 				log.info("[自动组卷]{}","自动组卷完成。projectId："+projectId+"-contractId:"+contractId+"-nodeId:"+nodeId);