|
|
|
@ -46,15 +46,15 @@ public class PtyDronQueryRepository{
|
|
|
|
|
builder.and(bas.arcrftModelNm.like('%' + rq.getArcrftModelNm() + '%')); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// if(!StringUtils.isEmpty(rq.getIdntfNum())) {
|
|
|
|
|
// builder.and(idnt.idntfNum.like('%' + rq.getArcrftModelNm() + '%'));
|
|
|
|
|
// }
|
|
|
|
|
if(!StringUtils.isEmpty(rq.getGroupId())) { |
|
|
|
|
builder.and(bas.groupId.eq(rq.getGroupId())); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
if(!StringUtils.isEmpty(rq.getArcrftTypeCd())) { |
|
|
|
|
builder.and(bas.arcrftTypeCd.eq(rq.getArcrftTypeCd())); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
List<BasDronModel> queryResult = |
|
|
|
|
List<BasDronModel> result = |
|
|
|
|
query.select(Projections.bean(BasDronModel.class , |
|
|
|
|
bas.groupId, |
|
|
|
|
bas.arcrftSno, |
|
|
|
@ -80,15 +80,15 @@ public class PtyDronQueryRepository{
|
|
|
|
|
.orderBy(bas.createDt.desc()) |
|
|
|
|
.fetch(); |
|
|
|
|
|
|
|
|
|
List<BasDronModel> result = new ArrayList<BasDronModel>(); |
|
|
|
|
|
|
|
|
|
for(BasDronModel model : queryResult) { |
|
|
|
|
// if(!StringUtils.isEmpty(model.getOwnerNm())) {
|
|
|
|
|
// model.setOwnerNm(EncryptUtils.decrypt(model.getOwnerNm()));
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
result.add(model); |
|
|
|
|
} |
|
|
|
|
// List<BasDronModel> result = new ArrayList<BasDronModel>();
|
|
|
|
|
//
|
|
|
|
|
// for(BasDronModel model : queryResult) {
|
|
|
|
|
//// if(!StringUtils.isEmpty(model.getOwnerNm())) {
|
|
|
|
|
//// model.setOwnerNm(EncryptUtils.decrypt(model.getOwnerNm()));
|
|
|
|
|
//// }
|
|
|
|
|
//
|
|
|
|
|
// result.add(model);
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
return result; |
|
|
|
|
} |
|
|
|
@ -129,7 +129,7 @@ public class PtyDronQueryRepository{
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* 상세 조회 |
|
|
|
|
* @param rq |
|
|
|
|
* @param arcrftSno |
|
|
|
|
* @return |
|
|
|
|
*/ |
|
|
|
|
public BasDronModel detail(int arcrftSno){ |
|
|
|
@ -180,8 +180,8 @@ public class PtyDronQueryRepository{
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* 식별번호가 존해 하는지 여부체크 |
|
|
|
|
* @param cstmrSno |
|
|
|
|
* @param groupId |
|
|
|
|
* @param idntfNum |
|
|
|
|
* @param |
|
|
|
|
* @return |
|
|
|
|
*/ |
|
|
|
|
public boolean isNotIdntNum(String idntfNum) { |
|
|
|
|