1.0.9 初始化合同、合同物料
yinq
4 months ago
parent
1cc34f544c
commit
daa46b0671
@ -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.ErpContractInfoVo;
|
||||
import org.dromara.oa.erp.domain.bo.ErpContractInfoBo;
|
||||
import org.dromara.oa.erp.service.IErpContractInfoService;
|
||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
|
||||
/**
|
||||
* 合同信息
|
||||
* 前端访问路由地址为:/oa/erp/contractInfo
|
||||
*
|
||||
* @author Yinq
|
||||
* @date 2025-10-11
|
||||
*/
|
||||
@Validated
|
||||
@RequiredArgsConstructor
|
||||
@RestController
|
||||
@RequestMapping("/erp/contractInfo")
|
||||
public class ErpContractInfoController extends BaseController {
|
||||
|
||||
private final IErpContractInfoService erpContractInfoService;
|
||||
|
||||
/**
|
||||
* 查询合同信息列表
|
||||
*/
|
||||
@SaCheckPermission("oa/erp:contractInfo:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<ErpContractInfoVo> list(ErpContractInfoBo bo, PageQuery pageQuery) {
|
||||
return erpContractInfoService.queryPageList(bo, pageQuery);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出合同信息列表
|
||||
*/
|
||||
@SaCheckPermission("oa/erp:contractInfo:export")
|
||||
@Log(title = "合同信息", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(ErpContractInfoBo bo, HttpServletResponse response) {
|
||||
List<ErpContractInfoVo> list = erpContractInfoService.queryList(bo);
|
||||
ExcelUtil.exportExcel(list, "合同信息", ErpContractInfoVo.class, response);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取合同信息详细信息
|
||||
*
|
||||
* @param contractId 主键
|
||||
*/
|
||||
@SaCheckPermission("oa/erp:contractInfo:query")
|
||||
@GetMapping("/{contractId}")
|
||||
public R<ErpContractInfoVo> getInfo(@NotNull(message = "主键不能为空")
|
||||
@PathVariable("contractId") Long contractId) {
|
||||
return R.ok(erpContractInfoService.queryById(contractId));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增合同信息
|
||||
*/
|
||||
@SaCheckPermission("oa/erp:contractInfo:add")
|
||||
@Log(title = "合同信息", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
public R<Void> add(@Validated(AddGroup.class) @RequestBody ErpContractInfoBo bo) {
|
||||
return toAjax(erpContractInfoService.insertByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改合同信息
|
||||
*/
|
||||
@SaCheckPermission("oa/erp:contractInfo:edit")
|
||||
@Log(title = "合同信息", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
public R<Void> edit(@Validated(EditGroup.class) @RequestBody ErpContractInfoBo bo) {
|
||||
return toAjax(erpContractInfoService.updateByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除合同信息
|
||||
*
|
||||
* @param contractIds 主键串
|
||||
*/
|
||||
@SaCheckPermission("oa/erp:contractInfo:remove")
|
||||
@Log(title = "合同信息", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{contractIds}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空")
|
||||
@PathVariable("contractIds") Long[] contractIds) {
|
||||
return toAjax(erpContractInfoService.deleteWithValidByIds(List.of(contractIds), true));
|
||||
}
|
||||
|
||||
/**
|
||||
* 下拉框查询合同信息列表
|
||||
*/
|
||||
@GetMapping("/getErpContractInfoList")
|
||||
public R<List<ErpContractInfoVo>> getErpContractInfoList(ErpContractInfoBo bo) {
|
||||
List<ErpContractInfoVo> list = erpContractInfoService.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.ErpContractMaterielVo;
|
||||
import org.dromara.oa.erp.domain.bo.ErpContractMaterielBo;
|
||||
import org.dromara.oa.erp.service.IErpContractMaterielService;
|
||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
|
||||
/**
|
||||
* 合同物料信息
|
||||
* 前端访问路由地址为:/oa/erp/contractMateriel
|
||||
*
|
||||
* @author Yinq
|
||||
* @date 2025-10-11
|
||||
*/
|
||||
@Validated
|
||||
@RequiredArgsConstructor
|
||||
@RestController
|
||||
@RequestMapping("/erp/contractMateriel")
|
||||
public class ErpContractMaterielController extends BaseController {
|
||||
|
||||
private final IErpContractMaterielService erpContractMaterielService;
|
||||
|
||||
/**
|
||||
* 查询合同物料信息列表
|
||||
*/
|
||||
@SaCheckPermission("oa/erp:contractMateriel:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<ErpContractMaterielVo> list(ErpContractMaterielBo bo, PageQuery pageQuery) {
|
||||
return erpContractMaterielService.queryPageList(bo, pageQuery);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出合同物料信息列表
|
||||
*/
|
||||
@SaCheckPermission("oa/erp:contractMateriel:export")
|
||||
@Log(title = "合同物料信息", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(ErpContractMaterielBo bo, HttpServletResponse response) {
|
||||
List<ErpContractMaterielVo> list = erpContractMaterielService.queryList(bo);
|
||||
ExcelUtil.exportExcel(list, "合同物料信息", ErpContractMaterielVo.class, response);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取合同物料信息详细信息
|
||||
*
|
||||
* @param contractMaterielId 主键
|
||||
*/
|
||||
@SaCheckPermission("oa/erp:contractMateriel:query")
|
||||
@GetMapping("/{contractMaterielId}")
|
||||
public R<ErpContractMaterielVo> getInfo(@NotNull(message = "主键不能为空")
|
||||
@PathVariable("contractMaterielId") Long contractMaterielId) {
|
||||
return R.ok(erpContractMaterielService.queryById(contractMaterielId));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增合同物料信息
|
||||
*/
|
||||
@SaCheckPermission("oa/erp:contractMateriel:add")
|
||||
@Log(title = "合同物料信息", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
public R<Void> add(@Validated(AddGroup.class) @RequestBody ErpContractMaterielBo bo) {
|
||||
return toAjax(erpContractMaterielService.insertByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改合同物料信息
|
||||
*/
|
||||
@SaCheckPermission("oa/erp:contractMateriel:edit")
|
||||
@Log(title = "合同物料信息", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
public R<Void> edit(@Validated(EditGroup.class) @RequestBody ErpContractMaterielBo bo) {
|
||||
return toAjax(erpContractMaterielService.updateByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除合同物料信息
|
||||
*
|
||||
* @param contractMaterielIds 主键串
|
||||
*/
|
||||
@SaCheckPermission("oa/erp:contractMateriel:remove")
|
||||
@Log(title = "合同物料信息", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{contractMaterielIds}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空")
|
||||
@PathVariable("contractMaterielIds") Long[] contractMaterielIds) {
|
||||
return toAjax(erpContractMaterielService.deleteWithValidByIds(List.of(contractMaterielIds), true));
|
||||
}
|
||||
|
||||
/**
|
||||
* 下拉框查询合同物料信息列表
|
||||
*/
|
||||
@GetMapping("/getErpContractMaterielList")
|
||||
public R<List<ErpContractMaterielVo>> getErpContractMaterielList(ErpContractMaterielBo bo) {
|
||||
List<ErpContractMaterielVo> list = erpContractMaterielService.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.ErpContractInfo;
|
||||
import org.dromara.oa.erp.domain.vo.ErpContractInfoVo;
|
||||
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
|
||||
|
||||
/**
|
||||
* 合同信息Mapper接口
|
||||
*
|
||||
* @author Yinq
|
||||
* @date 2025-10-11
|
||||
*/
|
||||
public interface ErpContractInfoMapper extends BaseMapperPlus<ErpContractInfo, ErpContractInfoVo> {
|
||||
|
||||
/**
|
||||
* 查询合同信息列表
|
||||
*
|
||||
* @param page 分页
|
||||
* @param queryWrapper 条件
|
||||
* @return 合同信息集合
|
||||
*/
|
||||
public Page<ErpContractInfoVo> selectCustomErpContractInfoVoList(@Param("page") Page<ErpContractInfoVo> page, @Param(Constants.WRAPPER) MPJLambdaWrapper<ErpContractInfo> queryWrapper);
|
||||
|
||||
/**
|
||||
* 查询合同信息列表
|
||||
*
|
||||
* @param queryWrapper 条件
|
||||
* @return 合同信息集合
|
||||
*/
|
||||
public List<ErpContractInfoVo> selectCustomErpContractInfoVoList(@Param(Constants.WRAPPER) MPJLambdaWrapper<ErpContractInfo> 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.ErpContractMateriel;
|
||||
import org.dromara.oa.erp.domain.vo.ErpContractMaterielVo;
|
||||
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
|
||||
|
||||
/**
|
||||
* 合同物料信息Mapper接口
|
||||
*
|
||||
* @author Yinq
|
||||
* @date 2025-10-11
|
||||
*/
|
||||
public interface ErpContractMaterielMapper extends BaseMapperPlus<ErpContractMateriel, ErpContractMaterielVo> {
|
||||
|
||||
/**
|
||||
* 查询合同物料信息列表
|
||||
*
|
||||
* @param page 分页
|
||||
* @param queryWrapper 条件
|
||||
* @return 合同物料信息集合
|
||||
*/
|
||||
public Page<ErpContractMaterielVo> selectCustomErpContractMaterielVoList(@Param("page") Page<ErpContractMaterielVo> page, @Param(Constants.WRAPPER) MPJLambdaWrapper<ErpContractMateriel> queryWrapper);
|
||||
|
||||
/**
|
||||
* 查询合同物料信息列表
|
||||
*
|
||||
* @param queryWrapper 条件
|
||||
* @return 合同物料信息集合
|
||||
*/
|
||||
public List<ErpContractMaterielVo> selectCustomErpContractMaterielVoList(@Param(Constants.WRAPPER) MPJLambdaWrapper<ErpContractMateriel> queryWrapper);
|
||||
|
||||
}
|
||||
@ -0,0 +1,69 @@
|
||||
package org.dromara.oa.erp.service;
|
||||
|
||||
import org.dromara.oa.erp.domain.ErpContractInfo;
|
||||
import org.dromara.oa.erp.domain.vo.ErpContractInfoVo;
|
||||
import org.dromara.oa.erp.domain.bo.ErpContractInfoBo;
|
||||
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-10-11
|
||||
*/
|
||||
public interface IErpContractInfoService {
|
||||
|
||||
/**
|
||||
* 查询合同信息
|
||||
*
|
||||
* @param contractId 主键
|
||||
* @return 合同信息
|
||||
*/
|
||||
ErpContractInfoVo queryById(Long contractId);
|
||||
|
||||
/**
|
||||
* 分页查询合同信息列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @param pageQuery 分页参数
|
||||
* @return 合同信息分页列表
|
||||
*/
|
||||
TableDataInfo<ErpContractInfoVo> queryPageList(ErpContractInfoBo bo, PageQuery pageQuery);
|
||||
|
||||
/**
|
||||
* 查询符合条件的合同信息列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @return 合同信息列表
|
||||
*/
|
||||
List<ErpContractInfoVo> queryList(ErpContractInfoBo bo);
|
||||
|
||||
/**
|
||||
* 新增合同信息
|
||||
*
|
||||
* @param bo 合同信息
|
||||
* @return 是否新增成功
|
||||
*/
|
||||
Boolean insertByBo(ErpContractInfoBo bo);
|
||||
|
||||
/**
|
||||
* 修改合同信息
|
||||
*
|
||||
* @param bo 合同信息
|
||||
* @return 是否修改成功
|
||||
*/
|
||||
Boolean updateByBo(ErpContractInfoBo bo);
|
||||
|
||||
/**
|
||||
* 校验并批量删除合同信息信息
|
||||
*
|
||||
* @param ids 待删除的主键集合
|
||||
* @param isValid 是否进行有效性校验
|
||||
* @return 是否删除成功
|
||||
*/
|
||||
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
|
||||
}
|
||||
@ -0,0 +1,69 @@
|
||||
package org.dromara.oa.erp.service;
|
||||
|
||||
import org.dromara.oa.erp.domain.ErpContractMateriel;
|
||||
import org.dromara.oa.erp.domain.vo.ErpContractMaterielVo;
|
||||
import org.dromara.oa.erp.domain.bo.ErpContractMaterielBo;
|
||||
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-10-11
|
||||
*/
|
||||
public interface IErpContractMaterielService {
|
||||
|
||||
/**
|
||||
* 查询合同物料信息
|
||||
*
|
||||
* @param contractMaterielId 主键
|
||||
* @return 合同物料信息
|
||||
*/
|
||||
ErpContractMaterielVo queryById(Long contractMaterielId);
|
||||
|
||||
/**
|
||||
* 分页查询合同物料信息列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @param pageQuery 分页参数
|
||||
* @return 合同物料信息分页列表
|
||||
*/
|
||||
TableDataInfo<ErpContractMaterielVo> queryPageList(ErpContractMaterielBo bo, PageQuery pageQuery);
|
||||
|
||||
/**
|
||||
* 查询符合条件的合同物料信息列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @return 合同物料信息列表
|
||||
*/
|
||||
List<ErpContractMaterielVo> queryList(ErpContractMaterielBo bo);
|
||||
|
||||
/**
|
||||
* 新增合同物料信息
|
||||
*
|
||||
* @param bo 合同物料信息
|
||||
* @return 是否新增成功
|
||||
*/
|
||||
Boolean insertByBo(ErpContractMaterielBo bo);
|
||||
|
||||
/**
|
||||
* 修改合同物料信息
|
||||
*
|
||||
* @param bo 合同物料信息
|
||||
* @return 是否修改成功
|
||||
*/
|
||||
Boolean updateByBo(ErpContractMaterielBo bo);
|
||||
|
||||
/**
|
||||
* 校验并批量删除合同物料信息信息
|
||||
*
|
||||
* @param ids 待删除的主键集合
|
||||
* @param isValid 是否进行有效性校验
|
||||
* @return 是否删除成功
|
||||
*/
|
||||
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
|
||||
}
|
||||
@ -0,0 +1,154 @@
|
||||
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.ErpContractInfoBo;
|
||||
import org.dromara.oa.erp.domain.vo.ErpContractInfoVo;
|
||||
import org.dromara.oa.erp.domain.ErpContractInfo;
|
||||
import org.dromara.oa.erp.mapper.ErpContractInfoMapper;
|
||||
import org.dromara.oa.erp.service.IErpContractInfoService;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Collection;
|
||||
|
||||
/**
|
||||
* 合同信息Service业务层处理
|
||||
*
|
||||
* @author Yinq
|
||||
* @date 2025-10-11
|
||||
*/
|
||||
@RequiredArgsConstructor
|
||||
@Service
|
||||
public class ErpContractInfoServiceImpl implements IErpContractInfoService {
|
||||
|
||||
private final ErpContractInfoMapper baseMapper;
|
||||
|
||||
/**
|
||||
* 查询合同信息
|
||||
*
|
||||
* @param contractId 主键
|
||||
* @return 合同信息
|
||||
*/
|
||||
@Override
|
||||
public ErpContractInfoVo queryById(Long contractId){
|
||||
return baseMapper.selectVoById(contractId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 分页查询合同信息列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @param pageQuery 分页参数
|
||||
* @return 合同信息分页列表
|
||||
*/
|
||||
@Override
|
||||
public TableDataInfo<ErpContractInfoVo> queryPageList(ErpContractInfoBo bo, PageQuery pageQuery) {
|
||||
MPJLambdaWrapper<ErpContractInfo> lqw = buildQueryWrapper(bo);
|
||||
Page<ErpContractInfoVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
|
||||
return TableDataInfo.build(result);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询符合条件的合同信息列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @return 合同信息列表
|
||||
*/
|
||||
@Override
|
||||
public List<ErpContractInfoVo> queryList(ErpContractInfoBo bo) {
|
||||
MPJLambdaWrapper<ErpContractInfo> lqw = buildQueryWrapper(bo);
|
||||
return baseMapper.selectVoList(lqw);
|
||||
}
|
||||
|
||||
private MPJLambdaWrapper<ErpContractInfo> buildQueryWrapper(ErpContractInfoBo bo) {
|
||||
Map<String, Object> params = bo.getParams();
|
||||
MPJLambdaWrapper<ErpContractInfo> lqw = JoinWrappers.lambda(ErpContractInfo.class)
|
||||
.selectAll(ErpContractInfo.class)
|
||||
.eq(StringUtils.isNotBlank(bo.getContractFlag()), ErpContractInfo::getContractFlag, bo.getContractFlag())
|
||||
.eq(StringUtils.isNotBlank(bo.getContractCode()), ErpContractInfo::getContractCode, bo.getContractCode())
|
||||
.like(StringUtils.isNotBlank(bo.getContractName()), ErpContractInfo::getContractName, bo.getContractName())
|
||||
.eq(StringUtils.isNotBlank(bo.getContractCategory()), ErpContractInfo::getContractCategory, bo.getContractCategory())
|
||||
.eq(StringUtils.isNotBlank(bo.getContractType()), ErpContractInfo::getContractType, bo.getContractType())
|
||||
.eq(StringUtils.isNotBlank(bo.getBusinessDirection()), ErpContractInfo::getBusinessDirection, bo.getBusinessDirection())
|
||||
.eq(bo.getContractDeptId() != null, ErpContractInfo::getContractDeptId, bo.getContractDeptId())
|
||||
.eq(bo.getContractDate() != null, ErpContractInfo::getContractDate, bo.getContractDate())
|
||||
.eq(bo.getTotalPrice() != null, ErpContractInfo::getTotalPrice, bo.getTotalPrice())
|
||||
.eq(bo.getACustomerId() != null, ErpContractInfo::getACustomerId, bo.getACustomerId())
|
||||
.eq(StringUtils.isNotBlank(bo.getARepresent()), ErpContractInfo::getARepresent, bo.getARepresent())
|
||||
.eq(bo.getADate() != null, ErpContractInfo::getADate, bo.getADate())
|
||||
.eq(bo.getBCustomerId() != null, ErpContractInfo::getBCustomerId, bo.getBCustomerId())
|
||||
.eq(StringUtils.isNotBlank(bo.getBRepresent()), ErpContractInfo::getBRepresent, bo.getBRepresent())
|
||||
.eq(bo.getBDate() != null, ErpContractInfo::getBDate, bo.getBDate())
|
||||
.eq(StringUtils.isNotBlank(bo.getContractStatus()), ErpContractInfo::getContractStatus, bo.getContractStatus())
|
||||
.eq(StringUtils.isNotBlank(bo.getFlowStatus()), ErpContractInfo::getFlowStatus, bo.getFlowStatus())
|
||||
.eq(bo.getTemplateId() != null, ErpContractInfo::getTemplateId, bo.getTemplateId())
|
||||
.eq(StringUtils.isNotBlank(bo.getOssId()), ErpContractInfo::getOssId, bo.getOssId())
|
||||
.eq(StringUtils.isNotBlank(bo.getPaymentMethod()), ErpContractInfo::getPaymentMethod, bo.getPaymentMethod())
|
||||
.eq(bo.getSignatureAppendix() != null, ErpContractInfo::getSignatureAppendix, bo.getSignatureAppendix())
|
||||
.eq(bo.getTaxRate() != null, ErpContractInfo::getTaxRate, bo.getTaxRate())
|
||||
.eq(StringUtils.isNotBlank(bo.getActiveFlag()), ErpContractInfo::getActiveFlag, bo.getActiveFlag())
|
||||
;
|
||||
return lqw;
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增合同信息
|
||||
*
|
||||
* @param bo 合同信息
|
||||
* @return 是否新增成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean insertByBo(ErpContractInfoBo bo) {
|
||||
ErpContractInfo add = MapstructUtils.convert(bo, ErpContractInfo.class);
|
||||
validEntityBeforeSave(add);
|
||||
boolean flag = baseMapper.insert(add) > 0;
|
||||
if (flag) {
|
||||
bo.setContractId(add.getContractId());
|
||||
}
|
||||
return flag;
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改合同信息
|
||||
*
|
||||
* @param bo 合同信息
|
||||
* @return 是否修改成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean updateByBo(ErpContractInfoBo bo) {
|
||||
ErpContractInfo update = MapstructUtils.convert(bo, ErpContractInfo.class);
|
||||
validEntityBeforeSave(update);
|
||||
return baseMapper.updateById(update) > 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* 保存前的数据校验
|
||||
*/
|
||||
private void validEntityBeforeSave(ErpContractInfo 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,143 @@
|
||||
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.ErpContractMaterielBo;
|
||||
import org.dromara.oa.erp.domain.vo.ErpContractMaterielVo;
|
||||
import org.dromara.oa.erp.domain.ErpContractMateriel;
|
||||
import org.dromara.oa.erp.mapper.ErpContractMaterielMapper;
|
||||
import org.dromara.oa.erp.service.IErpContractMaterielService;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Collection;
|
||||
|
||||
/**
|
||||
* 合同物料信息Service业务层处理
|
||||
*
|
||||
* @author Yinq
|
||||
* @date 2025-10-11
|
||||
*/
|
||||
@RequiredArgsConstructor
|
||||
@Service
|
||||
public class ErpContractMaterielServiceImpl implements IErpContractMaterielService {
|
||||
|
||||
private final ErpContractMaterielMapper baseMapper;
|
||||
|
||||
/**
|
||||
* 查询合同物料信息
|
||||
*
|
||||
* @param contractMaterielId 主键
|
||||
* @return 合同物料信息
|
||||
*/
|
||||
@Override
|
||||
public ErpContractMaterielVo queryById(Long contractMaterielId){
|
||||
return baseMapper.selectVoById(contractMaterielId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 分页查询合同物料信息列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @param pageQuery 分页参数
|
||||
* @return 合同物料信息分页列表
|
||||
*/
|
||||
@Override
|
||||
public TableDataInfo<ErpContractMaterielVo> queryPageList(ErpContractMaterielBo bo, PageQuery pageQuery) {
|
||||
MPJLambdaWrapper<ErpContractMateriel> lqw = buildQueryWrapper(bo);
|
||||
Page<ErpContractMaterielVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
|
||||
return TableDataInfo.build(result);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询符合条件的合同物料信息列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @return 合同物料信息列表
|
||||
*/
|
||||
@Override
|
||||
public List<ErpContractMaterielVo> queryList(ErpContractMaterielBo bo) {
|
||||
MPJLambdaWrapper<ErpContractMateriel> lqw = buildQueryWrapper(bo);
|
||||
return baseMapper.selectVoList(lqw);
|
||||
}
|
||||
|
||||
private MPJLambdaWrapper<ErpContractMateriel> buildQueryWrapper(ErpContractMaterielBo bo) {
|
||||
Map<String, Object> params = bo.getParams();
|
||||
MPJLambdaWrapper<ErpContractMateriel> lqw = JoinWrappers.lambda(ErpContractMateriel.class)
|
||||
.selectAll(ErpContractMateriel.class)
|
||||
.eq(bo.getContractId() != null, ErpContractMateriel::getContractId, bo.getContractId())
|
||||
.like(StringUtils.isNotBlank(bo.getProductName()), ErpContractMateriel::getProductName, bo.getProductName())
|
||||
.eq(StringUtils.isNotBlank(bo.getSpecificationDescription()), ErpContractMateriel::getSpecificationDescription, bo.getSpecificationDescription())
|
||||
.eq(bo.getMaterielId() != null, ErpContractMateriel::getMaterielId, bo.getMaterielId())
|
||||
.eq(bo.getRelationMaterielId() != null, ErpContractMateriel::getRelationMaterielId, bo.getRelationMaterielId())
|
||||
.eq(bo.getAmount() != null, ErpContractMateriel::getAmount, bo.getAmount())
|
||||
.eq(bo.getUnitId() != null, ErpContractMateriel::getUnitId, bo.getUnitId())
|
||||
.eq(bo.getBeforePrice() != null, ErpContractMateriel::getBeforePrice, bo.getBeforePrice())
|
||||
.eq(bo.getTaxRate() != null, ErpContractMateriel::getTaxRate, bo.getTaxRate())
|
||||
.eq(bo.getIncludingPrice() != null, ErpContractMateriel::getIncludingPrice, bo.getIncludingPrice())
|
||||
.eq(bo.getSubtotal() != null, ErpContractMateriel::getSubtotal, bo.getSubtotal())
|
||||
.eq(StringUtils.isNotBlank(bo.getActiveFlag()), ErpContractMateriel::getActiveFlag, bo.getActiveFlag())
|
||||
;
|
||||
return lqw;
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增合同物料信息
|
||||
*
|
||||
* @param bo 合同物料信息
|
||||
* @return 是否新增成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean insertByBo(ErpContractMaterielBo bo) {
|
||||
ErpContractMateriel add = MapstructUtils.convert(bo, ErpContractMateriel.class);
|
||||
validEntityBeforeSave(add);
|
||||
boolean flag = baseMapper.insert(add) > 0;
|
||||
if (flag) {
|
||||
bo.setContractMaterielId(add.getContractMaterielId());
|
||||
}
|
||||
return flag;
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改合同物料信息
|
||||
*
|
||||
* @param bo 合同物料信息
|
||||
* @return 是否修改成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean updateByBo(ErpContractMaterielBo bo) {
|
||||
ErpContractMateriel update = MapstructUtils.convert(bo, ErpContractMateriel.class);
|
||||
validEntityBeforeSave(update);
|
||||
return baseMapper.updateById(update) > 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* 保存前的数据校验
|
||||
*/
|
||||
private void validEntityBeforeSave(ErpContractMateriel 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.erp.mapper.ErpContractInfoMapper">
|
||||
<resultMap type="org.dromara.oa.erp.domain.vo.ErpContractInfoVo" id="ErpContractInfoResult">
|
||||
</resultMap>
|
||||
|
||||
<select id="selectCustomErpContractInfoVoList" resultMap="ErpContractInfoResult">
|
||||
select contract_id, tenant_id, contract_flag, contract_code, contract_name, contract_category, contract_type, business_direction, contract_dept_id, contract_date, total_price, a_customer_id, a_represent, a_date, b_customer_id, b_represent, b_date, contract_status, flow_status, template_id, oss_id, payment_method, signature_appendix, tax_rate, remark, active_flag, del_flag, create_dept, create_by, create_time, update_by, update_time from erp_contract_info 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.ErpContractMaterielMapper">
|
||||
<resultMap type="org.dromara.oa.erp.domain.vo.ErpContractMaterielVo" id="ErpContractMaterielResult">
|
||||
</resultMap>
|
||||
|
||||
<select id="selectCustomErpContractMaterielVoList" resultMap="ErpContractMaterielResult">
|
||||
select contract_materiel_id, tenant_id, contract_id, product_name, specification_description, materiel_id, relation_materiel_id, amount, unit_id, before_price, tax_rate, including_price, subtotal, remark, active_flag, del_flag, create_dept, create_by, create_time, update_by, update_time from erp_contract_materiel t
|
||||
${ew.getCustomSqlSegment}
|
||||
</select>
|
||||
|
||||
</mapper>
|
||||
Loading…
Reference in New Issue