【update】行程单部分方法修改

src/main/java/com/chint/manage/controller/ManageController.java

@@ -87,8 +87,8 @@ public class ManageController {
 
     @ApiOperation("行程单分页查询接口")
     @PostMapping("/itinerary/pageQuery")
-    public Result<PageResult<ItineraryPageDto>> orderPageQuery(@RequestBody ItineraryPageQuery dto){
-        return Result.Success(SUCCESS,manageService.orderPageQuery(dto));
+    public Result<PageResult<ItineraryPageDto>> itineraryPageQuery(@RequestBody ItineraryPageQuery dto){
+        return Result.Success(SUCCESS,manageService.itineraryPageQuery(dto));
     }
 
 

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<ItineraryPageDto> orderPageQueryByDto(ItineraryPageQuery dto);
+    Page<ItineraryPageDto> itineraryPageQueryByDto(ItineraryPageQuery dto);
 
     PageResult<? extends BaseExcel> pageConsumptionDetail(ConsumptionDetailQuery dto);
 }

src/main/java/com/chint/manage/mapper/impl/JdbcConsumptionDetailRepositoryImpl.java

@@ -44,7 +44,7 @@ public class JdbcConsumptionDetailRepositoryImpl implements JdbcConsumptionDetai
 
 
     @Override
-    public Page<ItineraryPageDto> orderPageQueryByDto(ItineraryPageQuery dto) {
+    public Page<ItineraryPageDto> itineraryPageQueryByDto(ItineraryPageQuery dto) {
         String query = "SELECT * FROM route_order " +
                 "WHERE 1 = 1 " +
                 "AND (:actualOrderNo  IS NULL OR actual_order_no = :actualOrderNo ) ";

src/main/java/com/chint/manage/service/ManageService.java

@@ -27,7 +27,7 @@ public interface ManageService {
 
     File standardExport(StandardQuery dto);
 
-    PageResult<ItineraryPageDto> orderPageQuery(ItineraryPageQuery dto);
+    PageResult<ItineraryPageDto> itineraryPageQuery(ItineraryPageQuery dto);
 
     void addOrderDownloadRecord(OrderDownloadRecord orderDownloadRecord);
 

src/main/java/com/chint/manage/service/impl/ManageServiceImpl.java

@@ -88,13 +88,13 @@ public class ManageServiceImpl implements ManageService {
     }
 
     @Override
-    public PageResult<ItineraryPageDto> orderPageQuery(ItineraryPageQuery dto) {
+    public PageResult<ItineraryPageDto> itineraryPageQuery(ItineraryPageQuery dto) {
         List<User> users=jdbcUserRepository.findAllByNameContains(dto.getApplicant());
         if (users==null||users.isEmpty()){
             return null;
         }
         dto.setUserIds(users.stream().map(User::getEmployeeNo).toList());
-        Page<ItineraryPageDto> page= jdbcConsumptionDetailRepository.orderPageQueryByDto(dto);
+        Page<ItineraryPageDto> page= jdbcConsumptionDetailRepository.itineraryPageQueryByDto(dto);
         //处理信息
         List<ItineraryPageDto> list=page.getContent();
         //查询行程和审批单信息

src/test/java/com/chint/ManageTest.java

@@ -49,7 +49,7 @@ public class ManageTest {
     @Test
     void pageQuery(){
         ItineraryPageQuery dto=new ItineraryPageQuery();
-        Page<ItineraryPageDto> page= jdbcConsumptionDetailRepository.orderPageQueryByDto(dto);
+        Page<ItineraryPageDto> page= jdbcConsumptionDetailRepository.itineraryPageQueryByDto(dto);
         System.out.println(page);
     }