Browse Source

Revert "."

This reverts commit 5eebc007cf.
Test
qkr7828(박재우) 2 years ago
parent
commit
8dafab98a2
  1. 4
      src/main/java/com/palnet/biz/api/anls/hstry/controller/AnlsHstryController.java
  2. 6
      src/main/java/com/palnet/biz/api/anls/hstry/service/AnlsHstryService.java

4
src/main/java/com/palnet/biz/api/anls/hstry/controller/AnlsHstryController.java

@ -45,8 +45,8 @@ public class AnlsHstryController {
@ApiOperation(value = "비행 현황 목록 출력") @ApiOperation(value = "비행 현황 목록 출력")
@Tag(name = "비행 이력 현황", description = "비행 이력 현황 관련 API") @Tag(name = "비행 이력 현황", description = "비행 이력 현황 관련 API")
public ResponseEntity<? extends BasicResponse> list(AnlsHstryGroupModel rq) { public ResponseEntity<? extends BasicResponse> list(AnlsHstryGroupModel rq) {
List<AnlsHstryModel> rs = null; List<AnlsHstryRsModel> rs = null;
ComnPagingRs<AnlsHstryModel> response; ComnPagingRs<AnlsHstryRsModel> response;
//입력값 검증 //입력값 검증
if(rq.getStDate() == null || !(rq.getStDate().length() == 10) || rq.getEndDate() ==null || !(rq.getEndDate().length() == 10) ) { if(rq.getStDate() == null || !(rq.getStDate().length() == 10) || rq.getEndDate() ==null || !(rq.getEndDate().length() == 10) ) {

6
src/main/java/com/palnet/biz/api/anls/hstry/service/AnlsHstryService.java

@ -66,17 +66,17 @@ public class AnlsHstryService {
private JwtTokenUtil jwtTokenUtil; private JwtTokenUtil jwtTokenUtil;
//비행이력현황 list //비행이력현황 list
public ComnPagingRs<AnlsHstryModel> list(AnlsHstryGroupModel rq){ public ComnPagingRs<AnlsHstryRsModel> list(AnlsHstryGroupModel rq){
Integer cstmrSno = jwtTokenUtil.getCstmrSnoByToken(); Integer cstmrSno = jwtTokenUtil.getCstmrSnoByToken();
List<JwtGroupModel> groupAuth = jwtTokenUtil.getGroupAuthByToken(); List<JwtGroupModel> groupAuth = jwtTokenUtil.getGroupAuthByToken();
String appAuth = jwtTokenUtil.getUserAuthByToken(); String appAuth = jwtTokenUtil.getUserAuthByToken();
ComnPagingRs<AnlsHstryModel> response = new ComnPagingRs<>(); ComnPagingRs<AnlsHstryRsModel> response = new ComnPagingRs<>();
Pageable pageable = PageRequest.of(rq.getPage()-1, rq.getRecord()); Pageable pageable = PageRequest.of(rq.getPage()-1, rq.getRecord());
if("USER".equals(appAuth) || "ROLE_USER".equals(appAuth)) { if("USER".equals(appAuth) || "ROLE_USER".equals(appAuth)) {
} }
PageImpl<AnlsHstryModel> result = query.listCntrlBasRs(rq, pageable); PageImpl<AnlsHstryRsModel> result = query.listCntrlBasRs(rq, pageable);
long total = query.countCntrlBasRs(rq, cstmrSno); long total = query.countCntrlBasRs(rq, cstmrSno);
long totalPage = total % rq.getRecord() > 0 ? (total/rq.getRecord()) + 1 : total/rq.getRecord(); long totalPage = total % rq.getRecord() > 0 ? (total/rq.getRecord()) + 1 : total/rq.getRecord();

Loading…
Cancel
Save