From bc4b384c945f1b81b7b9eb5b8ff617efdab86929 Mon Sep 17 00:00:00 2001 From: lh Date: Mon, 5 Jan 2026 09:34:40 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=9C=BA=E7=A5=A8=E9=A2=84?= =?UTF-8?q?=E8=AE=A2=E7=95=8C=E9=9D=A2=EF=BC=8C=E5=AE=9E=E7=8E=B0=E6=9C=BA?= =?UTF-8?q?=E7=A5=A8=E9=A2=84=E8=AE=A2=E6=B5=81=E7=A8=8B=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=EF=BC=8C=E4=BC=98=E5=8C=96=E6=9C=BA=E7=A5=A8?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E3=80=81=E5=AF=BC=E5=87=BA=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../oa/crm/domain/CrmFlightBooking.java | 2 +- .../oa/crm/domain/bo/CrmFlightBookingBo.java | 2 +- .../oa/crm/domain/vo/CrmFlightBookingVo.java | 25 ++++++++++--------- .../impl/CrmFlightBookingServiceImpl.java | 10 +++++--- 4 files changed, 21 insertions(+), 18 deletions(-) diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/domain/CrmFlightBooking.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/domain/CrmFlightBooking.java index e00a1f3a..cdd8aa50 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/domain/CrmFlightBooking.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/domain/CrmFlightBooking.java @@ -67,7 +67,7 @@ public class CrmFlightBooking extends TenantEntity { /** * 机票金额（元） */ - private Long flightAmount; + private Double flightAmount; /** * 附件ID（支持多个，逗号分隔） diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/domain/bo/CrmFlightBookingBo.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/domain/bo/CrmFlightBookingBo.java index b07373d8..8ba559a7 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/domain/bo/CrmFlightBookingBo.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/domain/bo/CrmFlightBookingBo.java @@ -78,7 +78,7 @@ public class CrmFlightBookingBo extends BaseEntity { * 机票金额（元） */ @NotNull(message = "机票金额（元）不能为空", groups = { AddGroup.class, EditGroup.class }) - private Long flightAmount; + private Double flightAmount; /** * 附件ID（支持多个，逗号分隔） diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/domain/vo/CrmFlightBookingVo.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/domain/vo/CrmFlightBookingVo.java index ce41ff4f..99857f9c 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/domain/vo/CrmFlightBookingVo.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/domain/vo/CrmFlightBookingVo.java @@ -1,7 +1,10 @@ package org.dromara.oa.crm.domain.vo; import java.util.Date; + +import cn.idev.excel.annotation.write.style.ColumnWidth; import com.fasterxml.jackson.annotation.JsonFormat; +import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.oa.crm.domain.CrmFlightBooking; import cn.idev.excel.annotation.ExcelIgnoreUnannotated; import cn.idev.excel.annotation.ExcelProperty; @@ -25,7 +28,7 @@ import java.util.Date; @Data @ExcelIgnoreUnannotated @AutoMapper(target = CrmFlightBooking.class) -public class CrmFlightBookingVo implements Serializable { +public class CrmFlightBookingVo extends BaseEntity implements Serializable { @Serial private static final long serialVersionUID = 1L; @@ -33,7 +36,7 @@ public class CrmFlightBookingVo implements Serializable { /** * 机票预订ID */ - @ExcelProperty(value = "机票预订ID") +// @ExcelProperty(value = "机票预订ID") private Long bookingId; /** @@ -45,7 +48,7 @@ public class CrmFlightBookingVo implements Serializable { /** * 乘机人ID */ - @ExcelProperty(value = "乘机人ID") +// @ExcelProperty(value = "乘机人ID") private Long passengerId; /** @@ -58,13 +61,13 @@ public class CrmFlightBookingVo implements Serializable { * 出行日期 */ @ExcelProperty(value = "出行日期") + @ColumnWidth(20) private Date travelDate; /** * 出发地点（出差地点） */ - @ExcelProperty(value = "出发地点", converter = ExcelDictConvert.class) - @ExcelDictFormat(readConverterExp = "出=差地点") + @ExcelProperty(value = "出发地点") private String departureLocation; /** @@ -77,28 +80,26 @@ public class CrmFlightBookingVo implements Serializable { * 机票折扣（1:5折及以下 2:5~8折 3:8折及以上 4:退改签） */ @ExcelProperty(value = "机票折扣", converter = ExcelDictConvert.class) - @ExcelDictFormat(readConverterExp = "1=:5折及以下,2=:5~8折,3=:8折及以上,4=:退改签") + @ExcelDictFormat(dictType = "flight_discount") private String flightDiscount; /** * 机票金额（元） */ - @ExcelProperty(value = "机票金额", converter = ExcelDictConvert.class) - @ExcelDictFormat(readConverterExp = "元=") - private Long flightAmount; + @ExcelProperty(value = "机票金额") + private Double flightAmount; /** * 附件ID（支持多个，逗号分隔） */ - @ExcelProperty(value = "附件ID", converter = ExcelDictConvert.class) - @ExcelDictFormat(readConverterExp = "支=持多个，逗号分隔") + @ExcelProperty(value = "附件ID") private String ossId; /** * 申请状态（1暂存 2审批中 3已审批 4作废） */ @ExcelProperty(value = "申请状态", converter = ExcelDictConvert.class) - @ExcelDictFormat(readConverterExp = "1=暂存,2=审批中,3=已审批,4=作废") + @ExcelDictFormat(dictType = "booking_status") private String bookingStatus; /** diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmFlightBookingServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmFlightBookingServiceImpl.java index 4fb02b49..d2d21955 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmFlightBookingServiceImpl.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmFlightBookingServiceImpl.java @@ -19,6 +19,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import org.dromara.common.tenant.helper.TenantHelper; import org.dromara.oa.erp.domain.ErpProjectPlan; +import org.dromara.oa.erp.domain.ErpProjectReportDetail; import org.dromara.oa.erp.domain.vo.ErpProjectPlanVo; import org.dromara.workflow.api.RemoteWorkflowService; import org.dromara.workflow.api.domain.RemoteStartProcess; @@ -70,6 +71,7 @@ public class CrmFlightBookingServiceImpl implements ICrmFlightBookingService { @Override public TableDataInfo queryPageList(CrmFlightBookingBo bo, PageQuery pageQuery) { MPJLambdaWrapper lqw = buildQueryWrapper(bo); + lqw.orderByDesc(CrmFlightBooking::getUpdateTime); Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); return TableDataInfo.build(result); } @@ -91,12 +93,12 @@ public class CrmFlightBookingServiceImpl implements ICrmFlightBookingService { MPJLambdaWrapper lqw = JoinWrappers.lambda(CrmFlightBooking.class) .selectAll(CrmFlightBooking.class) .eq(CrmFlightBooking::getDelFlag, "0") - .eq(StringUtils.isNotBlank(bo.getApplyCode()), CrmFlightBooking::getApplyCode, bo.getApplyCode()) + .like(StringUtils.isNotBlank(bo.getApplyCode()), CrmFlightBooking::getApplyCode, bo.getApplyCode()) .eq(bo.getPassengerId() != null, CrmFlightBooking::getPassengerId, bo.getPassengerId()) .like(StringUtils.isNotBlank(bo.getPassengerName()), CrmFlightBooking::getPassengerName, bo.getPassengerName()) .eq(bo.getTravelDate() != null, CrmFlightBooking::getTravelDate, bo.getTravelDate()) - .eq(StringUtils.isNotBlank(bo.getDepartureLocation()), CrmFlightBooking::getDepartureLocation, bo.getDepartureLocation()) - .eq(StringUtils.isNotBlank(bo.getArrivalLocation()), CrmFlightBooking::getArrivalLocation, bo.getArrivalLocation()) + .like(StringUtils.isNotBlank(bo.getDepartureLocation()), CrmFlightBooking::getDepartureLocation, bo.getDepartureLocation()) + .like(StringUtils.isNotBlank(bo.getArrivalLocation()), CrmFlightBooking::getArrivalLocation, bo.getArrivalLocation()) .eq(StringUtils.isNotBlank(bo.getFlightDiscount()), CrmFlightBooking::getFlightDiscount, bo.getFlightDiscount()) .eq(bo.getFlightAmount() != null, CrmFlightBooking::getFlightAmount, bo.getFlightAmount()) .eq(StringUtils.isNotBlank(bo.getOssId()), CrmFlightBooking::getOssId, bo.getOssId()) @@ -109,7 +111,7 @@ public class CrmFlightBookingServiceImpl implements ICrmFlightBookingService { /** * 新增机票预订 * - * @param bo 机票预订 + * @param bo 机票预订？ * @return 是否新增成功 */ @Override