diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/controller/CrmBusinessTripApplyController.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/controller/CrmBusinessTripApplyController.java new file mode 100644 index 00000000..5f72aeda --- /dev/null +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/controller/CrmBusinessTripApplyController.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.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 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 list = crmBusinessTripApplyService.queryList(bo); + ExcelUtil.exportExcel(list, "出差申请", CrmBusinessTripApplyVo.class, response); + } + + /** + * 获取出差申请详细信息 + * + * @param tripId 主键 + */ + @SaCheckPermission("oa/crm:businessTripApply:query") + @GetMapping("/{tripId}") + public R 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 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 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 remove(@NotEmpty(message = "主键不能为空") + @PathVariable("tripIds") Long[] tripIds) { + return toAjax(crmBusinessTripApplyService.deleteWithValidByIds(List.of(tripIds), true)); + } + + /** + * 下拉框查询出差申请列表 + */ + @GetMapping("/getCrmBusinessTripApplyList") + public R> getCrmBusinessTripApplyList(CrmBusinessTripApplyBo bo) { + List list = crmBusinessTripApplyService.queryList(bo); + return R.ok(list); + } + +} diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/domain/CrmBusinessTripApply.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/domain/CrmBusinessTripApply.java new file mode 100644 index 00000000..317a9c3a --- /dev/null +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/domain/CrmBusinessTripApply.java @@ -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; + + +} diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/domain/bo/CrmBusinessTripApplyBo.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/domain/bo/CrmBusinessTripApplyBo.java new file mode 100644 index 00000000..f70e4ea0 --- /dev/null +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/domain/bo/CrmBusinessTripApplyBo.java @@ -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 variables; + + /** + * 业务扩展参数 + */ + private RemoteFlowInstanceBizExt bizExt; + + +} diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/domain/vo/CrmBusinessTripApplyVo.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/domain/vo/CrmBusinessTripApplyVo.java new file mode 100644 index 00000000..d0d1d591 --- /dev/null +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/domain/vo/CrmBusinessTripApplyVo.java @@ -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; + + +} diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/mapper/CrmBusinessTripApplyMapper.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/mapper/CrmBusinessTripApplyMapper.java new file mode 100644 index 00000000..75af1f1e --- /dev/null +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/mapper/CrmBusinessTripApplyMapper.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.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 { + + /** + * 查询出差申请列表 + * + * @param page 分页 + * @param queryWrapper 条件 + * @return 出差申请集合 + */ + public Page selectCustomCrmBusinessTripApplyVoList(@Param("page") Page page, @Param(Constants.WRAPPER) MPJLambdaWrapper queryWrapper); + + /** + * 查询出差申请列表 + * + * @param queryWrapper 条件 + * @return 出差申请集合 + */ + public List selectCustomCrmBusinessTripApplyVoList(@Param(Constants.WRAPPER) MPJLambdaWrapper queryWrapper); + +} diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/ICrmBusinessTripApplyService.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/ICrmBusinessTripApplyService.java new file mode 100644 index 00000000..a33ab04e --- /dev/null +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/ICrmBusinessTripApplyService.java @@ -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 queryPageList(CrmBusinessTripApplyBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的出差申请列表 + * + * @param bo 查询条件 + * @return 出差申请列表 + */ + List 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 ids, Boolean isValid); +} diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmBusinessTripApplyServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmBusinessTripApplyServiceImpl.java new file mode 100644 index 00000000..85e3f64a --- /dev/null +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmBusinessTripApplyServiceImpl.java @@ -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 queryPageList(CrmBusinessTripApplyBo 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(CrmBusinessTripApplyBo bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private MPJLambdaWrapper buildQueryWrapper(CrmBusinessTripApplyBo bo) { + Map params = bo.getParams(); + MPJLambdaWrapper 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 ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/crm/CrmBusinessTripApplyMapper.xml b/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/crm/CrmBusinessTripApplyMapper.xml new file mode 100644 index 00000000..5866f621 --- /dev/null +++ b/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/crm/CrmBusinessTripApplyMapper.xml @@ -0,0 +1,14 @@ + + + + + + + + +