From 1a645200cd539614ad3b6545cc64049e44de7f6e Mon Sep 17 00:00:00 2001 From: liyawei Date: Wed, 25 May 2022 20:40:35 +0800 Subject: [PATCH] =?UTF-8?q?bug=2052998-=E6=B7=BB=E5=8A=A0=E8=B7=B3?= =?UTF-8?q?=E8=BD=AC=E6=A0=87=E8=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarFileSplitInfoController.java | 2 +- .../service/ISarFileSplitInfoService.java | 4 ++ .../impl/SarFileSplitInfoServiceImpl.java | 48 +++++++++++++++++++ 3 files changed, 53 insertions(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitInfoController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitInfoController.java index b31d4322b..34a4c5265 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitInfoController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitInfoController.java @@ -243,7 +243,7 @@ public class SarFileSplitInfoController extends JeroController>> getHeader(@RequestParam(name = "flag") String flag, @RequestParam(name = "cut") String cut) { - List> list = languageSwitchService.getHeader(flag, cut); + List> list = sarFileSplitInfoService.getHeader(flag, cut); return Result.OK(list); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/ISarFileSplitInfoService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/ISarFileSplitInfoService.java index 012516850..a0cb23233 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/ISarFileSplitInfoService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/ISarFileSplitInfoService.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.jero.modules.split.entity.SarFileSplitInfoEO; import java.util.List; +import java.util.Map; /** * @Description: 文档拆分表 @@ -65,4 +66,7 @@ public interface ISarFileSplitInfoService extends IService { boolean bindToDocumentLibrary(String id, String connectId, String fileName); void dataProcessing(String cut, List sarFileSplitInfoEOList); + + List> getHeader(String flag, String cut); + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitInfoServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitInfoServiceImpl.java index 9a4b4b717..b34083705 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitInfoServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitInfoServiceImpl.java @@ -10,6 +10,8 @@ import com.jero.common.constant.enums.YesOrNoEnum; import com.jero.common.exception.JeroBootException; import com.jero.generater.modules.online.cgform.entity.OnlCgformField; import com.jero.generater.modules.online.cgform.service.impl.OnlCgformFieldServiceImpl; +import com.jero.modules.document.enums.FieldTypeEnum; +import com.jero.modules.ocr.util.LineHumpUtil; import com.jero.modules.oss.entity.OSSFile; import com.jero.modules.oss.service.IOSSFileService; import com.jero.modules.split.entity.SarFileSplitInfoEO; @@ -263,4 +265,50 @@ public class SarFileSplitInfoServiceImpl extends ServiceImpl> getHeader(String flag, String cut) { + List fieldList = onlCgformFieldService.getFieldList(flag); + if (fieldList.size() != 0) { + //过滤列表字段(is_show_list-->列表是否显示0否 1是) + fieldList = fieldList.stream().filter(e -> YesOrNoEnum.YES.getValue().equals(String.valueOf(e.getIsShowList()))).collect(Collectors.toList()); + } + List> list = new ArrayList<>(); + for (OnlCgformField onlCgformField : fieldList) { + Map map = new HashMap<>(); + if(FieldTypeEnum.TEXT_LINK.getValue().equals(onlCgformField.getFieldShowType())){ + map.put("urlClick","true"); + } + if("file_name".equals(onlCgformField.getDbFieldName()) + || "serial_number".equals(onlCgformField.getDbFieldName()) + || "title".equals(onlCgformField.getDbFieldName())){ + //跳转详情的标识 + map.put("click","true"); + } + //日期添加排序标识 + if ("create_time".equals(onlCgformField.getDbFieldName())) { + map.put("sort", "true");//列表排序标识 + } + if ("update_time".equals(onlCgformField.getDbFieldName())) { + map.put("sort", "true");//列表排序标识 + } + + String dbFieldName = onlCgformField.getDbFieldName(); + map.put("db_field_name", LineHumpUtil.lineToHump(dbFieldName)); + + 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; + } + }