Merge branch 'dev' of http://219.151.181.73:3000/zhuwei/bladex into dev

blade-service-api/blade-business-api/src/main/java/org/springblade/business/vo/TrialCyThirdReportQueryVo.java

@@ -29,4 +29,6 @@ public class TrialCyThirdReportQueryVo {
     private Integer type;
     @ApiModelProperty("类型：0-施工,1-监理，2-业主")
     private Integer reportType;
+    @ApiModelProperty("报告编号")
+    private String reportNo;
 }

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

@@ -180,7 +180,10 @@ public class ExternalDataArchiveFileService {
 
             boolean sortDifferent = !Objects.equals(external.getSort(), local.getSort());
 
-            return fileTimeDifferent || sortDifferent;
+            // 新增 filePage 比较
+            boolean filePageDifferent = !Objects.equals(external.getFilePage(), local.getFilePage());
+            //sortDifferent || filePageDifferent;
+            return   filePageDifferent;
         }
         // 处理 transType == 0 和其他情况（默认逻辑）
         else {
@@ -195,10 +198,15 @@ public class ExternalDataArchiveFileService {
             boolean nodeIdDifferent = external.getNodeId() != null &&
                     !Objects.equals(external.getNodeId(), local.getNodeId());
 
+            // 新增filePage比较：当external的filePage非空时，与local的filePage比较
+            boolean filePageDifferent = external.getFilePage() != null &&
+                    !Objects.equals(external.getFilePage(), local.getFilePage());
+
             // 任意字段不同即需要更新
             return !Objects.equals(extUtimeStr, localUtimeStr)
                     || pdfUrlDifferent
-                    || nodeIdDifferent; // 新增nodeId判断
+                    || nodeIdDifferent
+                    || filePageDifferent; // 新增filePage判断
         }
     }
 

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

@@ -1578,7 +1578,7 @@
 
 
     <select id="getOutArchiveFilesByOutIds" resultMap="archiveFileResultMap1">
-        select  id,utime,out_id,pdf_page_url
+        select  id,utime,out_id,pdf_page_url,file_page
         from u_archive_file
 
         where project_id = #{projectId} and is_deleted = 0 and

blade-service/blade-business/src/main/java/org/springblade/business/mapper/TrialCyFinishTestReportMapper.xml

@@ -30,6 +30,9 @@
             <if test="query.reportType != null">
                 AND cs = #{query.reportType}
             </if>
+            <if test="query.reportNo != null and query.reportNo != ''">
+                AND reportNo like concat('%',#{query.reportNo},'%')
+            </if>
         </where>
     </select>
     <select id="selectViewPdfList" resultType="java.lang.String">