Merge remote-tracking branch 'origin/master' into master

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

@@ -148,7 +148,7 @@
     </select>
 
     <select id="selectArchivesAutoFilePage" resultMap="archivesAutoResultMap">
-        select * from u_archives_auto u where u.is_deleted = 0
+        select * from u_archives_auto u LEFT JOIN m_archive_tree_contract m ON u.node_id = m.id where u.is_deleted = 0
         <if test="vo.projectId != null and vo.projectId != ''">
             and u.project_id = #{vo.projectId}
         </if>
@@ -172,7 +172,7 @@
                 #{nodeId}
             </foreach>
         </if>
-        order by u.tree_sort,u.auto_file_sort is null ,u.auto_file_sort,u.file_number is null,u.file_number,u.create_time asc
+        order by m.tree_sort,u.auto_file_sort is null ,u.auto_file_sort,u.file_number is null,u.file_number,u.create_time asc
         limit #{current}, #{size}
     </select>
 

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/ExcelTabServiceImpl.java

@@ -1596,9 +1596,15 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
             Element table = doc.select("table").first();
             //计算填报率
             Long keySize = table.getElementsByAttribute("v-model").stream().count();
+            Long sigSize = table.getElementsByAttribute(":readonly").stream().count();
             if (fillNumbers != 0 && keySize != 0){
-                Double v = fillNumbers.doubleValue() / keySize.doubleValue() * 100;
-                realFillRate = v.intValue();
+                if (keySize == sigSize){
+                    realFillRate = 100;
+                }else {
+                    keySize = keySize - sigSize;
+                    Double v = fillNumbers.doubleValue() / keySize.doubleValue() * 100;
+                    realFillRate = v.intValue();
+                }
             }
             Elements trs = table.select("tr");
             if (ObjectUtil.isNotEmpty(DataInfo)) {