Browse Source

기체정보관리 버그 수정

- 기체목록 중복건
- 기체정보 상세 서버 에러
  (단건 데이터로 결과가 나와야 하는데 2건이상의 데이터 조회로 인한 에러)
feature/auth
지대한 2 years ago
parent
commit
a49eeec018
  1. 4
      src/main/java/com/palnet/biz/api/bas/dron/model/BasDronModel.java
  2. 2
      src/main/java/com/palnet/biz/api/bas/dron/service/BasDronService.java
  3. 19
      src/main/java/com/palnet/biz/jpa/repository/pty/PtyDronQueryRepository.java

4
src/main/java/com/palnet/biz/api/bas/dron/model/BasDronModel.java

@ -55,6 +55,8 @@ public class BasDronModel {
private String newIdntfNum; //변경된 식별 정보 private String newIdntfNum; //변경된 식별 정보
private String idntfTypeCd; private String idntfTypeCd;
private String ownerNm;
} }

2
src/main/java/com/palnet/biz/api/bas/dron/service/BasDronService.java

@ -43,7 +43,7 @@ public class BasDronService {
*/ */
public List<BasDronModel> list(BasDronRqModel rq){ public List<BasDronModel> list(BasDronRqModel rq){
List<BasDronModel> resultList = query.list(rq); List<BasDronModel> resultList = query.list(rq);
return resultList; return resultList;
} }
/** /**

19
src/main/java/com/palnet/biz/jpa/repository/pty/PtyDronQueryRepository.java

@ -74,14 +74,8 @@ public class PtyDronQueryRepository{
bas.takeoffWght, bas.takeoffWght,
bas.updateDt, bas.updateDt,
bas.updateUserId, bas.updateUserId,
bas.wghtTypeCd, bas.wghtTypeCd
idnt.idntfNum,
idnt.ownerNm
)).from(bas) )).from(bas)
.leftJoin(idnt)
.on(bas.arcrftSno.eq(idnt.arcrftSno))
.on(bas.useYn.eq("Y"))
.where(builder) .where(builder)
.orderBy(bas.createDt.desc()) .orderBy(bas.createDt.desc())
.fetch(); .fetch();
@ -141,8 +135,7 @@ public class PtyDronQueryRepository{
public BasDronModel detail(int arcrftSno){ public BasDronModel detail(int arcrftSno){
QComArcrftBas bas = QComArcrftBas.comArcrftBas; QComArcrftBas bas = QComArcrftBas.comArcrftBas;
QComIdntfBas idnt = QComIdntfBas.comIdntfBas;
BasDronModel result = BasDronModel result =
query.select(Projections.bean(BasDronModel.class , query.select(Projections.bean(BasDronModel.class ,
bas.groupId, bas.groupId,
@ -164,14 +157,8 @@ public class PtyDronQueryRepository{
bas.updateDt, bas.updateDt,
bas.updateUserId, bas.updateUserId,
bas.wghtTypeCd, bas.wghtTypeCd,
bas.imageUrl, bas.imageUrl
idnt.idntfNum,
idnt.ownerNm,
idnt.hpno
)).from(bas) )).from(bas)
.leftJoin(idnt)
.on(bas.arcrftSno.eq(idnt.arcrftSno))
.on(bas.useYn.eq("Y"))
.where(bas.arcrftSno.eq(arcrftSno)) .where(bas.arcrftSno.eq(arcrftSno))
.fetchOne(); .fetchOne();

Loading…
Cancel
Save