QR/laws_chery_serve
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "update 导入拆分结果 判断表格导入标准与选择标准不一致"

Browse Source 
This reverts commit ef4b91be8c.
This commit is contained in:
lijiarao
2024-09-26 13:40:43 +08:00
parent ef4b91be8c
commit c455d51a19
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java
+10 -8
View File
@@ -2017,16 +2017,18 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
// 判断第一条是否是标准
LawsDomesticStandard lawsDomesticStandard =
lawsDomesticStandardService.queryByStandardNumber(LawsDocumentSplit.get(0).getItemNum());
if (Objects.isNull(lawsDomesticStandard) || !lawsDomesticStandard.getId().equals(sarFileSplitInfoEO.getStandardId())){
if (MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) {
return Result.error("表格导入标准与选择标准不一致!");
} else {
return Result.error("Table import criteria are inconsistent with selection criteria!");
if (!Objects.isNull(lawsDomesticStandard)){
if (!lawsDomesticStandard.getId().equals(sarFileSplitInfoEO.getStandardId())){
if (MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) {
return Result.error("表格导入标准与选择标准不一致!");
} else {
return Result.error("Table import criteria are inconsistent with selection criteria!");
}
}
existStandard = true;
LawsDocumentSplit.get(0).setStandardId(lawsDomesticStandard.getId());
LawsDocumentSplit.get(0).setFileType(sarFileSplitInfoEO.getFileType());
}
existStandard = true;
LawsDocumentSplit.get(0).setStandardId(lawsDomesticStandard.getId());
LawsDocumentSplit.get(0).setFileType(sarFileSplitInfoEO.getFileType());
batchSaveItems(LawsDocumentSplit);
}
long bb = System.currentTimeMillis();