From 50ee6ccb8d8036ffaa2aabb4e4999c14a05b45a3 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 30 九月 2025 16:35:12 +0800
Subject: [PATCH] 资产管理数据权限修改
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AssetTypeServiceImpl.java | 40 +++++++++++++++++++++++++++++++++++-----
1 files changed, 35 insertions(+), 5 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 20e3869..fb4d5ed 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
@@ -6,7 +6,6 @@
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;
@@ -14,19 +13,19 @@
import com.ruoyi.system.model.AssetInventoryRecord;
import com.ruoyi.system.model.AssetMain;
import com.ruoyi.system.model.AssetType;
+import com.ruoyi.system.query.AsseIdleListQuery;
import com.ruoyi.system.query.AssetInventoryListQuery;
import com.ruoyi.system.query.AssetStatisticsListDetailQuery;
import com.ruoyi.system.query.AssetStatisticsListQuery;
import com.ruoyi.system.service.AssetInventoryRecordService;
import com.ruoyi.system.service.AssetMainService;
import com.ruoyi.system.service.AssetTypeService;
+import com.ruoyi.system.service.ISysUserService;
+import com.ruoyi.system.vo.AssetIdleListVO;
import com.ruoyi.system.vo.AssetInventoryVO;
import com.ruoyi.system.vo.AssetStatisticsDetailVO;
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 io.swagger.models.auth.In;
import lombok.RequiredArgsConstructor;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
@@ -35,7 +34,12 @@
import java.math.BigDecimal;
import java.math.RoundingMode;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
import java.util.stream.Collectors;
/**
@@ -53,6 +57,7 @@
private final AssetMainService assetMainService;
private final AssetTypeService assetTypeService;
private final AssetInventoryRecordService assetInventoryRecordService;
+ private final ISysUserService sysUserService;
@Override
public List<AssetTypeTreeVO> getAssetTypeTree() {
@@ -491,4 +496,29 @@
return pageInfo;
}
+ @Override
+ public PageInfo<AssetIdleListVO> pageListIdle(AsseIdleListQuery query) {
+ Map<Integer, AssetType> assetTypeMap = assetTypeService.list().stream().collect(
+ Collectors.toMap(AssetType::getId, e -> e)
+ );
+ PageInfo<AssetIdleListVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
+ List<AssetIdleListVO> list = this.baseMapper.pageListIdle(query,pageInfo);
+ for (AssetIdleListVO assetIdleListVO : list) {
+ AssetType assetType = assetTypeMap.get(assetIdleListVO.getAssetTypeId());
+ if (assetType!=null){
+ AssetType parent = assetTypeMap.get(assetType.getParentId());
+ assetIdleListVO.setAssetTypeName(parent.getTypeName()+">"+assetType.getTypeName());
+ }
+ }
+ pageInfo.setRecords(list);
+ return pageInfo;
+ }
+
+ @Override
+ public List<AssetIdleListVO> pageListIdleNoLimit(AsseIdleListQuery query) {
+ List<AssetIdleListVO> list = this.baseMapper.pageListIdleNoLimit(query);
+
+ return list;
+ }
+
}
--
Gitblit v1.7.1