ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/domain/CrmFlightBooking.java

@@ -67,7 +67,7 @@ public class CrmFlightBooking extends TenantEntity {
     /**
      * 机票金额（元）
      */
-    private Double flightAmount;
+    private Long flightAmount;
 
     /**
      * 附件ID（支持多个，逗号分隔）

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 Double flightAmount;
+    private Long flightAmount;
 
     /**
      * 附件ID（支持多个，逗号分隔）

ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/domain/vo/CrmFlightBookingVo.java

@@ -1,10 +1,7 @@
 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;
@@ -28,7 +25,7 @@ import java.util.Date;
 @Data
 @ExcelIgnoreUnannotated
 @AutoMapper(target = CrmFlightBooking.class)
-public class CrmFlightBookingVo extends BaseEntity implements Serializable {
+public class CrmFlightBookingVo implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 1L;
@@ -36,7 +33,7 @@ public class CrmFlightBookingVo extends BaseEntity implements Serializable {
     /**
      * 机票预订ID
      */
-//    @ExcelProperty(value = "机票预订ID")
+    @ExcelProperty(value = "机票预订ID")
     private Long bookingId;
 
     /**
@@ -48,7 +45,7 @@ public class CrmFlightBookingVo extends BaseEntity implements Serializable {
     /**
      * 乘机人ID
      */
-//    @ExcelProperty(value = "乘机人ID")
+    @ExcelProperty(value = "乘机人ID")
     private Long passengerId;
 
     /**
@@ -61,13 +58,13 @@ public class CrmFlightBookingVo extends BaseEntity implements Serializable {
      * 出行日期
      */
     @ExcelProperty(value = "出行日期")
-    @ColumnWidth(20)
     private Date travelDate;
 
     /**
      * 出发地点（出差地点）
      */
-    @ExcelProperty(value = "出发地点")
+    @ExcelProperty(value = "出发地点", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "出=差地点")
     private String departureLocation;
 
     /**
@@ -80,26 +77,28 @@ public class CrmFlightBookingVo extends BaseEntity implements Serializable {
      * 机票折扣（1:5折及以下 2:5~8折 3:8折及以上 4:退改签）
      */
     @ExcelProperty(value = "机票折扣", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(dictType = "flight_discount")
+    @ExcelDictFormat(readConverterExp = "1=:5折及以下,2=:5~8折,3=:8折及以上,4=:退改签")
     private String flightDiscount;
 
     /**
      * 机票金额（元）
      */
-    @ExcelProperty(value = "机票金额")
-    private Double flightAmount;
+    @ExcelProperty(value = "机票金额", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "元=")
+    private Long flightAmount;
 
     /**
      * 附件ID（支持多个，逗号分隔）
      */
-    @ExcelProperty(value = "附件ID")
+    @ExcelProperty(value = "附件ID", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "支=持多个，逗号分隔")
     private String ossId;
 
     /**
      * 申请状态（1暂存 2审批中 3已审批 4作废）
      */
     @ExcelProperty(value = "申请状态", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(dictType = "booking_status")
+    @ExcelDictFormat(readConverterExp = "1=暂存,2=审批中,3=已审批,4=作废")
     private String bookingStatus;
 
     /**

ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmFlightBookingServiceImpl.java

@@ -19,7 +19,6 @@ 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;
@@ -71,7 +70,6 @@ public class CrmFlightBookingServiceImpl implements ICrmFlightBookingService {
         @Override
         public TableDataInfo<CrmFlightBookingVo> queryPageList(CrmFlightBookingBo bo, PageQuery pageQuery) {
             MPJLambdaWrapper<CrmFlightBooking> lqw = buildQueryWrapper(bo);
-            lqw.orderByDesc(CrmFlightBooking::getUpdateTime);
             Page<CrmFlightBookingVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
             return TableDataInfo.build(result);
         }
@@ -93,12 +91,12 @@ public class CrmFlightBookingServiceImpl implements ICrmFlightBookingService {
         MPJLambdaWrapper<CrmFlightBooking> lqw = JoinWrappers.lambda(CrmFlightBooking.class)
         .selectAll(CrmFlightBooking.class)
         .eq(CrmFlightBooking::getDelFlag, "0")
-                    .like(StringUtils.isNotBlank(bo.getApplyCode()), CrmFlightBooking::getApplyCode, bo.getApplyCode())
+                    .eq(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())
-                    .like(StringUtils.isNotBlank(bo.getDepartureLocation()), CrmFlightBooking::getDepartureLocation, bo.getDepartureLocation())
-                    .like(StringUtils.isNotBlank(bo.getArrivalLocation()), CrmFlightBooking::getArrivalLocation, bo.getArrivalLocation())
+                    .eq(StringUtils.isNotBlank(bo.getDepartureLocation()), CrmFlightBooking::getDepartureLocation, bo.getDepartureLocation())
+                    .eq(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())
@@ -111,7 +109,7 @@ public class CrmFlightBookingServiceImpl implements ICrmFlightBookingService {
     /**
      * 新增机票预订
      *
-     * @param bo 机票预订？
+     * @param bo 机票预订
      * @return 是否新增成功
      */
     @Override