From 92d3993ef71ff31cb5f2c45dbd7ce7958402cf54 Mon Sep 17 00:00:00 2001
From: guanzheng <17633119157@163.com>
Date: Sat, 13 Apr 2024 01:16:40 +0800
Subject: [PATCH] init

---
 .idea/compiler.xml                            |   8 +-
 .idea/encodings.xml                           |  23 ++
 .idea/jarRepositories.xml                     |  30 +-
 .../web/backstage/oa/ocr/information/add.html | 279 +++++++++++++++
 .../backstage/oa/ocr/information/edit.html    | 319 ++++++++++++++++++
 .../backstage/oa/ocr/information/list.html    | 226 +++++++++++++
 .../backstage/system/information/list.html    |   2 +-
 .../ocr/controller/OcrFieldController.java    |  45 ++-
 .../controller/OcrFieldHtmlController.java    |  55 +++
 .../jyjz/xiaoyao/ocr/dataobject/OcrField.java |   4 +
 .../cn/jyjz/xiaoyao/ocr/dto/OcrFieldDto.java  |   4 +
 .../xiaoyao/ocr/service/OcrFieldService.java  |   4 +-
 .../ocr/service/impl/OcrFieldServiceImpl.java |  39 +--
 .../cn/jyjz/xiaoyao/ocr/vo/OcrFieldVo.java    |  12 +
 .../src/main/resources/application-dev.yml    |  10 +-
 15 files changed, 1009 insertions(+), 51 deletions(-)
 create mode 100644 htmlweb/web/backstage/oa/ocr/information/add.html
 create mode 100644 htmlweb/web/backstage/oa/ocr/information/edit.html
 create mode 100644 htmlweb/web/backstage/oa/ocr/information/list.html
 create mode 100644 jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrFieldHtmlController.java

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 5a9d7818..41c17930 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -31,18 +31,18 @@
   </component>
   <component name="JavacSettings">
     <option name="ADDITIONAL_OPTIONS_OVERRIDE">
-      <module name="jyjz-common" options="" />
+      <module name="jyjz-common" options="-parameters" />
       <module name="jyjz-common-base" options="-parameters" />
       <module name="jyjz-common-mybatisplus" options="-parameters" />
       <module name="jyjz-common-redis" options="-parameters" />
       <module name="jyjz-common-task" options="-parameters" />
       <module name="jyjz-common-upload" options="-parameters" />
       <module name="jyjz-common-web" options="-parameters" />
-      <module name="jyjz-framework" options="" />
+      <module name="jyjz-framework" options="-parameters" />
       <module name="jyjz-framework-security" options="-parameters" />
       <module name="jyjz-framework-securityweb" options="-parameters" />
-      <module name="jyjz-parent" options="" />
-      <module name="jyjz-system" options="" />
+      <module name="jyjz-parent" options="-parameters" />
+      <module name="jyjz-system" options="-parameters" />
       <module name="jyjz-system-abase" options="-parameters" />
       <module name="jyjz-system-admin" options="-parameters" />
       <module name="jyjz-system-authority" options="-parameters" />
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index cf5ed9ae..c9e78ddb 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -2,17 +2,40 @@
 <project version="4">
   <component name="Encoding">
     <file url="file://$PROJECT_DIR$/jyjz-common/jyjz-common-base/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/jyjz-common/jyjz-common-base/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/jyjz-common/jyjz-common-mybatisplus/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/jyjz-common/jyjz-common-mybatisplus/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/jyjz-common/jyjz-common-redis/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/jyjz-common/jyjz-common-redis/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/jyjz-common/jyjz-common-task/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/jyjz-common/jyjz-common-task/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/jyjz-common/jyjz-common-upload/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/jyjz-common/jyjz-common-upload/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/jyjz-common/jyjz-common-web/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/jyjz-common/jyjz-common-web/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/jyjz-common/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/jyjz-common/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/jyjz-framework/jyjz-framework-security/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/jyjz-framework/jyjz-framework-security/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/jyjz-framework/jyjz-framework-securityweb/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/jyjz-framework/jyjz-framework-securityweb/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/jyjz-framework/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/jyjz-framework/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/jyjz-system/jyjz-system-abase/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/jyjz-system/jyjz-system-abase/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/jyjz-system/jyjz-system-admin/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/jyjz-system/jyjz-system-admin/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/jyjz-system/jyjz-system-authority/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/jyjz-system/jyjz-system-authority/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/jyjz-system/jyjz-system-cms/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/jyjz-system/jyjz-system-cms/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/jyjz-system/jyjz-system-oa/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/jyjz-system/jyjz-system-oa/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/jyjz-system/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/jyjz-system/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/runstart/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/runstart/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index 6d892cd7..bd1b9c03 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -6,6 +6,11 @@
       <option name="name" value="central" />
       <option name="url" value="https://maven.aliyun.com/nexus/content/groups/public" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Central Repository" />
+      <option name="url" value="http://10.5.54.75:8081/repository/maven-public/" />
+    </remote-repository>
     <remote-repository>
       <option name="id" value="central" />
       <option name="name" value="Central Repository" />
@@ -16,11 +21,21 @@
       <option name="name" value="Central Repository" />
       <option name="url" value="http://maven.aliyun.com/nexus/content/groups/public/" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="nexus-75" />
+      <option name="name" value="nexus-75" />
+      <option name="url" value="http://10.5.54.75:8081/repository/maven-public/" />
+    </remote-repository>
     <remote-repository>
       <option name="id" value="rdc-releases" />
       <option name="name" value="rdc-releases" />
       <option name="url" value="https://packages.aliyun.com/maven/repository/2179753-release-2RMtZe/" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Central Repository" />
+      <option name="url" value="http://maven.aliyun.com/nexus/content/repositories/central/" />
+    </remote-repository>
     <remote-repository>
       <option name="id" value="central" />
       <option name="name" value="Maven Central repository" />
@@ -31,16 +46,21 @@
       <option name="name" value="alimaven" />
       <option name="url" value="https://maven.aliyun.com/repository/public" />
     </remote-repository>
-    <remote-repository>
-      <option name="id" value="jboss.community" />
-      <option name="name" value="JBoss Community repository" />
-      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
-    </remote-repository>
     <remote-repository>
       <option name="id" value="rdc-snapshots" />
       <option name="name" value="rdc-snapshots" />
       <option name="url" value="https://packages.aliyun.com/maven/repository/2179753-snapshot-eDoLiX/" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="nexus-75" />
+      <option name="name" value="nexus-75" />
+      <option name="url" value="http://maven.aliyun.com/nexus/content/groups/public" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="jboss.community" />
+      <option name="name" value="JBoss Community repository" />
+      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
+    </remote-repository>
     <remote-repository>
       <option name="id" value="snapshots" />
       <option name="name" value="snapshots" />
diff --git a/htmlweb/web/backstage/oa/ocr/information/add.html b/htmlweb/web/backstage/oa/ocr/information/add.html
new file mode 100644
index 00000000..d75dc6b9
--- /dev/null
+++ b/htmlweb/web/backstage/oa/ocr/information/add.html
@@ -0,0 +1,279 @@
+<#include "/common/taglibs.html" />
+<!DOCTYPE html>
+<head>
+	<meta charset="utf-8" />
+	<meta name="viewport" content="width=device-width, initial-scale=1.0">
+	<title>信息字段管理添加</title>
+
+
+
+<#include "/head/headaddedit.html" />
+	<link href="${ctx}/static/js/plugins/jqueryzTree/css/metroStyle/metroStyle.css" rel="stylesheet">
+</head>
+<body class="gray-bg">
+<div class="wrapper wrapper-content animated fadeInRight">
+		<div class="row">
+			<div class="col-sm-12">
+				<div class="ibox float-e-margins">
+					<div class="ibox-title">
+						<h5>信息字段新增</h5>
+					</div>
+
+					<div class="ibox-content">
+						<div class="main-content">
+							<form name="Postform" method="post"  id="Postform" class="form-horizontal" action="${ctx}/backstage/post/save">
+								<div class="row">
+									<div class="col-sm-6">
+										<div class="form-group">
+											<label class="col-sm-3 control-label is-required">* 字段名称:</label>
+											<div class="col-sm-9">
+												<input  name="name" id="name" class="form-control"   placeholder="字段名称" class="form-control" type="text" maxlength='100' required>
+											</div>
+										</div>
+									</div>
+									<div class="col-sm-6">
+										<div class="form-group">
+											<label class="col-sm-3 control-label is-required">* 字段类型:</label>
+											<div class="col-sm-9">
+												<select class="form-control" name='reviewType'  id='reviewType'>
+													<option value="0">终审</option>
+													<option value="1">工单</option>
+													<option value="2">一审二审</option>
+													<option value="3">审核填报</option>
+												</select>
+											</div>
+										</div>
+									</div>
+								</div>
+								<div class="row">
+									<div class="col-sm-6">
+										<div class="form-group">
+											<label class="col-sm-3 control-label is-required">* 字段描述:</label>
+											<div class="col-sm-9">
+												<input  name="fieldDesc" id="fieldDesc" class="form-control"   placeholder="字段描述" class="form-control" type="text" maxlength='100' required>
+											</div>
+										</div>
+									</div>
+									<div class="col-sm-6">
+										<div class="form-group">
+											<label class="col-sm-3 control-label is-required">是否必选:</label>
+											<div class="col-sm-9">
+												<div class="radio i-checks">
+													<label>
+														<input type="radio" checked="" value="1" name="isrequired"> <i></i>启用
+													</label>
+													<label>
+														<input type="radio" value="0" name="isrequired"> <i></i>停用
+													</label>
+												</div>
+											</div>
+										</div>
+									</div>
+								</div>
+								<div class="row">
+									<div class="col-sm-6">
+										<div class="form-group">
+											<label class="col-sm-3 control-label is-required">* 排序字段:</label>
+											<div class="col-sm-9">
+												<input  name="sort" id="sort" class="form-control"   placeholder="字段描述" class="form-control" type="text" maxlength='20' required>
+											</div>
+										</div>
+									</div>
+									<div class="col-sm-6" >
+										<div class="form-group">
+											<div class="form-group">
+												<label class="col-sm-3 control-label is-required">是否高亮:</label>
+												<div class="col-sm-9">
+													<div class="radio i-checks">
+														<label>
+															<input type="radio" checked="" value="1" name="isHighlight"> <i></i>否
+														</label>
+														<label>
+															<input type="radio" value="0" name="isHighlight"> <i></i>是
+														</label>
+													</div>
+												</div>
+											</div>
+										</div>
+									</div>
+
+								</div>
+								<div class="row">
+									<div class="col-sm-6" >
+										<div class="form-group">
+											<label class="col-sm-3 control-label is-required">是否可点击:</label>
+											<div class="col-sm-9">
+												<div class="radio i-checks">
+													<label>
+														<input type="radio" checked="" value="1" name="isTap"> <i></i>否
+													</label>
+													<label>
+														<input type="radio" value="0" name="isTap"> <i></i>是
+													</label>
+												</div>
+											</div>
+										</div>
+									</div>
+									<div class="col-sm-6" >
+										<div class="form-group">
+											<label class="col-sm-3 control-label is-required">是否隐藏:</label>
+											<div class="col-sm-9">
+												<div class="radio i-checks">
+													<label>
+														<input type="radio" checked="" value="1" name="isHide"> <i></i>否
+													</label>
+													<label>
+														<input type="radio" value="0" name="isHide"> <i></i>是
+													</label>
+												</div>
+											</div>
+										</div>
+									</div>
+
+								</div>
+								<div class="row">
+									<div class="form-group">
+										<div class="col-sm-offset-5">
+											<button id="savebutton" type="submit" class="btn btn-w-m btn-primary">保存</button>
+											<button type="button" onclick="rolesback()" class="btn btn-w-m btn-success">取消</button>
+										</div>
+									</div>
+								</div>
+							</form>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+<div id="ajaxDeptTreemodal" class="modal fade" tabindex="-1" data-backdrop="static" data-keyboard="false">
+	<div class="modal-dialog">
+		<div class="modal-content">
+			<div class="modal-header">
+				<button type="button" class="close" data-dismiss="modal" aria-hidden="true"></button>
+				<h4 class="modal-title">选择机构</h4>
+			</div>
+
+			<div class="modal-body" style=" padding: 15px 50px; ">
+				<ul id="departZtreeUl" class="ztree"></ul>
+			</div>
+			<div class="modal-footer">
+				<button type="button" data-dismiss="modal" class="btn btn-white">取消</button>
+				<button type="button" onclick="closedept()" class="btn btn-primary">确认</button>
+			</div>
+		</div>
+	</div>
+</div>
+<#include "/head/footadd.html" />
+<script src="${ctx}/static/js/plugins/layer/layer.min.js"></script>
+<script src="${ctx}/static/js/plugins/jqueryzTree/js/jquery.ztree.all.min.js"></script>
+<script type="text/javascript">
+	var $ajaxDeptTreemodal = $('#ajaxDeptTreemodal');
+
+	function selectDeptTree(){
+		$ajaxDeptTreemodal.modal();
+		$ajaxDeptTreemodal.css("z-index",(parent.getMaxZIndex() + 1));
+	}
+	function closedept(){
+		$ajaxDeptTreemodal.modal('hide');
+	}
+	var _deptTree;
+	var setting = {
+		data: {
+			simpleData: {
+				enable: true
+			}
+		}, callback: {onClick: zTreeOnClick }
+	};
+	function zTreeOnClick(event, treeId, treeNode) {
+
+		$("#reviewType").val(treeNode.name);
+		$("#deptid").val(treeNode.id);
+		closedept();
+
+	};
+
+	$(document).ready(function () {
+
+		if(parent.$("#index_user_issys").val() == 0){
+			$("#systemAdminUse").hide();
+		}
+		parent.axgetXiaoyao("${ctx}/backstage/admin/department/showDeptJsTree",null,false,function (data) {
+			_deptTree = $.fn.zTree.init($("#departZtreeUl"),setting, data);
+
+			_deptTree.expandAll(true);
+		});
+
+		$('.i-checks').iCheck({
+			checkboxClass: 'icheckbox_square-green',
+			radioClass: 'iradio_square-green',
+		});
+		$("#Postform").attr("action","${ctx}/ocr/field/saveOrUpdate");
+		var form1 = $('#Postform');
+		var error1 = $('.alert-danger', form1);
+		form1.validate({
+			debug: true,
+			errorElement: 'span',
+			errorClass: 'help-block help-block-error',
+			focusInvalid: false,
+			ignore: "",
+			errorPlacement: function (error, element) { 
+				if (element.parent(".input-group").size() > 0) {
+					error.insertAfter(element.parent(".input-group"));
+				} else if (element.attr("data-error-container")) { 
+					error.appendTo(element.attr("data-error-container"));
+				} else if (element.parents('.radio-list').size() > 0) { 
+				error.appendTo(element.parents('.radio-list').attr("data-error-container"));
+				} else if (element.parents('.radio-inline').size() > 0) { 
+					error.appendTo(element.parents('.radio-inline').attr("data-error-container"));
+				} else if (element.parents('.checkbox-list').size() > 0) {
+					error.appendTo(element.parents('.checkbox-list').attr("data-error-container"));
+				} else if (element.parents('.checkbox-inline').size() > 0) { 
+					error.appendTo(element.parents('.checkbox-inline').attr("data-error-container"));
+				} else {
+					error.insertAfter(element);
+				}
+			},
+			highlight: function (element) {
+				$(element).closest('.form-group').addClass('has-error');
+			},
+			unhighlight: function (element) {
+				$(element).closest('.form-group').removeClass('has-error');
+			},
+			success: function (label) {
+				label.closest('.form-group').removeClass('has-error');
+			},
+			submitHandler: function (){
+				parent.layer.load();
+				$("#savebutton").addClass('disabled');
+				$("#Postform").ajaxSubmit({
+						headers:{"logintoken": parent.getLoginToken()},
+						success:function(data) {
+							parent.layer.closeAll('loading');
+							if (data.code == "OK") {
+								parent.toastr.success(data.message);
+								rolesback();
+							} else if (data.code == "ERRORM") {
+								$.each(data.message, function (name, anArray) {
+									$.each(anArray, function (n, value) {
+										$("#" + n).closest('.form-group').addClass('has-error');
+										$("<span>").attr("id", n + "-error").addClass(
+												"help-block help-block-error").html(value).insertAfter($("#" + n));
+									});
+								});
+							} else {
+								$("#savebutton").addClass('removeClass');
+								parent.toastr.error(data.message);
+							}
+						}
+				});
+			}
+		});
+	});
+	function rolesback() {
+		parent.closeItem(window.frameElement.name);
+	}
+</script>
+</body>
+</html>
+
diff --git a/htmlweb/web/backstage/oa/ocr/information/edit.html b/htmlweb/web/backstage/oa/ocr/information/edit.html
new file mode 100644
index 00000000..ee84389c
--- /dev/null
+++ b/htmlweb/web/backstage/oa/ocr/information/edit.html
@@ -0,0 +1,319 @@
+<#include "/common/taglibs.html" />
+<!DOCTYPE html>
+<head>
+	<meta charset="utf-8" />
+	<meta name="viewport" content="width=device-width, initial-scale=1.0">
+	<title>岗位信息</title>
+
+
+
+<#include "/head/headaddedit.html" />
+	<link href="${ctx}/static/js/plugins/jqueryzTree/css/metroStyle/metroStyle.css" rel="stylesheet">
+</head>
+<body class="gray-bg">
+	<div class="wrapper wrapper-content animated fadeInRight">
+		<div class="row">
+			<div class="col-sm-12">
+				<div class="ibox float-e-margins">
+					<div class="ibox-title">
+						<h5>信息字段编辑</h5>
+					</div>
+					<div class="ibox-content">
+						<div class="main-content">
+							<form name="Postform" method="post"  id="Postform" class="form-horizontal" action="${ctx}/backstage/post/edit">
+								
+								<input type="hidden" id="id" name="id" value="${id}">
+								<div class="row">
+									<div class="col-sm-6">
+										<div class="form-group">
+											<label class="col-sm-3 control-label is-required">* 字段名称:</label>
+											<div class="col-sm-9">
+												<input  name="name" id="name" class="form-control"   placeholder="字段名称" class="form-control" type="text" maxlength='100' required>
+											</div>
+										</div>
+									</div>
+									<div class="col-sm-6">
+										<div class="form-group">
+											<label class="col-sm-3 control-label is-required">* 字段类型:</label>
+											<div class="col-sm-9">
+												<select class="form-control" name='reviewType'  id='reviewType'>
+													<option value="0">终审</option>
+													<option value="1">工单</option>
+													<option value="2">一审二审</option>
+													<option value="3">审核填报</option>
+												</select>
+											</div>
+										</div>
+									</div>
+								</div>
+								<div class="row">
+									<div class="col-sm-6">
+										<div class="form-group">
+											<label class="col-sm-3 control-label is-required">* 字段描述:</label>
+											<div class="col-sm-9">
+												<input  name="fieldDesc" id="fieldDesc" class="form-control"   placeholder="字段描述" class="form-control" type="text" maxlength='100' required>
+											</div>
+										</div>
+									</div>
+									<div class="col-sm-6">
+										<div class="form-group">
+											<label class="col-sm-3 control-label is-required">是否必选:</label>
+											<div class="col-sm-9">
+												<div class="radio i-checks">
+													<label>
+														<input type="radio" checked="" value="1" name="isrequired"> <i></i>启用
+													</label>
+													<label>
+														<input type="radio" value="0" name="isrequired"> <i></i>停用
+													</label>
+												</div>
+											</div>
+										</div>
+									</div>
+								</div>
+								<div class="row">
+									<div class="col-sm-6">
+										<div class="form-group">
+											<label class="col-sm-3 control-label is-required">* 排序字段:</label>
+											<div class="col-sm-9">
+												<input  name="sort" id="sort" class="form-control"   placeholder="字段描述" class="form-control" type="text" maxlength='20' required>
+											</div>
+										</div>
+									</div>
+									<div class="col-sm-6" >
+										<div class="form-group">
+											<div class="form-group">
+												<label class="col-sm-3 control-label is-required">是否高亮:</label>
+												<div class="col-sm-9">
+													<div class="radio i-checks">
+														<label>
+															<input type="radio" checked="" value="1" name="isHighlight"> <i></i>否
+														</label>
+														<label>
+															<input type="radio" value="0" name="isHighlight"> <i></i>是
+														</label>
+													</div>
+												</div>
+											</div>
+										</div>
+									</div>
+
+								</div>
+								<div class="row">
+									<div class="col-sm-6" >
+										<div class="form-group">
+											<label class="col-sm-3 control-label is-required">是否可点击:</label>
+											<div class="col-sm-9">
+												<div class="radio i-checks">
+													<label>
+														<input type="radio" checked="" value="1" name="isTap"> <i></i>否
+													</label>
+													<label>
+														<input type="radio" value="0" name="isTap"> <i></i>是
+													</label>
+												</div>
+											</div>
+										</div>
+									</div>
+									<div class="col-sm-6" >
+										<div class="form-group">
+											<label class="col-sm-3 control-label is-required">是否隐藏:</label>
+											<div class="col-sm-9">
+												<div class="radio i-checks">
+													<label>
+														<input type="radio" checked="" value="1" name="isHide"> <i></i>否
+													</label>
+													<label>
+														<input type="radio" value="0" name="isHide"> <i></i>是
+													</label>
+												</div>
+											</div>
+										</div>
+									</div>
+
+								</div>
+								<div class="row">
+									<div class="form-group">
+										<div class="col-sm-offset-5">
+											<button type="submit" class="btn btn-w-m btn-primary">保存</button>
+											<button type="button" onclick="rolesback()" class="btn btn-w-m btn-success">取消</button>
+										</div>
+									</div>
+								</div>
+							</form>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+	<div id="ajaxDeptTreemodal" class="modal fade" tabindex="-1" data-backdrop="static" data-keyboard="false">
+		<div class="modal-dialog">
+			<div class="modal-content">
+				<div class="modal-header">
+					<button type="button" class="close" data-dismiss="modal" aria-hidden="true"></button>
+					<h4 class="modal-title">选择机构</h4>
+				</div>
+
+				<div class="modal-body" style=" padding: 15px 50px; ">
+					<ul id="departZtreeUl" class="ztree"></ul>
+				</div>
+				<div class="modal-footer">
+					<button type="button" data-dismiss="modal" class="btn btn-white">取消</button>
+					<button type="button" onclick="closedept()" class="btn btn-primary">确认</button>
+				</div>
+			</div>
+		</div>
+	</div>
+<#include "/head/footadd.html" />
+	<script src="${ctx}/static/js/plugins/layer/layer.min.js"></script>
+	<script src="${ctx}/static/js/plugins/jqueryzTree/js/jquery.ztree.all.min.js"></script>
+<script type="text/javascript">
+	var $ajaxDeptTreemodal = $('#ajaxDeptTreemodal');
+
+	function selectDeptTree(){
+		$ajaxDeptTreemodal.modal();
+		$ajaxDeptTreemodal.css("z-index",(parent.getMaxZIndex() + 1));
+	}
+	function closedept(){
+		$ajaxDeptTreemodal.modal('hide');
+	}
+	var _deptTree;
+	var setting = {
+		data: {
+			simpleData: {
+				enable: true
+			}
+		}, callback: {onClick: zTreeOnClick }
+	};
+	function zTreeOnClick(event, treeId, treeNode) {
+
+		$("#parentname").val(treeNode.name);
+		$("#deptid").val(treeNode.id);
+		closedept();
+
+	};
+
+	$(document).ready(function () {
+
+
+		if(parent.$("#index_user_issys").val() == 0){
+			$("#systemAdminUse").hide();
+		}
+		$.ajaxSettings.async = false;
+		parent.axgetXiaoyao("${ctx}/backstage/admin/department/showDeptJsTree",null,false,function (data) {
+			_deptTree = $.fn.zTree.init($("#departZtreeUl"),setting, data);
+
+			_deptTree.expandAll(true);
+		});
+		$.ajaxSettings.async = true;
+
+
+		parent.axgetXiaoyao('${ctx}/ocr/field/getData' + $("#id").val(),null,false , function(data){
+			if(data.code == "OK"){
+				$("#id").val(data.data.id);
+
+				$("#postname").val(data.data.postname);
+				$("#postdesc").val(data.data.postdesc);
+
+				var node = _deptTree.getNodesByParam("id",String(data.data.deptid));
+				console.log("--node--------------" + data.data.deptid)
+				console.log(node)
+
+				if(undefined != node && node.length > 0){
+					_deptTree.selectNode(node[0]);
+					$("#parentname").val(node[0].name);
+				}
+				$("#sorting").val(data.data.sorting);
+				if(data.data.enabled == 1){
+					$("input:radio[name='enabled']").eq(0).attr('checked',true);
+				}else if(data.data.enabled == 0){
+					$("input:radio[name='enabled']").eq(1).attr('checked',true);
+				}
+
+				if(data.data.issys == 1){
+					$("input:radio[name='issys']").eq(0).attr('checked',true);
+				}else if(data.data.issys == 0){
+					$("input:radio[name='issys']").eq(1).attr('checked',true);
+				}
+
+				$("#postcode").val(data.data.postcode);
+
+			}else{
+				parent.toastr.error("非法请求。");
+			}
+
+			$('.i-checks').iCheck({
+				checkboxClass: 'icheckbox_square-green',
+				radioClass: 'iradio_square-green',
+			});
+		});
+
+		$("#Postform").attr("action","${ctx}/ocr/field/saveOrUpdate");
+		var form1 = $('#Postform');
+		var error1 = $('.alert-danger', form1);
+		form1.validate({
+			debug: true,
+			errorElement: 'span',
+			errorClass: 'help-block help-block-error',
+			focusInvalid: false,
+			ignore: ":hidden",
+			errorPlacement: function (error, element) { 
+				if (element.parent(".input-group").size() > 0) {
+					error.insertAfter(element.parent(".input-group"));
+				} else if (element.attr("data-error-container")) { 
+					error.appendTo(element.attr("data-error-container"));
+				} else if (element.parents('.radio-list').size() > 0) { 
+				error.appendTo(element.parents('.radio-list').attr("data-error-container"));
+				} else if (element.parents('.radio-inline').size() > 0) { 
+					error.appendTo(element.parents('.radio-inline').attr("data-error-container"));
+				} else if (element.parents('.checkbox-list').size() > 0) {
+					error.appendTo(element.parents('.checkbox-list').attr("data-error-container"));
+				} else if (element.parents('.checkbox-inline').size() > 0) { 
+					error.appendTo(element.parents('.checkbox-inline').attr("data-error-container"));
+				} else {
+					error.insertAfter(element);
+				}
+			},
+			highlight: function (element) {
+				$(element).closest('.form-group').addClass('has-error');
+			},
+			unhighlight: function (element) {
+				$(element).closest('.form-group').removeClass('has-error');
+			},
+			success: function (label) {
+				label.closest('.form-group').removeClass('has-error');
+			},
+			submitHandler: function (){
+				parent.layer.load();
+				$("#Postform").ajaxSubmit({
+					headers: {"logintoken": parent.getLoginToken()},
+					success: function (data) {
+						parent.layer.closeAll('loading');
+						if (data.code == "OK") {
+							parent.toastr.success(data.message);
+							rolesback();
+						} else if (data.code == "ERRORM") {
+							$.each(data.message, function (name, anArray) {
+								$.each(anArray, function (n, value) {
+									$("#" + n).closest('.form-group').addClass('has-error');
+									$("<span>").attr("id", n + "-error").addClass(
+											"help-block help-block-error").html(value).insertAfter($("#" + n));
+								});
+							});
+						} else {
+							parent.toastr.error(data.message);
+						}
+					}
+
+				});
+			}
+		});
+	});
+	function rolesback() {
+		parent.closeItem(window.frameElement.name);
+	}
+</script>
+</body>
+</html>
+
diff --git a/htmlweb/web/backstage/oa/ocr/information/list.html b/htmlweb/web/backstage/oa/ocr/information/list.html
new file mode 100644
index 00000000..bb98b308
--- /dev/null
+++ b/htmlweb/web/backstage/oa/ocr/information/list.html
@@ -0,0 +1,226 @@
+<#include "/common/taglibs.html" />
+<!DOCTYPE html>
+<head>
+	<meta charset="utf-8" />
+	<meta name="viewport" content="width=device-width, initial-scale=1.0">
+	<title>信息字段管理</title>
+
+
+
+<#include "/head/headlist.html" />
+</head>
+<body class="gray-bg">
+<div class="wrapper wrapper-content animated fadeInRight">
+	<div class="ibox ">
+		<div class="ibox-content">
+			<div class="ibox-content">
+				<form id="searcheuser" class="form-inline">
+
+					<div class="form-group">
+								<input name='name'  id='name'  class='form-control' placeholder='字段名称'/>
+					</div>
+					<div class="form-group">
+						<select class="form-control" name='reviewType'  id='reviewType'>
+							<option value="0">终审</option>
+							<option value="1">工单</option>
+							<option value="2">一审二审</option>
+							<option value="3">审核填报</option>
+						</select>
+					</div>
+
+					<div class="form-group">
+					<a class="btn btn-primary btn-rounded btn-sm" onclick="refreshTable()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+					<a class="btn btn-warning btn-rounded btn-sm" onclick="$('#searcheuser')[0].reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+					</div>
+				</form>
+			</div>
+		</div>
+	</div>
+	<div class="ibox-content">
+		<div class="row row-lg">
+			<div class="col-sm-12">
+				<div class="container-div">
+					<div class="btn-group-sm" id="_mybutton" role="group">
+					</div>
+					<br/>
+				</div>
+			</div>	
+			<div class="col-sm-12 select-table table-striped" >
+				<table id="Post_list" ></table>
+			</div>
+		</div>
+	</div>
+</div>
+<#include "/head/footlist.html" />
+</body>
+</html>
+	<script type="text/javascript">
+	var _tableListPost;
+	var jsptoolbar = '';
+	var jspOperation = '';
+	jQuery(document).ready(function($){
+		parent.axgetXiaoyao("${ctx}/backstage/admin/user/toolsbarOperation?" + "resourceid=${resourceid}",null,true ,
+			function(data){
+				if(data.code == "OK"){
+					jsptoolbar = data.data.Jsptoolbar;
+					jspOperation = data.data.JspOperation;
+					$("#_mybutton").empty();
+					$(jsptoolbar).each(function (i, toolbar) {
+						if(toolbar.methodid != '104'){
+							$("#_mybutton").append('<button class="btn sbold ' + toolbar.img + '" onClick="' + toolbar.actionmethod + '(\'${resourceid}' + toolbar.methodid + '\')"> ' + ' <i class="fa ' + toolbar.methodkey + '"></i> ' + toolbar.text + '</button>&nbsp');
+						}
+					});
+					_tableListPost = $('#Post_list').bootstrapTable({
+						url: '${ctx}/ocr/field/list',
+						pagination: true,          //是否显示分页（*）
+						pageNumber:1,            //初始化加载第一页，默认第一页
+						pageSize: 10,            //每页的记录行数（*）
+						sidePagination: "server",
+						pageList: [10, 25, 50],
+						ajaxOptions:{
+							headers: {"logintoken": parent.getLoginToken()}
+						},
+						queryParams: function queryParams(params) {
+							return {
+								sortorder: params.order,
+								sortname: params.sort,
+								pagesize: params.limit,
+								start: (params.offset / params.limit) + 1,
+								name:'{"value":"' + $("#search_postname").val() + '","op":"equal","type":"string"}',
+                reviewType:'{"value":"' + $("#reviewType").val() + '","op":"equal","type":"string"}',
+							};
+						},
+						responseHandler:function(res){
+							return{"rows": res.data.records, "total": res.data.total};
+						},
+						columns: [
+							{checkbox: true},
+							{ width:100,valign: "middle",field:'name',title:'字段名称',sortable:true},
+							{ width:150,valign: "middle",field:'reviewType',title:'字段类型',sortable:true,
+                formatter:function(value,oData,index) {
+                  var listOperation = "";
+                  if(oData.reviewType == 0){
+                    listOperation = "终审";
+                  }
+                  else if(oData.reviewType == 1) {
+                    listOperation = "工单";
+									}
+                  else if(oData.reviewType == 2) {
+                    listOperation = "一审二审";
+                  }
+                  else{
+                    listOperation = "审核填报";
+                  }
+                  return listOperation;
+                }
+							},
+							{ width:150,valign: "middle",field:'fieldDesc',title:'字段描述',sortable:true},
+							{ width:80,valign: "middle",field:'isrequired',title:'是否必选',sortable:true},
+							{ width:80,valign: "middle",field:'sort',title:'排序字段',sortable:true},
+							{
+								width:200,
+								field: 'id',
+								title: '操作',
+								formatter:function(value,oData,index) {
+									var listOperation = "";
+									$(jspOperation).each(function (i, toolbar) {
+										listOperation = listOperation + "<a href=\"javascript:" + toolbar.actionmethod + "('${resourceid}','" + oData.id + "');\" class=\"btn " + toolbar.img + " btn-xs\")><i class=\"fa " + toolbar.methodkey + "\"></i> " + toolbar.text + " </a>&nbsp;&nbsp;";
+									});
+									return listOperation;
+								}
+							}
+						]
+					});
+				}
+			}
+		);
+	});
+	function getIdSelections() {
+		return $.map(_tableListPost.bootstrapTable('getSelections'), function(row) {
+			return row.id
+		});
+	}
+	function _useradd(jframeid){
+		parent._xiaoyaoOpenMenuTab('${ctx}/backstage/oa/ocrfieldconfigurationHtml/toSave',"添加字段信息",jframeid + '_add');
+	}
+	function updateData(jframeid,str){
+		var url = '${ctx}/backstage/oa/ocrfieldconfigurationHtml/toEdit' + str ;
+		parent._xiaoyaoOpenMenuTab(url,"修改字段信息",jframeid + '_edit');
+	}
+	function _useredit(jframeid){
+		var str = getIdSelections() + "";
+		var tempstr = str.split(",");
+		if(str.length > 0 && tempstr.length > 1){
+			parent.toastr.error("每次只能修改一条信息。");
+		}else{
+			if (str.length > 0) {
+				updateData(jframeid,str);
+			} else {
+				parent.toastr.error("至少选择一条信息操作。");
+			}
+		}
+	}
+	function t_delete(str){
+		parent.layer.closeAll('loading');
+			$.getJSON('${ctx}/ocr/field/delete?logintoken=' + parent.document.getElementById("logintoken").value, {id:str}, function(data){
+				parent.layer.closeAll('loading');
+				if(data.code == "OK"){
+					swal(data.message, "您已经永久删除了这条信息。", "success");
+					refreshTable();
+				}else{
+					swal(data.message, "遇到未知错误！", "error");
+				}
+			});
+	}
+	function _deletebu(sourceid){
+		var str = getIdSelections() + "";
+		var tempstr = str.split(",");
+		if (str.length > 0 && tempstr.length > 0) {
+			swal({
+				title: "您确定要删除这条信息吗",
+				text: "删除后将无法恢复，请谨慎操作！",
+				type: "warning",
+				showCancelButton: true,
+				confirmButtonColor: "#DD6B55",
+				confirmButtonText: "是的，我要删除！",
+				cancelButtonText: "让我再考虑一下…",
+				closeOnConfirm: false,
+				closeOnCancel: false
+			},
+			function (isConfirm) {
+				if (isConfirm) {
+					t_delete(str);
+				} else {
+					swal("已取消", "您取消了删除操作！", "error");
+				}
+			});
+		} else {
+			parent.toastr.error("至少选择一条数据操作");
+		}
+	}
+	function _delete(sourceid,str){
+		swal({
+			title: "您确定要删除这条信息吗",
+			text: "删除后将无法恢复，请谨慎操作！",
+			type: "warning",
+			showCancelButton: true,
+			confirmButtonColor: "#DD6B55",
+			confirmButtonText: "是的，我要删除！",
+			cancelButtonText: "让我再考虑一下…",
+			closeOnConfirm: false,
+			closeOnCancel: false
+		},
+		function (isConfirm) {
+			if (isConfirm) {
+				t_delete(str);
+			} else {
+				swal("已取消", "您取消了删除操作！", "error");
+			}
+		});
+	}
+	function refreshTable(sourceid){
+		_tableListPost.bootstrapTable('refreshOptions',{pageNumber:1});
+	}
+	
+	</script>
+
diff --git a/htmlweb/web/backstage/system/information/list.html b/htmlweb/web/backstage/system/information/list.html
index bfdefe61..ca25d33c 100644
--- a/htmlweb/web/backstage/system/information/list.html
+++ b/htmlweb/web/backstage/system/information/list.html
@@ -71,7 +71,7 @@
 						}
 					});
 					_tableListPost = $('#Post_list').bootstrapTable({
-						url: '${ctx}/backstage/ocr/field/list',
+						url: '${ctx}/ocr/field/list',
 						pagination: true,          //是否显示分页（*）
 						pageNumber:1,            //初始化加载第一页，默认第一页
 						pageSize: 10,            //每页的记录行数（*）
diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrFieldController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrFieldController.java
index 157e4d61..1ade0d98 100644
--- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrFieldController.java
+++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrFieldController.java
@@ -1,19 +1,36 @@
 package cn.jyjz.xiaoyao.ocr.controller;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.jyjz.xiaoyao.common.base.controller.BaseController;
+import cn.jyjz.xiaoyao.common.base.param.ParamterPage;
+import cn.jyjz.xiaoyao.common.base.util.RequestBaseUtil;
+import cn.jyjz.xiaoyao.common.base.util.requestFormat.SearchQuery;
 import cn.jyjz.xiaoyao.common.base.vo.ResultVo;
 import cn.jyjz.xiaoyao.common.base.vo.ResultVoUtil;
+import cn.jyjz.xiaoyao.common.base.vo.UserToken;
+import cn.jyjz.xiaoyao.common.mybatisplus.util.SearchQueryFormat;
 import cn.jyjz.xiaoyao.ocr.dataobject.OcrField;
+import cn.jyjz.xiaoyao.ocr.dataobject.OcrUsersearch;
+import cn.jyjz.xiaoyao.ocr.dataobject.OcrUsersearchchild;
 import cn.jyjz.xiaoyao.ocr.dto.OcrFieldDto;
 import cn.jyjz.xiaoyao.ocr.service.OcrFieldService;
 import cn.jyjz.xiaoyao.ocr.vo.OcrFieldVo;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Arrays;
 import java.util.List;
 
 @RestController
@@ -31,10 +48,16 @@ public class OcrFieldController extends BaseController {
 	 */
 	@ApiOperation(value="根据评审类型查询字段列表", notes="根据评审类型查询字段列表")
 	@GetMapping(value = "/list")
-	public ResultVo<List<OcrFieldDto>> list(@RequestParam(name="reviewType") @ApiParam(value = "字段类型（终审:0，工单：1、一审二审:2、审核填报:3）", required = true) Integer reviewType) {
-		ResultVo<List<OcrFieldDto>> resultVo = new ResultVo<>();
-		List<OcrFieldDto> ocrFieldDtos = ocrFieldService.list(reviewType);
-		resultVo.setData(ocrFieldDtos);
+	public ResultVo<IPage<OcrField>> list(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+											@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+											@RequestParam(name="reviewType") @ApiParam(value = "字段类型（终审:0，工单：1、一审二审:2、审核填报:3）") Integer reviewType,
+											@RequestParam(name="name") @ApiParam(value = "字段名称") String name) {
+		ResultVo<IPage<OcrField>> resultVo = new ResultVo<>();
+		ParamterPage paramterPage = new ParamterPage();
+		paramterPage.setPagesize(pageSize);
+		paramterPage.setStart(pageNo);
+		IPage<OcrField> ocrFieldIPage = ocrFieldService.list(paramterPage,reviewType,name);
+		resultVo.setData(ocrFieldIPage);
 		resultVo.addOK("查询成功");
 		return resultVo;
 	}
@@ -68,6 +91,13 @@ public class OcrFieldController extends BaseController {
 		return ResultVoUtil.error("删除失败");
 	}
 
+
+	@ApiOperation(value="删除筛选字段", notes="删除筛选字段")
+	@GetMapping(value = "/getData")
+	public ResultVo getData(@RequestParam(name="id") @ApiParam(value = "字段ID", required = true) Long id) {
+		return ResultVoUtil.success(ocrFieldService.getById(id));
+	}
+
 	/**
 	 * 自定义筛选字段新增和修改
 	 * @return
@@ -76,12 +106,7 @@ public class OcrFieldController extends BaseController {
 	@PostMapping(value = "/saveOrUpdate")
 	public ResultVo saveOrUpdate(@ApiParam(value = "字段信息", required = true)  @RequestBody OcrFieldVo ocrFieldVo) {
 		try {
-			OcrField ocrField = new OcrField();
-			ocrField.setName(ocrFieldVo.getName());
-			ocrField.setReviewType(ocrFieldVo.getReviewType());
-			ocrField.setFieldDesc(ocrFieldVo.getFieldDesc());
-			ocrField.setIsrequired(ocrFieldVo.getIsrequired());
-			ocrFieldService.saveData(ocrField);
+			ocrFieldService.saveData(BeanUtil.copyProperties(ocrFieldVo,OcrField.class));
 		} catch (BeansException e) {
 			e.printStackTrace();
 		}
diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrFieldHtmlController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrFieldHtmlController.java
new file mode 100644
index 00000000..a6b82a71
--- /dev/null
+++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrFieldHtmlController.java
@@ -0,0 +1,55 @@
+package cn.jyjz.xiaoyao.ocr.controller;
+
+import cn.jyjz.xiaoyao.admin.service.UserService;
+import cn.jyjz.xiaoyao.common.base.controller.BaseController;
+import cn.jyjz.xiaoyao.common.base.service.UserTokenService;
+import cn.jyjz.xiaoyao.ocr.service.OcrConfigurationService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+@Controller
+@RequestMapping("/backstage/oa/ocrfieldconfigurationHtml")
+public class OcrFieldHtmlController extends BaseController{
+
+	private Logger log = LoggerFactory.getLogger(this.getClass());
+
+	@Autowired
+	private OcrConfigurationService ocrConfigurationService;
+
+	@Autowired
+	private UserTokenService userTokenService;
+	@Autowired
+	private UserService userService;
+	/**
+	*方法描述：跳转到列表页面
+	*创建人：mail.zhangyong@gmail.com
+	*创建时间：2024-01-14 10:27:01
+	**/
+	@GetMapping("/toList")
+	public String toListOcrConfiguration(HttpServletResponse response,HttpServletRequest request){
+		String resourceid = request.getParameter("resourceid");
+		request.setAttribute("resourceid",resourceid);
+		return "/backstage/oa/ocr/information/list";
+	}
+
+	@GetMapping("/toSave")
+	public String toSave(HttpServletResponse response,HttpServletRequest request){
+		String resourceid = request.getParameter("resourceid");
+		request.setAttribute("resourceid",resourceid);
+		return "/backstage/oa/ocr/information/add";
+	}
+
+	@GetMapping("/toEdit")
+	public String toEdit(HttpServletResponse response,HttpServletRequest request){
+		String resourceid = request.getParameter("resourceid");
+		request.setAttribute("resourceid",resourceid);
+		return "/backstage/oa/ocr/information/edit";
+	}
+}
diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrField.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrField.java
index 1e244f83..f94f9bfb 100644
--- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrField.java
+++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrField.java
@@ -80,4 +80,8 @@ public class OcrField implements Serializable {
     @Schema(description = "是否可点击,0:否,1：是")
     @TableField(value="is_tap")
     private Integer isTap;
+
+    @Schema(description = "是否可隐藏,0:否,1：是")
+    @TableField(value="is_hide")
+    private Integer isHide;
 }
diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dto/OcrFieldDto.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dto/OcrFieldDto.java
index 6cafbf31..d9ac6b88 100644
--- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dto/OcrFieldDto.java
+++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dto/OcrFieldDto.java
@@ -39,4 +39,8 @@ public class OcrFieldDto implements Serializable {
 
     @Schema(description = "是否可点击,0:否,1：是")
     private Integer isTap;
+
+    @Schema(description = "是否可隐藏,0:否,1：是")
+    private Integer isHide;
+
 }
diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrFieldService.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrFieldService.java
index 2050712a..2ea6e287 100644
--- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrFieldService.java
+++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrFieldService.java
@@ -1,9 +1,11 @@
 package cn.jyjz.xiaoyao.ocr.service;
 
+import cn.jyjz.xiaoyao.common.base.param.ParamterPage;
 import cn.jyjz.xiaoyao.common.mybatisplus.base.BaseService;
 import cn.jyjz.xiaoyao.ocr.dataobject.OcrField;
 import cn.jyjz.xiaoyao.ocr.dto.OcrFieldDto;
 import cn.jyjz.xiaoyao.ocr.vo.OcrFieldVo;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 
 import java.util.List;
 
@@ -15,7 +17,7 @@ public interface OcrFieldService extends BaseService<OcrField>  {
     /**
      * 自定义筛选字段列表查询
      */
-    List<OcrFieldDto> list(Integer reviewType);
+    IPage<OcrField> list(ParamterPage paramterPage, Integer reviewType, String name);
 
     /**
      * 自定义筛选字段列表查询全部
diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrFieldServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrFieldServiceImpl.java
index 215a12a1..70d11d12 100644
--- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrFieldServiceImpl.java
+++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrFieldServiceImpl.java
@@ -1,12 +1,17 @@
 package cn.jyjz.xiaoyao.ocr.service.impl;
 
+import cn.jyjz.xiaoyao.common.base.param.ParamterPage;
 import cn.jyjz.xiaoyao.common.mybatisplus.base.BaseServiceImpl;
 import cn.jyjz.xiaoyao.ocr.dataDao.OcrFieldMybatisDao;
 import cn.jyjz.xiaoyao.ocr.dataobject.OcrField;
 import cn.jyjz.xiaoyao.ocr.dto.OcrFieldDto;
 import cn.jyjz.xiaoyao.ocr.service.OcrFieldService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -14,6 +19,7 @@ import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 
 /**
@@ -26,35 +32,18 @@ public class OcrFieldServiceImpl extends BaseServiceImpl<OcrFieldMybatisDao, Ocr
 	private OcrFieldMybatisDao ocrFieldMybatisDao;
 
 	@Override
-	public List<OcrFieldDto> list(Integer reviewType){
-		List<OcrFieldDto> ocrFieldDtoList = new ArrayList<>();
+	public IPage<OcrField> list(ParamterPage paramterPage, Integer reviewType, String name){
 		try {
-			LambdaQueryWrapper<OcrField> queryWrapper = new LambdaQueryWrapper<>();
-//			queryWrapper.and(qw -> qw.eq(OcrField::getIsrequired, 2) // 检查是否必选字段为 2
-//					.or()
-//					.eq(OcrField::getReviewType, reviewType)); // 检查评审类型// 检查评审类型
-			queryWrapper.eq(OcrField::getReviewType,reviewType);
-			queryWrapper.eq(OcrField::getDel, 0);
-			queryWrapper.orderByAsc(OcrField::getSort);
-			List<OcrField> ocrFieldList = this.list(queryWrapper);
-			if(ocrFieldList.size()>0){
-				for (OcrField ocrField : ocrFieldList) {
-					OcrFieldDto dto = new OcrFieldDto();
-					dto.setId(ocrField.getId());
-					dto.setName(ocrField.getName());
-					dto.setReviewType(ocrField.getReviewType());
-					dto.setFieldDesc(ocrField.getFieldDesc());
-					dto.setIsrequired(ocrField.getIsrequired());
-					dto.setDel(ocrField.getDel());
-					dto.setIsHighlight(ocrField.getIsHighlight());
-					dto.setIsTap(ocrField.getIsTap());
-					ocrFieldDtoList.add(dto);
-				}
-			}
+			QueryWrapper<OcrField> queryWrapper = new QueryWrapper<>();
+			queryWrapper.eq(Objects.nonNull(reviewType),"reviewType",reviewType);
+			queryWrapper.like(StringUtils.isNotBlank(name),"name",name);
+			queryWrapper.eq("del", 0);
+			queryWrapper.orderByAsc("sort");
+			return this.selectSearchListPage(paramterPage, queryWrapper);
 		} catch (BeansException e) {
 			e.printStackTrace();
 		}
-		return ocrFieldDtoList;
+		return null;
 	}
 
 	@Override
diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/vo/OcrFieldVo.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/vo/OcrFieldVo.java
index 0c0f778b..09c49abf 100644
--- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/vo/OcrFieldVo.java
+++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/vo/OcrFieldVo.java
@@ -29,4 +29,16 @@ public class OcrFieldVo implements Serializable {
 
     @Schema(description = "是否必选",required = true)
     private Integer isrequired;
+
+    @Schema(description = "排序字段")
+    private Integer sort;
+
+    @Schema(description = "是否高亮")
+    private Integer isHighlight;
+
+    @Schema(description = "是否可点击")
+    private Integer isTap;
+
+    @Schema(description = "是否隐藏")
+    private Integer isHide;
 }
diff --git a/runstart/src/main/resources/application-dev.yml b/runstart/src/main/resources/application-dev.yml
index 79424669..b297e84c 100644
--- a/runstart/src/main/resources/application-dev.yml
+++ b/runstart/src/main/resources/application-dev.yml
@@ -160,15 +160,15 @@ mybatis-plus:
 xiaoyao:
   web:
     #上传文件路径
-    uploadPath: D:/Code/ocr/htmlweb/upload
+    uploadPath: E:/ZJWorkSpace/ocr/htmlweb/upload
     #页面根路径
-    frontPath: D:/Code/ocr/htmlweb
+    frontPath: E:/ZJWorkSpace/ocr/htmlweb
     #js、css、图片存放路径
-    staticPath: D:/Code/ocr/htmlweb/static
+    staticPath: E:/ZJWorkSpace/ocr/htmlweb/static
     #页面模版路径
-    webPath: D:/Code/ocr/htmlweb/web
+    webPath: E:/ZJWorkSpace/ocr/htmlweb/web
     #Lucene索引路径
-    lucenePath: D:/Code/ocr/htmlweb/lucene/indexDir
+    lucenePath: E:/ZJWorkSpace/ocr/htmlweb/lucene/indexDir
     #是否开启flowable
     haveFlowable: true
   webconfig: