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 38ca0820a..65006aa5f 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 @@ -154,6 +154,20 @@ public class OcrRecordEOController extends JeroController>> getForm(@RequestParam(name = "flag") String flag, + @RequestParam(name = "cut") String cut) { + List> list = ocrRecordService.getForm(flag, cut); + return Result.OK(list); + } + /** * 列表查询 * diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/service/IOcrRecordEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/service/IOcrRecordEOService.java index 1baa5f4e8..0abdd285e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/service/IOcrRecordEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/service/IOcrRecordEOService.java @@ -69,7 +69,7 @@ public interface IOcrRecordEOService extends IService { * @param cut * @return */ - public List> getHeader(String flag, String cut); + List> getHeader(String flag, String cut); /** * 查询条件中英文切换 @@ -77,6 +77,14 @@ public interface IOcrRecordEOService extends IService { * @param cut * @return */ - public List> queryCondition(String flag, String cut); + List> queryCondition(String flag, String cut); + + /** + * 表单中英文切换 + * @param flag + * @param cut + * @return + */ + List> getForm(String flag, String cut); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/service/impl/OcrRecordEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/service/impl/OcrRecordEOServiceImpl.java index 05ecfc622..2847c7c55 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/service/impl/OcrRecordEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/service/impl/OcrRecordEOServiceImpl.java @@ -160,4 +160,34 @@ public class OcrRecordEOServiceImpl extends ServiceImpl> getForm(String flag, String cut) { + List fieldList = onlCgformFieldService.getFieldList(flag); + if (fieldList.size() != 0) { + //过滤出搜索条件() + fieldList = fieldList.stream().filter(e -> YesOrNoEnum.YES.getValue().equals(String.valueOf(e.getIsShowForm()))).collect(Collectors.toList()); + } + List> list = new ArrayList<>(); + for (OnlCgformField onlCgformField : fieldList) { + Map map = new HashMap<>(); + map.put("area", null);//展示区域。没用到 + map.put("field_show_type", onlCgformField.getFieldShowType());//类型(判断是下拉还是输入框,等等) + map.put("field_must_input", onlCgformField.getFieldMustInput());//是否必填 + map.put("dict_field", onlCgformField.getDictField()); //下拉类型的数据字典编码 + map.put("db_field_name", LineHumpUtil.lineToHump(onlCgformField.getDbFieldName()));//字段 + if (CutEnum.CN.getValue().equals(cut)) { + map.put("db_field_txt", onlCgformField.getDbFieldTxt());//字段中文名 + } else { + map.put("db_field_txt", onlCgformField.getDbFieldEnName());//字段英文名 + } + list.add(map); + } + return list; + } }