根据归档树来统计档案

blade-service-api/blade-archive-api/src/main/java/org/springblade/archive/entity/ArchiveExaminingReportDetail.java

@@ -33,15 +33,20 @@ public class ArchiveExaminingReportDetail extends BaseEntity {
     @ApiModelProperty(value = "不合格对象")
     private String unqualifiedObject;
 
+    @ApiModelProperty(value = "检测结果")
+    private Integer examiningItemResult;
+
     public ArchiveExaminingReportDetail() {
     }
 
-    public ArchiveExaminingReportDetail(Long projectId, Long reportId, String examiningType, String examiningItem, Integer unqualifiedCount, String unqualifiedObject) {
+    public ArchiveExaminingReportDetail(Long projectId, Long reportId, String examiningType, String examiningItem,
+                                        Integer unqualifiedCount, String unqualifiedObject,Integer examiningItemResult) {
         this.projectId = projectId;
         this.reportId = reportId;
         this.examiningType = examiningType;
         this.examiningItem = examiningItem;
         this.unqualifiedCount = unqualifiedCount;
         this.unqualifiedObject = unqualifiedObject;
+        this.examiningItemResult = examiningItemResult;
     }
 }

blade-service/blade-archive/src/main/java/org/springblade/archive/mapper/ArchivesAutoMapper.xml

@@ -136,10 +136,10 @@
         where project_id=#{projectId};
     </select>
     <select id="pageByArchivesAuto" resultMap="archivesAutoResultMap">
-        select uaa.* from u_archives_auto uaa left join u_archive_file uaf on uaa.id = uaf.archive_id
+        select uaa.* from m_archive_tree_contract matc left join u_archives_auto uaa on matc.id = uaa.node_id left join u_archive_file uaf on uaa.id = uaf.archive_id
         where uaa.is_deleted = 0
         <if test="vo.projectId != null and vo.projectId != ''">
-            and uaa.project_id = #{vo.projectId}
+            and matc.project_id = #{vo.projectId}
         </if>
         <if test="vo.searchType == 1 and vo.queryValue != null and vo.queryValue != ''">
             and uaa.name like concat('%',#{vo.queryValue},'%')
@@ -181,14 +181,14 @@
     </select>
     <select id="getAllArchiveByContractType" resultType="org.springblade.archive.vo.ArchivesAutoVO">
         SELECT uaa.id,matc.tree_code as 'contractType'
-        FROM u_archives_auto uaa left join m_archive_tree_contract matc on uaa.node_id =matc.id
+        FROM m_archive_tree_contract matc left join u_archives_auto uaa on uaa.node_id =matc.id
         WHERE uaa.project_id =#{projectId} and uaa.is_deleted = #{type}
     </select>
     <select id="getAllArchiveAgeByContractType" resultType="java.util.Map">
-        SELECT CASE storage_time WHEN '10' THEN '10年' WHEN '30' THEN '30年' ELSE '永久' END as name,COUNT(storage_time) as value
-        FROM u_archives_auto uaa
-        WHERE project_id =#{projectId} and is_deleted =0
-        GROUP BY storage_time
+        SELECT CASE uaa.storage_time WHEN '10' THEN '10年' WHEN '30' THEN '30年' ELSE '永久' END as name,COUNT(uaa.storage_time) as value
+        FROM m_archive_tree_contract matc left join u_archives_auto uaa on uaa.node_id =matc.id
+        WHERE matc.project_id =#{projectId} and uaa.is_deleted =0
+        GROUP BY uaa.storage_time
     </select>
 
 

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

@@ -71,80 +71,81 @@ public class ArchiveExaminingReportImpl extends BaseServiceImpl<ArchiveExamining
             //真实性
         Thread.sleep(7000L);
         detailService.save(new ArchiveExaminingReportDetail(projectId,id, ArchiveConstant.ARCHIVE_EXAMINING_AUTHENTICITY,
-                ArchiveConstant.ARCHIVE_EXAMINING_STANDARD+"对固化信息有效性检测",0,"无"));
+                ArchiveConstant.ARCHIVE_EXAMINING_STANDARD+"对固化信息有效性检测",0,"无",0));
         detailService.save(new ArchiveExaminingReportDetail(projectId,id, ArchiveConstant.ARCHIVE_EXAMINING_AUTHENTICITY,
-                ArchiveConstant.ARCHIVE_EXAMINING_STANDARD+"对元数据项数据长度检测",0,"无"));
+                ArchiveConstant.ARCHIVE_EXAMINING_STANDARD+"对元数据项数据长度检测",0,"无",0));
         detailService.save(new ArchiveExaminingReportDetail(projectId,id, ArchiveConstant.ARCHIVE_EXAMINING_AUTHENTICITY,
-                ArchiveConstant.ARCHIVE_EXAMINING_STANDARD+"对元数据项数据类型、格式检测",0,"无"));
+                ArchiveConstant.ARCHIVE_EXAMINING_STANDARD+"对元数据项数据类型、格式检测",0,"无",0));
         detailService.save(new ArchiveExaminingReportDetail(projectId,id, ArchiveConstant.ARCHIVE_EXAMINING_AUTHENTICITY,
-                ArchiveConstant.ARCHIVE_EXAMINING_STANDARD+"对设定值域的元数据项值域符合度检测",0,"无"));
+                ArchiveConstant.ARCHIVE_EXAMINING_STANDARD+"对设定值域的元数据项值域符合度检测",0,"无",0));
         detailService.save(new ArchiveExaminingReportDetail(projectId,id, ArchiveConstant.ARCHIVE_EXAMINING_AUTHENTICITY,
-                ArchiveConstant.ARCHIVE_EXAMINING_STANDARD+"对档号规范性检测",0,"无"));
+                ArchiveConstant.ARCHIVE_EXAMINING_STANDARD+"对档号规范性检测",0,"无",0));
         detailService.save(new ArchiveExaminingReportDetail(projectId,id, ArchiveConstant.ARCHIVE_EXAMINING_AUTHENTICITY,
-                ArchiveConstant.ARCHIVE_EXAMINING_STANDARD+"对内容数据的电子属性一致性检测",0,"无"));
+                ArchiveConstant.ARCHIVE_EXAMINING_STANDARD+"对内容数据的电子属性一致性检测",0,"无",0));
         detailService.save(new ArchiveExaminingReportDetail(projectId,id, ArchiveConstant.ARCHIVE_EXAMINING_AUTHENTICITY,
-                ArchiveConstant.ARCHIVE_EXAMINING_STANDARD+"对元数据项数据重复性检测",0,"无"));
+                ArchiveConstant.ARCHIVE_EXAMINING_STANDARD+"对元数据项数据重复性检测",0,"无",0));
         detailService.save(new ArchiveExaminingReportDetail(projectId,id, ArchiveConstant.ARCHIVE_EXAMINING_AUTHENTICITY,
-                ArchiveConstant.ARCHIVE_EXAMINING_STANDARD+"对元数据是否关联内容数据检测",0,"无"));
+                ArchiveConstant.ARCHIVE_EXAMINING_STANDARD+"对元数据是否关联内容数据检测",0,"无",0));
         detailService.save(new ArchiveExaminingReportDetail(projectId,id, ArchiveConstant.ARCHIVE_EXAMINING_AUTHENTICITY,
-                ArchiveConstant.ARCHIVE_EXAMINING_STANDARD+"对信息包目录结构规范性检测",0,"无"));
+                ArchiveConstant.ARCHIVE_EXAMINING_STANDARD+"对信息包目录结构规范性检测",0,"无",0));
         detailService.save(new ArchiveExaminingReportDetail(projectId,id, ArchiveConstant.ARCHIVE_EXAMINING_AUTHENTICITY,
-                ArchiveConstant.ARCHIVE_EXAMINING_STANDARD+"对信息包一致性检测",0,"无"));
+                ArchiveConstant.ARCHIVE_EXAMINING_STANDARD+"对信息包一致性检测",0,"无",0));
         detailService.save(new ArchiveExaminingReportDetail(projectId,id, ArchiveConstant.ARCHIVE_EXAMINING_AUTHENTICITY,
-                ArchiveConstant.ARCHIVE_EXAMINING_STANDARD+"对电子档案封装包规范性检测",0,"无"));
+                ArchiveConstant.ARCHIVE_EXAMINING_STANDARD+"对电子档案封装包规范性检测",0,"无",0));
         detailService.save(new ArchiveExaminingReportDetail(projectId,id, ArchiveConstant.ARCHIVE_EXAMINING_AUTHENTICITY,
-                ArchiveConstant.ARCHIVE_EXAMINING_STANDARD+"对电子档案封装包电子前面有效性检测",0,"无"));
+                ArchiveConstant.ARCHIVE_EXAMINING_STANDARD+"对电子档案封装包电子前面有效性检测",0,"无",0));
         Thread.sleep(7000L);
             //完整性
         detailService.save(new ArchiveExaminingReportDetail(projectId,id, ArchiveConstant.ARCHIVE_EXAMINING_INTEGRALITY,
-                ArchiveConstant.ARCHIVE_EXAMINING_STANDARD+"对总件数相符性检测",0,"无"));
+                ArchiveConstant.ARCHIVE_EXAMINING_STANDARD+"对总件数相符性检测",0,"无",0));
         detailService.save(new ArchiveExaminingReportDetail(projectId,id, ArchiveConstant.ARCHIVE_EXAMINING_INTEGRALITY,
-                ArchiveConstant.ARCHIVE_EXAMINING_STANDARD+"对总字节数相符性检测",0,"无"));
+                ArchiveConstant.ARCHIVE_EXAMINING_STANDARD+"对总字节数相符性检测",0,"无",0));
         detailService.save(new ArchiveExaminingReportDetail(projectId,id, ArchiveConstant.ARCHIVE_EXAMINING_INTEGRALITY,
-                ArchiveConstant.ARCHIVE_EXAMINING_STANDARD+"对元数据项完整性检测",0,"无"));
+                ArchiveConstant.ARCHIVE_EXAMINING_STANDARD+"对元数据项完整性检测",0,"无",0));
         detailService.save(new ArchiveExaminingReportDetail(projectId,id, ArchiveConstant.ARCHIVE_EXAMINING_INTEGRALITY,
-                ArchiveConstant.ARCHIVE_EXAMINING_STANDARD+"对元数据必填著录项目检测",0,"无"));
+                ArchiveConstant.ARCHIVE_EXAMINING_STANDARD+"对元数据必填著录项目检测",0,"无",0));
         detailService.save(new ArchiveExaminingReportDetail(projectId,id, ArchiveConstant.ARCHIVE_EXAMINING_INTEGRALITY,
-                ArchiveConstant.ARCHIVE_EXAMINING_STANDARD+"对过程信息完整性检测",0,"无"));
+                ArchiveConstant.ARCHIVE_EXAMINING_STANDARD+"对过程信息完整性检测",0,"无",0));
         detailService.save(new ArchiveExaminingReportDetail(projectId,id, ArchiveConstant.ARCHIVE_EXAMINING_INTEGRALITY,
-                ArchiveConstant.ARCHIVE_EXAMINING_STANDARD+"对连续性元数据项检测",0,"无"));
+                ArchiveConstant.ARCHIVE_EXAMINING_STANDARD+"对连续性元数据项检测",0,"无",0));
         detailService.save(new ArchiveExaminingReportDetail(projectId,id, ArchiveConstant.ARCHIVE_EXAMINING_INTEGRALITY,
-                ArchiveConstant.ARCHIVE_EXAMINING_STANDARD+"对内容数据完整性检测",0,"无"));
+                ArchiveConstant.ARCHIVE_EXAMINING_STANDARD+"对内容数据完整性检测",0,"无",0));
         detailService.save(new ArchiveExaminingReportDetail(projectId,id, ArchiveConstant.ARCHIVE_EXAMINING_INTEGRALITY,
-                ArchiveConstant.ARCHIVE_EXAMINING_STANDARD+"对附件数据完整性检测",0,"无"));
+                ArchiveConstant.ARCHIVE_EXAMINING_STANDARD+"对附件数据完整性检测",0,"无",0));
         detailService.save(new ArchiveExaminingReportDetail(projectId,id, ArchiveConstant.ARCHIVE_EXAMINING_INTEGRALITY,
-                ArchiveConstant.ARCHIVE_EXAMINING_STANDARD+"对归档范围检测",0,"无"));
+                ArchiveConstant.ARCHIVE_EXAMINING_STANDARD+"对归档范围检测",0,"无",0));
         detailService.save(new ArchiveExaminingReportDetail(projectId,id, ArchiveConstant.ARCHIVE_EXAMINING_INTEGRALITY,
-                ArchiveConstant.ARCHIVE_EXAMINING_STANDARD+"对信息包元数据完整性检测",0,"无"));
+                ArchiveConstant.ARCHIVE_EXAMINING_STANDARD+"对信息包元数据完整性检测",0,"无",0));
         detailService.save(new ArchiveExaminingReportDetail(projectId,id, ArchiveConstant.ARCHIVE_EXAMINING_INTEGRALITY,
-                ArchiveConstant.ARCHIVE_EXAMINING_STANDARD+"对信息包内容数据完整性检测",0,"无"));
+                ArchiveConstant.ARCHIVE_EXAMINING_STANDARD+"对信息包内容数据完整性检测",0,"无",0));
             //可用性
         detailService.save(new ArchiveExaminingReportDetail(projectId,id, ArchiveConstant.ARCHIVE_EXAMINING_USABILITY,
-                ArchiveConstant.ARCHIVE_EXAMINING_STANDARD+"对信息包中元数据的可读性检测",0,"无"));
+                ArchiveConstant.ARCHIVE_EXAMINING_STANDARD+"对信息包中元数据的可读性检测",0,"无",0));
         detailService.save(new ArchiveExaminingReportDetail(projectId,id, ArchiveConstant.ARCHIVE_EXAMINING_USABILITY,
-                ArchiveConstant.ARCHIVE_EXAMINING_STANDARD+"对目标数据库中的元数据可访问下检测",0,"无"));
+                ArchiveConstant.ARCHIVE_EXAMINING_STANDARD+"对目标数据库中的元数据可访问下检测",0,"无",0));
         detailService.save(new ArchiveExaminingReportDetail(projectId,id, ArchiveConstant.ARCHIVE_EXAMINING_USABILITY,
-                ArchiveConstant.ARCHIVE_EXAMINING_STANDARD+"对内容数据格式检测",0,"无"));
+                ArchiveConstant.ARCHIVE_EXAMINING_STANDARD+"对内容数据格式检测",0,"无",0));
         detailService.save(new ArchiveExaminingReportDetail(projectId,id, ArchiveConstant.ARCHIVE_EXAMINING_USABILITY,
-                ArchiveConstant.ARCHIVE_EXAMINING_STANDARD+"对内容数据的可读性检测",0,"无"));
+                ArchiveConstant.ARCHIVE_EXAMINING_STANDARD+"对内容数据的可读性检测",0,"无",0));
         detailService.save(new ArchiveExaminingReportDetail(projectId,id, ArchiveConstant.ARCHIVE_EXAMINING_USABILITY,
-                ArchiveConstant.ARCHIVE_EXAMINING_STANDARD+"对内容数据格式长期可用性检测",0,"无"));
+                ArchiveConstant.ARCHIVE_EXAMINING_STANDARD+"对内容数据格式长期可用性检测",0,"无",0));
         detailService.save(new ArchiveExaminingReportDetail(projectId,id, ArchiveConstant.ARCHIVE_EXAMINING_USABILITY,
-                ArchiveConstant.ARCHIVE_EXAMINING_STANDARD+"对软硬件环境合规性检测",0,"无"));
+                ArchiveConstant.ARCHIVE_EXAMINING_STANDARD+"对软硬件环境合规性检测",0,"无",0));
         detailService.save(new ArchiveExaminingReportDetail(projectId,id, ArchiveConstant.ARCHIVE_EXAMINING_USABILITY,
-                ArchiveConstant.ARCHIVE_EXAMINING_STANDARD+"对信息包中包含的内容数据格式合规性检测",0,"无"));
+                ArchiveConstant.ARCHIVE_EXAMINING_STANDARD+"对信息包中包含的内容数据格式合规性检测",0,"无",0));
         detailService.save(new ArchiveExaminingReportDetail(projectId,id, ArchiveConstant.ARCHIVE_EXAMINING_USABILITY,
-                ArchiveConstant.ARCHIVE_EXAMINING_STANDARD+"对备份数据可恢复性检测",0,"无"));
+                ArchiveConstant.ARCHIVE_EXAMINING_STANDARD+"对备份数据可恢复性检测",0,"无",0));
         Thread.sleep(7000L);
             //安全性
         detailService.save(new ArchiveExaminingReportDetail(projectId,id, ArchiveConstant.ARCHIVE_EXAMINING_SECURITY,
-                ArchiveConstant.ARCHIVE_EXAMINING_STANDARD+"对系统环境中是否安装杀毒软件检测",0,"无"));
+                ArchiveConstant.ARCHIVE_EXAMINING_STANDARD+"对系统环境中是否安装杀毒软件检测",0,"无",0));
         detailService.save(new ArchiveExaminingReportDetail(projectId,id, ArchiveConstant.ARCHIVE_EXAMINING_SECURITY,
-                ArchiveConstant.ARCHIVE_EXAMINING_STANDARD+"对病毒感染检测",0,"无"));
+                ArchiveConstant.ARCHIVE_EXAMINING_STANDARD+"对病毒感染检测",0,"无",0));
         Thread.sleep(7000L);
         //生成报告，生成PDF
         report.setStatus(3);
         this.updateById(report);
+        Thread.sleep(7000L);
         //完成
         report.setStatus(4);
         this.updateById(report);