档案统计-案卷统计

1、原生数字化文件数量接口优化
2、已组/销毁案件查询接口优化

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

@@ -32,6 +32,7 @@ import org.springblade.manager.entity.ArchiveTreeContract;
 import org.springblade.system.entity.DictBiz;
 import org.springblade.system.user.entity.User;
 
+import java.math.BigDecimal;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -215,4 +216,12 @@ public interface ArchivesAutoMapper extends BaseMapper<ArchivesAuto> {
 	List<ArchiveFile> getOutArchiveFilesByOutIds(@Param("projectId")Long projectId,@Param("ids") List<String> outIds);
 
 	List<Map<String, Object>> getMetadaFileByFileIds(@Param("fileIds") List<Long> fileIds);
+
+	/**
+	 * 档案统计-案卷统计-已组/销毁 案卷优化
+	 * @param projectId
+	 * @param typ
+	 * @return
+	 */
+	Map<String, BigDecimal> getAllArchiveByContractTypeSummary(@Param("projectId") Long projectId,@Param("type") String typ);
 }

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

@@ -1376,6 +1376,25 @@
         </foreach>
         ORDER BY file_id, create_time DESC
     </select>
+    <select id="getAllArchiveByContractTypeSummary" resultType="java.util.Map">
+        select sum(a.key1 + a.key11) key1,sum(a.key2 + a.key12) key2,sum(a.key3 +a.key13) key3  from (
+         SELECT
+             sum( matc.tree_code IS NULL ) key3,
+             sum( matc.tree_code = 'S' ) key2,
+             sum( matc.tree_code = 'C' ) key1,
+             sum( mci.contract_type = 1 ) key11,
+             sum( mci.contract_type = 2 ) key12,
+             sum( mci.contract_type NOT IN ( 1, 2 )) key13
+         FROM
+             m_archive_tree_contract matc
+                 LEFT JOIN u_archives_auto uaa ON uaa.node_id = matc.id
+                 LEFT JOIN m_contract_info mci ON matc.tree_code = mci.id  and mci.is_deleted = 0
+         WHERE
+             uaa.project_id = #{projectId}
+           AND uaa.is_deleted = #{type}
+           AND uaa.is_destroy = #{type}
+        )a
+    </select>
 
 
 </mapper>

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

@@ -575,38 +575,13 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 
 	@Override
 	public Map<String, Integer> getAllArchiveByContractType(Long projectId, String typ) {
-		List<ArchivesAutoVO> list = baseMapper.getAllArchiveByContractType(projectId, typ);
-		List<ContractInfo> infos = contractClient.queryContractListByIds(Arrays.asList(projectId));
+		Map<String,BigDecimal> archivveMap = baseMapper.getAllArchiveByContractTypeSummary(projectId, typ);
 		int key1 = 0, key2 = 0, key3 = 0;
 		//判断案卷属于1施工，2监理，还是3业主
-		for (ArchivesAutoVO l : list) {
-			String type = l.getContractType();
-			if (StringUtils.isBlank(type)) {
-				//业主
-				key3++;
-			} else if ("S".equals(type)) {
-				//监理
-				key2++;
-			} else if ("C".equals(type)) {
-				//施工
-				key1++;
-			} else if (type.length() > 10) {
-				for (ContractInfo info : infos) {
-					if (type.equals(info.getId() + "")) {
-						Integer t = info.getContractType();
-						if (t == 1) {
-							key1++;
-						} else if (t == 2) {
-							key2++;
-						} else {
-							key3++;
-						}
-						break;
-					}
-				}
-			} else {
-				System.out.println(type);
-			}
+		if(archivveMap != null){
+			key1 += archivveMap.get("key1") != null ? archivveMap.get("key1").intValue() : 0;
+			key2 += archivveMap.get("key2") != null ? archivveMap.get("key2").intValue() : 0;
+			key3 += archivveMap.get("key3") != null ? archivveMap.get("key3").intValue() : 0;
 		}
 		Map<String, Integer> map = new HashMap<>();
 		map.put("key1", key1);

blade-service/blade-business/src/main/java/org/springblade/business/feignClient/ArchiveFileClientImpl.java

@@ -148,9 +148,6 @@ public class ArchiveFileClientImpl implements ArchiveFileClient {
                 key1 += mapAutoSummary.get("key1") != null ? mapAutoSummary.get("key1").intValue() : 0;
                 key2 += mapAutoSummary.get("key2") != null ? mapAutoSummary.get("key2").intValue() : 0;
                 key3 += mapAutoSummary.get("key3") != null ? mapAutoSummary.get("key3").intValue() : 0;
-                key4 += mapAutoSummary.get("key4") != null ? mapAutoSummary.get("key4").intValue() : 0;
-                key5 += mapAutoSummary.get("key5") != null ? mapAutoSummary.get("key5").intValue() : 0;
-                key6 += mapAutoSummary.get("key6") != null ? mapAutoSummary.get("key6").intValue() : 0;
             }
         }
         List<Map<String, Object>> mapList = new ArrayList<>();

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

@@ -489,7 +489,7 @@
           FROM
               u_archive_file uaf
                   LEFT JOIN m_archive_tree_contract matc ON uaf.node_id = matc.id
-                  left join m_contract_info mci on matc.tree_code = mci.id
+                  left join m_contract_info mci on matc.tree_code = mci.id and mci.is_deleted = 0
           WHERE
               uaf.project_id = #{projectId}
             AND matc.is_deleted = 0
@@ -509,11 +509,8 @@
         select sum(a.key1 + a.key11) key1,sum(a.key2 + a.key12) key2,sum(a.key3 +a.key13) key3 ,a.key4,a.key5,a.key6 from (
           SELECT
 
-              sum(matc.tree_code is null) key4,
               sum(matc.tree_code is null) key3,
-              sum(matc.tree_code = 'S') key5,
               sum(matc.tree_code = 'S') key2,
-              sum( matc.tree_code = 'C') key6,
               sum(matc.tree_code = 'C') key1,
               sum(mci.contract_type = 1) key11,
               sum(mci.contract_type = 2) key12,
@@ -521,7 +518,7 @@
 
           FROM u_archives_auto uaa
                    left join m_archive_tree_contract matc on uaa.node_id = matc.id
-                   left join m_contract_info mci on matc.tree_code = mci.id
+                   left join m_contract_info mci on matc.tree_code = mci.id and mci.is_deleted = 0
           WHERE uaa.project_id = #{projectId} and uaa.is_deleted = 0
       ) a