ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 81773 国内标准-导入 应该不能导入被代替标准号和被引用标准吧

Browse Source
This commit is contained in:
mzaxd
2024-02-05 15:36:32 +08:00
parent b50c82ce7c
commit a026daa316
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java
+6 -2
View File
@@ -1486,7 +1486,7 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
fieldList = fieldList.stream().filter(lawsTag -> YesOrNoEnum.YES.getValue()
.equals(lawsTag.getIsShowFormCreate().toString())).collect(Collectors.toList());
// 去除企标导入逻辑不需要显示的字段
// 去除导入逻辑不需要显示的字段
if (TableNameEnum.ENTERPRISE_STANDARDS.getTableName().equals(tableName)) {
fieldList = fieldList.stream()
.filter(lawsTag -> !lawsTag.getDbFieldName().equals(FieldCommon.ENTERPRISE_STANDARD_CODE))
@@ -1495,7 +1495,9 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
.filter(lawsTag -> !lawsTag.getDbFieldName().equals(FieldCommon.YEAR_NUMBER))
.collect(Collectors.toList());
}
fieldList = fieldList.stream().filter(lawsTag -> !lawsTag.getDbFieldName().equals(FieldCommon.REPLACED_BY_STANDARD))
.filter(lawsTag -> !lawsTag.getDbFieldName().equals(FieldCommon.REFERENCED_STANDARD))
.collect(Collectors.toList());
// 创建一个Excel工作簿
Workbook workbook = this.createWorkBookWithLawsTags(fieldList);
@@ -2514,6 +2516,8 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
.filter(lawsTag -> !lawsTag.getDbFieldName().equals(FieldCommon.ENTERPRISE_NAME_CODE))
.filter(lawsTag -> !lawsTag.getDbFieldName().equals(FieldCommon.STANDARD_CATEGORY_CODE))
.filter(lawsTag -> !lawsTag.getDbFieldName().equals(FieldCommon.YEAR_NUMBER))
.filter(lawsTag -> !lawsTag.getDbFieldName().equals(FieldCommon.REPLACED_BY_STANDARD))
.filter(lawsTag -> !lawsTag.getDbFieldName().equals(FieldCommon.REFERENCED_STANDARD))
.collect(Collectors.toList());
// 添加稽查内容字段
laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsDomesticController.java
+1 -1
View File
@@ -242,7 +242,7 @@ public class LawsDomesticController {
@RequiresPermissions("domesticStandard:import")
public Result<?> importExcelWithData(@RequestParam("file") @ApiParam("文件") MultipartFile file) {
List<String> errorMessages = lawsCommonService.importExcelWithData(file, TableNameEnum.DOMESTIC_REGULATIONS.getValue());
if (errorMessages.size() > 0) {
if (!errorMessages.isEmpty()) {
return Result.error(MessageUtils.getMessage(ResultCommon.IMPORT_ERROR), errorMessages);
}
return Result.OK();