From 9d1a18030d8f82aa264d1378186eb00c31c9af20 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 25 九月 2025 09:36:47 +0800
Subject: [PATCH] 审批流程bug修改
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AssetTypeServiceImpl.java | 96 +++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 95 insertions(+), 1 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AssetTypeServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AssetTypeServiceImpl.java
index 583b616..a28fcd9 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AssetTypeServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AssetTypeServiceImpl.java
@@ -3,24 +3,36 @@
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.basic.PageInfo;
+import com.ruoyi.common.core.domain.entity.TDept;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.system.dto.asset.AssetTypeDTO;
import com.ruoyi.system.mapper.AssetTypeMapper;
import com.ruoyi.system.model.AssetMain;
import com.ruoyi.system.model.AssetType;
+import com.ruoyi.system.query.AssetStatisticsListQuery;
import com.ruoyi.system.service.AssetMainService;
import com.ruoyi.system.service.AssetTypeService;
+import com.ruoyi.system.vo.AssetStatisticsVO;
import com.ruoyi.system.vo.asset.AssetTypeTreeVO;
+import com.ruoyi.system.vo.system.NotificationVO;
+import io.swagger.annotations.ApiModelProperty;
import lombok.RequiredArgsConstructor;
+import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.StringUtils;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Objects;
+import java.util.Set;
import java.util.stream.Collectors;
/**
@@ -32,7 +44,7 @@
* @since 2025-09-15
*/
@Service
-@RequiredArgsConstructor
+@RequiredArgsConstructor(onConstructor_ = {@Lazy})
public class AssetTypeServiceImpl extends ServiceImpl<AssetTypeMapper, AssetType> implements AssetTypeService {
private final AssetMainService assetMainService;
@@ -53,10 +65,31 @@
// 转换为VO对象
List<AssetTypeTreeVO> assetTypeVOs = BeanUtil.copyToList(allAssetTypes, AssetTypeTreeVO.class);
+ // 预查询：找出存在资产关联的资产类型ID集合（去重）
+ List<Integer> allTypeIds = allAssetTypes.stream().map(AssetType::getId).collect(Collectors.toList());
+ QueryWrapper<AssetMain> usedTypeQuery = new QueryWrapper<>();
+ usedTypeQuery.select("distinct asset_type_id").in("asset_type_id", allTypeIds);
+ List<AssetMain> usedTypeRows = assetMainService.list(usedTypeQuery);
+ Set<Integer> usedTypeIdSet = usedTypeRows.stream()
+ .map(AssetMain::getAssetTypeId)
+ .filter(Objects::nonNull)
+ .collect(Collectors.toSet());
+
// 按父级ID分组
Map<Integer, List<AssetTypeTreeVO>> parentIdMap = assetTypeVOs.stream()
.collect(Collectors.groupingBy(AssetTypeTreeVO::getParentId));
+ // 计算可删除标记：一级仅判断是否有子分类；二级仅判断是否有关联资产
+ for (AssetTypeTreeVO vo : assetTypeVOs) {
+ if (Objects.equals(vo.getLevel(), 1)) {
+ boolean hasChildren = parentIdMap.containsKey(vo.getId()) && CollUtil.isNotEmpty(parentIdMap.get(vo.getId()));
+ vo.setCanDelete(!hasChildren);
+ } else {
+ boolean hasAssets = usedTypeIdSet.contains(vo.getId());
+ vo.setCanDelete(!hasAssets);
+ }
+ }
+
// 构建树形结构
List<AssetTypeTreeVO> rootNodes = parentIdMap.get(0);
if (CollUtil.isEmpty(rootNodes)) {
@@ -263,4 +296,65 @@
return parentTypeCode + subTypeCode;
}
+ @Override
+ public PageInfo<AssetStatisticsVO> pageList(AssetStatisticsListQuery query) {
+ if (StringUtils.hasLength(query.getNameOrCode())){
+ // 查询出资产名称或者资产编号符合条件的code
+ List<Integer> assetTypeIds = assetMainService.lambdaQuery().like(AssetMain::getAssetName, query.getNameOrCode())
+ .or()
+ .like(AssetMain::getAssetCode, query.getNameOrCode())
+ .list()
+ .stream()
+ .map(AssetMain::getAssetTypeId)
+ .collect(Collectors.toList());
+ query.setAssetTypeIds(assetTypeIds);
+ if (assetTypeIds.isEmpty()){
+ return new PageInfo<>();
+ }
+ }
+ PageInfo<AssetStatisticsVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
+ List<AssetStatisticsVO> list = this.baseMapper.pageList(query,pageInfo);
+ List<AssetStatisticsVO> listNoLimit = this.baseMapper.pageListNoLimit(query);
+ List<Integer> assetTypeIds = listNoLimit.stream().map(AssetStatisticsVO::getAssetTypeIdSecond).collect(Collectors.toList());
+ if (assetTypeIds.isEmpty()){
+ return new PageInfo<>();
+ }
+ Map<Integer, List<AssetMain>> assetMainMap = assetMainService.lambdaQuery().in(AssetMain::getAssetTypeId, assetTypeIds).list()
+ .stream()
+ .collect(Collectors.groupingBy(AssetMain::getAssetTypeId));
+ for (AssetStatisticsVO asset : list) {
+ Integer totalCount= 0;
+ Integer idleCount= 0;
+ Integer useCount= 0;
+ Integer disposeCount= 0;
+ Integer otherCount= 0;
+ BigDecimal totalValue = new BigDecimal("0");
+ List<AssetMain> assetMains = assetMainMap.get(asset.getAssetTypeIdSecond());
+ if (!assetMains.isEmpty()){
+ for (AssetMain assetMain : assetMains) {
+ if (assetMain.getAssetStatus().contains("闲置")){
+ idleCount += assetMain.getQuantity();
+ }else if (assetMain.getAssetStatus().contains("使用中")){
+ useCount += assetMain.getQuantity();
+ }else if (assetMain.getAssetStatus().contains("损坏") || assetMain.getAssetStatus().contains("报废")){
+ disposeCount += assetMain.getQuantity();
+ }else{
+ otherCount += assetMain.getQuantity();
+ }
+ totalCount+= assetMain.getQuantity();
+ totalValue = totalValue.add(new BigDecimal(assetMain.getQuantity())
+ .multiply(assetMain.getUnitPrice()).setScale(2, RoundingMode.HALF_DOWN));
+ }
+ }
+ asset.setIdleCount(idleCount);
+ asset.setUseCount(useCount);
+ asset.setDisposeCount(disposeCount);
+ asset.setOtherCount(otherCount);
+ asset.setTotalCount(totalCount);
+ asset.setTotalValue(totalValue);
+ }
+ pageInfo.setRecords(list);
+ return pageInfo;
+ }
+
}
--
Gitblit v1.7.1