Merge branch 'master' of http://47.110.251.215:3000/java_org/bladex

blade-service-api/blade-business-api/src/main/java/org/springblade/business/entity/ArchiveFile.java

@@ -270,4 +270,7 @@ public class ArchiveFile extends BaseEntity {
 	 */
 	@ApiModelProperty("是否案卷四要素，0否，1是")
 	private Integer isElement;
+
+	@ApiModelProperty("卷内索引")
+	private Integer fid;
 }

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

@@ -597,7 +597,7 @@ public class ArchiveAutoPdfServiceImpl implements IArchiveAutoPdfService {
         for (ArchiveFile file:  datas) {
             idx++;
             //设置序号
-            file.setId(idx.longValue());
+            file.setFid(idx);
             //设置文件编号
             if (StringUtil.isEmpty(file.getFileNumber())) {
                 file.setFileNumber("\\");

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

@@ -56,6 +56,7 @@
         <result column="source_type" property="sourceType"/>
         <result column="is_element" property="isElement"/>
         <result column="pdf_page_url" property="pdfPageUrl"/>
+        <result column="fid" property="fid"/>
     </resultMap>
     <update id="recoveryByIds">
         update u_archive_file set is_deleted = 0 where