mirror of
https://codeup.aliyun.com/64f7d6b8ce01efaafef1e678/coal/coal.git
synced 2026-01-25 15:55:18 +08:00
完善
This commit is contained in:
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user