完善项目周报功能以及机票预定功能代码生成导入
lh
3 days ago
parent
9c3efa00bb
commit
11fe4876c4
@ -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<CrmFlightBookingVo> 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<CrmFlightBookingVo> list = crmFlightBookingService.queryList(bo);
|
||||
ExcelUtil.exportExcel(list, "机票预订", CrmFlightBookingVo.class, response);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取机票预订详细信息
|
||||
*
|
||||
* @param bookingId 主键
|
||||
*/
|
||||
@SaCheckPermission("oa/crm:flightBooking:query")
|
||||
@GetMapping("/{bookingId}")
|
||||
public R<CrmFlightBookingVo> 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<Void> 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<Void> 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<Void> remove(@NotEmpty(message = "主键不能为空")
|
||||
@PathVariable("bookingIds") Long[] bookingIds) {
|
||||
return toAjax(crmFlightBookingService.deleteWithValidByIds(List.of(bookingIds), true));
|
||||
}
|
||||
|
||||
/**
|
||||
* 下拉框查询机票预订列表
|
||||
*/
|
||||
@GetMapping("/getCrmFlightBookingList")
|
||||
public R<List<CrmFlightBookingVo>> getCrmFlightBookingList(CrmFlightBookingBo bo) {
|
||||
List<CrmFlightBookingVo> list = crmFlightBookingService.queryList(bo);
|
||||
return R.ok(list);
|
||||
}
|
||||
|
||||
}
|
||||
@ -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<CrmFlightBooking, CrmFlightBookingVo> {
|
||||
|
||||
/**
|
||||
* 查询机票预订列表
|
||||
*
|
||||
* @param page 分页
|
||||
* @param queryWrapper 条件
|
||||
* @return 机票预订集合
|
||||
*/
|
||||
public Page<CrmFlightBookingVo> selectCustomCrmFlightBookingVoList(@Param("page") Page<CrmFlightBookingVo> page, @Param(Constants.WRAPPER) MPJLambdaWrapper<CrmFlightBooking> queryWrapper);
|
||||
|
||||
/**
|
||||
* 查询机票预订列表
|
||||
*
|
||||
* @param queryWrapper 条件
|
||||
* @return 机票预订集合
|
||||
*/
|
||||
public List<CrmFlightBookingVo> selectCustomCrmFlightBookingVoList(@Param(Constants.WRAPPER) MPJLambdaWrapper<CrmFlightBooking> queryWrapper);
|
||||
|
||||
}
|
||||
@ -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<CrmFlightBookingVo> queryPageList(CrmFlightBookingBo bo, PageQuery pageQuery);
|
||||
|
||||
/**
|
||||
* 查询符合条件的机票预订列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @return 机票预订列表
|
||||
*/
|
||||
List<CrmFlightBookingVo> 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<Long> ids, Boolean isValid);
|
||||
}
|
||||
@ -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<CrmFlightBookingVo> queryPageList(CrmFlightBookingBo bo, PageQuery pageQuery) {
|
||||
MPJLambdaWrapper<CrmFlightBooking> lqw = buildQueryWrapper(bo);
|
||||
Page<CrmFlightBookingVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
|
||||
return TableDataInfo.build(result);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询符合条件的机票预订列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @return 机票预订列表
|
||||
*/
|
||||
@Override
|
||||
public List<CrmFlightBookingVo> queryList(CrmFlightBookingBo bo) {
|
||||
MPJLambdaWrapper<CrmFlightBooking> lqw = buildQueryWrapper(bo);
|
||||
return baseMapper.selectVoList(lqw);
|
||||
}
|
||||
|
||||
private MPJLambdaWrapper<CrmFlightBooking> buildQueryWrapper(CrmFlightBookingBo bo) {
|
||||
Map<String, Object> params = bo.getParams();
|
||||
MPJLambdaWrapper<CrmFlightBooking> 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<Long> ids, Boolean isValid) {
|
||||
if(isValid){
|
||||
//TODO 做一些业务上的校验,判断是否需要校验
|
||||
}
|
||||
return baseMapper.deleteByIds(ids) > 0;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,14 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper
|
||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="org.dromara.oa.crm.mapper.CrmFlightBookingMapper">
|
||||
<resultMap type="org.dromara.oa.crm.domain.vo.CrmFlightBookingVo" id="CrmFlightBookingResult">
|
||||
</resultMap>
|
||||
|
||||
<select id="selectCustomCrmFlightBookingVoList" resultMap="CrmFlightBookingResult">
|
||||
select booking_id, tenant_id, apply_code, passenger_id, passenger_name, travel_date, departure_location, arrival_location, flight_discount, flight_amount, oss_id, booking_status, flow_status, remark, del_flag, create_dept, create_by, create_time, update_by, update_time from crm_flight_booking t
|
||||
${ew.getCustomSqlSegment}
|
||||
</select>
|
||||
|
||||
</mapper>
|
||||
Loading…
Reference in New Issue