From 4ca07fc95b1dc174744daf01376eb3f49e3eaf57 Mon Sep 17 00:00:00 2001
From: xueqingkun <xueqingkun@126.com>
Date: Mon, 28 Oct 2024 16:32:02 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E4=BF=AE=E5=A4=8D=E8=AF=81=E6=8D=AE?=
 =?UTF-8?q?=E6=94=B9=E9=80=A0bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/constant/EvidenceConstants.java           |  6 ++++++
 .../supervision/police/dto/EvidenceProcessDTO.java   | 12 ++++++++----
 .../police/dto/indexRule/AtomicResultContent.java    |  4 ----
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/supervision/common/constant/EvidenceConstants.java b/src/main/java/com/supervision/common/constant/EvidenceConstants.java
index 5a28eef..ea051e4 100644
--- a/src/main/java/com/supervision/common/constant/EvidenceConstants.java
+++ b/src/main/java/com/supervision/common/constant/EvidenceConstants.java
@@ -1,5 +1,6 @@
 package com.supervision.common.constant;
 
+import java.util.List;
 import java.util.Map;
 
 public class EvidenceConstants {
@@ -49,4 +50,9 @@ public class EvidenceConstants {
                                                     PROCESS_STATUS_FAILED,"3",
                                                     PROCESS_STATUS_VERIFIED,"4");
 
+    public static final List<String> PROCESS_STATUS_UNFINISHED = List.of(PROCESS_STATUS_UNPROCESSED,
+                                                                PROCESS_STATUS_OCR_OK,
+                                                                PROCESS_STATUS_TITLE_EXTRACT_OK,
+                                                                PROCESS_STATUS_ATTR_EXTRACT_OK);
+
 }
diff --git a/src/main/java/com/supervision/police/dto/EvidenceProcessDTO.java b/src/main/java/com/supervision/police/dto/EvidenceProcessDTO.java
index 74d750c..0eaf2fd 100644
--- a/src/main/java/com/supervision/police/dto/EvidenceProcessDTO.java
+++ b/src/main/java/com/supervision/police/dto/EvidenceProcessDTO.java
@@ -62,7 +62,7 @@ public class EvidenceProcessDTO {
     private String attachmentSize;
 
     /**
-     * 处理状态
+     * 处理状态 0:处理中  1： 处理中  2： 处理完成
      */
     private String status;
 
@@ -86,10 +86,14 @@ public class EvidenceProcessDTO {
         }
         this.evidenceType = caseEvidence.getEvidenceType();
         if (StrUtil.isNotEmpty(caseEvidence.getProcessStatus())) {
-            if (StrUtil.isEmpty(caseEvidence.getAppendProcessing()) || StrUtil.equals(caseEvidence.getAppendProcessing(),"0")){
-                this.status = "2";// 处理完成
-            }else if (StrUtil.equals(caseEvidence.getAppendProcessing(),"1")){
+            if (EvidenceConstants.PROCESS_STATUS_UNFINISHED.contains(caseEvidence.getProcessStatus())){
                 this.status = "1";// 处理中
+            }else {
+                if (StrUtil.isEmpty(caseEvidence.getAppendProcessing()) || StrUtil.equals(caseEvidence.getAppendProcessing(),"0")){
+                    this.status = "2";// 处理完成
+                }else if (StrUtil.equals(caseEvidence.getAppendProcessing(),"1")){
+                    this.status = "1";// 处理中
+                }
             }
         }else {
             this.status = EvidenceConstants.PROCESS_STATUS_UNPROCESSED;
diff --git a/src/main/java/com/supervision/police/dto/indexRule/AtomicResultContent.java b/src/main/java/com/supervision/police/dto/indexRule/AtomicResultContent.java
index 4ba6da2..044c312 100644
--- a/src/main/java/com/supervision/police/dto/indexRule/AtomicResultContent.java
+++ b/src/main/java/com/supervision/police/dto/indexRule/AtomicResultContent.java
@@ -1,7 +1,6 @@
 package com.supervision.police.dto.indexRule;
 
 import lombok.Data;
-import org.springframework.context.ApplicationContext;
 
 import java.util.Map;
 
@@ -22,7 +21,4 @@ public class AtomicResultContent {
 
 
     private Map<String, Object> properties;
-
-
-    ApplicationContext applicationContext;
 }