From fc9ace25ce2bef9bb77d559c7f7cada9a1d4c0f7 Mon Sep 17 00:00:00 2001
From: DELL <haox0404@outlook.com>
Date: Thu, 25 Apr 2024 14:40:42 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9/ocr/ocrUsersearch/queryS?=
 =?UTF-8?q?earchCondition=E6=8E=A5=E5=8F=A3=E8=BF=94=E5=9B=9E=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=E7=8A=B6=E6=80=81=E5=AD=97=E6=AE=B5=EF=BC=8C=E5=BA=94?=
 =?UTF-8?q?=E8=AF=A5=E6=98=AFiztaskstatus?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ocr/service/impl/OcrUsersearchchildServiceImpl.java        | 3 +++
 .../main/java/cn/jyjz/xiaoyao/ocr/util/SearchConfigEnum.java   | 2 ++
 .../main/java/cn/jyjz/xiaoyao/ocr/vo/SearchConditionVO.java    | 3 +++
 3 files changed, 8 insertions(+)

diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrUsersearchchildServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrUsersearchchildServiceImpl.java
index 90a50ee6..b24cfd88 100644
--- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrUsersearchchildServiceImpl.java
+++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrUsersearchchildServiceImpl.java
@@ -74,6 +74,9 @@ public class OcrUsersearchchildServiceImpl extends BaseServiceImpl<OcrUsersearch
 			if(SearchConfigEnum.FIELD16.getId().equals(searchfield)){
 				vo.setIzstatus(ocrUsersearchchild.getSearchvalue());
 			}
+			if(SearchConfigEnum.IZTASKSTATUS.getId().equals(searchfield)){
+				vo.setIztaskstatus(ocrUsersearchchild.getSearchvalue());
+			}
 			if(SearchConfigEnum.FIELD17.getId().equals(searchfield)){
 				vo.setIzprojecttype(ocrUsersearchchild.getSearchvalue());
 			}
diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/util/SearchConfigEnum.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/util/SearchConfigEnum.java
index 2faf1e24..a650c344 100644
--- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/util/SearchConfigEnum.java
+++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/util/SearchConfigEnum.java
@@ -22,6 +22,8 @@ public enum SearchConfigEnum {
     FIELD4("iztaskrrom","field4"),
     //任务状态
     FIELD16("izstatus","field16"),
+    //任务状态(新)
+    IZTASKSTATUS("iztaskstatus","field16"),
     //拜访省份/直辖市、
     PROCINCE("izvisitpro","releaseprovince"),
     //厂商
diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/vo/SearchConditionVO.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/vo/SearchConditionVO.java
index f6e4dfc8..0e729387 100644
--- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/vo/SearchConditionVO.java
+++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/vo/SearchConditionVO.java
@@ -32,6 +32,9 @@ public class SearchConditionVO {
     @ApiModelProperty(value = "任务状态")
     private String izstatus;
 
+    @ApiModelProperty(value = "任务状态(新)")
+    private String iztaskstatus;
+
     @ApiModelProperty(value = "拜访省份/直辖市、")
     private String izvisitpro;