Merge remote-tracking branch 'origin/master' into master

2022-02-25 11:37:17 +08:00
parent 7416d2db8b e4b9f0d329
commit 6f0bb5372c
3 changed files with 54 additions and 2 deletions
@@ -154,6 +154,20 @@ public class OcrRecordEOController extends JeroController<OcrRecordEO, IOcrRecor
 		 return Result.OK(list);
 	 }

+	 /**
+	  * 表单中英文切换
+	  *
+	  * @return
+	  */
+	 @AutoLog(value = "OCR识别转换记录表-表单中英文切换")
+	 @ApiOperation(value="OCR识别转换记录表-表单中英文切换", notes="OCR识别转换记录表-表单中英文切换")
+	 @GetMapping(value = "/getForm")
+	 public Result<List<Map<String, Object>>> getForm(@RequestParam(name = "flag") String flag,
+															 @RequestParam(name = "cut") String cut) {
+		 List<Map<String, Object>> list = ocrRecordService.getForm(flag, cut);
+		 return Result.OK(list);
+	 }
+
    /**
 	 * 列表查询
 	 *
@@ -69,7 +69,7 @@ public interface IOcrRecordEOService extends IService<OcrRecordEO> {
 	 * @param cut
 	 * @return
 	 */
-	public List<Map<String, Object>> getHeader(String flag, String cut);
+	List<Map<String, Object>> getHeader(String flag, String cut);

 	/**
 	 * 查询条件中英文切换
@@ -77,6 +77,14 @@ public interface IOcrRecordEOService extends IService<OcrRecordEO> {
 	 * @param cut
 	 * @return
 	 */
-	public List<Map<String, Object>> queryCondition(String flag, String cut);
+	List<Map<String, Object>> queryCondition(String flag, String cut);
+
+	/**
+	 * 表单中英文切换
+	 * @param flag
+	 * @param cut
+	 * @return
+	 */
+	List<Map<String, Object>> getForm(String flag, String cut);

 }
@@ -160,4 +160,34 @@ public class OcrRecordEOServiceImpl extends ServiceImpl<OcrRecordEOMapper, OcrRe
 		}
 		return list;
 	}
+
+	/**
+	 * 查询条件中英文切换
+	 *
+	 * @return
+	 */
+	@Override
+	public List<Map<String, Object>> getForm(String flag, String cut) {
+		List<OnlCgformField> 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<Map<String, Object>> list = new ArrayList<>();
+		for (OnlCgformField onlCgformField : fieldList) {
+			Map<String, Object> 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;
+	}
 }