diff --git a/src/main/java/com/chint/manage/controller/ManageController.java b/src/main/java/com/chint/manage/controller/ManageController.java index 3529d34f..7fe194b9 100644 --- a/src/main/java/com/chint/manage/controller/ManageController.java +++ b/src/main/java/com/chint/manage/controller/ManageController.java @@ -87,8 +87,8 @@ public class ManageController { @ApiOperation("行程单分页查询接口") @PostMapping("/itinerary/pageQuery") - public Result> orderPageQuery(@RequestBody ItineraryPageQuery dto){ - return Result.Success(SUCCESS,manageService.orderPageQuery(dto)); + public Result> itineraryPageQuery(@RequestBody ItineraryPageQuery dto){ + return Result.Success(SUCCESS,manageService.itineraryPageQuery(dto)); } diff --git a/src/main/java/com/chint/manage/mapper/JdbcConsumptionDetailRepository.java b/src/main/java/com/chint/manage/mapper/JdbcConsumptionDetailRepository.java index 62adc392..72ec7001 100644 --- a/src/main/java/com/chint/manage/mapper/JdbcConsumptionDetailRepository.java +++ b/src/main/java/com/chint/manage/mapper/JdbcConsumptionDetailRepository.java @@ -8,7 +8,7 @@ import com.chint.manage.entity.query.ItineraryPageQuery; import org.springframework.data.domain.Page; public interface JdbcConsumptionDetailRepository { - Page orderPageQueryByDto(ItineraryPageQuery dto); + Page itineraryPageQueryByDto(ItineraryPageQuery dto); PageResult pageConsumptionDetail(ConsumptionDetailQuery dto); } \ No newline at end of file diff --git a/src/main/java/com/chint/manage/mapper/impl/JdbcConsumptionDetailRepositoryImpl.java b/src/main/java/com/chint/manage/mapper/impl/JdbcConsumptionDetailRepositoryImpl.java index 664b25e4..29148b91 100644 --- a/src/main/java/com/chint/manage/mapper/impl/JdbcConsumptionDetailRepositoryImpl.java +++ b/src/main/java/com/chint/manage/mapper/impl/JdbcConsumptionDetailRepositoryImpl.java @@ -44,7 +44,7 @@ public class JdbcConsumptionDetailRepositoryImpl implements JdbcConsumptionDetai @Override - public Page orderPageQueryByDto(ItineraryPageQuery dto) { + public Page itineraryPageQueryByDto(ItineraryPageQuery dto) { String query = "SELECT * FROM route_order " + "WHERE 1 = 1 " + "AND (:actualOrderNo IS NULL OR actual_order_no = :actualOrderNo ) "; diff --git a/src/main/java/com/chint/manage/service/ManageService.java b/src/main/java/com/chint/manage/service/ManageService.java index b30ff4db..c8609838 100644 --- a/src/main/java/com/chint/manage/service/ManageService.java +++ b/src/main/java/com/chint/manage/service/ManageService.java @@ -27,7 +27,7 @@ public interface ManageService { File standardExport(StandardQuery dto); - PageResult orderPageQuery(ItineraryPageQuery dto); + PageResult itineraryPageQuery(ItineraryPageQuery dto); void addOrderDownloadRecord(OrderDownloadRecord orderDownloadRecord); diff --git a/src/main/java/com/chint/manage/service/impl/ManageServiceImpl.java b/src/main/java/com/chint/manage/service/impl/ManageServiceImpl.java index 5b07a91f..98f1de08 100644 --- a/src/main/java/com/chint/manage/service/impl/ManageServiceImpl.java +++ b/src/main/java/com/chint/manage/service/impl/ManageServiceImpl.java @@ -88,13 +88,13 @@ public class ManageServiceImpl implements ManageService { } @Override - public PageResult orderPageQuery(ItineraryPageQuery dto) { + public PageResult itineraryPageQuery(ItineraryPageQuery dto) { List users=jdbcUserRepository.findAllByNameContains(dto.getApplicant()); if (users==null||users.isEmpty()){ return null; } dto.setUserIds(users.stream().map(User::getEmployeeNo).toList()); - Page page= jdbcConsumptionDetailRepository.orderPageQueryByDto(dto); + Page page= jdbcConsumptionDetailRepository.itineraryPageQueryByDto(dto); //处理信息 List list=page.getContent(); //查询行程和审批单信息 diff --git a/src/test/java/com/chint/ManageTest.java b/src/test/java/com/chint/ManageTest.java index 4149183e..e6467160 100644 --- a/src/test/java/com/chint/ManageTest.java +++ b/src/test/java/com/chint/ManageTest.java @@ -49,7 +49,7 @@ public class ManageTest { @Test void pageQuery(){ ItineraryPageQuery dto=new ItineraryPageQuery(); - Page page= jdbcConsumptionDetailRepository.orderPageQueryByDto(dto); + Page page= jdbcConsumptionDetailRepository.itineraryPageQueryByDto(dto); System.out.println(page); }