From b1f545d6c0ddade29be0417f79ab4becf9da2f92 Mon Sep 17 00:00:00 2001
From: shuliYao <1397940314@qq.com>
Date: Sun, 19 May 2024 23:03:45 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E5=85=A8=E9=87=8F?=
 =?UTF-8?q?=E6=8B=89=E5=8F=96=E5=8E=86=E5=8F=B2=E4=BB=BB=E5=8A=A1=EF=BC=8C?=
 =?UTF-8?q?=E4=BD=9C=E4=B8=BA=E7=9B=B8=E4=BC=BC=E5=9B=BE=E7=89=87=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E7=9B=B8=E5=BA=94=E7=9A=84=E7=8A=B6=E6=80=81=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/OcrTaskchildPictureServiceImpl.java  | 25 ++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskchildPictureServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskchildPictureServiceImpl.java
index 47996215..2a92d558 100644
--- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskchildPictureServiceImpl.java
+++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskchildPictureServiceImpl.java
@@ -740,6 +740,16 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
                         taskChildPictureVo.setHigh(dimensions[1]);
                     }
                 }
+
+                if((taskChildPictureVo.getStates()==3 || taskChildPictureVo.getStates()==5)&& taskChildPictureVo.getHistoryStates()==null){
+                    int historyStates = 1;
+                    if(taskChildPictureVo.getStates()==3){
+                        historyStates = 2;
+                    }else if(taskChildPictureVo.getStates()==5){
+                        historyStates = 3;
+                    }
+                    taskChildPictureVo.setHistoryStates(historyStates);
+                }
             }
             objectPage.setRecords(collect);
             objectPage.setTotal(taskChildPictures.size());
@@ -751,7 +761,20 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
     @Override
     public Page<OcrTaskChildPictureVo> getPackageSimilarityList(Integer pageNo, Integer pageSize, String oderType, String oderName, String checkDuplicateId, String pictureId) {
         Page<OcrTaskChildPictureVo> page = new Page<>(pageNo, pageSize);
-        return ocrtaskchildpicturemybatisdao.getPackageSimilarityList(page, checkDuplicateId, pictureId, oderType, oderName);
+        Page<OcrTaskChildPictureVo> result = ocrtaskchildpicturemybatisdao.getPackageSimilarityList(page, checkDuplicateId, pictureId, oderType, oderName);
+        //历史数据，因为没有审核记录所以需要填补最终状态.
+        for (OcrTaskChildPictureVo record : result.getRecords()) {
+            if((record.getStates()==3 || record.getStates()==5)&& record.getHistoryStates()==null){
+                int historyStates = 1;
+                if(record.getStates()==3){
+                    historyStates = 2;
+                }else if(record.getStates()==5){
+                    historyStates = 3;
+                }
+                record.setHistoryStates(historyStates);
+            }
+        }
+        return result;
     }
 
     @Override