修改档案鉴定，销毁档案

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

@@ -157,6 +157,9 @@ public class ArchivesAuto extends BaseEntity {
 
 	private Integer autoFileSort;
 
+	//是否已销毁
+	private Integer isDestroy;
+
 	/**
 	 * 立卷单位
 	 * **/

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

@@ -106,4 +106,6 @@ public interface ArchivesAutoMapper extends BaseMapper<ArchivesAuto> {
 	Integer splitFiles(@Param("ids") List<Long> ids);
 
 	List<DictBiz> getCarrierTypeByDict();
+
+	void batchDestroyByIds(@Param("ids")List<String> ids);
 }

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

@@ -289,7 +289,13 @@
                 where project_id = #{vo.projectId} and ancestors like concat('%', #{vo.nodeId}, '%') or id = #{vo.nodeId}
             ) matc
         left join u_archives_auto uaa on matc.id = uaa.node_id
-        where uaa.is_deleted = #{vo.isDeleted}
+        where
+        <if test="vo.isDeleted == 0">
+            uaa.is_deleted = 0 and uaa.is_destroy = 0
+        </if>
+        <if test="vo.isDeleted == 1">
+            uaa.is_deleted = 1 and uaa.is_destroy = 1
+        </if>
         <if test="vo.storageTime != null and vo.storageTime != ''">
             and uaa.storage_time = #{vo.storageTime}
         </if>
@@ -314,6 +320,13 @@
             #{id}
         </foreach>
     </update>
+    <update id="batchDestroyByIds">
+        update u_archives_auto set is_deleted = 1 ,is_destroy = 1 where
+        id in
+        <foreach collection="ids" item="id" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
 
 
 </mapper>

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

@@ -366,8 +366,8 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 			List<Long> collect = files.stream().map(file -> file.getId()).collect(Collectors.toList());
 			archiveFileClient.batchDeleteArchiveFile(collect);
 		}
-		//删除案卷
-		baseMapper.deleteBatchIds(list);
+		//销毁案卷
+		baseMapper.batchDestroyByIds(list);
 	}