From 0817f897f6644e7da725dd54bf437333454f546d Mon Sep 17 00:00:00 2001 From: nixj Date: Tue, 2 Jul 2024 14:05:42 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90update=E3=80=91=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E8=B6=85=E6=A0=87=E6=8A=A5=E8=A1=A8=E5=85=AC=E5=8F=B8=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E6=A8=A1=E7=B3=8A=E6=9F=A5=E8=AF=A2=E9=97=AE=E9=A2=98?= =?UTF-8?q?=EF=BC=8C=E5=8E=BB=E9=99=A4=E7=94=A8=E6=88=B7=E5=90=8D=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E4=B8=B4=E6=97=B6=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rest/bpm/dto/ANExceedStandardDto.java | 2 +- .../impl/ManageOrderDetailRepositoryImpl.java | 3 ++- .../manage/service/impl/ManageServiceImpl.java | 13 ------------- 3 files changed, 3 insertions(+), 15 deletions(-) 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); }