diff --git a/src/main/java/com/chint/interfaces/rest/bpm/dto/ANExceedStandardDto.java b/src/main/java/com/chint/interfaces/rest/bpm/dto/ANExceedStandardDto.java index aaecd117..fc926587 100644 --- a/src/main/java/com/chint/interfaces/rest/bpm/dto/ANExceedStandardDto.java +++ b/src/main/java/com/chint/interfaces/rest/bpm/dto/ANExceedStandardDto.java @@ -15,7 +15,7 @@ public class ANExceedStandardDto { private String applicant;//申请人 private String applyNo;//差旅申请单号 private String orderNo;//商旅订单号 - private String orderType;//超标原因 + private String orderType;//超标类型 private String orderSource;//订单来源 private String legNo;//行程ID private String startPlace;//出发地 diff --git a/src/main/java/com/chint/manage/mapper/impl/ManageOrderDetailRepositoryImpl.java b/src/main/java/com/chint/manage/mapper/impl/ManageOrderDetailRepositoryImpl.java index 9fbec593..0cedb558 100644 --- a/src/main/java/com/chint/manage/mapper/impl/ManageOrderDetailRepositoryImpl.java +++ b/src/main/java/com/chint/manage/mapper/impl/ManageOrderDetailRepositoryImpl.java @@ -54,6 +54,7 @@ public class ManageOrderDetailRepositoryImpl implements ManageOrderDetailReposit } if (!dto.getCompanyName().isEmpty()) { + dto.setCompanyName(dto.getCompanyName()+"%"); query+="AND oes.company_name LIKE (:companyName) "; } @@ -63,7 +64,7 @@ public class ManageOrderDetailRepositoryImpl implements ManageOrderDetailReposit Map params = new HashMap<>(); PageRequest pageRequest = PageRequest - .of(dto.getPageNum() - 1, dto.getPageSize(), Sort.by("id").descending()); + .of(dto.getPageNum() - 1, dto.getPageSize(), Sort.by("order_date").descending()); params.put("actualOrderNo", dto.getActualOrderNo()); params.put("applicant", dto.getApplicant()); params.put("companyName", dto.getCompanyName()); 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 1d48b334..0028c25f 100644 --- a/src/main/java/com/chint/manage/service/impl/ManageServiceImpl.java +++ b/src/main/java/com/chint/manage/service/impl/ManageServiceImpl.java @@ -106,19 +106,6 @@ public class ManageServiceImpl implements ManageService { } dto.setCompanyCods(companyCods); Page page=manageOrderDetailRepository.OrderExceedStandard(dto); - List content = page.getContent(); - Set employees=new HashSet<>(); - for (OrderExceedStandard orderExceedStandard : content) { - employees.add(orderExceedStandard.getEmployeeNo()); - } - List allByEmployeeNoIn = userBasicRepository. - findAllByEmployeeNoIn(employees.stream().toList()); - for (OrderExceedStandard orderExceedStandard : content) { - for (UserBasic userBasic : allByEmployeeNoIn) { - if(userBasic.getEmployeeNo().equals(orderExceedStandard.getEmployeeNo())){} - orderExceedStandard.setApplicant(userBasic.getName()); - } - } List excelList = getOrderExceedStandardExcels(page); return PageResult.totalPageNum(page.getTotalElements(), excelList); }