Merge remote-tracking branch 'origin/dev' into dev
commit
fa85f7f2bc
@ -0,0 +1,127 @@
|
||||
package org.dromara.oa.erp.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.erp.domain.vo.ErpProjectPurchaseVo;
|
||||
import org.dromara.oa.erp.domain.bo.ErpProjectPurchaseBo;
|
||||
import org.dromara.oa.erp.service.IErpProjectPurchaseService;
|
||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
|
||||
/**
|
||||
* 项目采购信息
|
||||
* 前端访问路由地址为:/oa/erp/projectPurchase
|
||||
*
|
||||
* @author Yinq
|
||||
* @date 2025-11-13
|
||||
*/
|
||||
@Validated
|
||||
@RequiredArgsConstructor
|
||||
@RestController
|
||||
@RequestMapping("/erp/projectPurchase")
|
||||
public class ErpProjectPurchaseController extends BaseController {
|
||||
|
||||
private final IErpProjectPurchaseService erpProjectPurchaseService;
|
||||
|
||||
/**
|
||||
* 查询项目采购信息列表
|
||||
*/
|
||||
@SaCheckPermission("oa/erp:projectPurchase:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<ErpProjectPurchaseVo> list(ErpProjectPurchaseBo bo, PageQuery pageQuery) {
|
||||
return erpProjectPurchaseService.queryPageList(bo, pageQuery);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出项目采购信息列表
|
||||
*/
|
||||
@SaCheckPermission("oa/erp:projectPurchase:export")
|
||||
@Log(title = "项目采购信息", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(ErpProjectPurchaseBo bo, HttpServletResponse response) {
|
||||
List<ErpProjectPurchaseVo> list = erpProjectPurchaseService.queryList(bo);
|
||||
ExcelUtil.exportExcel(list, "项目采购信息", ErpProjectPurchaseVo.class, response);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取项目采购信息详细信息
|
||||
*
|
||||
* @param projectPurchaseId 主键
|
||||
*/
|
||||
@SaCheckPermission("oa/erp:projectPurchase:query")
|
||||
@GetMapping("/{projectPurchaseId}")
|
||||
public R<ErpProjectPurchaseVo> getInfo(@NotNull(message = "主键不能为空")
|
||||
@PathVariable("projectPurchaseId") Long projectPurchaseId) {
|
||||
return R.ok(erpProjectPurchaseService.queryById(projectPurchaseId));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增项目采购信息
|
||||
*/
|
||||
@SaCheckPermission("oa/erp:projectPurchase:add")
|
||||
@Log(title = "项目采购信息", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
public R<Void> add(@Validated(AddGroup.class) @RequestBody ErpProjectPurchaseBo bo) {
|
||||
return toAjax(erpProjectPurchaseService.insertByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 提交项目采购信息并提交流程
|
||||
*/
|
||||
@SaCheckPermission("oa/erp:projectPurchase:add")
|
||||
@Log(title = "项目采购信息", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping("/submitAndFlowStart")
|
||||
public R<ErpProjectPurchaseVo> submitAndFlowStart(@Validated(AddGroup.class) @RequestBody ErpProjectPurchaseBo bo) {
|
||||
return R.ok(erpProjectPurchaseService.projectPurchaseSubmitAndFlowStart(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改项目采购信息
|
||||
*/
|
||||
@SaCheckPermission("oa/erp:projectPurchase:edit")
|
||||
@Log(title = "项目采购信息", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
public R<Void> edit(@Validated(EditGroup.class) @RequestBody ErpProjectPurchaseBo bo) {
|
||||
return toAjax(erpProjectPurchaseService.updateByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除项目采购信息
|
||||
*
|
||||
* @param projectPurchaseIds 主键串
|
||||
*/
|
||||
@SaCheckPermission("oa/erp:projectPurchase:remove")
|
||||
@Log(title = "项目采购信息", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{projectPurchaseIds}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空")
|
||||
@PathVariable("projectPurchaseIds") Long[] projectPurchaseIds) {
|
||||
return toAjax(erpProjectPurchaseService.deleteWithValidByIds(List.of(projectPurchaseIds), true));
|
||||
}
|
||||
|
||||
/**
|
||||
* 下拉框查询项目采购信息列表
|
||||
*/
|
||||
@GetMapping("/getErpProjectPurchaseList")
|
||||
public R<List<ErpProjectPurchaseVo>> getErpProjectPurchaseList(ErpProjectPurchaseBo bo) {
|
||||
List<ErpProjectPurchaseVo> list = erpProjectPurchaseService.queryList(bo);
|
||||
return R.ok(list);
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,116 @@
|
||||
package org.dromara.oa.erp.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.erp.domain.vo.ErpProjectPurchaseMaterialVo;
|
||||
import org.dromara.oa.erp.domain.bo.ErpProjectPurchaseMaterialBo;
|
||||
import org.dromara.oa.erp.service.IErpProjectPurchaseMaterialService;
|
||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
|
||||
/**
|
||||
* 项目采购物料
|
||||
* 前端访问路由地址为:/oa/erp/projectPurchaseMaterial
|
||||
*
|
||||
* @author Yinq
|
||||
* @date 2025-11-13
|
||||
*/
|
||||
@Validated
|
||||
@RequiredArgsConstructor
|
||||
@RestController
|
||||
@RequestMapping("/erp/projectPurchaseMaterial")
|
||||
public class ErpProjectPurchaseMaterialController extends BaseController {
|
||||
|
||||
private final IErpProjectPurchaseMaterialService erpProjectPurchaseMaterialService;
|
||||
|
||||
/**
|
||||
* 查询项目采购物料列表
|
||||
*/
|
||||
@SaCheckPermission("oa/erp:projectPurchaseMaterial:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<ErpProjectPurchaseMaterialVo> list(ErpProjectPurchaseMaterialBo bo, PageQuery pageQuery) {
|
||||
return erpProjectPurchaseMaterialService.queryPageList(bo, pageQuery);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出项目采购物料列表
|
||||
*/
|
||||
@SaCheckPermission("oa/erp:projectPurchaseMaterial:export")
|
||||
@Log(title = "项目采购物料", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(ErpProjectPurchaseMaterialBo bo, HttpServletResponse response) {
|
||||
List<ErpProjectPurchaseMaterialVo> list = erpProjectPurchaseMaterialService.queryList(bo);
|
||||
ExcelUtil.exportExcel(list, "项目采购物料", ErpProjectPurchaseMaterialVo.class, response);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取项目采购物料详细信息
|
||||
*
|
||||
* @param purchaseMaterialId 主键
|
||||
*/
|
||||
@SaCheckPermission("oa/erp:projectPurchaseMaterial:query")
|
||||
@GetMapping("/{purchaseMaterialId}")
|
||||
public R<ErpProjectPurchaseMaterialVo> getInfo(@NotNull(message = "主键不能为空")
|
||||
@PathVariable("purchaseMaterialId") Long purchaseMaterialId) {
|
||||
return R.ok(erpProjectPurchaseMaterialService.queryById(purchaseMaterialId));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增项目采购物料
|
||||
*/
|
||||
@SaCheckPermission("oa/erp:projectPurchaseMaterial:add")
|
||||
@Log(title = "项目采购物料", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
public R<Void> add(@Validated(AddGroup.class) @RequestBody ErpProjectPurchaseMaterialBo bo) {
|
||||
return toAjax(erpProjectPurchaseMaterialService.insertByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改项目采购物料
|
||||
*/
|
||||
@SaCheckPermission("oa/erp:projectPurchaseMaterial:edit")
|
||||
@Log(title = "项目采购物料", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
public R<Void> edit(@Validated(EditGroup.class) @RequestBody ErpProjectPurchaseMaterialBo bo) {
|
||||
return toAjax(erpProjectPurchaseMaterialService.updateByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除项目采购物料
|
||||
*
|
||||
* @param purchaseMaterialIds 主键串
|
||||
*/
|
||||
@SaCheckPermission("oa/erp:projectPurchaseMaterial:remove")
|
||||
@Log(title = "项目采购物料", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{purchaseMaterialIds}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空")
|
||||
@PathVariable("purchaseMaterialIds") Long[] purchaseMaterialIds) {
|
||||
return toAjax(erpProjectPurchaseMaterialService.deleteWithValidByIds(List.of(purchaseMaterialIds), true));
|
||||
}
|
||||
|
||||
/**
|
||||
* 下拉框查询项目采购物料列表
|
||||
*/
|
||||
@GetMapping("/getErpProjectPurchaseMaterialList")
|
||||
public R<List<ErpProjectPurchaseMaterialVo>> getErpProjectPurchaseMaterialList(ErpProjectPurchaseMaterialBo bo) {
|
||||
List<ErpProjectPurchaseMaterialVo> list = erpProjectPurchaseMaterialService.queryList(bo);
|
||||
return R.ok(list);
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,37 @@
|
||||
package org.dromara.oa.erp.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.erp.domain.ErpProjectPurchase;
|
||||
import org.dromara.oa.erp.domain.vo.ErpProjectPurchaseVo;
|
||||
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
|
||||
|
||||
/**
|
||||
* 项目采购信息Mapper接口
|
||||
*
|
||||
* @author Yinq
|
||||
* @date 2025-11-13
|
||||
*/
|
||||
public interface ErpProjectPurchaseMapper extends BaseMapperPlus<ErpProjectPurchase, ErpProjectPurchaseVo> {
|
||||
|
||||
/**
|
||||
* 查询项目采购信息列表
|
||||
*
|
||||
* @param page 分页
|
||||
* @param queryWrapper 条件
|
||||
* @return 项目采购信息集合
|
||||
*/
|
||||
public Page<ErpProjectPurchaseVo> selectCustomErpProjectPurchaseVoList(@Param("page") Page<ErpProjectPurchaseVo> page, @Param(Constants.WRAPPER) MPJLambdaWrapper<ErpProjectPurchase> queryWrapper);
|
||||
|
||||
/**
|
||||
* 查询项目采购信息列表
|
||||
*
|
||||
* @param queryWrapper 条件
|
||||
* @return 项目采购信息集合
|
||||
*/
|
||||
public List<ErpProjectPurchaseVo> selectCustomErpProjectPurchaseVoList(@Param(Constants.WRAPPER) MPJLambdaWrapper<ErpProjectPurchase> queryWrapper);
|
||||
|
||||
}
|
||||
@ -0,0 +1,37 @@
|
||||
package org.dromara.oa.erp.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.erp.domain.ErpProjectPurchaseMaterial;
|
||||
import org.dromara.oa.erp.domain.vo.ErpProjectPurchaseMaterialVo;
|
||||
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
|
||||
|
||||
/**
|
||||
* 项目采购物料Mapper接口
|
||||
*
|
||||
* @author Yinq
|
||||
* @date 2025-11-13
|
||||
*/
|
||||
public interface ErpProjectPurchaseMaterialMapper extends BaseMapperPlus<ErpProjectPurchaseMaterial, ErpProjectPurchaseMaterialVo> {
|
||||
|
||||
/**
|
||||
* 查询项目采购物料列表
|
||||
*
|
||||
* @param page 分页
|
||||
* @param queryWrapper 条件
|
||||
* @return 项目采购物料集合
|
||||
*/
|
||||
public Page<ErpProjectPurchaseMaterialVo> selectCustomErpProjectPurchaseMaterialVoList(@Param("page") Page<ErpProjectPurchaseMaterialVo> page, @Param(Constants.WRAPPER) MPJLambdaWrapper<ErpProjectPurchaseMaterial> queryWrapper);
|
||||
|
||||
/**
|
||||
* 查询项目采购物料列表
|
||||
*
|
||||
* @param queryWrapper 条件
|
||||
* @return 项目采购物料集合
|
||||
*/
|
||||
public List<ErpProjectPurchaseMaterialVo> selectCustomErpProjectPurchaseMaterialVoList(@Param(Constants.WRAPPER) MPJLambdaWrapper<ErpProjectPurchaseMaterial> queryWrapper);
|
||||
|
||||
}
|
||||
@ -0,0 +1,69 @@
|
||||
package org.dromara.oa.erp.service;
|
||||
|
||||
import org.dromara.oa.erp.domain.ErpProjectPurchaseMaterial;
|
||||
import org.dromara.oa.erp.domain.vo.ErpProjectPurchaseMaterialVo;
|
||||
import org.dromara.oa.erp.domain.bo.ErpProjectPurchaseMaterialBo;
|
||||
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-11-13
|
||||
*/
|
||||
public interface IErpProjectPurchaseMaterialService {
|
||||
|
||||
/**
|
||||
* 查询项目采购物料
|
||||
*
|
||||
* @param purchaseMaterialId 主键
|
||||
* @return 项目采购物料
|
||||
*/
|
||||
ErpProjectPurchaseMaterialVo queryById(Long purchaseMaterialId);
|
||||
|
||||
/**
|
||||
* 分页查询项目采购物料列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @param pageQuery 分页参数
|
||||
* @return 项目采购物料分页列表
|
||||
*/
|
||||
TableDataInfo<ErpProjectPurchaseMaterialVo> queryPageList(ErpProjectPurchaseMaterialBo bo, PageQuery pageQuery);
|
||||
|
||||
/**
|
||||
* 查询符合条件的项目采购物料列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @return 项目采购物料列表
|
||||
*/
|
||||
List<ErpProjectPurchaseMaterialVo> queryList(ErpProjectPurchaseMaterialBo bo);
|
||||
|
||||
/**
|
||||
* 新增项目采购物料
|
||||
*
|
||||
* @param bo 项目采购物料
|
||||
* @return 是否新增成功
|
||||
*/
|
||||
Boolean insertByBo(ErpProjectPurchaseMaterialBo bo);
|
||||
|
||||
/**
|
||||
* 修改项目采购物料
|
||||
*
|
||||
* @param bo 项目采购物料
|
||||
* @return 是否修改成功
|
||||
*/
|
||||
Boolean updateByBo(ErpProjectPurchaseMaterialBo bo);
|
||||
|
||||
/**
|
||||
* 校验并批量删除项目采购物料信息
|
||||
*
|
||||
* @param ids 待删除的主键集合
|
||||
* @param isValid 是否进行有效性校验
|
||||
* @return 是否删除成功
|
||||
*/
|
||||
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
|
||||
}
|
||||
@ -0,0 +1,77 @@
|
||||
package org.dromara.oa.erp.service;
|
||||
|
||||
import org.dromara.oa.erp.domain.ErpProjectPurchase;
|
||||
import org.dromara.oa.erp.domain.vo.ErpProjectPurchaseVo;
|
||||
import org.dromara.oa.erp.domain.bo.ErpProjectPurchaseBo;
|
||||
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-11-13
|
||||
*/
|
||||
public interface IErpProjectPurchaseService {
|
||||
|
||||
/**
|
||||
* 查询项目采购信息
|
||||
*
|
||||
* @param projectPurchaseId 主键
|
||||
* @return 项目采购信息
|
||||
*/
|
||||
ErpProjectPurchaseVo queryById(Long projectPurchaseId);
|
||||
|
||||
/**
|
||||
* 分页查询项目采购信息列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @param pageQuery 分页参数
|
||||
* @return 项目采购信息分页列表
|
||||
*/
|
||||
TableDataInfo<ErpProjectPurchaseVo> queryPageList(ErpProjectPurchaseBo bo, PageQuery pageQuery);
|
||||
|
||||
/**
|
||||
* 查询符合条件的项目采购信息列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @return 项目采购信息列表
|
||||
*/
|
||||
List<ErpProjectPurchaseVo> queryList(ErpProjectPurchaseBo bo);
|
||||
|
||||
/**
|
||||
* 新增项目采购信息
|
||||
*
|
||||
* @param bo 项目采购信息
|
||||
* @return 是否新增成功
|
||||
*/
|
||||
Boolean insertByBo(ErpProjectPurchaseBo bo);
|
||||
|
||||
/**
|
||||
* 提交项目采购并发起流程
|
||||
*
|
||||
* @param bo 项目采购信息
|
||||
* @return 项目采购信息
|
||||
*/
|
||||
ErpProjectPurchaseVo projectPurchaseSubmitAndFlowStart(ErpProjectPurchaseBo bo);
|
||||
|
||||
/**
|
||||
* 修改项目采购信息
|
||||
*
|
||||
* @param bo 项目采购信息
|
||||
* @return 是否修改成功
|
||||
*/
|
||||
Boolean updateByBo(ErpProjectPurchaseBo bo);
|
||||
|
||||
/**
|
||||
* 校验并批量删除项目采购信息信息
|
||||
*
|
||||
* @param ids 待删除的主键集合
|
||||
* @param isValid 是否进行有效性校验
|
||||
* @return 是否删除成功
|
||||
*/
|
||||
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
|
||||
}
|
||||
@ -0,0 +1,147 @@
|
||||
package org.dromara.oa.erp.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.erp.domain.bo.ErpProjectPurchaseMaterialBo;
|
||||
import org.dromara.oa.erp.domain.vo.ErpProjectPurchaseMaterialVo;
|
||||
import org.dromara.oa.erp.domain.ErpProjectPurchaseMaterial;
|
||||
import org.dromara.oa.erp.mapper.ErpProjectPurchaseMaterialMapper;
|
||||
import org.dromara.oa.erp.service.IErpProjectPurchaseMaterialService;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Collection;
|
||||
|
||||
/**
|
||||
* 项目采购物料Service业务层处理
|
||||
*
|
||||
* @author Yinq
|
||||
* @date 2025-11-13
|
||||
*/
|
||||
@RequiredArgsConstructor
|
||||
@Service
|
||||
public class ErpProjectPurchaseMaterialServiceImpl implements IErpProjectPurchaseMaterialService {
|
||||
|
||||
private final ErpProjectPurchaseMaterialMapper baseMapper;
|
||||
|
||||
/**
|
||||
* 查询项目采购物料
|
||||
*
|
||||
* @param purchaseMaterialId 主键
|
||||
* @return 项目采购物料
|
||||
*/
|
||||
@Override
|
||||
public ErpProjectPurchaseMaterialVo queryById(Long purchaseMaterialId) {
|
||||
return baseMapper.selectVoById(purchaseMaterialId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 分页查询项目采购物料列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @param pageQuery 分页参数
|
||||
* @return 项目采购物料分页列表
|
||||
*/
|
||||
@Override
|
||||
public TableDataInfo<ErpProjectPurchaseMaterialVo> queryPageList(ErpProjectPurchaseMaterialBo bo, PageQuery pageQuery) {
|
||||
MPJLambdaWrapper<ErpProjectPurchaseMaterial> lqw = buildQueryWrapper(bo);
|
||||
Page<ErpProjectPurchaseMaterialVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
|
||||
return TableDataInfo.build(result);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询符合条件的项目采购物料列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @return 项目采购物料列表
|
||||
*/
|
||||
@Override
|
||||
public List<ErpProjectPurchaseMaterialVo> queryList(ErpProjectPurchaseMaterialBo bo) {
|
||||
MPJLambdaWrapper<ErpProjectPurchaseMaterial> lqw = buildQueryWrapper(bo);
|
||||
return baseMapper.selectVoList(lqw);
|
||||
}
|
||||
|
||||
private MPJLambdaWrapper<ErpProjectPurchaseMaterial> buildQueryWrapper(ErpProjectPurchaseMaterialBo bo) {
|
||||
Map<String, Object> params = bo.getParams();
|
||||
MPJLambdaWrapper<ErpProjectPurchaseMaterial> lqw = JoinWrappers.lambda(ErpProjectPurchaseMaterial.class)
|
||||
.selectAll(ErpProjectPurchaseMaterial.class)
|
||||
.eq(ErpProjectPurchaseMaterial::getDelFlag, "0")
|
||||
.eq(bo.getProjectPurchaseId() != null, ErpProjectPurchaseMaterial::getProjectPurchaseId, bo.getProjectPurchaseId())
|
||||
.eq(bo.getRelationDetailsId() != null, ErpProjectPurchaseMaterial::getRelationDetailsId, bo.getRelationDetailsId())
|
||||
.eq(StringUtils.isNotBlank(bo.getSpareFlag()), ErpProjectPurchaseMaterial::getSpareFlag, bo.getSpareFlag())
|
||||
.eq(StringUtils.isNotBlank(bo.getPurchasePlanFlag()), ErpProjectPurchaseMaterial::getPurchasePlanFlag, bo.getPurchasePlanFlag())
|
||||
.eq(StringUtils.isNotBlank(bo.getMaterialFlag()), ErpProjectPurchaseMaterial::getMaterialFlag, bo.getMaterialFlag())
|
||||
.eq(bo.getMaterialId() != null, ErpProjectPurchaseMaterial::getMaterialId, bo.getMaterialId())
|
||||
.eq(bo.getRelationMaterialId() != null, ErpProjectPurchaseMaterial::getRelationMaterialId, bo.getRelationMaterialId())
|
||||
.eq(StringUtils.isNotBlank(bo.getMaterialCode()), ErpProjectPurchaseMaterial::getMaterialCode, bo.getMaterialCode())
|
||||
.like(StringUtils.isNotBlank(bo.getMaterialName()), ErpProjectPurchaseMaterial::getMaterialName, bo.getMaterialName())
|
||||
.eq(StringUtils.isNotBlank(bo.getSpecificationDescription()), ErpProjectPurchaseMaterial::getSpecificationDescription, bo.getSpecificationDescription())
|
||||
.eq(bo.getUnitId() != null, ErpProjectPurchaseMaterial::getUnitId, bo.getUnitId())
|
||||
.eq(bo.getNeedPurchaseAmount() != null, ErpProjectPurchaseMaterial::getNeedPurchaseAmount, bo.getNeedPurchaseAmount())
|
||||
.eq(bo.getPurchaseAmount() != null, ErpProjectPurchaseMaterial::getPurchaseAmount, bo.getPurchaseAmount())
|
||||
.eq(bo.getArrivalTime() != null, ErpProjectPurchaseMaterial::getArrivalTime, bo.getArrivalTime())
|
||||
.eq(bo.getSerialNumber() != null, ErpProjectPurchaseMaterial::getSerialNumber, bo.getSerialNumber())
|
||||
.eq(StringUtils.isNotBlank(bo.getActiveFlag()), ErpProjectPurchaseMaterial::getActiveFlag, bo.getActiveFlag());
|
||||
return lqw;
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增项目采购物料
|
||||
*
|
||||
* @param bo 项目采购物料
|
||||
* @return 是否新增成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean insertByBo(ErpProjectPurchaseMaterialBo bo) {
|
||||
ErpProjectPurchaseMaterial add = MapstructUtils.convert(bo, ErpProjectPurchaseMaterial.class);
|
||||
validEntityBeforeSave(add);
|
||||
boolean flag = baseMapper.insert(add) > 0;
|
||||
if (flag) {
|
||||
bo.setPurchaseMaterialId(add.getPurchaseMaterialId());
|
||||
}
|
||||
return flag;
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改项目采购物料
|
||||
*
|
||||
* @param bo 项目采购物料
|
||||
* @return 是否修改成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean updateByBo(ErpProjectPurchaseMaterialBo bo) {
|
||||
ErpProjectPurchaseMaterial update = MapstructUtils.convert(bo, ErpProjectPurchaseMaterial.class);
|
||||
validEntityBeforeSave(update);
|
||||
return baseMapper.updateById(update) > 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* 保存前的数据校验
|
||||
*/
|
||||
private void validEntityBeforeSave(ErpProjectPurchaseMaterial 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,237 @@
|
||||
package org.dromara.oa.erp.service.impl;
|
||||
|
||||
import cn.hutool.core.convert.Convert;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.github.yulichang.toolkit.JoinWrappers;
|
||||
import com.github.yulichang.wrapper.MPJLambdaWrapper;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.dubbo.config.annotation.DubboReference;
|
||||
import org.apache.seata.spring.annotation.GlobalTransactional;
|
||||
import org.dromara.common.core.enums.BusinessStatusEnum;
|
||||
import org.dromara.common.core.enums.OAStatusEnum;
|
||||
import org.dromara.common.core.exception.ServiceException;
|
||||
import org.dromara.common.core.utils.MapstructUtils;
|
||||
import org.dromara.common.core.utils.StringUtils;
|
||||
import org.dromara.common.mybatis.core.page.PageQuery;
|
||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
import org.dromara.common.tenant.helper.TenantHelper;
|
||||
import org.dromara.oa.erp.domain.ErpProjectPurchase;
|
||||
import org.dromara.oa.erp.domain.bo.ErpProjectPurchaseBo;
|
||||
import org.dromara.oa.erp.domain.vo.ErpProjectPurchaseVo;
|
||||
import org.dromara.oa.erp.mapper.ErpProjectPurchaseMapper;
|
||||
import org.dromara.oa.erp.service.IErpProjectPurchaseService;
|
||||
import org.dromara.workflow.api.RemoteWorkflowService;
|
||||
import org.dromara.workflow.api.domain.RemoteFlowInstanceBizExt;
|
||||
import org.dromara.workflow.api.domain.RemoteStartProcess;
|
||||
import org.dromara.workflow.api.event.ProcessEvent;
|
||||
import org.springframework.context.event.EventListener;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Objects;
|
||||
|
||||
/**
|
||||
* 项目采购信息Service业务层处理
|
||||
*
|
||||
* @author Yinq
|
||||
* @date 2025-11-13
|
||||
*/
|
||||
@RequiredArgsConstructor
|
||||
@Service
|
||||
@Slf4j
|
||||
public class ErpProjectPurchaseServiceImpl implements IErpProjectPurchaseService {
|
||||
|
||||
private final ErpProjectPurchaseMapper baseMapper;
|
||||
|
||||
@DubboReference(timeout = 30000)
|
||||
private RemoteWorkflowService remoteWorkflowService;
|
||||
|
||||
/**
|
||||
* 查询项目采购信息
|
||||
*
|
||||
* @param projectPurchaseId 主键
|
||||
* @return 项目采购信息
|
||||
*/
|
||||
@Override
|
||||
public ErpProjectPurchaseVo queryById(Long projectPurchaseId) {
|
||||
return baseMapper.selectVoById(projectPurchaseId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 分页查询项目采购信息列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @param pageQuery 分页参数
|
||||
* @return 项目采购信息分页列表
|
||||
*/
|
||||
@Override
|
||||
public TableDataInfo<ErpProjectPurchaseVo> queryPageList(ErpProjectPurchaseBo bo, PageQuery pageQuery) {
|
||||
MPJLambdaWrapper<ErpProjectPurchase> lqw = buildQueryWrapper(bo);
|
||||
Page<ErpProjectPurchaseVo> result = baseMapper.selectCustomErpProjectPurchaseVoList(pageQuery.build(), lqw);
|
||||
return TableDataInfo.build(result);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询符合条件的项目采购信息列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @return 项目采购信息列表
|
||||
*/
|
||||
@Override
|
||||
public List<ErpProjectPurchaseVo> queryList(ErpProjectPurchaseBo bo) {
|
||||
MPJLambdaWrapper<ErpProjectPurchase> lqw = buildQueryWrapper(bo);
|
||||
return baseMapper.selectCustomErpProjectPurchaseVoList(lqw);
|
||||
}
|
||||
|
||||
private MPJLambdaWrapper<ErpProjectPurchase> buildQueryWrapper(ErpProjectPurchaseBo bo) {
|
||||
Map<String, Object> params = bo.getParams();
|
||||
MPJLambdaWrapper<ErpProjectPurchase> lqw = JoinWrappers.lambda(ErpProjectPurchase.class)
|
||||
.selectAll(ErpProjectPurchase.class)
|
||||
.eq(ErpProjectPurchase::getDelFlag, "0")
|
||||
.eq(bo.getProjectId() != null, ErpProjectPurchase::getProjectId, bo.getProjectId())
|
||||
.eq(StringUtils.isNotBlank(bo.getProjectCode()), ErpProjectPurchase::getProjectCode, bo.getProjectCode())
|
||||
.eq(bo.getManagerId() != null, ErpProjectPurchase::getManagerId, bo.getManagerId())
|
||||
.eq(bo.getChargeId() != null, ErpProjectPurchase::getChargeId, bo.getChargeId())
|
||||
.eq(bo.getDeputyId() != null, ErpProjectPurchase::getDeputyId, bo.getDeputyId())
|
||||
.eq(bo.getReporterId() != null, ErpProjectPurchase::getReporterId, bo.getReporterId())
|
||||
.eq(StringUtils.isNotBlank(bo.getConsigneeUser()), ErpProjectPurchase::getConsigneeUser, bo.getConsigneeUser())
|
||||
.eq(StringUtils.isNotBlank(bo.getConsigneeAddress()), ErpProjectPurchase::getConsigneeAddress, bo.getConsigneeAddress())
|
||||
.eq(StringUtils.isNotBlank(bo.getConsigneeContact()), ErpProjectPurchase::getConsigneeContact, bo.getConsigneeContact())
|
||||
.eq(StringUtils.isNotBlank(bo.getProjectPurchaseStatus()), ErpProjectPurchase::getProjectPurchaseStatus, bo.getProjectPurchaseStatus())
|
||||
.eq(StringUtils.isNotBlank(bo.getFlowStatus()), ErpProjectPurchase::getFlowStatus, bo.getFlowStatus())
|
||||
.eq(bo.getSortOrder() != null, ErpProjectPurchase::getSortOrder, bo.getSortOrder())
|
||||
.eq(bo.getRelationId() != null, ErpProjectPurchase::getRelationId, bo.getRelationId())
|
||||
.eq(StringUtils.isNotBlank(bo.getSpareFlag()), ErpProjectPurchase::getSpareFlag, bo.getSpareFlag())
|
||||
.eq(StringUtils.isNotBlank(bo.getActiveFlag()), ErpProjectPurchase::getActiveFlag, bo.getActiveFlag());
|
||||
return lqw;
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增项目采购信息
|
||||
*
|
||||
* @param bo 项目采购信息
|
||||
* @return 是否新增成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean insertByBo(ErpProjectPurchaseBo bo) {
|
||||
ErpProjectPurchase add = MapstructUtils.convert(bo, ErpProjectPurchase.class);
|
||||
validEntityBeforeSave(add);
|
||||
boolean flag = baseMapper.insert(add) > 0;
|
||||
if (flag) {
|
||||
bo.setProjectPurchaseId(add.getProjectPurchaseId());
|
||||
}
|
||||
return flag;
|
||||
}
|
||||
|
||||
/**
|
||||
* 提交项目采购并提交流程
|
||||
*
|
||||
* @param bo 项目采购信息
|
||||
* @return 项目采购信息
|
||||
*/
|
||||
@Override
|
||||
@GlobalTransactional(rollbackFor = Exception.class)
|
||||
public ErpProjectPurchaseVo projectPurchaseSubmitAndFlowStart(ErpProjectPurchaseBo bo) {
|
||||
ErpProjectPurchase entity = MapstructUtils.convert(bo, ErpProjectPurchase.class);
|
||||
validEntityBeforeSave(entity);
|
||||
if (bo.getProjectPurchaseId() == null) {
|
||||
this.insertByBo(bo);
|
||||
} else {
|
||||
this.updateByBo(bo);
|
||||
}
|
||||
if (bo.getVariables() == null) {
|
||||
bo.setVariables(new HashMap<>());
|
||||
}
|
||||
bo.getVariables().put("ignore", true);
|
||||
if (StringUtils.isBlank(bo.getFlowCode())) {
|
||||
throw new ServiceException("流程编码不能为空");
|
||||
}
|
||||
RemoteFlowInstanceBizExt bizExt = bo.getBizExt();
|
||||
if (bizExt == null) {
|
||||
bizExt = new RemoteFlowInstanceBizExt();
|
||||
bo.setBizExt(bizExt);
|
||||
}
|
||||
RemoteStartProcess startProcess = new RemoteStartProcess();
|
||||
startProcess.setBusinessId(String.valueOf(bo.getProjectPurchaseId()));
|
||||
startProcess.setFlowCode(bo.getFlowCode());
|
||||
startProcess.setVariables(bo.getVariables());
|
||||
bizExt.setBusinessId(startProcess.getBusinessId());
|
||||
startProcess.setBizExt(bizExt);
|
||||
boolean started = remoteWorkflowService.startCompleteTask(startProcess);
|
||||
if (!started) {
|
||||
throw new ServiceException("流程发起异常");
|
||||
}
|
||||
// 更新状态为审批中
|
||||
ErpProjectPurchase updateStatus = new ErpProjectPurchase();
|
||||
updateStatus.setProjectPurchaseId(bo.getProjectPurchaseId());
|
||||
updateStatus.setFlowStatus(BusinessStatusEnum.WAITING.getStatus());
|
||||
updateStatus.setProjectPurchaseStatus("2");
|
||||
baseMapper.updateById(updateStatus);
|
||||
return queryById(bo.getProjectPurchaseId());
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改项目采购信息
|
||||
*
|
||||
* @param bo 项目采购信息
|
||||
* @return 是否修改成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean updateByBo(ErpProjectPurchaseBo bo) {
|
||||
ErpProjectPurchase update = MapstructUtils.convert(bo, ErpProjectPurchase.class);
|
||||
validEntityBeforeSave(update);
|
||||
return baseMapper.updateById(update) > 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* 保存前的数据校验
|
||||
*/
|
||||
private void validEntityBeforeSave(ErpProjectPurchase entity) {
|
||||
//TODO 做一些数据校验,如唯一约束
|
||||
}
|
||||
|
||||
/**
|
||||
* 校验并批量删除项目采购信息信息
|
||||
*
|
||||
* @param ids 待删除的主键集合
|
||||
* @param isValid 是否进行有效性校验
|
||||
* @return 是否删除成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
|
||||
if (isValid) {
|
||||
//TODO 做一些业务上的校验,判断是否需要校验
|
||||
}
|
||||
return baseMapper.deleteByIds(ids) > 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* 项目采购流程事件监听
|
||||
*
|
||||
* @param processEvent 流程事件
|
||||
*/
|
||||
@EventListener(condition = "#processEvent.flowCode =='xmcg'")
|
||||
public void processHandler(ProcessEvent processEvent) {
|
||||
TenantHelper.dynamic(processEvent.getTenantId(), () -> {
|
||||
Long businessId = Convert.toLong(processEvent.getBusinessId());
|
||||
ErpProjectPurchase purchase = baseMapper.selectById(businessId);
|
||||
purchase.setFlowStatus(processEvent.getStatus());
|
||||
if (Objects.equals(processEvent.getStatus(), BusinessStatusEnum.WAITING.getStatus())) {
|
||||
purchase.setProjectPurchaseStatus(OAStatusEnum.APPROVING.getStatus());
|
||||
} else if (Objects.equals(processEvent.getStatus(), BusinessStatusEnum.FINISH.getStatus())) {
|
||||
purchase.setProjectPurchaseStatus(OAStatusEnum.COMPLETED.getStatus());
|
||||
} else if (Objects.equals(processEvent.getStatus(), BusinessStatusEnum.INVALID.getStatus())
|
||||
|| Objects.equals(processEvent.getStatus(), BusinessStatusEnum.TERMINATION.getStatus())) {
|
||||
purchase.setProjectPurchaseStatus(OAStatusEnum.INVALID.getStatus());
|
||||
} else if (Objects.equals(processEvent.getStatus(), BusinessStatusEnum.BACK.getStatus())
|
||||
|| Objects.equals(processEvent.getStatus(), BusinessStatusEnum.CANCEL.getStatus())) {
|
||||
purchase.setProjectPurchaseStatus(OAStatusEnum.DRAFT.getStatus());
|
||||
}
|
||||
baseMapper.updateById(purchase);
|
||||
});
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,39 @@
|
||||
<?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.erp.mapper.ErpProjectPurchaseMapper">
|
||||
<resultMap type="org.dromara.oa.erp.domain.vo.ErpProjectPurchaseVo" id="ErpProjectPurchaseResult">
|
||||
</resultMap>
|
||||
|
||||
<select id="selectCustomErpProjectPurchaseVoList" resultMap="ErpProjectPurchaseResult">
|
||||
select project_purchase_id,
|
||||
tenant_id,
|
||||
project_id,
|
||||
project_code,
|
||||
manager_id,
|
||||
charge_id,
|
||||
deputy_id,
|
||||
version,
|
||||
reporter_id,
|
||||
consignee_user,
|
||||
consignee_address,
|
||||
consignee_contact,
|
||||
project_purchase_status,
|
||||
flow_status,
|
||||
sort_order,
|
||||
relation_id,
|
||||
remark,
|
||||
spare_flag,
|
||||
active_flag,
|
||||
del_flag,
|
||||
create_dept,
|
||||
create_by,
|
||||
create_time,
|
||||
update_by,
|
||||
update_time
|
||||
from erp_project_purchase t
|
||||
${ew.getCustomSqlSegment}
|
||||
</select>
|
||||
|
||||
</mapper>
|
||||
@ -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.erp.mapper.ErpProjectPurchaseMaterialMapper">
|
||||
<resultMap type="org.dromara.oa.erp.domain.vo.ErpProjectPurchaseMaterialVo" id="ErpProjectPurchaseMaterialResult">
|
||||
</resultMap>
|
||||
|
||||
<select id="selectCustomErpProjectPurchaseMaterialVoList" resultMap="ErpProjectPurchaseMaterialResult">
|
||||
select purchase_material_id, tenant_id, project_purchase_id, relation_details_id, spare_flag, purchase_plan_flag, material_flag, material_id, relation_material_id, material_code, material_name, specification_description, unit_id, need_purchase_amount, purchase_amount, arrival_time, serial_number, remark, active_flag, del_flag, create_dept, create_by, create_time, update_by, update_time from erp_project_purchase_material t
|
||||
${ew.getCustomSqlSegment}
|
||||
</select>
|
||||
|
||||
</mapper>
|
||||
Loading…
Reference in New Issue