Selaa lähdekoodia

档案接口新增返回值,立卷单位,起止时间

chenr 5 kuukautta sitten
vanhempi
commit
b344c96641

+ 6 - 0
blade-service-api/blade-archive-api/src/main/java/org/springblade/archive/vo/ArchivesAutoVO2.java

@@ -32,4 +32,10 @@ public class ArchivesAutoVO2  {
 
     private String ancestors;
 
+    private String unit;
+
+    private String startDate;
+
+    private String endDate;
+
 }

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

@@ -440,7 +440,7 @@
     <select id="getListByProjectId" resultType="org.springblade.archive.dto.ArchivesAutoDTO">
         select *
         from u_archives_auto
-        where project_id = #{projectId} and is_deleted = 0 limit 10;
+        where project_id = #{projectId} and is_deleted = 0 limit 1;
     </select>
     <select id="pageByArchivesAuto" resultMap="archivesAutoResultMap">
         select uaa.*
@@ -1033,7 +1033,7 @@
     <select id="getUnitAllArchive2" resultType="org.springblade.archive.vo.ArchivesAutoVO2">
         select
                concat(matc.ancestors,',',matc.id)  as ancestors,
-               uaa.id,uaa.name,uaa.page_n ,uaa.remark ,uaa.file_number,
+               uaa.id,uaa.name,uaa.page_n ,uaa.remark ,uaa.file_number,uaa.unit,uaa.start_date,uaa.end_date,
                 (select bdb.dict_value  from blade_dict_biz bdb WHERE bdb.is_sealed = 0 and bdb.code = 'storage_period' and bdb.dict_key = uaa.storage_time limit 1 ) as storageTimeValue
         from m_archive_tree_contract matc right join u_archives_auto uaa on matc.id = uaa.node_id
         WHERE uaa.is_deleted = 0 and matc.is_deleted = 0 and uaa.is_apply = #{isApply} and matc.ancestors like concat("%",#{firstNode},"%")