비행운항 스케줄 목록 - 비행 상태 값 수정

src/main/java/com/palnet/biz/api/bas/flight/model/BasFlightScheduleRs.java

@@ -9,14 +9,17 @@ public class BasFlightScheduleRs {
 
     private String groupId;
     private String groupNm;
-    private String memberName;
     private String ownerNm;
     private String idntfNum;
+    private String startAddress;
+    private String endAddress;
     private Date schFltStDt;
     private Date schFltEndDt;
     private String cntrlId;
     private Date cntrlStDt;
     private Date cntrlEndDt;
+    
+    // BEFORE (B) : 비행 전, FLYING (F) : 비행 중, SUCCESS (S) : 비행 완료 
     private String statusCd;
 
 }

src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanQueryRepository.java

@@ -10,6 +10,7 @@ import com.querydsl.core.types.ConstantImpl;
 import com.querydsl.core.types.ExpressionUtils;
 import com.querydsl.core.types.Predicate;
 import com.querydsl.core.types.Projections;
+import com.querydsl.core.types.dsl.CaseBuilder;
 import com.querydsl.core.types.dsl.DateTemplate;
 import com.querydsl.core.types.dsl.Expressions;
 import com.querydsl.jpa.JPAExpressions;
@@ -393,7 +394,6 @@ public class FltPlanQueryRepository {
                                             .from(groupBas)
                                             .where(groupBas.groupId.eq(fltPlanBas.groupId)),"groupNm"
                                 ),
-                                fltPlanBas.memberName,
                                 fltPlanArcrft.ownerNm,
                                 fltPlanArcrft.idntfNum,
                                 ExpressionUtils.as(
@@ -427,7 +427,10 @@ public class FltPlanQueryRepository {
                                 cntrlBas.cntrlId,
                                 cntrlBas.cntrlStDt,
                                 cntrlBas.cntrlEndDt,
-                                cntrlBas.statusCd
+                                new CaseBuilder()
+                                    .when(cntrlBas.statusCd.eq("01")).then("F")
+                                    .when(cntrlBas.statusCd.eq("99")).then("S")
+                                    .otherwise("B").as("statusCd")
                         )
                 )
                 .from(fltPlanBas)

src/main/java/com/palnet/biz/message/service/impl/MessageServiceImpl.java

@@ -108,11 +108,11 @@ public class MessageServiceImpl implements MessageService {
             model.setTypeCd("01");
             model.setAreaTrnsYn("N");
             model.setControlStartDt(DateUtils.getCurrentTime());
-
-            // 기체 식별번호의 관제 ID 저장 (single ton)
-            shareContext.putIdntfKey(model.getObjectId(), controlID);
         }
 
+        // 기체 식별번호의 관제 ID 저장
+        shareContext.putIdntfKey(model.getObjectId(), model.getControlId());
+
         return model;
     }