Merge branch 'refs/heads/feature-SaveAgain-lihb-20250813' into test-merge

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

@@ -86,6 +86,11 @@ public class InformationQueryVO extends InformationQuery {
     private Integer waitingUserStatus;
 
 
+    @ApiModelProperty("重刷状态 0-待重刷，1-正在重刷，2-重刷成功，3-重刷失败")
+    private Integer saveAgain;
+
+    @ApiModelProperty("重刷次数：如果次数大于5次 每次都是3，就停止重刷")
+    private Integer saveAgainCount;
 
     public void setWaitingUserList(String waitingUserName, Integer status) {
         if (this.waitingUserList == null) {

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

@@ -229,7 +229,7 @@ public interface ArchivesAutoMapper extends BaseMapper<ArchivesAuto> {
 	 */
 	Map<String, BigDecimal> getAllArchiveByContractTypeSummary(@Param("projectId") Long projectId,@Param("type") String typ);
 
-	String getArchiveFileByParentId(@Param("nodeId") String nodeId,@Param("contractId") String contractId);
+	Long getArchiveFileByParentId(@Param("nodeId") String nodeId,@Param("contractId") String contractId);
 
     List<ArchivesAutoVO4> selectAllArchiveAuto(@Param("projectId")Long projectId, @Param("contractId") Long contractId, @Param("nodeIds") List<String> nodeIds,@Param("isArchive")Integer isArchive);
 

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

@@ -1643,4 +1643,8 @@
         order by m.tree_sort,u.auto_file_sort is null ,u.auto_file_sort,u.file_number is null,
         SUBSTRING_INDEX(u.file_number, '_', 1), SUBSTRING_INDEX(u.file_number, '_', -1) + 0 ,u.create_time asc
     </select>
+    <select id="getArchiveFileByParentId" resultType="java.lang.Long">
+        select c.id from m_archive_tree_contract c left join m_archive_tree a on a.id=c.from_id where c.contract_id=#{contractId} and a.id=#{nodeId} and c.is_deleted=0 and a.is_deleted=0
+
+    </select>
 </mapper>

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

@@ -4808,7 +4808,7 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 			return R.fail("请传输正确的contractId");
 		}
 		//获取文件的父节点Id
-		String treeContractId = baseMapper.getArchiveFileByParentId(nodeId, contractId);
+		Long treeContractId = baseMapper.getArchiveFileByParentId(nodeId, contractId);
 		if (treeContractId == null || Func.isNull(treeContractId)) {
 			R.fail("请校验传输的nodeId和contractId,没有查到父节点Id");
 		}
@@ -4822,6 +4822,7 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 		archivesAuto.setContractId(Func.toLong(contractId));
 		archivesAuto.setName(fileName);
 		archivesAuto.setIsDeleted(0);
+		archivesAuto.setNodeId(treeContractId);
 		this.save(archivesAuto);
 
 		// 保存文件到archive_file表中

blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml

@@ -131,6 +131,8 @@
     <select id="selectInformationQueryPageTwo" resultType="org.springblade.business.entity.InformationQuery">
         SELECT
             query.pdf_trial_url,
+            query.save_again,
+            query.save_again_count,
             query.pdf_trial_url_position,
             query.wbs_id,
             query.id,
@@ -148,6 +150,8 @@
             (
             SELECT
                 iq.pdf_trial_url_position,
+                iq.save_again,
+                iq.save_again_count,
                 iq.pdf_trial_url,
                 iq.sort,
                 iq.id,