This commit is contained in:
2024-02-20 22:42:20 +08:00
parent e7944993be
commit 7bc8138194

View File

@@ -103,7 +103,7 @@ class CoalAnalysisService extends BaseService<CoalAnalysisEntity, CoalAnalysisRe
CoalAnalysisEntity::getArchiveStatus,
x -> "0",
(e, actual, expected) -> {
throw new BizException("化验报告 " + e.getName() + "已归档,无法编辑");
throw new BizException("化验报告 " + "已归档,无法编辑");
});
hisService.saveHis(entity);
@@ -121,7 +121,7 @@ class CoalAnalysisService extends BaseService<CoalAnalysisEntity, CoalAnalysisRe
CoalAnalysisEntity::getArchiveStatus,
x -> "0",
(e, actual, expected) -> {
throw new BizException("化验报告 " + e.getName() + "已归档,无法删除");
throw new BizException("化验报告 " + "已归档,无法删除");
});
this.repository.deleteAllById(request.getIds());
}
@@ -148,7 +148,7 @@ class CoalAnalysisService extends BaseService<CoalAnalysisEntity, CoalAnalysisRe
this.repository.findAllById(dto.getIds()).stream()
.peek(x -> ArchiveUtils.checkArchiveStatus(x, CoalAnalysisEntity::getArchiveStatus, y -> "0", (e, actual, expected) -> {
throw new BizException("化验报告 " + e.getName() + "已归档,无法再次归档");
throw new BizException("化验报告 " + "已归档,无法再次归档");
}))
.peek(x -> x.setArchiveStatus("1"))
.forEach(this.repository::save);
@@ -157,7 +157,7 @@ class CoalAnalysisService extends BaseService<CoalAnalysisEntity, CoalAnalysisRe
public void unarchive(IdRequest dto) {
this.repository.findAllById(dto.getIds()).stream()
.peek(x->ArchiveUtils.checkArchiveStatus(x, CoalAnalysisEntity::getArchiveStatus, y -> "1", (e, actual, expected) -> {
throw new BizException("化验报告 " + e.getName() + "未归档,无法取消归档");
throw new BizException("化验报告 " + "未归档,无法取消归档");
}))
.peek(x -> x.setArchiveStatus("0"))
.forEach(this.repository::save);