huangtf 2 gadi atpakaļ
vecāks
revīzija
d558528853

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

@@ -168,6 +168,9 @@ public class ArchivesAuto extends BaseEntity {
 
     private Integer isLock;  //案卷锁定  0未锁  1已锁定    (已锁定的案卷,自动归档执行不再拆卷重新组卷)
 
+    //是否查阅,0,未查阅,1已查阅
+    private Integer isReviewed;
+
     //是否是影音
     public boolean isMedia() {
         return (this.getCarrierType() != null &&

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

@@ -273,4 +273,8 @@ public class ArchiveFile extends BaseEntity {
 
     @ApiModelProperty("卷内索引")
     private Integer fid;
+
+    //整改情况,0,无整改,1 待整改,2 已整改
+    @ApiModelProperty("整改情况")
+    private Integer rectification;
 }

+ 19 - 0
blade-service/blade-archive/src/main/java/org/springblade/archive/controller/ArchiveInspectionController.java

@@ -0,0 +1,19 @@
+package org.springblade.inspection.controller;
+
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.tool.api.R;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@AllArgsConstructor
+@RequestMapping("/archiveInspection")
+@Api(value = "档案检查信息", tags = "档案检查信息")
+public class ArchiveInspectionController extends BladeController {
+
+
+
+}

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

@@ -48,6 +48,7 @@
         <result column="auto_file_sort" property="autoFileSort"/>
         <result column="filing_unit" property="filingUnit"/>
         <result column="file_size" property="fileSize"/>
+        <result column="is_reviewed" property="isReviewed"/>
         <collection property="approvalFileList" javaType="java.util.List"
                     select="approvalFile"
                     column="{archiveId=id}">

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

@@ -57,6 +57,7 @@
         <result column="is_element" property="isElement"/>
         <result column="pdf_page_url" property="pdfPageUrl"/>
         <result column="fid" property="fid"/>
+        <result column="rectification" property="rectification"/>
     </resultMap>
     <update id="recoveryByIds">
         update u_archive_file set is_deleted = 0 where