From acb62185a80f377e621fb548ead655e05ce9fea9 Mon Sep 17 00:00:00 2001
From: shuliYao <1397940314@qq.com>
Date: Sat, 16 Mar 2024 23:50:14 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=A7=A3=E5=86=B3=E5=90=88=E5=B9=B6?=
 =?UTF-8?q?=E5=86=B2=E7=AA=81=E9=81=97=E7=95=99=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/OcrPictureServiceImpl.java   |  2 +
 .../impl/OcrTaskchildPictureServiceImpl.java  | 90 +++++++++----------
 2 files changed, 47 insertions(+), 45 deletions(-)

diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrPictureServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrPictureServiceImpl.java
index f9fea4e..a051406 100644
--- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrPictureServiceImpl.java
+++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrPictureServiceImpl.java
@@ -692,6 +692,8 @@ public class OcrPictureServiceImpl extends BaseServiceImpl<OcrPictureMybatisDao,
         if (this.saveBatch(ocrPictureList)) {
 
             this.createTaskChild(ocrPictureList, ocrPictureList.get(0).getTenantId().toString());
+
+
             return ocrPictureList.size();
         }
         return 0;
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 7fb8e52..fe18e9a 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
@@ -61,20 +61,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));
@@ -85,12 +85,12 @@ 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,12 +131,12 @@ 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();
 	}
@@ -215,8 +215,8 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
 		}
 		return true;
 	}
-	
-	
+
+
 	/**
 	 * 判断任务是否已经审批
 	 *
@@ -233,7 +233,7 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
 		}
 		return true;
 	}
-	
+
 	@Override
 	public List<OcrTaskchildPicture> listAll(String tenantId, String createUser, QueryWrapper queryWrapper){
 
@@ -510,7 +510,7 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
 	public Long listFinalCount(Map<String, Object> query){
 		return this.ocrtaskchildpicturemybatisdao.listFinalCount(query);
 	}
-	
+
 	/**
 	 * 查询所有业务表集合
 	 * @param query
@@ -519,7 +519,7 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
 	public List<OcrTaskchildPictureAppro> listmytask(Map<String, Object> query){
 		return this.ocrtaskchildpicturemybatisdao.listmytask(query);
 	}
-	
+
 	public Long listmytaskCount(Map<String, Object> query){
 		return this.ocrtaskchildpicturemybatisdao.listmytaskCount(query);
 	}