모델 종류 이름 변경
This commit is contained in:
@@ -108,12 +108,12 @@ public class ModelTrainMngCoreService {
|
||||
modelMasterEntity.setId(modelId);
|
||||
datasetEntity.setModel(modelMasterEntity);
|
||||
|
||||
if (addReq.getModelNo().equals(ModelType.M1.getId())) {
|
||||
if (addReq.getModelNo().equals(ModelType.G1.getId())) {
|
||||
datasetEntity.setBuildingCnt(dataset.getSummary().getBuildingCnt());
|
||||
datasetEntity.setContainerCnt(dataset.getSummary().getContainerCnt());
|
||||
} else if (addReq.getModelNo().equals(ModelType.M2.getId())) {
|
||||
} else if (addReq.getModelNo().equals(ModelType.G2.getId())) {
|
||||
datasetEntity.setWasteCnt(dataset.getSummary().getWasteCnt());
|
||||
} else if (addReq.getModelNo().equals(ModelType.M3.getId())) {
|
||||
} else if (addReq.getModelNo().equals(ModelType.G3.getId())) {
|
||||
datasetEntity.setLandCoverCnt(dataset.getSummary().getLandCoverCnt());
|
||||
}
|
||||
|
||||
|
||||
@@ -36,6 +36,10 @@ public class ModelMngRepositoryImpl implements ModelMngRepositoryCustom {
|
||||
builder.and(modelMasterEntity.statusCd.eq(req.getStatus()));
|
||||
}
|
||||
|
||||
if (req.getModelNo() != null && !req.getModelNo().isEmpty()) {
|
||||
builder.and(modelMasterEntity.modelNo.eq(req.getModelNo()));
|
||||
}
|
||||
|
||||
List<ModelMasterEntity> content =
|
||||
queryFactory
|
||||
.selectFrom(modelMasterEntity)
|
||||
|
||||
Reference in New Issue
Block a user