|
@@ -375,7 +375,8 @@
|
|
where project_id = #{projectId};
|
|
where project_id = #{projectId};
|
|
</select>
|
|
</select>
|
|
<select id="pageByArchivesAuto" resultMap="archivesAutoResultMap">
|
|
<select id="pageByArchivesAuto" resultMap="archivesAutoResultMap">
|
|
- select uaa.* from m_archive_tree_contract matc left join u_archives_auto uaa on matc.id = uaa.node_id left join
|
|
|
|
|
|
+ select uaa.*,(select COUNT(1) from u_archive_file af WHERE af.archive_id = uaa.id AND af.is_element = 0 and af.is_deleted = 0) as pageNumber
|
|
|
|
+ from m_archive_tree_contract matc left join u_archives_auto uaa on matc.id = uaa.node_id left join
|
|
u_archive_file uaf on uaa.id = uaf.archive_id
|
|
u_archive_file uaf on uaa.id = uaf.archive_id
|
|
where uaa.is_deleted = 0 and uaa.is_archive = 1
|
|
where uaa.is_deleted = 0 and uaa.is_archive = 1
|
|
<if test="vo.projectId != null and vo.projectId != ''">
|
|
<if test="vo.projectId != null and vo.projectId != ''">
|
|
@@ -425,7 +426,7 @@
|
|
</select>
|
|
</select>
|
|
|
|
|
|
<select id="pageByArchivesAuto2" resultMap="archivesAutoResultMap">
|
|
<select id="pageByArchivesAuto2" resultMap="archivesAutoResultMap">
|
|
- select uaa.* from
|
|
|
|
|
|
+ select uaa.*,(select COUNT(1) from u_archive_file af WHERE af.archive_id = uaa.id AND af.is_element = 0 and af.is_deleted = 0) as pageNumber from
|
|
(SELECT id FROM m_archive_tree_contract WHERE project_id =#{vo.projectId}
|
|
(SELECT id FROM m_archive_tree_contract WHERE project_id =#{vo.projectId}
|
|
and 1=2
|
|
and 1=2
|
|
<foreach collection="vo.nodeIdArray" item="nodeId">
|
|
<foreach collection="vo.nodeIdArray" item="nodeId">
|
|
@@ -485,6 +486,9 @@
|
|
) matc left join u_archives_auto uaa on matc.id = uaa.node_id left join u_archive_file uaf on uaa.id =
|
|
) matc left join u_archives_auto uaa on matc.id = uaa.node_id left join u_archive_file uaf on uaa.id =
|
|
uaf.archive_id
|
|
uaf.archive_id
|
|
where uaa.is_deleted = 0 and uaa.is_archive = 1
|
|
where uaa.is_deleted = 0 and uaa.is_archive = 1
|
|
|
|
+ <if test="vo.contractId != null and vo.contractId != ''">
|
|
|
|
+ and uaa.contract_id = #{vo.contractId}
|
|
|
|
+ </if>
|
|
GROUP BY uaa.id
|
|
GROUP BY uaa.id
|
|
order by uaa.tree_sort,uaa.auto_file_sort,uaa.file_number asc
|
|
order by uaa.tree_sort,uaa.auto_file_sort,uaa.file_number asc
|
|
</select>
|
|
</select>
|
|
@@ -496,6 +500,9 @@
|
|
) matc left join u_archives_auto uaa on matc.id = uaa.node_id left join u_archive_file uaf on uaa.id =
|
|
) matc left join u_archives_auto uaa on matc.id = uaa.node_id left join u_archive_file uaf on uaa.id =
|
|
uaf.archive_id
|
|
uaf.archive_id
|
|
where uaa.is_deleted = 0 and uaa.is_archive = 1
|
|
where uaa.is_deleted = 0 and uaa.is_archive = 1
|
|
|
|
+ <if test="vo.contractId != null and vo.contractId != ''">
|
|
|
|
+ and uaa.contract_id = #{vo.contractId}
|
|
|
|
+ </if>
|
|
<if test="vo.searchType == 1 and vo.queryValue != null and vo.queryValue != ''">
|
|
<if test="vo.searchType == 1 and vo.queryValue != null and vo.queryValue != ''">
|
|
and uaa.name like concat('%',#{vo.queryValue},'%')
|
|
and uaa.name like concat('%',#{vo.queryValue},'%')
|
|
</if>
|
|
</if>
|
|
@@ -543,6 +550,9 @@
|
|
) matc left join u_archives_auto uaa on matc.id = uaa.node_id left join u_archive_file uaf on uaa.id =
|
|
) matc left join u_archives_auto uaa on matc.id = uaa.node_id left join u_archive_file uaf on uaa.id =
|
|
uaf.archive_id
|
|
uaf.archive_id
|
|
where uaa.is_deleted = 0 and uaa.is_archive = 1
|
|
where uaa.is_deleted = 0 and uaa.is_archive = 1
|
|
|
|
+ <if test="vo.contractId != null and vo.contractId != ''">
|
|
|
|
+ and uaa.contract_id = #{vo.contractId}
|
|
|
|
+ </if>
|
|
GROUP BY uaa.id
|
|
GROUP BY uaa.id
|
|
order by uaa.tree_sort,uaa.auto_file_sort,uaa.file_number asc
|
|
order by uaa.tree_sort,uaa.auto_file_sort,uaa.file_number asc
|
|
-- order by uaa.id
|
|
-- order by uaa.id
|
|
@@ -555,6 +565,9 @@
|
|
) matc left join u_archives_auto uaa on matc.id = uaa.node_id left join u_archive_file uaf on uaa.id =
|
|
) matc left join u_archives_auto uaa on matc.id = uaa.node_id left join u_archive_file uaf on uaa.id =
|
|
uaf.archive_id
|
|
uaf.archive_id
|
|
where uaa.is_deleted = 0 and uaa.is_archive = 1
|
|
where uaa.is_deleted = 0 and uaa.is_archive = 1
|
|
|
|
+ <if test="vo.contractId != null and vo.contractId != ''">
|
|
|
|
+ and uaa.contract_id = #{vo.contractId}
|
|
|
|
+ </if>
|
|
<if test="vo.searchType == 1 and vo.queryValue != null and vo.queryValue != ''">
|
|
<if test="vo.searchType == 1 and vo.queryValue != null and vo.queryValue != ''">
|
|
and uaa.name like concat('%',#{vo.queryValue},'%')
|
|
and uaa.name like concat('%',#{vo.queryValue},'%')
|
|
</if>
|
|
</if>
|