feat(crm/TripApply): 新增出差申请后端基础逻辑

dev
Yangk 15 hours ago
parent 11fe4876c4
commit 43bf015094

@ -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.CrmBusinessTripApplyVo;
import org.dromara.oa.crm.domain.bo.CrmBusinessTripApplyBo;
import org.dromara.oa.crm.service.ICrmBusinessTripApplyService;
import org.dromara.common.mybatis.core.page.TableDataInfo;
/**
*
* 访:/oa/crm/businessTripApply
*
* @author Yangk
* @date 2025-12-19
*/
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("crm/businessTripApply")
public class CrmBusinessTripApplyController extends BaseController {
private final ICrmBusinessTripApplyService crmBusinessTripApplyService;
/**
*
*/
@SaCheckPermission("oa/crm:businessTripApply:list")
@GetMapping("/list")
public TableDataInfo<CrmBusinessTripApplyVo> list(CrmBusinessTripApplyBo bo, PageQuery pageQuery) {
return crmBusinessTripApplyService.queryPageList(bo, pageQuery);
}
/**
*
*/
@SaCheckPermission("oa/crm:businessTripApply:export")
@Log(title = "出差申请", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(CrmBusinessTripApplyBo bo, HttpServletResponse response) {
List<CrmBusinessTripApplyVo> list = crmBusinessTripApplyService.queryList(bo);
ExcelUtil.exportExcel(list, "出差申请", CrmBusinessTripApplyVo.class, response);
}
/**
*
*
* @param tripId
*/
@SaCheckPermission("oa/crm:businessTripApply:query")
@GetMapping("/{tripId}")
public R<CrmBusinessTripApplyVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable("tripId") Long tripId) {
return R.ok(crmBusinessTripApplyService.queryById(tripId));
}
/**
*
*/
@SaCheckPermission("oa/crm:businessTripApply:add")
@Log(title = "出差申请", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody CrmBusinessTripApplyBo bo) {
return toAjax(crmBusinessTripApplyService.insertByBo(bo));
}
/**
*
*/
@SaCheckPermission("oa/crm:businessTripApply:edit")
@Log(title = "出差申请", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody CrmBusinessTripApplyBo bo) {
return toAjax(crmBusinessTripApplyService.updateByBo(bo));
}
/**
*
*
* @param tripIds
*/
@SaCheckPermission("oa/crm:businessTripApply:remove")
@Log(title = "出差申请", businessType = BusinessType.DELETE)
@DeleteMapping("/{tripIds}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable("tripIds") Long[] tripIds) {
return toAjax(crmBusinessTripApplyService.deleteWithValidByIds(List.of(tripIds), true));
}
/**
*
*/
@GetMapping("/getCrmBusinessTripApplyList")
public R<List<CrmBusinessTripApplyVo>> getCrmBusinessTripApplyList(CrmBusinessTripApplyBo bo) {
List<CrmBusinessTripApplyVo> list = crmBusinessTripApplyService.queryList(bo);
return R.ok(list);
}
}

@ -0,0 +1,154 @@
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_business_trip_apply
*
* @author Yangk
* @date 2025-12-19
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("crm_business_trip_apply")
public class CrmBusinessTripApply extends TenantEntity {
@Serial
private static final long serialVersionUID = 1L;
/**
* ID
*/
@TableId(value = "trip_id", type = IdType.ASSIGN_ID)
private Long tripId;
/**
*
*/
private String applyCode;
/**
* 1 2 3/ 4
*/
private String tripType;
/**
* ID
*/
private Long applicantId;
/**
*
*/
private String applicantName;
/**
* ID
*/
private Long deptId;
/**
*
*/
private String deptName;
/**
*
*/
private String tripLocation;
/**
*
*/
private Date startTime;
/**
*
*/
private Date endTime;
/**
* ()
*/
private Long durationDays;
/**
*
*/
private String tripReason;
/**
* ID
*/
private Long projectId;
/**
* ID
*/
private Long customerId;
/**
*
*/
private String exchangeObject;
/**
*
*/
private String businessDirection;
/**
*
*/
private String exchangePurpose;
/**
*
*/
private String exchangeProcess;
/**
* /
*/
private String meetingName;
/**
*
*/
private String feedback;
/**
* 1 2 3 4
*/
private String tripStatus;
/**
*
*/
private String flowStatus;
/**
*
*/
private String remark;
/**
* ID
*/
private String ossId;
/**
* 0 1
*/
@TableLogic
private String delFlag;
}

@ -0,0 +1,166 @@
package org.dromara.oa.crm.domain.bo;
import org.dromara.oa.crm.domain.CrmBusinessTripApply;
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 java.util.Map;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.dromara.workflow.api.domain.RemoteFlowInstanceBizExt;
/**
* crm_business_trip_apply
*
* @author Yangk
* @date 2025-12-19
*/
@Data
@EqualsAndHashCode(callSuper = true)
@AutoMapper(target = CrmBusinessTripApply.class, reverseConvertGenerate = false)
public class CrmBusinessTripApplyBo extends BaseEntity {
/**
* ID
*/
private Long tripId;
/**
*
*/
private String applyCode;
/**
* 1 2 3/ 4
*/
@NotBlank(message = "出差类型1安装调试 2市场交流 3展会/会议 4其他不能为空", groups = { AddGroup.class, EditGroup.class })
private String tripType;
/**
* ID
*/
@NotNull(message = "申请人ID不能为空", groups = { AddGroup.class, EditGroup.class })
private Long applicantId;
/**
*
*/
private String applicantName;
/**
* ID
*/
private Long deptId;
/**
*
*/
private String deptName;
/**
*
*/
private String tripLocation;
/**
*
*/
private Date startTime;
/**
*
*/
private Date endTime;
/**
* ()
*/
private Long durationDays;
/**
*
*/
private String tripReason;
/**
* ID
*/
private Long projectId;
/**
* ID
*/
private Long customerId;
/**
*
*/
private String exchangeObject;
/**
*
*/
private String businessDirection;
/**
*
*/
private String exchangePurpose;
/**
*
*/
private String exchangeProcess;
/**
* /
*/
private String meetingName;
/**
*
*/
private String feedback;
/**
* 1 2 3 4
*/
private String tripStatus;
/**
*
*/
private String flowStatus;
/**
*
*/
private String remark;
/**
* ID
*/
private String ossId;
/**
*
*/
private String flowCode;
/**
*
*/
private Map<String, Object> variables;
/**
*
*/
private RemoteFlowInstanceBizExt bizExt;
}

@ -0,0 +1,183 @@
package org.dromara.oa.crm.domain.vo;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.dromara.oa.crm.domain.CrmBusinessTripApply;
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_business_trip_apply
*
* @author Yangk
* @date 2025-12-19
*/
@Data
@ExcelIgnoreUnannotated
@AutoMapper(target = CrmBusinessTripApply.class)
public class CrmBusinessTripApplyVo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* ID
*/
private Long tripId;
/**
*
*/
@ExcelProperty(value = "申请单号")
private String applyCode;
/**
* 1 2 3/ 4
*/
@ExcelProperty(value = "出差类型", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "trip_type")
private String tripType;
/**
* ID
*/
@ExcelProperty(value = "申请人ID")
private Long applicantId;
/**
*
*/
@ExcelProperty(value = "申请人姓名")
private String applicantName;
/**
* ID
*/
@ExcelProperty(value = "申请人部门ID")
private Long deptId;
/**
*
*/
@ExcelProperty(value = "申请人部门名称")
private String deptName;
/**
*
*/
@ExcelProperty(value = "出差地点")
private String tripLocation;
/**
*
*/
@ExcelProperty(value = "开始日期")
private Date startTime;
/**
*
*/
@ExcelProperty(value = "结束日期")
private Date endTime;
/**
* ()
*/
@ExcelProperty(value = "时长(天)")
private Long durationDays;
/**
*
*/
@ExcelProperty(value = "出差事由")
private String tripReason;
/**
* ID
*/
@ExcelProperty(value = "项目ID")
private Long projectId;
/**
* ID
*/
@ExcelProperty(value = "客户ID")
private Long customerId;
/**
*
*/
@ExcelProperty(value = "交流对象")
private String exchangeObject;
/**
*
*/
@ExcelProperty(value = "业务方向")
private String businessDirection;
/**
*
*/
@ExcelProperty(value = "交流目的")
private String exchangePurpose;
/**
*
*/
@ExcelProperty(value = "交流过程简述")
private String exchangeProcess;
/**
* /
*/
@ExcelProperty(value = "会议/展会名称")
private String meetingName;
/**
*
*/
@ExcelProperty(value = "结果反馈")
private String feedback;
/**
* 1 2 3 4
*/
@ExcelProperty(value = "申请状态", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "trip_status")
private String tripStatus;
/**
*
*/
@ExcelProperty(value = "流程状态")
private String flowStatus;
/**
*
*/
@ExcelProperty(value = "备注")
private String remark;
/**
* ID
*/
@ExcelProperty(value = "附件ID", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "多=个用逗号分隔")
private String ossId;
}

@ -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.CrmBusinessTripApply;
import org.dromara.oa.crm.domain.vo.CrmBusinessTripApplyVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
/**
* Mapper
*
* @author Yangk
* @date 2025-12-19
*/
public interface CrmBusinessTripApplyMapper extends BaseMapperPlus<CrmBusinessTripApply, CrmBusinessTripApplyVo> {
/**
*
*
* @param page
* @param queryWrapper
* @return
*/
public Page<CrmBusinessTripApplyVo> selectCustomCrmBusinessTripApplyVoList(@Param("page") Page<CrmBusinessTripApplyVo> page, @Param(Constants.WRAPPER) MPJLambdaWrapper<CrmBusinessTripApply> queryWrapper);
/**
*
*
* @param queryWrapper
* @return
*/
public List<CrmBusinessTripApplyVo> selectCustomCrmBusinessTripApplyVoList(@Param(Constants.WRAPPER) MPJLambdaWrapper<CrmBusinessTripApply> queryWrapper);
}

@ -0,0 +1,69 @@
package org.dromara.oa.crm.service;
import org.dromara.oa.crm.domain.CrmBusinessTripApply;
import org.dromara.oa.crm.domain.vo.CrmBusinessTripApplyVo;
import org.dromara.oa.crm.domain.bo.CrmBusinessTripApplyBo;
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 Yangk
* @date 2025-12-19
*/
public interface ICrmBusinessTripApplyService {
/**
*
*
* @param tripId
* @return
*/
CrmBusinessTripApplyVo queryById(Long tripId);
/**
*
*
* @param bo
* @param pageQuery
* @return
*/
TableDataInfo<CrmBusinessTripApplyVo> queryPageList(CrmBusinessTripApplyBo bo, PageQuery pageQuery);
/**
*
*
* @param bo
* @return
*/
List<CrmBusinessTripApplyVo> queryList(CrmBusinessTripApplyBo bo);
/**
*
*
* @param bo
* @return
*/
Boolean insertByBo(CrmBusinessTripApplyBo bo);
/**
*
*
* @param bo
* @return
*/
Boolean updateByBo(CrmBusinessTripApplyBo bo);
/**
*
*
* @param ids
* @param isValid
* @return
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
}

@ -0,0 +1,154 @@
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.CrmBusinessTripApplyBo;
import org.dromara.oa.crm.domain.vo.CrmBusinessTripApplyVo;
import org.dromara.oa.crm.domain.CrmBusinessTripApply;
import org.dromara.oa.crm.mapper.CrmBusinessTripApplyMapper;
import org.dromara.oa.crm.service.ICrmBusinessTripApplyService;
import java.util.List;
import java.util.Map;
import java.util.Collection;
/**
* Service
*
* @author Yangk
* @date 2025-12-19
*/
@RequiredArgsConstructor
@Service
public class CrmBusinessTripApplyServiceImpl implements ICrmBusinessTripApplyService {
private final CrmBusinessTripApplyMapper baseMapper;
/**
*
*
* @param tripId
* @return
*/
@Override
public CrmBusinessTripApplyVo queryById(Long tripId){
return baseMapper.selectVoById(tripId);
}
/**
*
*
* @param bo
* @param pageQuery
* @return
*/
@Override
public TableDataInfo<CrmBusinessTripApplyVo> queryPageList(CrmBusinessTripApplyBo bo, PageQuery pageQuery) {
MPJLambdaWrapper<CrmBusinessTripApply> lqw = buildQueryWrapper(bo);
Page<CrmBusinessTripApplyVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
/**
*
*
* @param bo
* @return
*/
@Override
public List<CrmBusinessTripApplyVo> queryList(CrmBusinessTripApplyBo bo) {
MPJLambdaWrapper<CrmBusinessTripApply> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private MPJLambdaWrapper<CrmBusinessTripApply> buildQueryWrapper(CrmBusinessTripApplyBo bo) {
Map<String, Object> params = bo.getParams();
MPJLambdaWrapper<CrmBusinessTripApply> lqw = JoinWrappers.lambda(CrmBusinessTripApply.class)
.selectAll(CrmBusinessTripApply.class)
.eq(CrmBusinessTripApply::getDelFlag, "0")
.eq(StringUtils.isNotBlank(bo.getApplyCode()), CrmBusinessTripApply::getApplyCode, bo.getApplyCode())
.eq(StringUtils.isNotBlank(bo.getTripType()), CrmBusinessTripApply::getTripType, bo.getTripType())
.eq(bo.getApplicantId() != null, CrmBusinessTripApply::getApplicantId, bo.getApplicantId())
.like(StringUtils.isNotBlank(bo.getApplicantName()), CrmBusinessTripApply::getApplicantName, bo.getApplicantName())
.eq(bo.getDeptId() != null, CrmBusinessTripApply::getDeptId, bo.getDeptId())
.like(StringUtils.isNotBlank(bo.getDeptName()), CrmBusinessTripApply::getDeptName, bo.getDeptName())
.eq(StringUtils.isNotBlank(bo.getTripLocation()), CrmBusinessTripApply::getTripLocation, bo.getTripLocation())
.eq(bo.getStartTime() != null, CrmBusinessTripApply::getStartTime, bo.getStartTime())
.eq(bo.getEndTime() != null, CrmBusinessTripApply::getEndTime, bo.getEndTime())
.eq(bo.getDurationDays() != null, CrmBusinessTripApply::getDurationDays, bo.getDurationDays())
.eq(StringUtils.isNotBlank(bo.getTripReason()), CrmBusinessTripApply::getTripReason, bo.getTripReason())
.eq(bo.getProjectId() != null, CrmBusinessTripApply::getProjectId, bo.getProjectId())
.eq(bo.getCustomerId() != null, CrmBusinessTripApply::getCustomerId, bo.getCustomerId())
.eq(StringUtils.isNotBlank(bo.getExchangeObject()), CrmBusinessTripApply::getExchangeObject, bo.getExchangeObject())
.eq(StringUtils.isNotBlank(bo.getBusinessDirection()), CrmBusinessTripApply::getBusinessDirection, bo.getBusinessDirection())
.eq(StringUtils.isNotBlank(bo.getExchangePurpose()), CrmBusinessTripApply::getExchangePurpose, bo.getExchangePurpose())
.eq(StringUtils.isNotBlank(bo.getExchangeProcess()), CrmBusinessTripApply::getExchangeProcess, bo.getExchangeProcess())
.like(StringUtils.isNotBlank(bo.getMeetingName()), CrmBusinessTripApply::getMeetingName, bo.getMeetingName())
.eq(StringUtils.isNotBlank(bo.getFeedback()), CrmBusinessTripApply::getFeedback, bo.getFeedback())
.eq(StringUtils.isNotBlank(bo.getTripStatus()), CrmBusinessTripApply::getTripStatus, bo.getTripStatus())
.eq(StringUtils.isNotBlank(bo.getFlowStatus()), CrmBusinessTripApply::getFlowStatus, bo.getFlowStatus())
.eq(StringUtils.isNotBlank(bo.getOssId()), CrmBusinessTripApply::getOssId, bo.getOssId())
;
return lqw;
}
/**
*
*
* @param bo
* @return
*/
@Override
public Boolean insertByBo(CrmBusinessTripApplyBo bo) {
CrmBusinessTripApply add = MapstructUtils.convert(bo, CrmBusinessTripApply.class);
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setTripId(add.getTripId());
}
return flag;
}
/**
*
*
* @param bo
* @return
*/
@Override
public Boolean updateByBo(CrmBusinessTripApplyBo bo) {
CrmBusinessTripApply update = MapstructUtils.convert(bo, CrmBusinessTripApply.class);
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;
}
/**
*
*/
private void validEntityBeforeSave(CrmBusinessTripApply 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.CrmBusinessTripApplyMapper">
<resultMap type="org.dromara.oa.crm.domain.vo.CrmBusinessTripApplyVo" id="CrmBusinessTripApplyResult">
</resultMap>
<select id="selectCustomCrmBusinessTripApplyVoList" resultMap="CrmBusinessTripApplyResult">
select trip_id, tenant_id, apply_code, trip_type, applicant_id, applicant_name, dept_id, dept_name, trip_location, start_time, end_time, duration_days, trip_reason, project_id, customer_id, exchange_object, business_direction, exchange_purpose, exchange_process, meeting_name, feedback, trip_status, flow_status, remark, oss_id, del_flag, create_dept, create_by, create_time, update_by, update_time from crm_business_trip_apply t
${ew.getCustomSqlSegment}
</select>
</mapper>
Loading…
Cancel
Save