Pārlūkot izejas kodu

案卷预警bug

“zhifk” 2 gadi atpakaļ
vecāks
revīzija
82139aa6b8

+ 5 - 0
blade-service-api/blade-archive-api/src/main/java/org/springblade/archive/entity/ArchiveInspection.java

@@ -48,4 +48,9 @@ public class ArchiveInspection extends BaseEntity {
      */
     private String archiveName;
 
+    /**
+     * 来源 0是巡检
+     * */
+    private Integer sourceType;
+
 }

+ 2 - 1
blade-service/blade-archive/src/main/java/org/springblade/archive/controller/ArchiveInspectionInfoController.java

@@ -48,7 +48,7 @@ public class ArchiveInspectionInfoController {
         }
         archiveInspection.setTenantId(AuthUtil.getTenantId());
         archiveInspection.setUserId(AuthUtil.getUserId());
-
+        archiveInspection.setSourceType(0);
         boolean success = archiveInspectionService.save(archiveInspection);
         if(success){
             archiveFileClient.updateRectificationById(archiveInspection.getFileId(),1);
@@ -80,6 +80,7 @@ public class ArchiveInspectionInfoController {
             archiveInspection.setId(null);
             return this.addArchiveInspection(archiveInspection);
         }
+        archiveInspectionMod.setSourceType(0);
         boolean b = archiveInspectionService.saveOrUpdate(archiveInspectionMod);
         if(b){
             archiveFileClient.updateRectificationById(archiveInspection.getFileId(),1);

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

@@ -12,6 +12,7 @@
         <result column="file_id" property="fileId" />
         <result column="archive_id" property="archiveId" />
         <result column="archive_name" property="archiveName" />
+        <result column="source_type" property="sourceType" />
     </resultMap>
     <!-- 示例:查询所有记录 -->
     <select id="selectAll" resultType="org.springblade.archive.entity.ArchiveInspection">

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

@@ -85,6 +85,9 @@
         <if test="vo.archiveId != null and vo.archiveId != ''">
             and u.archive_id = #{vo.archiveId}
         </if>
+        <if test="vo.rectification != null and vo.rectification != ''">
+            and u.rectification = #{vo.rectification}
+        </if>
         <choose>
             <when test="vo.isArchive != null and vo.isArchive != ''">
                 and u.is_auto_file = #{vo.isArchive}
@@ -132,6 +135,9 @@
         <if test="vo.archiveId != null and vo.archiveId != ''">
             and u.archive_id = #{vo.archiveId}
         </if>
+        <if test="vo.rectification != null and vo.rectification != ''">
+            and u.rectification = #{vo.rectification}
+        </if>
         <choose>
             <when test="vo.isArchive != null and vo.isArchive != ''">
                 and u.is_auto_file = #{vo.isArchive}