档案验收bug

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

@@ -940,15 +940,15 @@ public class ArchivesAutoController extends BladeController {
 	@ApiImplicitParams(value = {
 			@ApiImplicitParam(name = "projectId", value = "项目id", required = true),
 			@ApiImplicitParam(name = "nodeId", value = "当前节点id", required = true),
-			@ApiImplicitParam(name = "searchType", value = "搜索类型1档案名称2文件名称", required = true),
+			@ApiImplicitParam(name = "searchType", value = "搜索类型1档案名称2文件名称3档号", required = true),
 			@ApiImplicitParam(name = "searchValue", value = "搜索值", required = false),
 			@ApiImplicitParam(name = "current", value = "当前页", required = true),
 			@ApiImplicitParam(name = "size", value = "每页的数量", required = true),
 			@ApiImplicitParam(name = "type", value = "树类型，所有案卷1，我验收的案卷2", required = true)
 	})
+
 	public R<IPage<ArchiveInspectVO>> getNodeArchives(Query query,@RequestParam Long nodeId,@RequestParam Long projectId,@RequestParam Integer searchType,@RequestParam String searchValue,@RequestParam Integer type) {
-		IPage<ArchiveInspectVO> list = archivesAutoService.getNodeArchives(query,nodeId,projectId,searchType,searchValue,type);
-		return R.data(list);
+		return R.data(archivesAutoService.getNodeArchives(query, nodeId, projectId, searchType, searchValue, type));
 	}
 
 	/**

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

@@ -1305,6 +1305,9 @@
             <if test="searchType == 2">
                 and (select COUNT(1) from u_archive_file uaf WHERE uaf.archive_id = uaa.id and uaf.file_name like concat('%',#{searchValue},'%'))
             </if>
+            <if test="searchType == 3">
+            and uaa.file_number like concat('%',#{searchValue},'%')
+            </if>
         </if>
     </select>
     <select id="getNodeArchives2" resultType="org.springblade.archive.vo.ArchiveInspectVO">

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

@@ -129,7 +129,7 @@ public class ArchiveExpertConclusionServiceImpl extends BaseServiceImpl<ArchiveE
         List<ArchiveExpertConclusion> list = this.list(new LambdaQueryWrapper<ArchiveExpertConclusion>()
                 .eq(ArchiveExpertConclusion::getProjectId, projectId)
                 .eq(ArchiveExpertConclusion::getStatus, 2)
-                .orderByDesc(ArchiveExpertConclusion::getApproveDate));
+                .orderByDesc(ArchiveExpertConclusion::getApproveDate).orderByDesc(ArchiveExpertConclusion::getUpdateTime));
         if (list.size() == 0){
             throw new ServiceException("暂无历史验收报告");
         }

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

@@ -4049,7 +4049,7 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 				.last("limit 1"));
 		if (type == 1){
 			//查询所有的，树不加id，档案状态加
-			return baseMapper.getNodeArchives(page,nodeId,projectId,searchType,searchValue,AuthUtil.getUserId(),one.getId());
+			return baseMapper.getNodeArchives(page, nodeId, projectId, searchType, searchValue, AuthUtil.getUserId(), one.getId());
 		}else {
 			//查询专家的，树加id，档案状态加
 			return baseMapper.getNodeArchives2(page,nodeId,projectId,searchType,searchValue,AuthUtil.getUserId(),one.getId());