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 4ac17eb7..b498b2eb 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 @@ -1331,44 +1331,44 @@ public class LawsCommonServiceImpl implements ILawsCommonService { Map stringObjectMap = processResultMap(initMap, fieldList); if (module.equals(TableNameEnum.ENTERPRISE_STANDARDS.getValue())) { - // 企标独有的稽查内容列表 - LambdaQueryWrapper esIcWrapper = new LambdaQueryWrapper<>(); - esIcWrapper.eq(EnterpriseStandardInspectContent::getStandardId, id); - List list = esInspectContentService.list(esIcWrapper); - List departIdList = list.stream().map(EnterpriseStandardInspectContent::getRectificationDepartment) - .collect(Collectors.toList()); - if (departIdList.size() != 0) { - LambdaQueryWrapper sysDepartLambdaQueryWrapper = new LambdaQueryWrapper<>(); - sysDepartLambdaQueryWrapper.in(SysDepart::getId, departIdList); - List departList = sysDepartService.list(sysDepartLambdaQueryWrapper); - Map> departMap = departList.stream().collect(Collectors.groupingBy(SysDepart::getId)); - for (EnterpriseStandardInspectContent content : list) { - if (content.getRectificationDepartment() != null) { - content.setRectificationDepartment_dictText(departMap.get(content.getRectificationDepartment()).get(0).getDepartName()); - } - } - } - 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"))); - } +// // 企标独有的稽查内容列表 +// LambdaQueryWrapper esIcWrapper = new LambdaQueryWrapper<>(); +// esIcWrapper.eq(EnterpriseStandardInspectContent::getStandardId, id); +// List list = esInspectContentService.list(esIcWrapper); +// List departIdList = list.stream().map(EnterpriseStandardInspectContent::getRectificationDepartment) +// .collect(Collectors.toList()); +// if (departIdList.size() != 0) { +// LambdaQueryWrapper sysDepartLambdaQueryWrapper = new LambdaQueryWrapper<>(); +// sysDepartLambdaQueryWrapper.in(SysDepart::getId, departIdList); +// List departList = sysDepartService.list(sysDepartLambdaQueryWrapper); +// Map> departMap = departList.stream().collect(Collectors.groupingBy(SysDepart::getId)); +// for (EnterpriseStandardInspectContent content : list) { +// if (content.getRectificationDepartment() != null) { +// content.setRectificationDepartment_dictText(departMap.get(content.getRectificationDepartment()).get(0).getDepartName()); +// } +// } +// } +// 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); diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardAuthUserServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardAuthUserServiceImpl.java index 2db9e90d..2b037952 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardAuthUserServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardAuthUserServiceImpl.java @@ -149,7 +149,11 @@ public class EnterpriseStandardAuthUserServiceImpl extends ServiceImpl> records) { - records.forEach(kv -> kv.put(FieldCommon.DETAIL_FLAG, false)); + if (true) { + records.forEach(kv -> kv.put(FieldCommon.DETAIL_FLAG, true)); + return; + } + SysUser currentUser = sysUserService.getById(UserUtils.getUserId()); String userId = currentUser.getId(); String userName = currentUser.getUsername(); @@ -330,6 +334,10 @@ public class EnterpriseStandardAuthUserServiceImpl extends ServiceImpl> records) { + if (true) { + records.forEach(kv -> kv.put(FieldCommon.EDIT_FLAG, true)); + return; + } // 只有创建人和管理员才有维护的权限 String userId = UserUtils.getUserId(); SysUser currentUser = sysUserService.getById(userId); @@ -425,6 +433,10 @@ public class EnterpriseStandardAuthUserServiceImpl extends ServiceImpl> records) { + if (true) { + records.forEach(kv -> kv.put(FieldCommon.DEL_FLAG, true)); + return; + } String userId = UserUtils.getUserId(); SysUser currentUser = sysUserService.getById(userId); List standardIds = new ArrayList<>(); diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsEnterpriseStandard.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsEnterpriseStandard.java index 5f9fac1a..43399e8f 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsEnterpriseStandard.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsEnterpriseStandard.java @@ -102,12 +102,6 @@ public class LawsEnterpriseStandard implements Serializable { @ApiModelProperty(value = "年代号") private String yearNumber; - /** - * 企标类型 - */ - @ApiModelProperty(value = "企标类型") - private String standardCategory; - /** * 企标英文名称 */ @@ -203,12 +197,6 @@ public class LawsEnterpriseStandard implements Serializable { @ApiModelProperty(value = "被引用标准") private String referencedStandard; - /** - * 配合单位 - */ - @ApiModelProperty(value = "配合单位") - private String cooperationUnit; - /** * 标准推进人 */