From a3a0d8a83e538efc6cf27865e5a33bf26e958ff7 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 25 九月 2025 09:37:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AssetMainServiceImpl.java | 210 +++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 205 insertions(+), 5 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AssetMainServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AssetMainServiceImpl.java
index 231a1bb..627216d 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AssetMainServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AssetMainServiceImpl.java
@@ -1,20 +1,220 @@
package com.ruoyi.system.service.impl;
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.ruoyi.common.core.domain.entity.TDept;
+import com.ruoyi.system.model.AssetType;
+import com.ruoyi.system.service.TDeptService;
+import com.ruoyi.system.vo.asset.AssetMainVO;
+import org.springframework.util.CollectionUtils;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+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.utils.SecurityUtils;
import com.ruoyi.system.mapper.AssetMainMapper;
+import com.ruoyi.system.mapper.AssetPropertyExtMapper;
+import com.ruoyi.system.mapper.AssetVehicleExtMapper;
+import com.ruoyi.system.mapper.OaApprovalApplicationStorageAssetMapper;
+import com.ruoyi.system.mapper.OaApprovalApplicationStorageAssetPropertyExtMapper;
+import com.ruoyi.system.mapper.OaApprovalApplicationStorageAssetVehicleExtMapper;
import com.ruoyi.system.model.AssetMain;
+import com.ruoyi.system.model.AssetPropertyExt;
+import com.ruoyi.system.model.AssetVehicleExt;
+import com.ruoyi.system.model.OaApprovalApplicationStorageAsset;
+import com.ruoyi.system.model.OaApprovalApplicationStorageAssetPropertyExt;
+import com.ruoyi.system.model.OaApprovalApplicationStorageAssetVehicleExt;
+import com.ruoyi.system.query.AssetMainPageQuery;
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.OaApprovalApplicationStorageAssetPropertyExtService;
+import com.ruoyi.system.service.OaApprovalApplicationStorageAssetService;
+import com.ruoyi.system.service.OaApprovalApplicationStorageAssetVehicleExtService;
+import com.ruoyi.system.vo.asset.AssetMainPageVO;
+import lombok.RequiredArgsConstructor;
+import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
/**
- * <p>
* 资产主表 服务实现类
- * </p>
- *
- * @author WuGuanFengYue
- * @since 2025-09-15
*/
@Service
+@RequiredArgsConstructor(onConstructor_ = {@Lazy})
public class AssetMainServiceImpl extends ServiceImpl<AssetMainMapper, AssetMain> implements AssetMainService {
+ private final AssetTypeService assetTypeService;
+ private final OaApprovalApplicationStorageAssetService oaApprovalApplicationStorageAssetService;
+ private final OaApprovalApplicationStorageAssetPropertyExtService oaApprovalApplicationStorageAssetPropertyExtService;
+ private final OaApprovalApplicationStorageAssetVehicleExtService oaApprovalApplicationStorageAssetVehicleExtService;
+ private final AssetVehicleExtService assetVehicleExtService;
+ private final AssetPropertyExtService assetPropertyExtService;
+
+ private final AssetMainMapper assetMainMapper;
+ private final OaApprovalApplicationStorageAssetMapper oaApprovalApplicationStorageAssetMapper;
+ private final OaApprovalApplicationStorageAssetPropertyExtMapper oaApprovalApplicationStorageAssetPropertyExtMapper;
+ private final OaApprovalApplicationStorageAssetVehicleExtMapper oaApprovalApplicationStorageAssetVehicleExtMapper;
+ private final AssetPropertyExtMapper assetPropertyExtMapper;
+ private final AssetVehicleExtMapper assetVehicleExtMapper;
+ private final TDeptService tDeptService;
+ @Override
+ public IPage<AssetMainPageVO> getApprovedPageList(AssetMainPageQuery pageQuery) {
+ Page<AssetMainPageVO> page = new Page<>(pageQuery.getPageNum(), pageQuery.getPageSize());
+ return this.baseMapper.selectApprovedAssetPage(page, pageQuery);
+ }
+ /**
+ * 生成资产编码
+ * 格式：资产类型一级分类简写+资产类型子类简写+入库日期+【-】+数量顺序编号（4位）
+ * 例如：GDFC20250917-0001
+ */
+ @Override
+ public String generateAssetCode(Integer assetTypeId, LocalDate storageDate) {
+ // 根据资产类型ID获取资产编码前缀
+ String typeCodePrefix = assetTypeService.getAssetCodePrefix(assetTypeId);
+ String dateStr = storageDate.format(DateTimeFormatter.ofPattern("yyyyMMdd"));
+ String prefix = typeCodePrefix + dateStr + "-";
+
+ // 查询当天该类型资产的数量
+ Long count = this.lambdaQuery()
+ .like(AssetMain::getAssetCode, prefix)
+ .ge(AssetMain::getCreateTime, storageDate.atStartOfDay())
+ .lt(AssetMain::getCreateTime, storageDate.plusDays(1).atStartOfDay())
+ .count();
+
+ int sequence = (count != null ? count.intValue() : 0) + 1;
+ String sequenceStr = String.format("%04d", sequence);
+
+ return prefix + sequenceStr;
+ }
+
+ @Override
+ public void saveAssetByApprovalApplicationId(Integer approvalApplicationId) {
+ // 1. 根据approvalApplicationId查询审批通过的资产列表
+ List<OaApprovalApplicationStorageAsset> storageAssets = oaApprovalApplicationStorageAssetMapper
+ .selectList(new LambdaQueryWrapper<OaApprovalApplicationStorageAsset>()
+ .eq(OaApprovalApplicationStorageAsset::getApprovalApplicationId, approvalApplicationId));
+
+ if (CollectionUtils.isEmpty(storageAssets)) {
+ return;
+ }
+
+ for (OaApprovalApplicationStorageAsset storageAsset : storageAssets) {
+ Integer assetMainType = storageAsset.getAssetMainType();
+ BigDecimal quantity = storageAsset.getQuantity();
+
+ // 根据数量生成对应条数的资产记录
+ int assetCount = quantity != null ? quantity.intValue() : 1;
+
+ for (int i = 0; i < assetCount; i++) {
+ // 创建资产主表记录
+ AssetMain assetMain = new AssetMain();
+ BeanUtil.copyProperties(storageAsset, assetMain);
+
+ // 为每个资产生成编码
+ String assetCode = generateAssetCode(storageAsset.getAssetTypeId(), LocalDate.now());
+ assetMain.setAssetCode(assetCode);
+
+ // 单个资产的数量设为1
+ assetMain.setQuantity(1);
+ // 单个资产的总价值等于单价
+ assetMain.setTotalValue(storageAsset.getUnitPrice());
+
+ // 设置创建信息
+ assetMain.setCreateTime(LocalDateTime.now());
+ assetMain.setCreateBy(SecurityUtils.getUsername());
+ assetMain.setDisabled(false);
+
+ // 保存资产主表
+ assetMainMapper.insert(assetMain);
+
+ // 2. 根据资产类型保存扩展信息
+ if (assetMainType != null) {
+ if (assetMainType == 1) {
+ // 房产资产 - 保存房产扩展信息
+ savePropertyExtension(storageAsset.getId(), assetMain.getId());
+ } else if (assetMainType == 2) {
+ // 车辆资产 - 保存车辆扩展信息
+ saveVehicleExtension(storageAsset.getId(), assetMain.getId());
+ }
+ // assetMainType == 0 为通用资产，无需保存扩展信息
+ }
+ }
+ }
+ }
+
+ /**
+ * 保存房产资产扩展信息
+ */
+ private void savePropertyExtension(Integer storageAssetId, Integer assetMainId) {
+ // 查询房产扩展信息
+ OaApprovalApplicationStorageAssetPropertyExt propertyExt = oaApprovalApplicationStorageAssetPropertyExtMapper
+ .selectOne(new LambdaQueryWrapper<OaApprovalApplicationStorageAssetPropertyExt>()
+ .eq(OaApprovalApplicationStorageAssetPropertyExt::getStorageAssetId, storageAssetId));
+
+ if (propertyExt != null) {
+ AssetPropertyExt assetPropertyExt = new AssetPropertyExt();
+ BeanUtil.copyProperties(propertyExt, assetPropertyExt);
+ assetPropertyExt.setAssetMainId(assetMainId);
+ assetPropertyExt.setCreateTime(LocalDateTime.now());
+ assetPropertyExt.setCreateBy(SecurityUtils.getUsername());
+ assetPropertyExt.setDisabled(false);
+
+ assetPropertyExtMapper.insert(assetPropertyExt);
+ }
+ }
+
+ /**
+ * 保存车辆资产扩展信息
+ */
+ private void saveVehicleExtension(Integer storageAssetId, Integer assetMainId) {
+ // 查询车辆扩展信息
+ OaApprovalApplicationStorageAssetVehicleExt vehicleExt = oaApprovalApplicationStorageAssetVehicleExtMapper
+ .selectOne(new QueryWrapper<OaApprovalApplicationStorageAssetVehicleExt>()
+ .eq("storage_asset_id", storageAssetId));
+
+ if (vehicleExt != null) {
+ AssetVehicleExt assetVehicleExt = new AssetVehicleExt();
+ BeanUtil.copyProperties(vehicleExt, assetVehicleExt);
+ assetVehicleExt.setAssetMainId(assetMainId);
+ assetVehicleExt.setCreateTime(LocalDateTime.now());
+ assetVehicleExt.setCreateBy(SecurityUtils.getUsername());
+ assetVehicleExt.setDisabled(false);
+
+ assetVehicleExtMapper.insert(assetVehicleExt);
+ }
+ }
+
+ @Override
+ public List<AssetMainVO> getListByIds(List<Integer> assetMainIds) {
+ if (!CollectionUtils.isEmpty(assetMainIds)) {
+ List<AssetMain> assetMains = this.lambdaQuery()
+ .in(AssetMain::getId, assetMainIds)
+ .list();
+ //查询资产类型名称
+ List<Integer> assetTypeIds = assetMains.stream().map(AssetMain::getAssetTypeId).distinct().collect(Collectors.toList());
+ Map<Integer, String> typeNameMap = assetTypeIds.isEmpty() ? Collections.emptyMap() : assetTypeService.listByIds(assetTypeIds).stream()
+ .collect(Collectors.toMap(AssetType::getId, AssetType::getTypeName));
+ //查询归属部门名称
+ List<Integer> deptIds = assetMains.stream().map(AssetMain::getOwnershipDeptId).distinct().collect(Collectors.toList());
+ Map<Integer, String> deptNameMap = deptIds.isEmpty() ? Collections.emptyMap() : tDeptService.listByIds(deptIds).stream()
+ .collect(Collectors.toMap(TDept::getId, TDept::getDeptName));
+ List<AssetMainVO> voList = BeanUtil.copyToList(assetMains, AssetMainVO.class);
+ for (AssetMainVO assetMainVO : voList) {
+ assetMainVO.setAssetTypeName(typeNameMap.get(assetMainVO.getAssetTypeId()));
+ assetMainVO.setOwnershipDeptName(deptNameMap.get(assetMainVO.getOwnershipDeptId()));
+ }
+ return voList;
+ }
+ return Collections.emptyList();
+ }
}
--
Gitblit v1.7.1