档案合并案卷

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

@@ -519,14 +519,14 @@ public class ArchivesAutoController extends BladeController {
 	@ApiOperationSupport(order = 13)
 	@ApiOperation(value = "重新生成案卷", notes = "传入ids")
 	@Transactional
-	public R reCreateArchiveAuto(String ids){
+	public R reCreateArchiveAuto(@ApiParam(value = "主键集合", required = true) @RequestParam String ids){
 		//先查出勾选的案卷
-		List<ArchivesAuto> archivesAutoList=archivesAutoService.selectArchiveAutosByIds(ids);
+		List<ArchivesAuto> archivesAutoList=archivesAutoService.listByIds(Func.toLongList(ids));
 		if(archivesAutoList.size()<=1){
 			return R.fail("请选择多个案卷进行合并");
 		}
 		archivesAutoList.sort(Comparator.comparingInt(a -> {
-			String[] parts = a.getName().split("_");
+			String[] parts = a.getFileNumber().split("_");
 			return Integer.parseInt(parts[parts.length - 1]); // 取最后一个部分作为数字
 		}));
 		//根据档号后缀排序 拿到第一个

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

@@ -229,7 +229,6 @@ public interface ArchivesAutoMapper extends BaseMapper<ArchivesAuto> {
 
     List<ArchivesAutoVO4> selectAllArchiveAuto(@Param("projectId")Long projectId, @Param("contractId") Long contractId, @Param("nodeIds") List<String> nodeIds,@Param("isArchive")Integer isArchive);
 
-    List<ArchivesAuto> selectArchiveAutosByIds(@Param("ids")String ids);
 
 
 }

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

@@ -219,7 +219,7 @@
 
     <select id="approvalFile" resultType="org.springblade.archive.vo.ArchivesAutoVO$ApprovalFile">
         <if test="archiveId!=null">
-            select * from u_archive_file where archive_id = #{archiveId} order by sort
+            select * from u_archive_file where archive_id = #{archiveId} and is_element = 0 order by sort
         </if>
     </select>
 
@@ -1173,7 +1173,7 @@
                uaa.id,uaa.name,uaa.page_n ,uaa.remark ,uaa.file_number,uaa.unit,uaa.start_date,uaa.end_date,
                 (select bdb.dict_value  from blade_dict_biz bdb WHERE bdb.is_sealed = 0 and bdb.code = 'storage_period' and bdb.dict_key = uaa.storage_time limit 1 ) as storageTimeValue
         from m_archive_tree_contract matc right join u_archives_auto uaa on matc.id = uaa.node_id
-        WHERE uaa.is_deleted = 0 and matc.is_deleted = 0 and uaa.is_apply = #{isApply} and matc.ancestors like concat("%",#{firstNode},"%") and uaa.is_archive = 1
+        WHERE uaa.is_deleted = 0 and matc.is_deleted = 0 and uaa.is_apply = #{isApply} and matc.ancestors like concat("%",#{firstNode},"%")
         order by uaa.tree_sort
     </select>
     <select id="getNodeArchives" resultType="org.springblade.archive.vo.ArchiveInspectVO">
@@ -1274,7 +1274,7 @@
         )
     </select>
     <select id="getRoutingInspection" resultType="org.springblade.archive.vo.ArchiveWarningVO">
-        select uaf.file_name ,IF(uaf.file_url is null or uaf.file_url = '', uaf.pdf_file_url, uaf.file_url) as file_url,0 as sourceType,uaf.node_id,
+        select uaf.file_name ,uaf.file_url,0 as sourceType,uaf.node_id,
                (select uaa.name from u_archives_auto uaa WHERE uaa.id = uaf.archive_id) as archive_name,
                (select GROUP_CONCAT(uai.opinion) from u_archive_inspection uai WHERE uai.file_id = uaf.id) as allopinion
         from u_archive_file uaf join m_archive_tree_contract atc on uaf.node_id  = atc.id
@@ -1285,7 +1285,7 @@
     <select id="getSpotCheck" resultType="org.springblade.archive.vo.ArchiveWarningVO">
         select GROUP_CONCAT(aei.opinion) as allopinion,aei.archive_name ,aei.node_id,1 as sourceType,
                (select uaf.file_name from u_archive_file uaf WHERE uaf.id = aei.file_id) as fileName,
-               (select IF(uaf.file_url is null or uaf.file_url = '', uaf.pdf_file_url, uaf.file_url) as file_url from u_archive_file uaf WHERE uaf.id = aei.file_id) as fileUrl
+               (select uaf.file_url from u_archive_file uaf WHERE uaf.id = aei.file_id) as fileUrl
         from m_archive_tree_contract atc join u_archive_expert_inspection aei on aei.node_id  = atc.id
         where atc.project_id  = #{projectId} and atc.is_deleted = 0 and aei.is_deleted = 0 and aei.is_pass = 0
           and atc.is_deleted = 0
@@ -1435,13 +1435,4 @@
         </foreach>
         ORDER BY uaa.auto_file_sort Asc
     </select>
-    <select id="getArchiveFileByParentId" resultType="java.lang.String">
-        SELECT b.id from m_archive_tree a ,m_archive_tree_contract b where a.id=b.from_id and a.id=#{nodeId} and contract_id=#{contractId} and a.is_deleted=0 and b.is_deleted=0
-    </select>
-    <select id="selectArchiveAutosByIds" resultType="org.springblade.archive.entity.ArchivesAuto">
-        select * from u_archives_auto where id in
-        <foreach collection="ids" item="id" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </select>
 </mapper>

blade-service/blade-archive/src/main/java/org/springblade/archive/service/IArchivesAutoService.java

@@ -167,6 +167,5 @@ public interface IArchivesAutoService extends BaseService<ArchivesAuto> {
 
 	void reCreateArchiveAuto(ArchivesAuto archivesAuto, List<ArchiveFile> waitArchiveFiles);
 
-	List<ArchivesAuto> selectArchiveAutosByIds(String ids);
 
 }

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

@@ -1438,7 +1438,6 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 		//生成文件对应的页码，返回url
 		archiveAutoPdfService.builtFilePageNo(archivesAuto, waitArchiveFiles);
 		this.updateById(archivesAuto);
-
 		return "";
 	}
 
@@ -1495,12 +1494,10 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 		archiveAutoPdfService.buildArchiveFrontPdfs(archivesAuto.getProjectId(), archivesAuto, waitArchiveFiles, true);
 		//生成页码
 		builtFilePageNo(archivesAuto, waitArchiveFiles);
+		archiveFileClient.updateArchiveFile(waitArchiveFiles);
 	}
 
-	@Override
-	public List<ArchivesAuto> selectArchiveAutosByIds(String ids) {
-		return this.baseMapper.selectArchiveAutosByIds(ids);
-	}
+
 
 
 	/**