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 7d0155ac..14d22c48 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> list(@RequestParam(name="start", defaultValue="1") Integer start, + public ResultVo> list(@RequestParam(name="reviewType") @ApiParam(value = "字段类型(终审:0,工单:1、一审二审:2、审核填报:3)", required = true) Integer reviewType) { + ResultVo> resultVo = new ResultVo<>(); + List ocrFieldDtos = ocrFieldService.list(reviewType); + resultVo.setData(ocrFieldDtos); + resultVo.addOK("查询成功"); + return resultVo; + } + + /** + * 自定义筛选字段列表查询 + * @return + */ + @ApiOperation(value="根据评审类型查询字段列表", notes="根据评审类型查询字段列表") + @GetMapping(value = "/page") + public ResultVo> 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 ocrFieldIPage = ocrFieldService.list(paramterPage,queryWrapper); + IPage 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 cf539d7b..3f8a965a 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 { /** * 自定义筛选字段列表查询 */ - IPage list(ParamterPage paramterPage, QueryWrapper queryWrapper); + IPage pageList(ParamterPage paramterPage, QueryWrapper queryWrapper); + + List 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 f284ea8a..d9c283ec 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 list(Integer reviewType){ + List ocrFieldDtoList = new ArrayList<>(); + try { + LambdaQueryWrapper 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 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 list(ParamterPage paramterPage, QueryWrapper queryWrapper){ + public IPage pageList(ParamterPage paramterPage, QueryWrapper queryWrapper){ try { queryWrapper.eq("del", 0); queryWrapper.orderByAsc("sort");