资产管理-采购申请

mitao

3 天以前 a9f2a7f4fac47c7a5b1302db2e0c363a55459f84

资产管理-采购申请

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalApplicationPurchaseController.java

@@ -1,8 +1,20 @@
package com.ruoyi.web.controller.api;


import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.system.dto.OaApprovalApplicationPurchaseDTO;
import com.ruoyi.system.service.OaApprovalApplicationPurchaseService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import javax.validation.Valid;

/**
 * <p>
@@ -12,9 +24,23 @@
 * @author WuGuanFengYue
 * @since 2025-09-15
 */
@Api(tags = {"OA审批-采购申请相关接口"})
@Validated
@RestController
@RequestMapping("/oa-approval-application-purchase")
@RequiredArgsConstructor
public class OaApprovalApplicationPurchaseController {

    private final OaApprovalApplicationPurchaseService oaApprovalApplicationPurchaseService;

    @ApiOperation("提交采购申请")
    @PostMapping("/submit")
    @Log(title = "采购申请-提交", businessType = BusinessType.INSERT)
    public R<Void> saveOrSubmit(@Valid @RequestBody OaApprovalApplicationPurchaseDTO dto) {
        oaApprovalApplicationPurchaseService.submit(dto);
        return R.ok();
    }


}


 ruoyi-system/src/main/java/com/ruoyi/system/emums/ApprovalStatusEnum.java

New file
@@ -0,0 +1,25 @@
package com.ruoyi.system.emums;

import lombok.Getter;
import lombok.AllArgsConstructor;
@Getter
@AllArgsConstructor
public enum ApprovalStatusEnum {
    DRAFT(0, "草稿"),
    PENDING(1, "待审批"),
    PASSED(2, "审批通过"),
    REFUSED(3, "审批拒绝"),
    CANCELED(4, "已撤回");

    private final Integer code;
    private final String desc;

    public static ApprovalStatusEnum getEnumByCode(Integer code) {
        for (ApprovalStatusEnum e : ApprovalStatusEnum.values()) {
            if (e.code.equals(code)) {
                return e;
            }
        }
        return null;
    }
} 

 ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java

@@ -1,13 +1,13 @@
package com.ruoyi.system.mapper;

import java.util.List;

import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.system.query.SysUserQuery;
import com.ruoyi.system.vo.system.SysUserVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import com.ruoyi.common.core.domain.entity.SysUser;

import java.util.List;

/**
 * 用户表 数据层
@@ -206,4 +206,11 @@
    Integer selectUserCount(@Param("projectIds")List<String> projectIds, @Param("deptType")Integer deptType);

    List<SysUser> selectUserByNickName(@Param("nickName")String nickName);

    /**
     * 根据用户id列表查询用户列表
     * @param userIds
     * @return
     */
    List<SysUser> selectListByUserIds(@Param("userIds") List<Integer> userIds);
}

 ruoyi-system/src/main/java/com/ruoyi/system/model/OaApprovalApplicationPurchase.java

@@ -11,6 +11,7 @@

import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;

/**
 * <p>
@@ -40,6 +41,10 @@
    @TableField("title")
    private String title;

    @ApiModelProperty(value = "申请日期")
    @TableField("application_date")
    private Date applicationDate;

    @ApiModelProperty(value = "资产类型")
    @TableField("asset_type_id")
    private Integer assetTypeId;

 ruoyi-system/src/main/java/com/ruoyi/system/model/OaApprovalApplications.java

@@ -67,7 +67,7 @@

    @ApiModelProperty(value = "审批状态 0-草稿，1-待审批，2-审批通过，3-审批拒绝 ，4-已撤回")
    @TableField("approval_status")
    private Boolean approvalStatus;
    private Integer approvalStatus;

    @ApiModelProperty(value = "附件地址，多个使用英文逗号拼接")
    @TableField("attachment_url")
@@ -95,7 +95,7 @@

    @ApiModelProperty(value = "是否删除 0-否，1-是")
    @TableField("disabled")
    private Boolean disabled;
    private Integer disabled;


}

 ruoyi-system/src/main/java/com/ruoyi/system/model/OaApprovalFlowNode.java

@@ -50,7 +50,7 @@

    @ApiModelProperty(value = "审批类型 0-上级部门,1-指定部门审批，2-指定人员审批")
    @TableField("approval_type")
    private Boolean approvalType;
    private Integer approvalType;

    @ApiModelProperty(value = "审批类型上级部门为时为空，指定部门审批存部门id，指定人员审批存人员id，多个id使用英文逗号拼接")
    @TableField("approval_ids")
@@ -58,7 +58,7 @@

    @ApiModelProperty(value = "启用状态 0-禁用 1-启用")
    @TableField("status")
    private Boolean status;
    private Integer status;

    @ApiModelProperty(value = "是否需要签名 0-否，1-是")
    @TableField("sign_flag")

 ruoyi-system/src/main/java/com/ruoyi/system/model/OaApprovalTodo.java

@@ -62,7 +62,7 @@

    @ApiModelProperty(value = "状态 0-待处理，1-已处理")
    @TableField("status")
    private Boolean status;
    private Integer status;

    @ApiModelProperty(value = "创建时间")
    @TableField("create_time")

 ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java

@@ -1,11 +1,11 @@
package com.ruoyi.system.service;

import java.util.List;

import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.system.query.SysUserQuery;
import com.ruoyi.system.vo.system.SysUserVO;

import java.util.List;

/**
 * 用户 业务层
@@ -297,4 +297,11 @@
    Integer selectUserCount(List<String> projectId, Integer deptType);

    List<SysUser> selectUserByNickName(String nickName);

    /**
     * 根据用户id列表查询用户列表
     * @param userIds
     * @return
     */
    List<SysUser> selectListByUserIds(List<Integer> userIds);
}

 ruoyi-system/src/main/java/com/ruoyi/system/service/OaApprovalApplicationPurchaseService.java

@@ -1,6 +1,7 @@
package com.ruoyi.system.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.system.dto.OaApprovalApplicationPurchaseDTO;
import com.ruoyi.system.model.OaApprovalApplicationPurchase;

/**
@@ -13,4 +14,10 @@
 */
public interface OaApprovalApplicationPurchaseService extends IService<OaApprovalApplicationPurchase> {

    /**
     * 保存或提交采购申请
     *
     * @param dto 采购申请DTO
     */
    void submit(OaApprovalApplicationPurchaseDTO dto);
}

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OaApprovalApplicationPurchaseServiceImpl.java

@@ -1,10 +1,37 @@
package com.ruoyi.system.service.impl;

import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.system.dto.OaApprovalApplicationPurchaseDTO;
import com.ruoyi.system.emums.ApprovalStatusEnum;
import com.ruoyi.system.mapper.OaApprovalApplicationPurchaseMapper;
import com.ruoyi.system.model.OaApprovalApplicationPurchase;
import com.ruoyi.system.model.OaApprovalApplicationPurchaseItem;
import com.ruoyi.system.model.OaApprovalApplications;
import com.ruoyi.system.model.OaApprovalFlowNode;
import com.ruoyi.system.model.OaApprovalTodo;
import com.ruoyi.system.service.ISysDeptService;
import com.ruoyi.system.service.ISysUserService;
import com.ruoyi.system.service.OaApprovalApplicationPurchaseItemService;
import com.ruoyi.system.service.OaApprovalApplicationPurchaseService;
import com.ruoyi.system.service.OaApprovalApplicationsService;
import com.ruoyi.system.service.OaApprovalFlowNodeService;
import com.ruoyi.system.service.OaApprovalTodoService;
import lombok.RequiredArgsConstructor;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;

import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;

/**
 * <p>
@@ -15,6 +42,251 @@
 * @since 2025-09-15
 */
@Service
@RequiredArgsConstructor
public class OaApprovalApplicationPurchaseServiceImpl extends ServiceImpl<OaApprovalApplicationPurchaseMapper, OaApprovalApplicationPurchase> implements OaApprovalApplicationPurchaseService {

    private final OaApprovalApplicationsService oaApprovalApplicationsService;
    private final OaApprovalApplicationPurchaseItemService oaApprovalApplicationPurchaseItemService;
    private final OaApprovalFlowNodeService oaApprovalFlowNodeService;
    private final OaApprovalTodoService oaApprovalTodoService;
    private final ISysUserService sysUserService;
    private final ISysDeptService sysDeptService;

    @Override
    @Transactional(rollbackFor = Exception.class)
    public void submit(OaApprovalApplicationPurchaseDTO dto) {
        // 1. 保存审批申请主表数据
        OaApprovalApplications applications = buildOaApprovalApplications(dto);
        
        // 2. 如果是提交操作，获取流程节点并创建待办
        OaApprovalFlowNode firstFlowNode = getFirstFlowNode(dto.getApprovalId());
        applications.setCurrentFlowNodeId(firstFlowNode.getId());
        oaApprovalApplicationsService.save(applications);

        // 3.创建待办事项记录
        createApprovalTodo(applications.getId(), applications.getApplicationCode(), firstFlowNode, dto.getDeptId());

        // 4.保存采购资产明细数据
        List<OaApprovalApplicationPurchaseItem> items = buildOaApprovalApplicationPurchaseItems(dto, applications.getId());
        oaApprovalApplicationPurchaseItemService.saveBatch(items);

        // 5. 保存采购申请详情数据
        OaApprovalApplicationPurchase purchase = buildOaApprovalApplicationPurchase(dto, applications.getId());
        save(purchase);
    }
    /**
     * 获取第一个流程节点
     */
    private OaApprovalFlowNode getFirstFlowNode(Integer approvalId) {
        // 1. 查询审批流程配置
        List<OaApprovalFlowNode> flowNodes = oaApprovalFlowNodeService.lambdaQuery()
                .eq(OaApprovalFlowNode::getApprovalId, approvalId)
                .eq(OaApprovalFlowNode::getStatus, 1) // 启用状态
                .orderByAsc(OaApprovalFlowNode::getSortOrder)
                .list();

        if (CollectionUtils.isEmpty(flowNodes)) {
            throw new ServiceException("未找到有效的审批流程配置");
        }

        // 2. 获取第一个流程节点
        return flowNodes.get(0);
    }

    /**
     * 创建待办数据
     */
    private void createApprovalTodo(Long applicationId, String applicationCode, OaApprovalFlowNode flowNode, Integer deptId) {
        // 根据审批类型创建待办数据
        Integer approvalType = flowNode.getApprovalType();
        if (approvalType == null) {
            throw new ServiceException("审批类型不能为空");
        }

        switch (approvalType) {
            case 0: // 上级部门审批
                createUpperDeptTodo(applicationId, applicationCode, flowNode, deptId);
                break;
            case 1: // 指定部门审批
                createSpecifiedDeptTodo(applicationId, applicationCode, flowNode);
                break;
            case 2: // 指定人员审批
                createSpecifiedUserTodo(applicationId, applicationCode, flowNode);
                break;
            default:
                throw new ServiceException("不支持的审批类型: " + approvalType);
        }
    }
    /**
     * 创建上级部门审批待办
     */
    private void createUpperDeptTodo(Long applicationId, String applicationCode, OaApprovalFlowNode flowNode, Integer deptId) {
        // 1. 获取申请部门信息
        if (deptId == null) {
            throw new ServiceException("未填写申请部门信息");
        }

        SysDept currentDept = sysDeptService.selectDeptById(Long.valueOf(deptId));
        if (currentDept == null) {
            throw new ServiceException("申请部门信息不存在");
        }

        // 2. 获取上级部门信息
        if (currentDept.getParentId() == null || currentDept.getParentId() == 0) {
            throw new ServiceException("当前部门没有上级部门");
        }

        SysDept parentDept = sysDeptService.selectDeptById(currentDept.getParentId());
        if (parentDept == null) {
            throw new ServiceException("上级部门信息不存在");
        }

        // 3. 查询所有关联了该上级部门的用户
        List<SysUser> users = sysUserService.selectListByDeptId(parentDept.getDeptId().toString());
        if (CollUtil.isEmpty(users)) {
            throw new ServiceException("上级部门下没有找到用户");
        }

        // 4. 为每个用户创建待办数据
        createTodoItem(applicationId, applicationCode, flowNode, users);
    }

    /**
     * 创建指定部门审批待办
     */
    private void createSpecifiedDeptTodo(Long applicationId, String applicationCode, OaApprovalFlowNode flowNode) {
        if (StringUtils.isBlank(flowNode.getApprovalIds())) {
            throw new ServiceException("操作失败，审批流程配置异常");
        }
        // 收集部门ID
        List<String> deptIdList = Arrays.stream(flowNode.getApprovalIds().split(",")).collect(Collectors.toList());

        // 查询所有关联了这些部门的用户
        List<SysUser> users = sysUserService.selectListByDeptIds(deptIdList);
        if (CollUtil.isEmpty(users)) {
            throw new ServiceException("指定部门下没有找到用户");
        }

        // 为每个用户创建待办数据
        createTodoItem(applicationId, applicationCode, flowNode, users);
    }

    /**
     * 创建指定人员审批待办
     */
    private void createSpecifiedUserTodo(Long applicationId, String applicationCode, OaApprovalFlowNode flowNode) {
        if (StringUtils.isBlank(flowNode.getApprovalIds())) {
            throw new ServiceException("操作失败，审批流程配置异常");
        }
        List<Integer> userIds = Arrays.stream(flowNode.getApprovalIds().split(","))
                .map(Integer::valueOf).collect(Collectors.toList());
        // 1. 查询用户信息
        List<SysUser> users = sysUserService.selectListByUserIds(userIds);
        if (CollUtil.isEmpty(users)) {
            throw new ServiceException("没有找到指定审批用户");
        }
        //2. 创建待办数据
        createTodoItem(applicationId, applicationCode, flowNode, users);
    }

    /**
     * 创建待办数据项
     */
    private void createTodoItem(Long applicationId, String applicationCode, OaApprovalFlowNode flowNode, List<SysUser> userList) {
        List<OaApprovalTodo> approvalTodoList = userList.stream().map(item -> {
            OaApprovalTodo todo = new OaApprovalTodo();
            todo.setApplicationId(applicationId);
            todo.setApplicationCode(applicationCode);
            todo.setFlowNodeId(flowNode.getId());
            todo.setUserId(item.getUserId().intValue());
            todo.setUserName(item.getNickName());

            // 设置部门信息
            if (item.getDeptId() != null) {
                todo.setDeptId(Integer.valueOf(item.getDeptId()));
            }

            todo.setSortOrder(flowNode.getSortOrder());
            todo.setStatus(0); // 0-待处理
            todo.setCreateTime(LocalDateTime.now());
            return todo;
        }).collect(Collectors.toList());
        //批量保存
        oaApprovalTodoService.saveBatch(approvalTodoList);
    }
    /**
     * 构建审批申请主表数据
     */
    private OaApprovalApplications buildOaApprovalApplications(OaApprovalApplicationPurchaseDTO dto) {
        OaApprovalApplications applications = new OaApprovalApplications();
        applications.setApplicationCode(generateApplicationCode());
        applications.setApprovalId(dto.getApprovalId());
        applications.setApplicantUserId(dto.getApplicantUserId());
        applications.setApplicantName(dto.getApplicantName());
        applications.setDeptId(dto.getDeptId());
        applications.setDeptName(dto.getDeptName());
        applications.setApplicationDate(dto.getApplicationDate());
        applications.setApplicationReason(dto.getApplicationReason());
        applications.setAttachmentUrl(dto.getAttachmentUrl());
        applications.setDisabled(0); // 未删除
        applications.setApprovalStatus(ApprovalStatusEnum.PENDING.getCode());
        return applications;
    }

    /**
     * 构建采购申请详情数据
     */
    private OaApprovalApplicationPurchase buildOaApprovalApplicationPurchase(OaApprovalApplicationPurchaseDTO dto, Long applicationId) {
        OaApprovalApplicationPurchase purchase = new OaApprovalApplicationPurchase();
        purchase.setApprovalApplicationId(applicationId.intValue());
        // 使用事项标题，而非采购说明
        purchase.setTitle(dto.getTitle());
        // 表结构中无 application_date 字段，此处不再设置
        purchase.setAssetTypeId(dto.getAssetTypeId());
        purchase.setTotalAmount(dto.getTotalAmount());

        return purchase;
    }

    /**
     * 构建采购资产明细数据
     */
    private List<OaApprovalApplicationPurchaseItem> buildOaApprovalApplicationPurchaseItems(OaApprovalApplicationPurchaseDTO dto, Long applicationId) {
        return dto.getPurchaseItems().stream()
                .map(item -> {
                    OaApprovalApplicationPurchaseItem purchaseItem = new OaApprovalApplicationPurchaseItem();
                    purchaseItem.setApprovalApplicationId(applicationId.intValue());
                    purchaseItem.setAssetName(item.getAssetName());
                    purchaseItem.setAssetTypeId(item.getAssetTypeId());
                    purchaseItem.setSpec(item.getSpec());
                    purchaseItem.setUnit(item.getUnit());
                    purchaseItem.setQuantity(item.getQuantity());
                    purchaseItem.setPrice(item.getPrice());
                    purchaseItem.setTotalAmount(item.getTotalAmount());
                    return purchaseItem;
                })
                .collect(java.util.stream.Collectors.toList());
    }

    /**
     * 生成申请单号
     * 格式：CG + 年月日 + 3位序号
     */
    private String generateApplicationCode() {
        String dateStr = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd"));
        String prefix = "CG" + dateStr;
        
        // 查询当天已生成的申请单号数量
        Long count = oaApprovalApplicationsService.lambdaQuery()
                .like(OaApprovalApplications::getApplicationCode, prefix)
                .ge(OaApprovalApplications::getCreateTime, LocalDate.now().atStartOfDay())
                .lt(OaApprovalApplications::getCreateTime, LocalDate.now().plusDays(1).atStartOfDay())
                .count();
        
        // 生成3位序号，从001开始
        int sequence = (count != null ? count.intValue() : 0) + 1;
        String sequenceStr = String.format("%03d", sequence);
        
        return prefix + sequenceStr;
    }
}

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -1,6 +1,5 @@
package com.ruoyi.system.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.common.annotation.DataScope;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.constant.UserConstants;
@@ -14,7 +13,11 @@
import com.ruoyi.system.domain.SysPost;
import com.ruoyi.system.domain.SysUserPost;
import com.ruoyi.system.domain.SysUserRole;
import com.ruoyi.system.mapper.*;
import com.ruoyi.system.mapper.SysPostMapper;
import com.ruoyi.system.mapper.SysRoleMapper;
import com.ruoyi.system.mapper.SysUserMapper;
import com.ruoyi.system.mapper.SysUserPostMapper;
import com.ruoyi.system.mapper.SysUserRoleMapper;
import com.ruoyi.system.query.SysUserQuery;
import com.ruoyi.system.service.ISysConfigService;
import com.ruoyi.system.service.ISysUserService;
@@ -27,9 +30,6 @@
import org.springframework.util.CollectionUtils;

import javax.validation.Validator;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
@@ -701,4 +701,9 @@
    public SysUser selectByPhone(String phonenumber) {
        return userMapper.selectByPhone(phonenumber);
    }

    @Override
    public List<SysUser> selectListByUserIds(List<Integer> userIds) {
        return userMapper.selectListByUserIds(userIds);
    }
}

 ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -313,7 +313,19 @@
            AND nick_name = #{nickName}
        </if>
    </select>

    <select id="selectListByUserIds" resultType="com.ruoyi.common.core.domain.entity.SysUser"
            parameterType="java.util.List">
        select  * from sys_user
        <where>
            del_flag = '0'
            <if test="userIds != null and userIds.size() > 0">
                and user_id in
                <foreach item="item" collection="userIds" open="(" separator="," close=")">
                    #{item}
                </foreach>
            </if>
        </where>
    </select>
    <insert id="insertUser" parameterType="SysUser" useGeneratedKeys="true" keyProperty="userId">
         insert into sys_user(
             <if test="userId != null and userId != 0">user_id,</if>