From d12caa2ff55c14a3802e882bf00e1fe3d865f33c Mon Sep 17 00:00:00 2001 From: caozhen <18736171426@139.com> Date: Fri, 22 Sep 2023 14:49:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8B=86=E5=88=86=E5=B7=B2=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E6=96=87=E6=9C=AC=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=AD=97=E5=85=B8=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/modules/oss/entity/OSSFile.java | 4 ++++ .../impl/SarFileSplitInfoServiceImpl.java | 20 ++++++++++++++++--- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/laws-module-system/src/main/java/com/jero/modules/oss/entity/OSSFile.java b/laws-module-system/src/main/java/com/jero/modules/oss/entity/OSSFile.java index 9fc08f9a..95cbfcbe 100644 --- a/laws-module-system/src/main/java/com/jero/modules/oss/entity/OSSFile.java +++ b/laws-module-system/src/main/java/com/jero/modules/oss/entity/OSSFile.java @@ -29,6 +29,10 @@ public class OSSFile extends JeroEntity { @Excel(name = "标准文件类型（使用数据库字段名）") private String standardFileType; + @TableField(exist = false) + @ApiModelProperty(value = "文本状态") + private String standardFileType_dictText; + @ApiModelProperty(value = "关联ID") private String connectId; diff --git a/laws-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitInfoServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitInfoServiceImpl.java index 5a3d117e..76ca7f77 100644 --- a/laws-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitInfoServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitInfoServiceImpl.java @@ -10,6 +10,7 @@ import com.jero.common.constant.enums.LanguageEnum; import com.jero.common.constant.enums.ModuleEnum; import com.jero.common.constant.enums.YesOrNoEnum; import com.jero.common.exception.JeroBootException; +import com.jero.common.system.vo.DictModel; 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; @@ -377,9 +378,14 @@ public class SarFileSplitInfoServiceImpl extends ServiceImpl process_manuscript = sysDictService.queryDictItemsByCode("process_manuscript"); + List dictList = process_manuscript.stream().map(vo -> vo.getValue()).collect(Collectors.toList()); + wrapper.in(OSSFile::getStandardFileType, dictList); + //限制查询word文档 + wrapper.last(" AND (file_name LIKE " + "'%.docx'" + " OR file_name LIKE " + "'%.doc' )"); Page pageList = ossFileService.page(page, wrapper); - //为来源、标准号、标准名称赋值 + //为来源、标准号、标准名称、文本状态赋值 Map> collect1 = lawsDomesticStandards.stream().collect(Collectors.groupingBy(LawsDomesticStandard::getId)); Map> collect2 = lawsEnterpriseStandards.stream().collect(Collectors.groupingBy(LawsEnterpriseStandard::getId)); for (OSSFile record : pageList.getRecords()) { @@ -391,14 +397,22 @@ public class SarFileSplitInfoServiceImpl extends ServiceImpl domesticStandards = collect2.get(standardId); if (domesticStandards != null && !domesticStandards.isEmpty()){ LawsEnterpriseStandard standard = domesticStandards.get(0); - String origin_dictText = sysDictService.queryDictTextByKey("split_standard_source", "2"); + String origin_dictText = sysDictService.queryDictTextByKey("split_standard_source", "3"); record.setOrigin_dictText(origin_dictText); record.setStandardNumber(standard.getStandardNumber()); record.setStandardName(standard.getStandardName()); + if (StringUtils.isNotBlank(record.getStandardFileType())){ + String standardFileType_dictText = sysDictService.queryDictTextByKey("process_manuscript", record.getStandardFileType()); + record.setStandardFileType_dictText(standardFileType_dictText); + } } } }