echo
/
route
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
nixj 2024-05-22 08:36:42 +08:00
parent 863cecabd3
commit 35299e05e6
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/chint/manage/controller/ManageController.java
View File

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

2
src/main/java/com/chint/manage/mapper/JdbcConsumptionDetailRepository.java
View File

@ -8,7 +8,7 @@ import com.chint.manage.entity.query.ItineraryPageQuery;
import org.springframework.data.domain.Page; import org.springframework.data.domain.Page;
public interface JdbcConsumptionDetailRepository { public interface JdbcConsumptionDetailRepository {
Page<ItineraryPageDto> orderPageQueryByDto(ItineraryPageQuery dto); Page<ItineraryPageDto> itineraryPageQueryByDto(ItineraryPageQuery dto);
PageResult<? extends BaseExcel> pageConsumptionDetail(ConsumptionDetailQuery dto); PageResult<? extends BaseExcel> pageConsumptionDetail(ConsumptionDetailQuery dto);
} }

2
src/main/java/com/chint/manage/mapper/impl/JdbcConsumptionDetailRepositoryImpl.java
View File

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

2
src/main/java/com/chint/manage/service/ManageService.java
View File

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

4
src/main/java/com/chint/manage/service/impl/ManageServiceImpl.java
View File

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

2
src/test/java/com/chint/ManageTest.java
View File

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