From 46f2fa57a94bdd66942ce959baa99ba0bdee9858 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Tue, 20 Aug 2024 17:42:45 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E5=85=B6=E4=BB=96?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E7=9A=84=E6=A0=87=E5=87=86=E8=A7=A3=E8=AF=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../laws/common/constant/FieldCommon.java | 1 + .../service/impl/LawsCommonServiceImpl.java | 22 ++----------------- 2 files changed, 3 insertions(+), 20 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/constant/FieldCommon.java b/laws-modules/src/main/java/com/jero/modules/laws/common/constant/FieldCommon.java index 6533acd5..8bfc3783 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/constant/FieldCommon.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/constant/FieldCommon.java @@ -175,6 +175,7 @@ public class FieldCommon { public static final String FILE_DRAFT_FOR_COMMENT = "draft_for_comment"; // 草案 public static final String FILE_DRAFT = "draft"; + public static final String FILE_OTHER_FILE = "other_file"; public static final String DEL_FLAG = "del_flag"; public static final String TRY_FLAG = "try_flag"; public static final String RELEASE_DATE = "release_date"; diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java index 22de5355..d92d6ae4 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java @@ -364,6 +364,8 @@ public class LawsCommonServiceImpl implements ILawsCommonService { flagMap.get(FieldCommon.FILE_DRAFT_FOR_COMMENT)); map.put(FieldCommon.FILE_DRAFT + FieldCommon._STANDARD_SPLIT, flagMap.get(FieldCommon.FILE_DRAFT)); + map.put(FieldCommon.FILE_OTHER_FILE + FieldCommon._STANDARD_SPLIT, + flagMap.get(FieldCommon.FILE_OTHER_FILE)); } @Override @@ -1371,26 +1373,6 @@ public class LawsCommonServiceImpl implements ILawsCommonService { } } stringObjectMap.put("checkList", list); -// // 设置企标独有的标准适用范围 -// // 查询标准拆分表 -// LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); -// // 标准id -// queryWrapper.eq(SarFileSplitInfoEO::getStandardId, id); -// // 拆分表发布标识 -// queryWrapper.isNotNull(SarFileSplitInfoEO::getPublishBeforeId); -// // 文件字段标识 -// queryWrapper.eq(SarFileSplitInfoEO::getFileType, FieldCommon.FILE_PUBLISH_OF_ORIGINAL); -// List sarFileSplitInfoEOList = sarFileSplitInfoService.list(queryWrapper); -// if (!sarFileSplitInfoEOList.isEmpty()) { -// // 按照创建时间倒序排序 -// sarFileSplitInfoEOList.sort(Comparator.comparing(SarFileSplitInfoEO::getCreateTime).reversed()); -// List> maps = -// documentSplitMapper.queryLawsDocumentSplitByInfoId(sarFileSplitInfoEOList.get(0).getId()); -// // 获取item_num等于1的Map -// maps.stream().filter(m -> m.get("item_num").equals("1")) -// .findFirst() -// .ifPresent(map -> stringObjectMap.put("standard_scope", map.get("item_content"))); -// } } // 标准拆分标识 splitFlag(stringObjectMap);