From 28f9605441cdda5bd9cfabd2241ff8509a4a8888 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 20 十月 2025 18:48:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OaApprovalApplicationPurchaseServiceImpl.java | 179 ++++-------------------------------------------------------
1 files changed, 12 insertions(+), 167 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OaApprovalApplicationPurchaseServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OaApprovalApplicationPurchaseServiceImpl.java
index f00eb9b..3a08cd6 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OaApprovalApplicationPurchaseServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OaApprovalApplicationPurchaseServiceImpl.java
@@ -1,37 +1,27 @@
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.constants.ApprovalApplicationCodePrefix;
+import com.ruoyi.system.dto.asset.OaApprovalApplicationPurchaseDTO;
import com.ruoyi.system.emums.ApprovalStatusEnum;
+import com.ruoyi.system.emums.ApprovalTypeEnum;
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>
@@ -49,8 +39,6 @@
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)
@@ -59,12 +47,12 @@
OaApprovalApplications applications = buildOaApprovalApplications(dto);
// 2. 如果是提交操作，获取流程节点并创建待办
- OaApprovalFlowNode firstFlowNode = getFirstFlowNode(dto.getApprovalId());
+ OaApprovalFlowNode firstFlowNode = getFirstFlowNode(ApprovalTypeEnum.PURCHASE.getCode());
applications.setCurrentFlowNodeId(firstFlowNode.getId());
oaApprovalApplicationsService.save(applications);
- // 3.创建待办事项记录
- createApprovalTodo(applications.getId(), applications.getApplicationCode(), firstFlowNode, dto.getDeptId());
+ // 3. 创建待办事项记录（公共服务）
+ oaApprovalTodoService.createApprovalTodos(applications.getId(), applications.getApplicationCode(), firstFlowNode, dto.getDeptId());
// 4.保存采购资产明细数据
List<OaApprovalApplicationPurchaseItem> items = buildOaApprovalApplicationPurchaseItems(dto, applications.getId());
@@ -94,133 +82,12 @@
}
/**
- * 创建待办数据
- */
- 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.setApplicationCode(oaApprovalApplicationsService.generateApplicationCode(ApprovalApplicationCodePrefix.ASSET_PURCHASE));
+ applications.setApprovalId(ApprovalTypeEnum.PURCHASE.getCode());
applications.setApplicantUserId(dto.getApplicantUserId());
applications.setApplicantName(dto.getApplicantName());
applications.setDeptId(dto.getDeptId());
@@ -236,9 +103,9 @@
/**
* 构建采购申请详情数据
*/
- private OaApprovalApplicationPurchase buildOaApprovalApplicationPurchase(OaApprovalApplicationPurchaseDTO dto, Long applicationId) {
+ private OaApprovalApplicationPurchase buildOaApprovalApplicationPurchase(OaApprovalApplicationPurchaseDTO dto, Integer applicationId) {
OaApprovalApplicationPurchase purchase = new OaApprovalApplicationPurchase();
- purchase.setApprovalApplicationId(applicationId.intValue());
+ purchase.setApprovalApplicationId(applicationId);
// 使用事项标题，而非采购说明
purchase.setTitle(dto.getTitle());
// 表结构中无 application_date 字段，此处不再设置
@@ -251,11 +118,11 @@
/**
* 构建采购资产明细数据
*/
- private List<OaApprovalApplicationPurchaseItem> buildOaApprovalApplicationPurchaseItems(OaApprovalApplicationPurchaseDTO dto, Long applicationId) {
+ private List<OaApprovalApplicationPurchaseItem> buildOaApprovalApplicationPurchaseItems(OaApprovalApplicationPurchaseDTO dto, Integer applicationId) {
return dto.getPurchaseItems().stream()
.map(item -> {
OaApprovalApplicationPurchaseItem purchaseItem = new OaApprovalApplicationPurchaseItem();
- purchaseItem.setApprovalApplicationId(applicationId.intValue());
+ purchaseItem.setApprovalApplicationId(applicationId);
purchaseItem.setAssetName(item.getAssetName());
purchaseItem.setAssetTypeId(item.getAssetTypeId());
purchaseItem.setSpec(item.getSpec());
@@ -266,27 +133,5 @@
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;
}
}
--
Gitblit v1.7.1