From 11fe4876c4f645063a46f5018c15eb73e0bc5189 Mon Sep 17 00:00:00 2001 From: lh Date: Fri, 19 Dec 2025 14:38:15 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=A1=B9=E7=9B=AE=E5=91=A8?= =?UTF-8?q?=E6=8A=A5=E5=8A=9F=E8=83=BD=E4=BB=A5=E5=8F=8A=E6=9C=BA=E7=A5=A8?= =?UTF-8?q?=E9=A2=84=E5=AE=9A=E5=8A=9F=E8=83=BD=E4=BB=A3=E7=A0=81=E7=94=9F?= =?UTF-8?q?=E6=88=90=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CrmFlightBookingController.java | 116 ++++++++++++++ .../oa/crm/domain/CrmFlightBooking.java | 99 ++++++++++++ .../oa/crm/domain/bo/CrmFlightBookingBo.java | 98 ++++++++++++ .../oa/crm/domain/vo/CrmFlightBookingVo.java | 117 ++++++++++++++ .../oa/crm/mapper/CrmFlightBookingMapper.java | 37 +++++ .../crm/service/ICrmFlightBookingService.java | 69 +++++++++ .../impl/CrmFlightBookingServiceImpl.java | 143 ++++++++++++++++++ .../mapper/oa/crm/CrmFlightBookingMapper.xml | 14 ++ 8 files changed, 693 insertions(+) create mode 100644 ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/controller/CrmFlightBookingController.java create mode 100644 ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/domain/CrmFlightBooking.java create mode 100644 ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/domain/bo/CrmFlightBookingBo.java create mode 100644 ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/domain/vo/CrmFlightBookingVo.java create mode 100644 ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/mapper/CrmFlightBookingMapper.java create mode 100644 ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/ICrmFlightBookingService.java create mode 100644 ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmFlightBookingServiceImpl.java create mode 100644 ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/crm/CrmFlightBookingMapper.xml diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/controller/CrmFlightBookingController.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/controller/CrmFlightBookingController.java new file mode 100644 index 00000000..c741c095 --- /dev/null +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/controller/CrmFlightBookingController.java @@ -0,0 +1,116 @@ +package org.dromara.oa.crm.controller; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.oa.crm.domain.vo.CrmFlightBookingVo; +import org.dromara.oa.crm.domain.bo.CrmFlightBookingBo; +import org.dromara.oa.crm.service.ICrmFlightBookingService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 机票预订 + * 前端访问路由地址为:/oa/flightBooking + * + * @author Yinq + * @date 2025-12-17 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/crm/flightBooking") +public class CrmFlightBookingController extends BaseController { + + private final ICrmFlightBookingService crmFlightBookingService; + + /** + * 查询机票预订列表 + */ + @SaCheckPermission("oa/crm:flightBooking:list") + @GetMapping("/list") + public TableDataInfo list(CrmFlightBookingBo bo, PageQuery pageQuery) { + return crmFlightBookingService.queryPageList(bo, pageQuery); + } + + /** + * 导出机票预订列表 + */ + @SaCheckPermission("oa/crm:flightBooking:export") + @Log(title = "机票预订", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(CrmFlightBookingBo bo, HttpServletResponse response) { + List list = crmFlightBookingService.queryList(bo); + ExcelUtil.exportExcel(list, "机票预订", CrmFlightBookingVo.class, response); + } + + /** + * 获取机票预订详细信息 + * + * @param bookingId 主键 + */ + @SaCheckPermission("oa/crm:flightBooking:query") + @GetMapping("/{bookingId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable("bookingId") Long bookingId) { + return R.ok(crmFlightBookingService.queryById(bookingId)); + } + + /** + * 新增机票预订 + */ + @SaCheckPermission("oa/crm:flightBooking:add") + @Log(title = "机票预订", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody CrmFlightBookingBo bo) { + return toAjax(crmFlightBookingService.insertByBo(bo)); + } + + /** + * 修改机票预订 + */ + @SaCheckPermission("oa/crm:flightBooking:edit") + @Log(title = "机票预订", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody CrmFlightBookingBo bo) { + return toAjax(crmFlightBookingService.updateByBo(bo)); + } + + /** + * 删除机票预订 + * + * @param bookingIds 主键串 + */ + @SaCheckPermission("oa/crm:flightBooking:remove") + @Log(title = "机票预订", businessType = BusinessType.DELETE) + @DeleteMapping("/{bookingIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable("bookingIds") Long[] bookingIds) { + return toAjax(crmFlightBookingService.deleteWithValidByIds(List.of(bookingIds), true)); + } + + /** + * 下拉框查询机票预订列表 + */ + @GetMapping("/getCrmFlightBookingList") + public R> getCrmFlightBookingList(CrmFlightBookingBo bo) { + List list = crmFlightBookingService.queryList(bo); + return R.ok(list); + } + +} 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 new file mode 100644 index 00000000..e7407c48 --- /dev/null +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/domain/CrmFlightBooking.java @@ -0,0 +1,99 @@ +package org.dromara.oa.crm.domain; + +import org.dromara.common.tenant.core.TenantEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; + +import java.io.Serial; + +/** + * 机票预订对象 crm_flight_booking + * + * @author Yinq + * @date 2025-12-17 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("crm_flight_booking") +public class CrmFlightBooking extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 机票预订ID + */ + @TableId(value = "booking_id", type = IdType.AUTO) + private Long bookingId; + + /** + * 机票预订编号 + */ + private String applyCode; + + /** + * 乘机人ID + */ + private Long passengerId; + + /** + * 乘机人姓名 + */ + private String passengerName; + + /** + * 出行日期 + */ + private Date travelDate; + + /** + * 出发地点（出差地点） + */ + private String departureLocation; + + /** + * 到达地点 + */ + private String arrivalLocation; + + /** + * 机票折扣（1:5折及以下 2:5~8折 3:8折及以上 4:退改签） + */ + private String flightDiscount; + + /** + * 机票金额（元） + */ + private Long flightAmount; + + /** + * 附件ID（支持多个，逗号分隔） + */ + private String ossId; + + /** + * 申请状态（1暂存 2审批中 3已审批 4作废） + */ + private String bookingStatus; + + /** + * 流程状态 + */ + private String flowStatus; + + /** + * 备注 + */ + private String remark; + + /** + * 删除标志（0代表存在 1代表删除） + */ + @TableLogic + private String delFlag; + + +} 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 new file mode 100644 index 00000000..20f99e52 --- /dev/null +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/domain/bo/CrmFlightBookingBo.java @@ -0,0 +1,98 @@ +package org.dromara.oa.crm.domain.bo; + +import org.dromara.oa.crm.domain.CrmFlightBooking; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; + +/** + * 机票预订业务对象 crm_flight_booking + * + * @author Yinq + * @date 2025-12-17 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = CrmFlightBooking.class, reverseConvertGenerate = false) +public class CrmFlightBookingBo extends BaseEntity { + + /** + * 机票预订ID + */ + @NotNull(message = "机票预订ID不能为空", groups = { EditGroup.class }) + private Long bookingId; + + /** + * 机票预订编号 + */ + private String applyCode; + + /** + * 乘机人ID + */ + @NotNull(message = "乘机人ID不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long passengerId; + + /** + * 乘机人姓名 + */ + private String passengerName; + + /** + * 出行日期 + */ + @NotNull(message = "出行日期不能为空", groups = { AddGroup.class, EditGroup.class }) + private Date travelDate; + + /** + * 出发地点（出差地点） + */ + @NotBlank(message = "出发地点（出差地点）不能为空", groups = { AddGroup.class, EditGroup.class }) + private String departureLocation; + + /** + * 到达地点 + */ + @NotBlank(message = "到达地点不能为空", groups = { AddGroup.class, EditGroup.class }) + private String arrivalLocation; + + /** + * 机票折扣（1:5折及以下 2:5~8折 3:8折及以上 4:退改签） + */ + @NotBlank(message = "机票折扣（1:5折及以下 2:5~8折 3:8折及以上 4:退改签）不能为空", groups = { AddGroup.class, EditGroup.class }) + private String flightDiscount; + + /** + * 机票金额（元） + */ + @NotNull(message = "机票金额（元）不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long flightAmount; + + /** + * 附件ID（支持多个，逗号分隔） + */ + private String ossId; + + /** + * 申请状态（1暂存 2审批中 3已审批 4作废） + */ + private String bookingStatus; + + /** + * 流程状态 + */ + private String flowStatus; + + /** + * 备注 + */ + private String remark; + + +} 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 new file mode 100644 index 00000000..ce41ff4f --- /dev/null +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/domain/vo/CrmFlightBookingVo.java @@ -0,0 +1,117 @@ +package org.dromara.oa.crm.domain.vo; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.dromara.oa.crm.domain.CrmFlightBooking; +import cn.idev.excel.annotation.ExcelIgnoreUnannotated; +import cn.idev.excel.annotation.ExcelProperty; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 机票预订视图对象 crm_flight_booking + * + * @author Yinq + * @date 2025-12-17 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = CrmFlightBooking.class) +public class CrmFlightBookingVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 机票预订ID + */ + @ExcelProperty(value = "机票预订ID") + private Long bookingId; + + /** + * 机票预订编号 + */ + @ExcelProperty(value = "机票预订编号") + private String applyCode; + + /** + * 乘机人ID + */ + @ExcelProperty(value = "乘机人ID") + private Long passengerId; + + /** + * 乘机人姓名 + */ + @ExcelProperty(value = "乘机人姓名") + private String passengerName; + + /** + * 出行日期 + */ + @ExcelProperty(value = "出行日期") + private Date travelDate; + + /** + * 出发地点（出差地点） + */ + @ExcelProperty(value = "出发地点", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "出=差地点") + private String departureLocation; + + /** + * 到达地点 + */ + @ExcelProperty(value = "到达地点") + private String arrivalLocation; + + /** + * 机票折扣（1:5折及以下 2:5~8折 3:8折及以上 4:退改签） + */ + @ExcelProperty(value = "机票折扣", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "1=:5折及以下,2=:5~8折,3=:8折及以上,4=:退改签") + private String flightDiscount; + + /** + * 机票金额（元） + */ + @ExcelProperty(value = "机票金额", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "元=") + private Long flightAmount; + + /** + * 附件ID（支持多个，逗号分隔） + */ + @ExcelProperty(value = "附件ID", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "支=持多个，逗号分隔") + private String ossId; + + /** + * 申请状态（1暂存 2审批中 3已审批 4作废） + */ + @ExcelProperty(value = "申请状态", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "1=暂存,2=审批中,3=已审批,4=作废") + private String bookingStatus; + + /** + * 流程状态 + */ + @ExcelProperty(value = "流程状态") + private String flowStatus; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + +} diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/mapper/CrmFlightBookingMapper.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/mapper/CrmFlightBookingMapper.java new file mode 100644 index 00000000..f5c4d749 --- /dev/null +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/mapper/CrmFlightBookingMapper.java @@ -0,0 +1,37 @@ +package org.dromara.oa.crm.mapper; + +import java.util.List; +import com.github.yulichang.wrapper.MPJLambdaWrapper; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.ibatis.annotations.Param; +import org.dromara.oa.crm.domain.CrmFlightBooking; +import org.dromara.oa.crm.domain.vo.CrmFlightBookingVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 机票预订Mapper接口 + * + * @author Yinq + * @date 2025-12-17 + */ +public interface CrmFlightBookingMapper extends BaseMapperPlus { + + /** + * 查询机票预订列表 + * + * @param page 分页 + * @param queryWrapper 条件 + * @return 机票预订集合 + */ + public Page selectCustomCrmFlightBookingVoList(@Param("page") Page page, @Param(Constants.WRAPPER) MPJLambdaWrapper queryWrapper); + + /** + * 查询机票预订列表 + * + * @param queryWrapper 条件 + * @return 机票预订集合 + */ + public List selectCustomCrmFlightBookingVoList(@Param(Constants.WRAPPER) MPJLambdaWrapper queryWrapper); + +} diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/ICrmFlightBookingService.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/ICrmFlightBookingService.java new file mode 100644 index 00000000..d42600b1 --- /dev/null +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/ICrmFlightBookingService.java @@ -0,0 +1,69 @@ +package org.dromara.oa.crm.service; + +import org.dromara.oa.crm.domain.CrmFlightBooking; +import org.dromara.oa.crm.domain.vo.CrmFlightBookingVo; +import org.dromara.oa.crm.domain.bo.CrmFlightBookingBo; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; + +import java.util.Collection; +import java.util.List; + +/** + * 机票预订Service接口 + * + * @author Yinq + * @date 2025-12-17 + */ +public interface ICrmFlightBookingService { + + /** + * 查询机票预订 + * + * @param bookingId 主键 + * @return 机票预订 + */ + CrmFlightBookingVo queryById(Long bookingId); + + /** + * 分页查询机票预订列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 机票预订分页列表 + */ + TableDataInfo queryPageList(CrmFlightBookingBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的机票预订列表 + * + * @param bo 查询条件 + * @return 机票预订列表 + */ + List queryList(CrmFlightBookingBo bo); + + /** + * 新增机票预订 + * + * @param bo 机票预订 + * @return 是否新增成功 + */ + Boolean insertByBo(CrmFlightBookingBo bo); + + /** + * 修改机票预订 + * + * @param bo 机票预订 + * @return 是否修改成功 + */ + Boolean updateByBo(CrmFlightBookingBo bo); + + /** + * 校验并批量删除机票预订信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} 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 new file mode 100644 index 00000000..ee3fc8a9 --- /dev/null +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmFlightBookingServiceImpl.java @@ -0,0 +1,143 @@ +package org.dromara.oa.crm.service.impl; + +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; + import org.dromara.common.mybatis.core.page.TableDataInfo; + import org.dromara.common.mybatis.core.page.PageQuery; + import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.yulichang.toolkit.JoinWrappers; +import com.github.yulichang.wrapper.MPJLambdaWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.dromara.oa.crm.domain.bo.CrmFlightBookingBo; +import org.dromara.oa.crm.domain.vo.CrmFlightBookingVo; +import org.dromara.oa.crm.domain.CrmFlightBooking; +import org.dromara.oa.crm.mapper.CrmFlightBookingMapper; +import org.dromara.oa.crm.service.ICrmFlightBookingService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 机票预订Service业务层处理 + * + * @author Yinq + * @date 2025-12-17 + */ +@RequiredArgsConstructor +@Service +public class CrmFlightBookingServiceImpl implements ICrmFlightBookingService { + + private final CrmFlightBookingMapper baseMapper; + + /** + * 查询机票预订 + * + * @param bookingId 主键 + * @return 机票预订 + */ + @Override + public CrmFlightBookingVo queryById(Long bookingId){ + return baseMapper.selectVoById(bookingId); + } + + /** + * 分页查询机票预订列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 机票预订分页列表 + */ + @Override + public TableDataInfo queryPageList(CrmFlightBookingBo bo, PageQuery pageQuery) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的机票预订列表 + * + * @param bo 查询条件 + * @return 机票预订列表 + */ + @Override + public List queryList(CrmFlightBookingBo bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private MPJLambdaWrapper buildQueryWrapper(CrmFlightBookingBo bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = JoinWrappers.lambda(CrmFlightBooking.class) + .selectAll(CrmFlightBooking.class) + .eq(CrmFlightBooking::getDelFlag, "0") + .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()) + .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()) + .eq(StringUtils.isNotBlank(bo.getBookingStatus()), CrmFlightBooking::getBookingStatus, bo.getBookingStatus()) + .eq(StringUtils.isNotBlank(bo.getFlowStatus()), CrmFlightBooking::getFlowStatus, bo.getFlowStatus()) +; + return lqw; + } + + /** + * 新增机票预订 + * + * @param bo 机票预订 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(CrmFlightBookingBo bo) { + CrmFlightBooking add = MapstructUtils.convert(bo, CrmFlightBooking.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setBookingId(add.getBookingId()); + } + return flag; + } + + /** + * 修改机票预订 + * + * @param bo 机票预订 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(CrmFlightBookingBo bo) { + CrmFlightBooking update = MapstructUtils.convert(bo, CrmFlightBooking.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(CrmFlightBooking entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除机票预订信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/crm/CrmFlightBookingMapper.xml b/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/crm/CrmFlightBookingMapper.xml new file mode 100644 index 00000000..0b7d5984 --- /dev/null +++ b/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/crm/CrmFlightBookingMapper.xml @@ -0,0 +1,14 @@ + + + + + + + + +