From 9dbdee21b225078a7bb548091d6549f00436a237 Mon Sep 17 00:00:00 2001
From: shuliYao <1397940314@qq.com>
Date: Sat, 13 Apr 2024 15:50:42 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E5=8A=A8=E6=80=81?=
 =?UTF-8?q?=E5=88=97=E5=AD=97=E6=AE=B5=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ocr/controller/OcrFieldController.java    | 18 ++++++++--
 .../xiaoyao/ocr/service/OcrFieldService.java  |  4 ++-
 .../ocr/service/impl/OcrFieldServiceImpl.java | 35 ++++++++++++++++++-
 3 files changed, 53 insertions(+), 4 deletions(-)

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 7d0155a..14d22c4 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
@@ -58,7 +58,21 @@ public class OcrFieldController extends BaseController {
 	 */
 	@ApiOperation(value="根据评审类型查询字段列表", notes="根据评审类型查询字段列表")
 	@GetMapping(value = "/list")
-	public ResultVo<IPage<OcrField>> list(@RequestParam(name="start", defaultValue="1") Integer start,
+	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);
+		resultVo.addOK("查询成功");
+		return resultVo;
+	}
+
+	/**
+	 * 自定义筛选字段列表查询
+	 * @return
+	 */
+	@ApiOperation(value="根据评审类型查询字段列表", notes="根据评审类型查询字段列表")
+	@GetMapping(value = "/page")
+	public ResultVo<IPage<OcrField>> page(@RequestParam(name="start", defaultValue="1") Integer start,
 										  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 										  HttpServletRequest request) {
 
@@ -72,7 +86,7 @@ public class OcrFieldController extends BaseController {
 		ParamterPage paramterPage = new ParamterPage();
 		paramterPage.setPagesize(pageSize);
 		paramterPage.setStart(start);
-		IPage<OcrField> ocrFieldIPage = ocrFieldService.list(paramterPage,queryWrapper);
+		IPage<OcrField> ocrFieldIPage = ocrFieldService.pageList(paramterPage,queryWrapper);
 		resultVo.setData(ocrFieldIPage);
 		resultVo.addOK("查询成功");
 		return resultVo;
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 cf539d7..3f8a965 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
@@ -19,7 +19,9 @@ public interface OcrFieldService extends BaseService<OcrField>  {
     /**
      * 自定义筛选字段列表查询
      */
-    IPage<OcrField> list(ParamterPage paramterPage, QueryWrapper<OcrField> queryWrapper);
+    IPage<OcrField> pageList(ParamterPage paramterPage, QueryWrapper<OcrField> queryWrapper);
+
+    List<OcrFieldDto> list(Integer reviewType);
 
     /**
      * 自定义筛选字段列表查询全部
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 f284ea8..d9c283e 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
@@ -36,8 +36,41 @@ public class OcrFieldServiceImpl extends BaseServiceImpl<OcrFieldMybatisDao, Ocr
 	@Autowired
 	private OcrFieldMybatisDao ocrFieldMybatisDao;
 
+
+	@Override
+	public List<OcrFieldDto> list(Integer reviewType){
+		List<OcrFieldDto> ocrFieldDtoList = new ArrayList<>();
+		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);
+				}
+			}
+		} catch (BeansException e) {
+			e.printStackTrace();
+		}
+		return ocrFieldDtoList;
+	}
+
 	@Override
-	public IPage<OcrField> list(ParamterPage paramterPage, QueryWrapper<OcrField> queryWrapper){
+	public IPage<OcrField> pageList(ParamterPage paramterPage, QueryWrapper<OcrField> queryWrapper){
 		try {
 			queryWrapper.eq("del", 0);
 			queryWrapper.orderByAsc("sort");