feat(oa): 添加出差申请明细功能并重构为主子表结构
- 新增出差申请明细实体类、业务对象、视图对象及映射器 - 添加出差申请明细控制器和服务实现 - 重构出差申请主表字段：移除exchangeProcess字段，将feedback字段重命名为exchangeFeedback - 在出差申请主表中添加明细列表关联关系 - 实现出差申请与明细的级联查询、保存、更新和删除功能 - 添加事务注解确保数据一致性操作dev
Yangk
5 hours ago
parent
92147b6408
commit
bc9e530d28
@ -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.CrmBusinessTripDetailsVo;
|
||||
import org.dromara.oa.crm.domain.bo.CrmBusinessTripDetailsBo;
|
||||
import org.dromara.oa.crm.service.ICrmBusinessTripDetailsService;
|
||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
|
||||
/**
|
||||
* 出差申请明细
|
||||
* 前端访问路由地址为:/oa/crm/businessTripDetails
|
||||
*
|
||||
* @author Yangk
|
||||
* @date 2026-03-17
|
||||
*/
|
||||
@Validated
|
||||
@RequiredArgsConstructor
|
||||
@RestController
|
||||
@RequestMapping("/businessTripDetails")
|
||||
public class CrmBusinessTripDetailsController extends BaseController {
|
||||
|
||||
private final ICrmBusinessTripDetailsService crmBusinessTripDetailsService;
|
||||
|
||||
/**
|
||||
* 查询出差申请明细列表
|
||||
*/
|
||||
@SaCheckPermission("oa/crm:businessTripDetails:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<CrmBusinessTripDetailsVo> list(CrmBusinessTripDetailsBo bo, PageQuery pageQuery) {
|
||||
return crmBusinessTripDetailsService.queryPageList(bo, pageQuery);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出出差申请明细列表
|
||||
*/
|
||||
@SaCheckPermission("oa/crm:businessTripDetails:export")
|
||||
@Log(title = "出差申请明细", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(CrmBusinessTripDetailsBo bo, HttpServletResponse response) {
|
||||
List<CrmBusinessTripDetailsVo> list = crmBusinessTripDetailsService.queryList(bo);
|
||||
ExcelUtil.exportExcel(list, "出差申请明细", CrmBusinessTripDetailsVo.class, response);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取出差申请明细详细信息
|
||||
*
|
||||
* @param tripDetailsId 主键
|
||||
*/
|
||||
@SaCheckPermission("oa/crm:businessTripDetails:query")
|
||||
@GetMapping("/{tripDetailsId}")
|
||||
public R<CrmBusinessTripDetailsVo> getInfo(@NotNull(message = "主键不能为空")
|
||||
@PathVariable("tripDetailsId") Long tripDetailsId) {
|
||||
return R.ok(crmBusinessTripDetailsService.queryById(tripDetailsId));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增出差申请明细
|
||||
*/
|
||||
@SaCheckPermission("oa/crm:businessTripDetails:add")
|
||||
@Log(title = "出差申请明细", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
public R<Void> add(@Validated(AddGroup.class) @RequestBody CrmBusinessTripDetailsBo bo) {
|
||||
return toAjax(crmBusinessTripDetailsService.insertByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改出差申请明细
|
||||
*/
|
||||
@SaCheckPermission("oa/crm:businessTripDetails:edit")
|
||||
@Log(title = "出差申请明细", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
public R<Void> edit(@Validated(EditGroup.class) @RequestBody CrmBusinessTripDetailsBo bo) {
|
||||
return toAjax(crmBusinessTripDetailsService.updateByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除出差申请明细
|
||||
*
|
||||
* @param tripDetailsIds 主键串
|
||||
*/
|
||||
@SaCheckPermission("oa/crm:businessTripDetails:remove")
|
||||
@Log(title = "出差申请明细", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{tripDetailsIds}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空")
|
||||
@PathVariable("tripDetailsIds") Long[] tripDetailsIds) {
|
||||
return toAjax(crmBusinessTripDetailsService.deleteWithValidByIds(List.of(tripDetailsIds), true));
|
||||
}
|
||||
|
||||
/**
|
||||
* 下拉框查询出差申请明细列表
|
||||
*/
|
||||
@GetMapping("/getCrmBusinessTripDetailsList")
|
||||
public R<List<CrmBusinessTripDetailsVo>> getCrmBusinessTripDetailsList(CrmBusinessTripDetailsBo bo) {
|
||||
List<CrmBusinessTripDetailsVo> list = crmBusinessTripDetailsService.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.CrmBusinessTripDetails;
|
||||
import org.dromara.oa.crm.domain.vo.CrmBusinessTripDetailsVo;
|
||||
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
|
||||
|
||||
/**
|
||||
* 出差申请明细Mapper接口
|
||||
*
|
||||
* @author Yangk
|
||||
* @date 2026-03-17
|
||||
*/
|
||||
public interface CrmBusinessTripDetailsMapper extends BaseMapperPlus<CrmBusinessTripDetails, CrmBusinessTripDetailsVo> {
|
||||
|
||||
/**
|
||||
* 查询出差申请明细列表
|
||||
*
|
||||
* @param page 分页
|
||||
* @param queryWrapper 条件
|
||||
* @return 出差申请明细集合
|
||||
*/
|
||||
public Page<CrmBusinessTripDetailsVo> selectCustomCrmBusinessTripDetailsVoList(@Param("page") Page<CrmBusinessTripDetailsVo> page, @Param(Constants.WRAPPER) MPJLambdaWrapper<CrmBusinessTripDetails> queryWrapper);
|
||||
|
||||
/**
|
||||
* 查询出差申请明细列表
|
||||
*
|
||||
* @param queryWrapper 条件
|
||||
* @return 出差申请明细集合
|
||||
*/
|
||||
public List<CrmBusinessTripDetailsVo> selectCustomCrmBusinessTripDetailsVoList(@Param(Constants.WRAPPER) MPJLambdaWrapper<CrmBusinessTripDetails> queryWrapper);
|
||||
|
||||
}
|
||||
@ -0,0 +1,69 @@
|
||||
package org.dromara.oa.crm.service;
|
||||
|
||||
import org.dromara.oa.crm.domain.CrmBusinessTripDetails;
|
||||
import org.dromara.oa.crm.domain.vo.CrmBusinessTripDetailsVo;
|
||||
import org.dromara.oa.crm.domain.bo.CrmBusinessTripDetailsBo;
|
||||
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 2026-03-17
|
||||
*/
|
||||
public interface ICrmBusinessTripDetailsService {
|
||||
|
||||
/**
|
||||
* 查询出差申请明细
|
||||
*
|
||||
* @param tripDetailsId 主键
|
||||
* @return 出差申请明细
|
||||
*/
|
||||
CrmBusinessTripDetailsVo queryById(Long tripDetailsId);
|
||||
|
||||
/**
|
||||
* 分页查询出差申请明细列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @param pageQuery 分页参数
|
||||
* @return 出差申请明细分页列表
|
||||
*/
|
||||
TableDataInfo<CrmBusinessTripDetailsVo> queryPageList(CrmBusinessTripDetailsBo bo, PageQuery pageQuery);
|
||||
|
||||
/**
|
||||
* 查询符合条件的出差申请明细列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @return 出差申请明细列表
|
||||
*/
|
||||
List<CrmBusinessTripDetailsVo> queryList(CrmBusinessTripDetailsBo bo);
|
||||
|
||||
/**
|
||||
* 新增出差申请明细
|
||||
*
|
||||
* @param bo 出差申请明细
|
||||
* @return 是否新增成功
|
||||
*/
|
||||
Boolean insertByBo(CrmBusinessTripDetailsBo bo);
|
||||
|
||||
/**
|
||||
* 修改出差申请明细
|
||||
*
|
||||
* @param bo 出差申请明细
|
||||
* @return 是否修改成功
|
||||
*/
|
||||
Boolean updateByBo(CrmBusinessTripDetailsBo bo);
|
||||
|
||||
/**
|
||||
* 校验并批量删除出差申请明细信息
|
||||
*
|
||||
* @param ids 待删除的主键集合
|
||||
* @param isValid 是否进行有效性校验
|
||||
* @return 是否删除成功
|
||||
*/
|
||||
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
|
||||
}
|
||||
@ -0,0 +1,145 @@
|
||||
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.CrmBusinessTripDetailsBo;
|
||||
import org.dromara.oa.crm.domain.vo.CrmBusinessTripDetailsVo;
|
||||
import org.dromara.oa.crm.domain.CrmBusinessTripDetails;
|
||||
import org.dromara.oa.crm.mapper.CrmBusinessTripDetailsMapper;
|
||||
import org.dromara.oa.crm.service.ICrmBusinessTripDetailsService;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Collection;
|
||||
|
||||
/**
|
||||
* 出差申请明细Service业务层处理
|
||||
*
|
||||
* @author Yangk
|
||||
* @date 2026-03-17
|
||||
*/
|
||||
@RequiredArgsConstructor
|
||||
@Service
|
||||
public class CrmBusinessTripDetailsServiceImpl implements ICrmBusinessTripDetailsService {
|
||||
|
||||
private final CrmBusinessTripDetailsMapper baseMapper;
|
||||
|
||||
/**
|
||||
* 查询出差申请明细
|
||||
*
|
||||
* @param tripDetailsId 主键
|
||||
* @return 出差申请明细
|
||||
*/
|
||||
@Override
|
||||
public CrmBusinessTripDetailsVo queryById(Long tripDetailsId){
|
||||
return baseMapper.selectVoById(tripDetailsId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 分页查询出差申请明细列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @param pageQuery 分页参数
|
||||
* @return 出差申请明细分页列表
|
||||
*/
|
||||
@Override
|
||||
public TableDataInfo<CrmBusinessTripDetailsVo> queryPageList(CrmBusinessTripDetailsBo bo, PageQuery pageQuery) {
|
||||
MPJLambdaWrapper<CrmBusinessTripDetails> lqw = buildQueryWrapper(bo);
|
||||
Page<CrmBusinessTripDetailsVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
|
||||
return TableDataInfo.build(result);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询符合条件的出差申请明细列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @return 出差申请明细列表
|
||||
*/
|
||||
@Override
|
||||
public List<CrmBusinessTripDetailsVo> queryList(CrmBusinessTripDetailsBo bo) {
|
||||
MPJLambdaWrapper<CrmBusinessTripDetails> lqw = buildQueryWrapper(bo);
|
||||
return baseMapper.selectVoList(lqw);
|
||||
}
|
||||
|
||||
private MPJLambdaWrapper<CrmBusinessTripDetails> buildQueryWrapper(CrmBusinessTripDetailsBo bo) {
|
||||
Map<String, Object> params = bo.getParams();
|
||||
MPJLambdaWrapper<CrmBusinessTripDetails> lqw = JoinWrappers.lambda(CrmBusinessTripDetails.class)
|
||||
.selectAll(CrmBusinessTripDetails.class)
|
||||
.eq(CrmBusinessTripDetails::getDelFlag, "0")
|
||||
.eq(bo.getTripId() != null, CrmBusinessTripDetails::getTripId, bo.getTripId())
|
||||
.eq(bo.getItineraryNumber() != null, CrmBusinessTripDetails::getItineraryNumber, bo.getItineraryNumber())
|
||||
.eq(StringUtils.isNotBlank(bo.getTripLocation()), CrmBusinessTripDetails::getTripLocation, bo.getTripLocation())
|
||||
.eq(bo.getStartTime() != null, CrmBusinessTripDetails::getStartTime, bo.getStartTime())
|
||||
.eq(bo.getEndTime() != null, CrmBusinessTripDetails::getEndTime, bo.getEndTime())
|
||||
.eq(bo.getDurationDays() != null, CrmBusinessTripDetails::getDurationDays, bo.getDurationDays())
|
||||
.eq(bo.getProjectId() != null, CrmBusinessTripDetails::getProjectId, bo.getProjectId())
|
||||
.eq(bo.getCustomerId() != null, CrmBusinessTripDetails::getCustomerId, bo.getCustomerId())
|
||||
.like(StringUtils.isNotBlank(bo.getMeetingName()), CrmBusinessTripDetails::getMeetingName, bo.getMeetingName())
|
||||
.eq(StringUtils.isNotBlank(bo.getExchangePurpose()), CrmBusinessTripDetails::getExchangePurpose, bo.getExchangePurpose())
|
||||
.eq(StringUtils.isNotBlank(bo.getExchangeFeedback()), CrmBusinessTripDetails::getExchangeFeedback, bo.getExchangeFeedback())
|
||||
.eq(StringUtils.isNotBlank(bo.getTripReason()), CrmBusinessTripDetails::getTripReason, bo.getTripReason())
|
||||
.eq(StringUtils.isNotBlank(bo.getOssId()), CrmBusinessTripDetails::getOssId, bo.getOssId())
|
||||
;
|
||||
return lqw;
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增出差申请明细
|
||||
*
|
||||
* @param bo 出差申请明细
|
||||
* @return 是否新增成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean insertByBo(CrmBusinessTripDetailsBo bo) {
|
||||
CrmBusinessTripDetails add = MapstructUtils.convert(bo, CrmBusinessTripDetails.class);
|
||||
validEntityBeforeSave(add);
|
||||
boolean flag = baseMapper.insert(add) > 0;
|
||||
if (flag) {
|
||||
bo.setTripDetailsId(add.getTripDetailsId());
|
||||
}
|
||||
return flag;
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改出差申请明细
|
||||
*
|
||||
* @param bo 出差申请明细
|
||||
* @return 是否修改成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean updateByBo(CrmBusinessTripDetailsBo bo) {
|
||||
CrmBusinessTripDetails update = MapstructUtils.convert(bo, CrmBusinessTripDetails.class);
|
||||
validEntityBeforeSave(update);
|
||||
return baseMapper.updateById(update) > 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* 保存前的数据校验
|
||||
*/
|
||||
private void validEntityBeforeSave(CrmBusinessTripDetails 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.CrmBusinessTripDetailsMapper">
|
||||
<resultMap type="org.dromara.oa.crm.domain.vo.CrmBusinessTripDetailsVo" id="CrmBusinessTripDetailsResult">
|
||||
</resultMap>
|
||||
|
||||
<select id="selectCustomCrmBusinessTripDetailsVoList" resultMap="CrmBusinessTripDetailsResult">
|
||||
select trip_details_id, trip_id, tenant_id, itinerary_number, trip_location, start_time, end_time, duration_days, project_id, customer_id, meeting_name, exchange_purpose, exchange_feedback, trip_reason, remark, oss_id, del_flag, create_dept, create_by, create_time, update_by, update_time from crm_business_trip_details t
|
||||
${ew.getCustomSqlSegment}
|
||||
</select>
|
||||
|
||||
</mapper>
|
||||
Loading…
Reference in New Issue