案卷收集

blade-service-api/blade-archive-api/src/main/java/org/springblade/archive/entity/ArchivesAuto.java

@@ -147,4 +147,6 @@ public class ArchivesAuto extends BaseEntity {
 	//是否案卷收集上传的案卷
 	private Integer isAutoFile;
 
+	private Integer autoFileSort;
+
 }

blade-service-api/blade-business-api/src/main/java/org/springblade/business/entity/ArchiveFile.java

@@ -239,4 +239,8 @@ public class ArchiveFile extends BaseEntity {
 	 */
 	@ApiModelProperty("分盒编号")
 	private Integer boxNumber;
+
+	//是否案卷收集上传的案卷
+	@ApiModelProperty("是否案卷收集上传的案卷")
+	private Integer isAutoFile;
 }

blade-service/blade-archive/src/main/java/org/springblade/archive/controller/ArchiveFileAutoController.java

@@ -69,6 +69,7 @@ public class ArchiveFileAutoController extends BladeController {
                         for (ArchivesAutoVO.ApprovalFile approvalFile : saveList) {
                             ArchiveFileVO saveVo = BeanUtil.copy(approvalFile, ArchiveFileVO.class);
                             saveVo.setSort(l + i);
+                            saveVo.setIsAutoFile(1);
                             saveVo.setStatus(new Integer("0").equals(saveVo.getIsApproval()) ? 2 : 0);
                             saveVo.setIsCertification(new Integer("0").equals(saveVo.getIsNeedCertification()) ? 1 : 0);
                             saveVos.getList().add(saveVo);

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

@@ -45,6 +45,7 @@
         <result column="isOpen" property="isOpen"/>
         <result column="ischeck" property="ischeck"/>
         <result column="is_auto_file" property="isAutoFile"/>
+        <result column="auto_file_sort" property="autoFileSort"/>
     </resultMap>
 
 

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

@@ -49,6 +49,7 @@
         <result column="sort" property="sort"/>
         <result column="box_name" property="boxName"/>
         <result column="box_number" property="boxNumber"/>
+        <result column="is_auto_file" property="isAutoFile"/>
     </resultMap>
     <update id="recoveryByIds">
         update u_archive_file set is_deleted = 0 where
@@ -59,7 +60,7 @@
     </update>
 
     <select id="selectArchiveFileCount" resultType="java.lang.Integer">
-        select count(id) from u_archive_file where is_deleted = 0
+        select count(id) from u_archive_file where is_deleted = 0  and is_auto_file != 1
         <if test="vo.isApprovalValue != null and vo.isApprovalValue != ''">
             and status = #{vo.isApprovalValue}
         </if>
@@ -72,6 +73,7 @@
         <if test="vo.contractId != null and vo.contractId != ''">
             and contract_id = #{vo.contractId}
         </if>
+
         <if test="vo.nodeIds != null and vo.nodeIds != ''">
             and node_id in
             <foreach collection="vo.nodeIdArray" item="nodeId" open="(" separator="," close=")">
@@ -91,7 +93,7 @@
     </select>
 
     <select id="selectArchiveFilePage" resultMap="archiveFileResultMap">
-        select * from u_archive_file where is_deleted = 0
+        select * from u_archive_file where is_deleted = 0 and is_auto_file != 1
         <if test="vo.isApprovalValue != null and vo.isApprovalValue != ''">
             and status = #{vo.isApprovalValue}
         </if>
@@ -124,7 +126,7 @@
     </select>
 
     <select id="selectArchiveFilePageByBoxNameCount" resultType="java.lang.Integer">
-        select count(id) from u_archive_file where is_deleted = 0
+        select count(id) from u_archive_file where is_deleted = 0 and is_auto_file != 1
         <if test="vo.isApprovalValue != null and vo.isApprovalValue != ''">
             and status = #{vo.isApprovalValue}
         </if>
@@ -166,7 +168,7 @@
         order by box_number,sort,create_time DESC
     </select>
     <select id="selectArchiveFilePageByBoxName" resultMap="archiveFileResultMap">
-        select * from u_archive_file where is_deleted = 0
+        select * from u_archive_file where is_deleted = 0 and is_auto_file != 1
         <if test="vo.isApprovalValue != null and vo.isApprovalValue != ''">
             and status = #{vo.isApprovalValue}
         </if>