DeXun/fad_oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(oa): 新增供应商信息管理功能

Browse Source 
- 新增供应商信息实体类OaSupplier及对应VO、BO类- 新增供应商信息Service接口与实现类
- 新增供应商信息Controller控制器
- 新增供应商信息Mapper接口与XML映射文件- 在项目进度步骤中添加供应商相关字段（supplierId、requirementFile等）- 完善供应商信息的增删改查及分页查询功能
- 支持供应商信息导出Excel功能
This commit is contained in:
Joshi
2025-11-11 12:59:20 +08:00
parent 932f329f9d
commit d5c7b78419
11 changed files with 553 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

101
ruoyi-oa/src/main/java/com/ruoyi/oa/controller/OaSupplierController.java Normal file
View File

@@ -0,0 +1,101 @@
package com.ruoyi.oa.controller;
import java.util.List;
import java.util.Arrays;
import java.util.concurrent.TimeUnit;
import lombok.RequiredArgsConstructor;
import javax.servlet.http.HttpServletResponse;
import javax.validation.constraints.*;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.validate.AddGroup;
import com.ruoyi.common.core.validate.EditGroup;
import com.ruoyi.common.core.validate.QueryGroup;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.oa.domain.vo.OaSupplierVo;
import com.ruoyi.oa.domain.bo.OaSupplierBo;
import com.ruoyi.oa.service.IOaSupplierService;
import com.ruoyi.common.core.page.TableDataInfo;
/**
* 供应商信息
*
* @author ruoyi
* @date 2025-11-11
*/
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/oa/supplier")
public class OaSupplierController extends BaseController {
private final IOaSupplierService iOaSupplierService;
/**
* 查询供应商信息列表
*/
@GetMapping("/list")
public TableDataInfo<OaSupplierVo> list(OaSupplierBo bo, PageQuery pageQuery) {
return iOaSupplierService.queryPageList(bo, pageQuery);
}
/**
* 导出供应商信息列表
*/
@Log(title = "供应商信息", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(OaSupplierBo bo, HttpServletResponse response) {
List<OaSupplierVo> list = iOaSupplierService.queryList(bo);
ExcelUtil.exportExcel(list, "供应商信息", OaSupplierVo.class, response);
}
/**
* 获取供应商信息详细信息
*
* @param supplierId 主键
*/
@GetMapping("/{supplierId}")
public R<OaSupplierVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long supplierId) {
return R.ok(iOaSupplierService.queryById(supplierId));
}
/**
* 新增供应商信息
*/
@Log(title = "供应商信息", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody OaSupplierBo bo) {
return toAjax(iOaSupplierService.insertByBo(bo));
}
/**
* 修改供应商信息
*/
@Log(title = "供应商信息", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody OaSupplierBo bo) {
return toAjax(iOaSupplierService.updateByBo(bo));
}
/**
* 删除供应商信息
*
* @param supplierIds 主键串
*/
@Log(title = "供应商信息", businessType = BusinessType.DELETE)
@DeleteMapping("/{supplierIds}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] supplierIds) {
return toAjax(iOaSupplierService.deleteWithValidByIds(Arrays.asList(supplierIds), true));
}
}

10
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/OaProjectScheduleStep.java
View File

@@ -141,4 +141,14 @@ public class OaProjectScheduleStep extends BaseEntity {
@TableField(exist = false)
private Long projectId;
//供应商id
private Long supplierId;
//需求文件
private String requirementFile;
//其他
private String other;
}

68
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/OaSupplier.java Normal file
View File

@@ -0,0 +1,68 @@
package com.ruoyi.oa.domain;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
import java.util.Date;
import java.math.BigDecimal;
import com.ruoyi.common.core.domain.BaseEntity;
/**
* 供应商信息对象 oa_supplier
*
* @author ruoyi
* @date 2025-11-11
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("oa_supplier")
public class OaSupplier extends BaseEntity {
private static final long serialVersionUID=1L;
/**
* 供应商主键ID
*/
@TableId(value = "supplier_id")
private Long supplierId;
/**
* 供应商名称
*/
private String supplierName;
/**
* 联系人
*/
private String contactPerson;
/**
* 联系电话
*/
private String contactPhone;
/**
* 联系邮箱
*/
private String contactEmail;
/**
* 公司地址
*/
private String companyAddress;
/**
* 供应商类型
*/
private String supplierType;
/**
* 状态 1正常 0禁用
*/
private Long status;
/**
* 备注
*/
private String remark;
/**
* 删除标志：0=正常，1=已删除
*/
@TableLogic
private Integer delFlag;
}

9
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaProjectScheduleStepBo.java
View File

@@ -155,4 +155,13 @@ public class OaProjectScheduleStepBo extends BaseEntity {
//排序字段
private Integer sortNum;
//供应商id
private Long supplierId;
//需求文件
private String requirementFile;
//其他
private String other;
}

70
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaSupplierBo.java Normal file
View File

@@ -0,0 +1,70 @@
package com.ruoyi.oa.domain.bo;
import com.ruoyi.common.core.validate.AddGroup;
import com.ruoyi.common.core.validate.EditGroup;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.*;
import java.util.Date;
import com.ruoyi.common.core.domain.BaseEntity;
/**
* 供应商信息业务对象 oa_supplier
*
* @author ruoyi
* @date 2025-11-11
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class OaSupplierBo extends BaseEntity {
/**
* 供应商主键ID
*/
private Long supplierId;
/**
* 供应商名称
*/
private String supplierName;
/**
* 联系人
*/
private String contactPerson;
/**
* 联系电话
*/
private String contactPhone;
/**
* 联系邮箱
*/
private String contactEmail;
/**
* 公司地址
*/
private String companyAddress;
/**
* 供应商类型
*/
private String supplierType;
/**
* 状态 1正常 0禁用
*/
private Long status;
/**
* 备注
*/
private String remark;
}

11
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaProjectScheduleStepVo.java
View File

@@ -176,6 +176,17 @@ public class OaProjectScheduleStepVo extends BaseEntity {
/** 新增：进度统计信息 */
private ProgressStats progressStats;
//供应商id
private Long supplierId;
//供应商名称
private String supplierName;
//需求文件
private String requirementFile;
//其他
private String other;
/** 进度统计内部类（封装total、completed等字段） */
@Data
public static class ProgressStats {

79
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaSupplierVo.java Normal file
View File

@@ -0,0 +1,79 @@
package com.ruoyi.oa.domain.vo;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import com.ruoyi.common.annotation.ExcelDictFormat;
import com.ruoyi.common.convert.ExcelDictConvert;
import lombok.Data;
import java.util.Date;
/**
* 供应商信息视图对象 oa_supplier
*
* @author ruoyi
* @date 2025-11-11
*/
@Data
@ExcelIgnoreUnannotated
public class OaSupplierVo {
private static final long serialVersionUID = 1L;
/**
* 供应商主键ID
*/
@ExcelProperty(value = "供应商主键ID")
private Long supplierId;
/**
* 供应商名称
*/
@ExcelProperty(value = "供应商名称")
private String supplierName;
/**
* 联系人
*/
@ExcelProperty(value = "联系人")
private String contactPerson;
/**
* 联系电话
*/
@ExcelProperty(value = "联系电话")
private String contactPhone;
/**
* 联系邮箱
*/
@ExcelProperty(value = "联系邮箱")
private String contactEmail;
/**
* 公司地址
*/
@ExcelProperty(value = "公司地址")
private String companyAddress;
/**
* 供应商类型
*/
@ExcelProperty(value = "供应商类型")
private String supplierType;
/**
* 状态 1正常 0禁用
*/
@ExcelProperty(value = "状态 1正常 0禁用")
private Long status;
/**
* 备注
*/
@ExcelProperty(value = "备注")
private String remark;
}

15
ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/OaSupplierMapper.java Normal file
View File

@@ -0,0 +1,15 @@
package com.ruoyi.oa.mapper;
import com.ruoyi.oa.domain.OaSupplier;
import com.ruoyi.oa.domain.vo.OaSupplierVo;
import com.ruoyi.common.core.mapper.BaseMapperPlus;
/**
* 供应商信息Mapper接口
*
* @author ruoyi
* @date 2025-11-11
*/
public interface OaSupplierMapper extends BaseMapperPlus<OaSupplierMapper, OaSupplier, OaSupplierVo> {
}

49
ruoyi-oa/src/main/java/com/ruoyi/oa/service/IOaSupplierService.java Normal file
View File

@@ -0,0 +1,49 @@
package com.ruoyi.oa.service;
import com.ruoyi.oa.domain.OaSupplier;
import com.ruoyi.oa.domain.vo.OaSupplierVo;
import com.ruoyi.oa.domain.bo.OaSupplierBo;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.domain.PageQuery;
import java.util.Collection;
import java.util.List;
/**
* 供应商信息Service接口
*
* @author ruoyi
* @date 2025-11-11
*/
public interface IOaSupplierService {
/**
* 查询供应商信息
*/
OaSupplierVo queryById(Long supplierId);
/**
* 查询供应商信息列表
*/
TableDataInfo<OaSupplierVo> queryPageList(OaSupplierBo bo, PageQuery pageQuery);
/**
* 查询供应商信息列表
*/
List<OaSupplierVo> queryList(OaSupplierBo bo);
/**
* 新增供应商信息
*/
Boolean insertByBo(OaSupplierBo bo);
/**
* 修改供应商信息
*/
Boolean updateByBo(OaSupplierBo bo);
/**
* 校验并批量删除供应商信息信息
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
}

116
ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaSupplierServiceImpl.java Normal file
View File

@@ -0,0 +1,116 @@
package com.ruoyi.oa.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.domain.PageQuery;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import com.ruoyi.oa.domain.bo.OaSupplierBo;
import com.ruoyi.oa.domain.vo.OaSupplierVo;
import com.ruoyi.oa.domain.OaSupplier;
import com.ruoyi.oa.mapper.OaSupplierMapper;
import com.ruoyi.oa.service.IOaSupplierService;
import java.util.List;
import java.util.Map;
import java.util.Collection;
/**
* 供应商信息Service业务层处理
*
* @author ruoyi
* @date 2025-11-11
*/
@RequiredArgsConstructor
@Service
public class OaSupplierServiceImpl implements IOaSupplierService {
private final OaSupplierMapper baseMapper;
/**
* 查询供应商信息
*/
@Override
public OaSupplierVo queryById(Long supplierId){
return baseMapper.selectVoById(supplierId);
}
/**
* 查询供应商信息列表
*/
@Override
public TableDataInfo<OaSupplierVo> queryPageList(OaSupplierBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<OaSupplier> lqw = buildQueryWrapper(bo);
Page<OaSupplierVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
/**
* 查询供应商信息列表
*/
@Override
public List<OaSupplierVo> queryList(OaSupplierBo bo) {
LambdaQueryWrapper<OaSupplier> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private LambdaQueryWrapper<OaSupplier> buildQueryWrapper(OaSupplierBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<OaSupplier> lqw = Wrappers.lambdaQuery();
lqw.like(StringUtils.isNotBlank(bo.getSupplierName()), OaSupplier::getSupplierName, bo.getSupplierName());
lqw.eq(StringUtils.isNotBlank(bo.getContactPerson()), OaSupplier::getContactPerson, bo.getContactPerson());
lqw.eq(StringUtils.isNotBlank(bo.getContactPhone()), OaSupplier::getContactPhone, bo.getContactPhone());
lqw.eq(StringUtils.isNotBlank(bo.getContactEmail()), OaSupplier::getContactEmail, bo.getContactEmail());
lqw.eq(StringUtils.isNotBlank(bo.getCompanyAddress()), OaSupplier::getCompanyAddress, bo.getCompanyAddress());
lqw.eq(StringUtils.isNotBlank(bo.getSupplierType()), OaSupplier::getSupplierType, bo.getSupplierType());
lqw.eq(bo.getStatus() != null, OaSupplier::getStatus, bo.getStatus());
lqw.orderByDesc(OaSupplier::getCreateTime);
return lqw;
}
/**
* 新增供应商信息
*/
@Override
public Boolean insertByBo(OaSupplierBo bo) {
OaSupplier add = BeanUtil.toBean(bo, OaSupplier.class);
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setSupplierId(add.getSupplierId());
}
return flag;
}
/**
* 修改供应商信息
*/
@Override
public Boolean updateByBo(OaSupplierBo bo) {
OaSupplier update = BeanUtil.toBean(bo, OaSupplier.class);
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;
}
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(OaSupplier entity){
//TODO 做一些数据校验,如唯一约束
}
/**
* 批量删除供应商信息
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteBatchIds(ids) > 0;
}
}

25
ruoyi-oa/src/main/resources/mapper/oa/OaSupplierMapper.xml Normal file
View File

@@ -0,0 +1,25 @@
<?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="com.ruoyi.oa.mapper.OaSupplierMapper">
<resultMap type="com.ruoyi.oa.domain.OaSupplier" id="OaSupplierResult">
<result property="supplierId" column="supplier_id"/>
<result property="supplierName" column="supplier_name"/>
<result property="contactPerson" column="contact_person"/>
<result property="contactPhone" column="contact_phone"/>
<result property="contactEmail" column="contact_email"/>
<result property="companyAddress" column="company_address"/>
<result property="supplierType" column="supplier_type"/>
<result property="status" column="status"/>
<result property="remark" column="remark"/>
<result property="createBy" column="create_by"/>
<result property="createTime" column="create_time"/>
<result property="updateBy" column="update_by"/>
<result property="updateTime" column="update_time"/>
<result property="delFlag" column="del_flag"/>
</resultMap>
</mapper>