Merge pull request 'feat/dev_251201' (#124) from feat/dev_251201 into develop
Reviewed-on: https://kamco.gitea.gs.dabeeo.com/dabeeo/kamco-dabeeo-backoffice/pulls/124
This commit is contained in:
@@ -44,7 +44,7 @@ public class MapInkxMngCoreService {
|
||||
|
||||
MapInkx5kEntity entity =
|
||||
new MapInkx5kEntity(
|
||||
req.getMapidcdNo(), req.getMapidNm(), map_polygon, fid50k.longValue(), "USE" // 기본은 USE로
|
||||
req.getMapidcdNo(), req.getMapidNm(), map_polygon, fid50k, "USE" // 기본은 USE로
|
||||
);
|
||||
|
||||
mapInkx5kRepository.save(entity);
|
||||
|
||||
@@ -40,13 +40,13 @@ public class MapInkx5kEntity extends CommonDateEntity {
|
||||
private Geometry geom;
|
||||
|
||||
@Column(name = "fid_k50")
|
||||
private Long fidK50;
|
||||
private Integer fidK50;
|
||||
|
||||
@Column(name = "use_inference")
|
||||
private String useInference;
|
||||
|
||||
public MapInkx5kEntity(
|
||||
String mapidcdNo, String mapidNm, Geometry geom, Long fidK50, String useInference) {
|
||||
String mapidcdNo, String mapidNm, Geometry geom, Integer fidK50, String useInference) {
|
||||
this.mapidcdNo = mapidcdNo;
|
||||
this.mapidNm = mapidNm;
|
||||
this.geom = geom;
|
||||
|
||||
@@ -393,7 +393,7 @@ public class MapSheetMngRepositoryImpl extends QuerydslRepositorySupport
|
||||
.innerJoin(mapInkx5kEntity)
|
||||
.on(mapSheetMngHstEntity.mapSheetCode.eq(mapInkx5kEntity.fid))
|
||||
.leftJoin(mapInkx50kEntity)
|
||||
.on(mapInkx5kEntity.fidK50.eq(mapInkx50kEntity.fid.longValue()))
|
||||
.on(mapInkx5kEntity.fidK50.eq(mapInkx50kEntity.fid))
|
||||
.where(whereBuilder)
|
||||
.fetchOne();
|
||||
|
||||
|
||||
@@ -66,7 +66,7 @@ public class MapInkx5kRepositoryImpl extends QuerydslRepositorySupport
|
||||
mapInkx5kEntity.useInference))
|
||||
.from(mapInkx5kEntity)
|
||||
.innerJoin(mapInkx50kEntity)
|
||||
.on(mapInkx5kEntity.fidK50.intValue().eq(mapInkx50kEntity.fid))
|
||||
.on(mapInkx5kEntity.fidK50.eq(mapInkx50kEntity.fid))
|
||||
.where(searchUseInference(useInference), searchValueMapCdNm(searchVal))
|
||||
.offset(pageable.getOffset())
|
||||
.limit(pageable.getPageSize())
|
||||
|
||||
@@ -48,7 +48,7 @@ public class MapInkxMngDto {
|
||||
private String mapidcdNo;
|
||||
private String mapidNm;
|
||||
private JsonNode geom;
|
||||
private Long fidK50;
|
||||
private Integer fidK50;
|
||||
private String useInference;
|
||||
private ZonedDateTime createdDttm;
|
||||
private ZonedDateTime updatedDttm;
|
||||
|
||||
Reference in New Issue
Block a user