From 6fdc34e62abea9562bc20e7c5deceb564432da57 Mon Sep 17 00:00:00 2001
From: lijingtao <18301674552@163.COM>
Date: Sat, 16 Mar 2024 21:23:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=8C=85-=E6=89=B9=E9=87=8F?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E7=9C=9F=E5=81=87=E5=92=8C=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E5=8C=85-=E4=BB=BB=E5=8A=A1=E6=B8=85=E9=99=A4=E6=A0=87?=
 =?UTF-8?q?=E8=AE=B0=E5=8E=BB=E6=8E=89=E9=99=90=E5=88=B6=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=EF=BC=8C=E7=94=A8=E6=88=B7=E5=8F=AF=E4=BB=A5=E9=9A=8F=E4=BE=BF?=
 =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E7=9C=9F=E5=81=87=E6=A0=87=E6=B3=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/OcrTaskchildPictureServiceImpl.java  | 76 +++++++++----------
 1 file changed, 38 insertions(+), 38 deletions(-)

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 66996871..7939db91 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
@@ -62,20 +62,20 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
             OcrTaskchildPicture old = this.listPicturePackageId(childpictureid, Long.parseLong(packageid));
 
             //如果是历史图片，不允许进行设置
-            if (old.isIzHistory()) {
-                if (historyPname.length() > 0) {
-                    historyPname.append("," + old.getOcrPicture().getImgname());
-                } else {
-                    historyPname.append(old.getOcrPicture().getImgname());
-                }
-            }
-            if (old.getStates().intValue() == 3 || old.getStates().intValue() == 5) {
-                if (taskType.length() > 0) {
-                    taskType.append("," + old.getOcrPicture().getImgname());
-                } else {
-                    taskType.append(old.getOcrPicture().getImgname());
-                }
-            }
+//            if (old.isIzHistory()) {
+//                if (historyPname.length() > 0) {
+//                    historyPname.append("," + old.getOcrPicture().getImgname());
+//                } else {
+//                    historyPname.append(old.getOcrPicture().getImgname());
+//                }
+//            }
+//            if (old.getStates().intValue() == 3 || old.getStates().intValue() == 5) {
+//                if (taskType.length() > 0) {
+//                    taskType.append("," + old.getOcrPicture().getImgname());
+//                } else {
+//                    taskType.append(old.getOcrPicture().getImgname());
+//                }
+//            }
 
             OcrPicture ocrPicture = old.getOcrPicture();
             ocrPicture.setJudgeid(Long.parseLong(judgeid));
@@ -86,11 +86,11 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
             saveList.add(ocrPicture);
         }
 
-        if (StringUtils.isNotBlank(historyPname.toString())) {
-            return ResultVoUtil.error(historyPname.toString() + "为历史数据，不能标记。");
-        } else if (StringUtils.isNotBlank(taskType.toString())) {
-            return ResultVoUtil.error(taskType.toString() + "已经审批，不能标记。");
-        }
+//        if (StringUtils.isNotBlank(historyPname.toString())) {
+//            return ResultVoUtil.error(historyPname.toString() + "为历史数据，不能标记。");
+//        } else if (StringUtils.isNotBlank(taskType.toString())) {
+//            return ResultVoUtil.error(taskType.toString() + "已经审批，不能标记。");
+//        }
 
         return this.ocrPictureService.updateBatchById(saveList) ? ResultVoUtil.success() : ResultVoUtil.error();
     }
@@ -107,20 +107,20 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
             OcrTaskchildPicture old = this.listPicturePackageId(childpictureid, Long.parseLong(packageid));
 
             //如果是历史图片，不允许进行设置
-            if (old.isIzHistory()) {
-                if (historyPname.length() > 0) {
-                    historyPname.append("," + old.getOcrPicture().getImgname());
-                } else {
-                    historyPname.append(old.getOcrPicture().getImgname());
-                }
-            }
-            if (old.getStates().intValue() == 3 || old.getStates().intValue() == 5) {
-                if (taskType.length() > 0) {
-                    taskType.append("," + old.getOcrPicture().getImgname());
-                } else {
-                    taskType.append(old.getOcrPicture().getImgname());
-                }
-            }
+//            if (old.isIzHistory()) {
+//                if (historyPname.length() > 0) {
+//                    historyPname.append("," + old.getOcrPicture().getImgname());
+//                } else {
+//                    historyPname.append(old.getOcrPicture().getImgname());
+//                }
+//            }
+//            if (old.getStates().intValue() == 3 || old.getStates().intValue() == 5) {
+//                if (taskType.length() > 0) {
+//                    taskType.append("," + old.getOcrPicture().getImgname());
+//                } else {
+//                    taskType.append(old.getOcrPicture().getImgname());
+//                }
+//            }
 
             OcrPicture ocrPicture = old.getOcrPicture();
             ocrPicture.setJudgeid(null);
@@ -131,11 +131,11 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
             saveList.add(ocrPicture);
         }
 
-        if (StringUtils.isNotBlank(historyPname.toString())) {
-            return ResultVoUtil.error(historyPname.toString() + "为历史数据，不能清除标记。");
-        } else if (StringUtils.isNotBlank(taskType.toString())) {
-            return ResultVoUtil.error(taskType.toString() + "已经审批，不能清除标记。");
-        }
+//        if (StringUtils.isNotBlank(historyPname.toString())) {
+//            return ResultVoUtil.error(historyPname.toString() + "为历史数据，不能清除标记。");
+//        } else if (StringUtils.isNotBlank(taskType.toString())) {
+//            return ResultVoUtil.error(taskType.toString() + "已经审批，不能清除标记。");
+//        }
 
         return this.ocrPictureService.updateBatchById(saveList) ? ResultVoUtil.success() : ResultVoUtil.error();
     }