From 7c0a8a91ae6d1c684e7a358929f4bd04f3f4bfe8 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期四, 18 九月 2025 21:01:21 +0800
Subject: [PATCH] 资产管理-资产入库列表接口 资产管理-资产领用申请接口
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OaApprovalApplicationStorageServiceImpl.java | 254 ++++++++++++++++++++------------------------------
1 files changed, 100 insertions(+), 154 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OaApprovalApplicationStorageServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OaApprovalApplicationStorageServiceImpl.java
index 1e91e6b..f56632b 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OaApprovalApplicationStorageServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OaApprovalApplicationStorageServiceImpl.java
@@ -1,9 +1,9 @@
package com.ruoyi.system.service.impl;
-import cn.hutool.core.collection.CollUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
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.core.domain.entity.TDept;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.system.dto.asset.OaApprovalApplicationStorageGeneralDTO;
import com.ruoyi.system.dto.asset.OaApprovalApplicationStoragePropertyDTO;
@@ -12,22 +12,38 @@
import com.ruoyi.system.emums.ApprovalTypeEnum;
import com.ruoyi.system.emums.AssetTypeEnum;
import com.ruoyi.system.mapper.OaApprovalApplicationStorageMapper;
-import com.ruoyi.system.model.*;
-import com.ruoyi.system.service.*;
+import com.ruoyi.system.model.AssetGeneralExt;
+import com.ruoyi.system.model.AssetMain;
+import com.ruoyi.system.model.AssetPropertyExt;
+import com.ruoyi.system.model.AssetVehicleExt;
+import com.ruoyi.system.model.AssetWarehouse;
+import com.ruoyi.system.model.OaApprovalApplicationStorage;
+import com.ruoyi.system.model.OaApprovalApplications;
+import com.ruoyi.system.model.OaApprovalFlowNode;
+import com.ruoyi.system.service.AssetGeneralExtService;
+import com.ruoyi.system.service.AssetMainService;
+import com.ruoyi.system.service.AssetPropertyExtService;
+import com.ruoyi.system.service.AssetTypeService;
+import com.ruoyi.system.service.AssetVehicleExtService;
+import com.ruoyi.system.service.AssetWarehouseService;
+import com.ruoyi.system.service.ISysDeptService;
+import com.ruoyi.system.service.ISysUserService;
+import com.ruoyi.system.service.OaApprovalApplicationStorageService;
+import com.ruoyi.system.service.OaApprovalApplicationsService;
+import com.ruoyi.system.service.OaApprovalFlowNodeService;
+import com.ruoyi.system.service.OaApprovalTodoService;
+import com.ruoyi.system.service.TDeptService;
+import com.ruoyi.system.vo.asset.OaApprovalApplicationStoragePageVO;
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.math.BigDecimal;
import java.time.LocalDate;
-import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.List;
-import java.util.stream.Collectors;
/**
* <p>
@@ -51,6 +67,8 @@
private final OaApprovalTodoService oaApprovalTodoService;
private final ISysUserService sysUserService;
private final ISysDeptService sysDeptService;
+ private final TDeptService tDeptService;
+ private final AssetWarehouseService assetWarehouseService;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -63,15 +81,15 @@
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. 保存资产入库申请明细数据
OaApprovalApplicationStorage storage = buildOaApprovalApplicationStorage(dto, applications.getId());
save(storage);
// 5. 保存通用资产数据
- saveGeneralAssets(dto.getAssetItems(), applications.getId(), dto.getAssetTypeId(), dto.getStorageTime());
+ saveGeneralAssets(dto.getAssetItems(), applications.getId(), dto.getAssetTypeId(), dto.getStorageTime(), dto);
}
@Override
@@ -85,15 +103,15 @@
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. 保存资产入库申请明细数据
OaApprovalApplicationStorage storage = buildOaApprovalApplicationStorage(dto, applications.getId());
save(storage);
// 5. 保存房产资产数据
- savePropertyAssets(dto.getAssetItems(), applications.getId(), dto.getAssetTypeId(), dto.getStorageTime());
+ savePropertyAssets(dto.getAssetItems(), applications.getId(), dto.getAssetTypeId(), dto.getStorageTime(), dto);
}
@Override
@@ -107,21 +125,21 @@
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. 保存资产入库申请明细数据
OaApprovalApplicationStorage storage = buildOaApprovalApplicationStorage(dto, applications.getId());
save(storage);
// 5. 保存车辆资产数据
- saveVehicleAssets(dto.getAssetItems(), applications.getId(), dto.getAssetTypeId(), dto.getStorageTime());
+ saveVehicleAssets(dto.getAssetItems(), applications.getId(), dto.getAssetTypeId(), dto.getStorageTime(), dto);
}
/**
* 保存通用资产数据
*/
- private void saveGeneralAssets(List<OaApprovalApplicationStorageGeneralDTO.GeneralAssetItemDTO> assetItems, Integer applicationId, Integer assetTypeId, LocalDate storageDate) {
+ private void saveGeneralAssets(List<OaApprovalApplicationStorageGeneralDTO.GeneralAssetItemDTO> assetItems, Integer applicationId, Integer assetTypeId, LocalDate storageDate, OaApprovalApplicationStorageGeneralDTO baseDto) {
List<AssetMain> allAssetMains = new ArrayList<>();
List<AssetGeneralExt> allGeneralExts = new ArrayList<>();
@@ -129,7 +147,7 @@
// 根据数量创建对应数量的资产记录
int quantity = item.getQuantity().intValue();
for (int i = 0; i < quantity; i++) {
- AssetMain assetMain = buildAssetMain(item, applicationId, assetTypeId, storageDate);
+ AssetMain assetMain = buildAssetMain(item, applicationId, assetTypeId, storageDate, baseDto);
assetMain.setAssetMainType(AssetTypeEnum.GENERAL.getCode());
assetMain.setQuantity(BigDecimal.ONE); // 每个资产记录数量为1
assetMain.setTotalValue(item.getUnitPrice()); // 总价值等于单价
@@ -157,7 +175,7 @@
/**
* 保存房产资产数据
*/
- private void savePropertyAssets(List<OaApprovalApplicationStoragePropertyDTO.PropertyAssetItemDTO> assetItems, Integer applicationId, Integer assetTypeId, LocalDate storageDate) {
+ private void savePropertyAssets(List<OaApprovalApplicationStoragePropertyDTO.PropertyAssetItemDTO> assetItems, Integer applicationId, Integer assetTypeId, LocalDate storageDate, OaApprovalApplicationStoragePropertyDTO baseDto) {
List<AssetMain> allAssetMains = new ArrayList<>();
List<AssetPropertyExt> allPropertyExts = new ArrayList<>();
@@ -165,7 +183,7 @@
// 根据数量创建对应数量的资产记录
int quantity = item.getQuantity().intValue();
for (int i = 0; i < quantity; i++) {
- AssetMain assetMain = buildAssetMainFromProperty(item, applicationId, assetTypeId, storageDate);
+ AssetMain assetMain = buildAssetMainFromProperty(item, applicationId, assetTypeId, storageDate, baseDto);
assetMain.setAssetMainType(AssetTypeEnum.HOUSE.getCode());
assetMain.setQuantity(BigDecimal.ONE); // 每个资产记录数量为1
assetMain.setTotalValue(item.getUnitPrice()); // 总价值等于单价
@@ -193,7 +211,7 @@
/**
* 保存车辆资产数据
*/
- private void saveVehicleAssets(List<OaApprovalApplicationStorageVehicleDTO.VehicleAssetItemDTO> assetItems, Integer applicationId, Integer assetTypeId, LocalDate storageDate) {
+ private void saveVehicleAssets(List<OaApprovalApplicationStorageVehicleDTO.VehicleAssetItemDTO> assetItems, Integer applicationId, Integer assetTypeId, LocalDate storageDate, OaApprovalApplicationStorageVehicleDTO baseDto) {
List<AssetMain> allAssetMains = new ArrayList<>();
List<AssetVehicleExt> allVehicleExts = new ArrayList<>();
@@ -201,7 +219,7 @@
// 根据数量创建对应数量的资产记录
int quantity = item.getQuantity().intValue();
for (int i = 0; i < quantity; i++) {
- AssetMain assetMain = buildAssetMainFromVehicle(item, applicationId, assetTypeId, storageDate);
+ AssetMain assetMain = buildAssetMainFromVehicle(item, applicationId, assetTypeId, storageDate, baseDto);
assetMain.setAssetMainType(AssetTypeEnum.VEHICLE.getCode());
assetMain.setQuantity(BigDecimal.ONE); // 每个资产记录数量为1
assetMain.setTotalValue(item.getUnitPrice()); // 总价值等于单价
@@ -229,7 +247,7 @@
/**
* 构建通用资产主表数据
*/
- private AssetMain buildAssetMain(OaApprovalApplicationStorageGeneralDTO.GeneralAssetItemDTO item, Integer applicationId, Integer assetTypeId, LocalDate storageDate) {
+ private AssetMain buildAssetMain(OaApprovalApplicationStorageGeneralDTO.GeneralAssetItemDTO item, Integer applicationId, Integer assetTypeId, LocalDate storageDate, OaApprovalApplicationStorageGeneralDTO baseDto) {
AssetMain assetMain = new AssetMain();
assetMain.setApprovalApplicationId(applicationId.intValue());
assetMain.setAssetOriginalCode(item.getAssetOriginalCode());
@@ -242,10 +260,9 @@
assetMain.setUsefulLife(item.getUsefulLife());
assetMain.setOwnershipDeptId(item.getOwnershipDeptId());
assetMain.setUserName(item.getUserName());
- assetMain.setUseDeptId(item.getUseDeptId());
- assetMain.setWarehouseId(item.getWarehouseId());
- assetMain.setWarehouseName(item.getWarehouseName());
- assetMain.setAddress(item.getAddress());
+ // 根据整单 addressType 写入使用部门ID或仓库ID
+ applyAddressToAssetMain(assetMain, baseDto.getAddressType(), baseDto.getUseDeptName(), baseDto.getWarehouseName(), baseDto.getAddress());
+ assetMain.setAssetMainType(baseDto.getAddressType());
assetMain.setAssetStatus(item.getAssetStatus());
assetMain.setRemarks(item.getRemarks());
assetMain.setAccountingStatus(item.getAccountingStatus());
@@ -260,7 +277,7 @@
/**
* 构建房产资产主表数据
*/
- private AssetMain buildAssetMainFromProperty(OaApprovalApplicationStoragePropertyDTO.PropertyAssetItemDTO item, Integer applicationId, Integer assetTypeId, LocalDate storageDate) {
+ private AssetMain buildAssetMainFromProperty(OaApprovalApplicationStoragePropertyDTO.PropertyAssetItemDTO item, Integer applicationId, Integer assetTypeId, LocalDate storageDate, OaApprovalApplicationStoragePropertyDTO baseDto) {
AssetMain assetMain = new AssetMain();
assetMain.setApprovalApplicationId(applicationId.intValue());
assetMain.setAssetOriginalCode(item.getAssetOriginalCode());
@@ -273,10 +290,8 @@
assetMain.setUsefulLife(item.getUsefulLife());
assetMain.setOwnershipDeptId(item.getOwnershipDeptId());
assetMain.setUserName(item.getUserName());
- assetMain.setUseDeptId(item.getUseDeptId());
- assetMain.setWarehouseId(item.getWarehouseId());
- assetMain.setWarehouseName(item.getWarehouseName());
- assetMain.setAddress(item.getAddress());
+ applyAddressToAssetMain(assetMain, baseDto.getAddressType(), baseDto.getUseDeptName(), baseDto.getWarehouseName(), baseDto.getAddress());
+ assetMain.setAssetMainType(baseDto.getAddressType());
assetMain.setAssetStatus(item.getAssetStatus());
assetMain.setRemarks(item.getRemarks());
assetMain.setAccountingStatus(item.getAccountingStatus());
@@ -291,7 +306,7 @@
/**
* 构建车辆资产主表数据
*/
- private AssetMain buildAssetMainFromVehicle(OaApprovalApplicationStorageVehicleDTO.VehicleAssetItemDTO item, Integer applicationId, Integer assetTypeId, LocalDate storageDate) {
+ private AssetMain buildAssetMainFromVehicle(OaApprovalApplicationStorageVehicleDTO.VehicleAssetItemDTO item, Integer applicationId, Integer assetTypeId, LocalDate storageDate, OaApprovalApplicationStorageVehicleDTO baseDto) {
AssetMain assetMain = new AssetMain();
assetMain.setApprovalApplicationId(applicationId.intValue());
assetMain.setAssetOriginalCode(item.getAssetOriginalCode());
@@ -304,10 +319,8 @@
assetMain.setUsefulLife(item.getUsefulLife());
assetMain.setOwnershipDeptId(item.getOwnershipDeptId());
assetMain.setUserName(item.getUserName());
- assetMain.setUseDeptId(item.getUseDeptId());
- assetMain.setWarehouseId(item.getWarehouseId());
- assetMain.setWarehouseName(item.getWarehouseName());
- assetMain.setAddress(item.getAddress());
+ applyAddressToAssetMain(assetMain, baseDto.getAddressType(), baseDto.getUseDeptName(), baseDto.getWarehouseName(), baseDto.getAddress());
+ assetMain.setAssetMainType(baseDto.getAddressType());
assetMain.setAssetStatus(item.getAssetStatus());
assetMain.setRemarks(item.getRemarks());
assetMain.setAccountingStatus(item.getAccountingStatus());
@@ -317,6 +330,46 @@
assetMain.setAccountingAmount(item.getAccountingAmount());
assetMain.setDisabled(false);
return assetMain;
+ }
+
+ /**
+ * 按整单地址类型设置资产主表位置信息（使用部门ID或仓库ID或地址）
+ */
+ private void applyAddressToAssetMain(AssetMain assetMain, Integer addressType, String useDeptName, String warehouseName, String address) {
+ if (addressType == null) {
+ return;
+ }
+ switch (addressType) {
+ case 0:
+ // 使用部门
+ if (useDeptName != null && !useDeptName.isEmpty()) {
+ TDept dept = tDeptService.lambdaQuery()
+ .eq(TDept::getDeptName, useDeptName)
+ .one();
+ if (dept != null) {
+ assetMain.setUseDeptId(dept.getId());
+ }
+ }
+ break;
+ case 1:
+ if (warehouseName != null && !warehouseName.isEmpty()) {
+ AssetWarehouse warehouse = assetWarehouseService.lambdaQuery()
+ .eq(AssetWarehouse::getWarehouseName, warehouseName)
+ .one();
+ if (warehouse != null) {
+ assetMain.setWarehouseId(warehouse.getId());
+ assetMain.setWarehouseName(warehouse.getWarehouseName());
+ }
+ }
+ break;
+ case 2:
+ if (address != null && !address.isEmpty()) {
+ assetMain.setAddress(address);
+ }
+ break;
+ default:
+ // ignore
+ }
}
/**
@@ -400,119 +453,6 @@
return flowNodes.get(0);
}
- /**
- * 创建待办数据
- */
- private void createApprovalTodo(Integer 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(Integer applicationId, String applicationCode, OaApprovalFlowNode flowNode, Integer deptId) {
- if (deptId == null) {
- throw new ServiceException("未填写申请部门信息");
- }
-
- SysDept currentDept = sysDeptService.selectDeptById(Long.valueOf(deptId));
- if (currentDept == null) {
- throw new ServiceException("申请部门信息不存在");
- }
-
- if (currentDept.getParentId() == null || currentDept.getParentId() == 0) {
- throw new ServiceException("当前部门没有上级部门");
- }
-
- SysDept parentDept = sysDeptService.selectDeptById(currentDept.getParentId());
- if (parentDept == null) {
- throw new ServiceException("上级部门信息不存在");
- }
-
- List<SysUser> users = sysUserService.selectListByDeptId(parentDept.getDeptId().toString());
- if (CollUtil.isEmpty(users)) {
- throw new ServiceException("上级部门下没有找到用户");
- }
-
- createTodoItem(applicationId, applicationCode, flowNode, users);
- }
-
- /**
- * 创建指定部门审批待办
- */
- private void createSpecifiedDeptTodo(Integer applicationId, String applicationCode, OaApprovalFlowNode flowNode) {
- if (StringUtils.isBlank(flowNode.getApprovalIds())) {
- throw new ServiceException("操作失败，审批流程配置异常");
- }
-
- 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(Integer 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());
- List<SysUser> users = sysUserService.selectListByUserIds(userIds);
- if (CollUtil.isEmpty(users)) {
- throw new ServiceException("没有找到指定审批用户");
- }
-
- createTodoItem(applicationId, applicationCode, flowNode, users);
- }
-
- /**
- * 创建待办数据项
- */
- private void createTodoItem(Integer 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);
- todo.setCreateTime(LocalDateTime.now());
- return todo;
- }).collect(Collectors.toList());
-
- oaApprovalTodoService.saveBatch(approvalTodoList);
- }
/**
* 构建审批申请主表数据
@@ -520,7 +460,7 @@
private OaApprovalApplications buildOaApprovalApplications(Object dto) {
OaApprovalApplications applications = new OaApprovalApplications();
applications.setApprovalId(ApprovalTypeEnum.IN_STOCK.getCode());
-
+ applications.setApplicationDate(LocalDate.now());
if (dto instanceof OaApprovalApplicationStorageGeneralDTO) {
OaApprovalApplicationStorageGeneralDTO generalDTO = (OaApprovalApplicationStorageGeneralDTO) dto;
applications.setApplicantUserId(generalDTO.getApplicantUserId());
@@ -630,4 +570,10 @@
return prefix + sequenceStr;
}
-}
\ No newline at end of file
+
+ @Override
+ public IPage<OaApprovalApplicationStoragePageVO> getPageList(com.ruoyi.system.query.OaApprovalApplicationStoragePageQuery pageQuery) {
+ Page<OaApprovalApplicationStoragePageVO> page = new Page<>(pageQuery.getPageNum(), pageQuery.getPageSize());
+ return this.baseMapper.selectApplicationStoragePage(page, pageQuery);
+ }
+}
--
Gitblit v1.7.1