From 3f8122ef05fe3be379dcffacd72d4361985be6cb Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Fri, 25 Feb 2022 10:16:15 +0800
Subject: [PATCH] =?UTF-8?q?ocr=E8=AF=86=E5=88=AB-=E5=88=86=E9=A1=B5?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ocr/controller/OcrRecordEOController.java | 19 ++---
 .../modules/ocr/page/OcrRecordEOPage.java     | 83 +++++++++++++++++++
 2 files changed, 90 insertions(+), 12 deletions(-)
 create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/page/OcrRecordEOPage.java

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/controller/OcrRecordEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/controller/OcrRecordEOController.java
index 327182190..38ca0820a 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/controller/OcrRecordEOController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/controller/OcrRecordEOController.java
@@ -14,6 +14,7 @@ import com.jero.modules.document.service.IBussDocumentLibraryEOService;
 import com.jero.modules.ocr.entity.OcrRecordEO;
 import com.jero.modules.ocr.enums.FileTypeEnum;
 import com.jero.modules.ocr.enums.ResultContentEnum;
+import com.jero.modules.ocr.page.OcrRecordEOPage;
 import com.jero.modules.ocr.service.IOcrRecordEOService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -56,25 +57,19 @@ public class OcrRecordEOController extends JeroController<OcrRecordEO, IOcrRecor
 	 /**
 	 * 分页列表查询
 	 *
-	 * @param ocrRecordEO
-	 * @param pageNo
-	 * @param pageSize
-	 * @param req
+	 * @param ocrRecordEOPage
 	 * @return
 	 */
 	@AutoLog(value = "OCR识别转换记录表-分页列表查询")
 	@ApiOperation(value="OCR识别转换记录表-分页列表查询", notes="OCR识别转换记录表-分页列表查询")
 	@PostMapping(value = "/page")
-	public Result<?> queryPageList(OcrRecordEO ocrRecordEO,
-								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-								   HttpServletRequest req) {
+	public Result<?> queryPageList(@RequestBody OcrRecordEOPage ocrRecordEOPage) {
 		LambdaQueryWrapper<OcrRecordEO> queryWrapper = new LambdaQueryWrapper<>();
-		queryWrapper.like(StringUtils.isNotEmpty(ocrRecordEO.getStandName()), OcrRecordEO::getStandName, ocrRecordEO.getStandName())
-				.like(StringUtils.isNotEmpty(ocrRecordEO.getStandNumber()), OcrRecordEO::getStandNumber, ocrRecordEO.getStandNumber())
-				.eq(StringUtils.isNotEmpty(ocrRecordEO.getResultContent()), OcrRecordEO::getResultContent, ocrRecordEO.getResultContent())
+		queryWrapper.like(StringUtils.isNotEmpty(ocrRecordEOPage.getStandName()), OcrRecordEO::getStandName, ocrRecordEOPage.getStandName())
+				.like(StringUtils.isNotEmpty(ocrRecordEOPage.getStandNumber()), OcrRecordEO::getStandNumber, ocrRecordEOPage.getStandNumber())
+				.eq(StringUtils.isNotEmpty(ocrRecordEOPage.getResultContent()), OcrRecordEO::getResultContent, ocrRecordEOPage.getResultContent())
 				.orderByDesc(OcrRecordEO::getCreateTime);
-		Page<OcrRecordEO> page = new Page<OcrRecordEO>(pageNo, pageSize);
+		Page<OcrRecordEO> page = new Page<OcrRecordEO>(ocrRecordEOPage.getPageNo(), ocrRecordEOPage.getPageSize());
 		IPage<OcrRecordEO> pageList = ocrRecordService.page(page, queryWrapper);
 		List<OcrRecordEO> rows = pageList.getRecords();
 		for (OcrRecordEO row : rows){
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/page/OcrRecordEOPage.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/page/OcrRecordEOPage.java
new file mode 100644
index 000000000..ad56e6cba
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/page/OcrRecordEOPage.java
@@ -0,0 +1,83 @@
+package com.jero.modules.ocr.page;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.jero.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * @Author: liyawei
+ * @Description:
+ * @Date: Created in 9:40 2022/2/25
+ */
+@Data
+public class OcrRecordEOPage {
+    /**主键*/
+    private String id;
+
+    /**创建人*/
+    private String createBy;
+
+    /**创建日期*/
+    private java.util.Date createTime;
+
+    /**更新人*/
+    private String updateBy;
+
+    /**更新日期*/
+    private java.util.Date updateTime;
+
+    /**所属部门*/
+    private String sysOrgCode;
+
+    /**标准名称*/
+    private String standName;
+
+    /**标准编号*/
+    private String standNumber;
+
+    /**文本状态*/
+    private String fileType;
+
+    /**文件名称*/
+    private String fileName;
+
+    /**转换结果*/
+    private String resultContent;
+
+    /**doc本地存放全路径*/
+    private String docName;
+
+    /**doc文件名称*/
+    private String docRealName;
+
+    /**doc文件编码*/
+    private String wordFileCode;
+
+    /**json文件本地存放全路径*/
+    private String jsonName;
+
+    /**json文件名称*/
+    private String jsonRealName;
+
+    /**json文件编码*/
+    private String jsonFileCode;
+
+    /**pdf文件id*/
+    private String attId;
+
+    /**同步状态*/
+    private String syncState;
+
+    private String docRealFile;
+
+    private String jsonRealFile;
+
+    private Integer pageNo;
+    private Integer pageSize;
+}