From 4ad572c4e51e44e3134def3c70879b3a698ab1d8 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 29 九月 2025 19:56:16 +0800
Subject: [PATCH] 资产变更
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OaApprovalApplicationStorageServiceImpl.java | 468 ++++++++++++++++++++++------------------------------------
1 files changed, 178 insertions(+), 290 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 5bfb9d1..97d8f45 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,5 +1,7 @@
package com.ruoyi.system.service.impl;
+import cn.hutool.core.bean.BeanUtil;
+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;
@@ -13,7 +15,6 @@
import com.ruoyi.system.emums.ApprovalTypeEnum;
import com.ruoyi.system.emums.AssetTypeEnum;
import com.ruoyi.system.mapper.OaApprovalApplicationStorageMapper;
-import com.ruoyi.system.model.AssetMain;
import com.ruoyi.system.model.AssetWarehouse;
import com.ruoyi.system.model.OaApprovalApplicationStorage;
import com.ruoyi.system.model.OaApprovalApplicationStorageAsset;
@@ -23,10 +24,6 @@
import com.ruoyi.system.model.OaApprovalFlowNode;
import com.ruoyi.system.query.ApprovalDetailQuery;
import com.ruoyi.system.query.OaApprovalApplicationStoragePageQuery;
-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.OaApprovalApplicationStorageAssetPropertyExtService;
import com.ruoyi.system.service.OaApprovalApplicationStorageAssetService;
@@ -36,22 +33,26 @@
import com.ruoyi.system.service.OaApprovalFlowNodeService;
import com.ruoyi.system.service.OaApprovalTodoService;
import com.ruoyi.system.service.TDeptService;
-import com.ruoyi.system.vo.PurchaseListVO;
import com.ruoyi.system.vo.StorageListVO;
import com.ruoyi.system.vo.asset.OaApprovalApplicationStorageGeneralDetailVO;
import com.ruoyi.system.vo.asset.OaApprovalApplicationStoragePageVO;
import com.ruoyi.system.vo.asset.OaApprovalApplicationStoragePropertyDetailVO;
import com.ruoyi.system.vo.asset.OaApprovalApplicationStorageVehicleDetailVO;
import lombok.RequiredArgsConstructor;
+import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.stream.Collectors;
/**
@@ -70,10 +71,6 @@
private final OaApprovalApplicationStorageAssetService oaApprovalApplicationStorageAssetService;
private final OaApprovalApplicationStorageAssetPropertyExtService oaApprovalApplicationStorageAssetPropertyExtService;
private final OaApprovalApplicationStorageAssetVehicleExtService oaApprovalApplicationStorageAssetVehicleExtService;
- private final AssetMainService assetMainService;
- private final AssetPropertyExtService assetPropertyExtService;
- private final AssetVehicleExtService assetVehicleExtService;
- private final AssetTypeService assetTypeService;
private final OaApprovalFlowNodeService oaApprovalFlowNodeService;
private final OaApprovalTodoService oaApprovalTodoService;
private final TDeptService tDeptService;
@@ -218,16 +215,9 @@
* 构建通用资产主表数据
*/
private OaApprovalApplicationStorageAsset buildAssetMain(OaApprovalApplicationStorageGeneralDTO.GeneralAssetItemDTO item, Integer applicationId, Integer assetTypeId, LocalDate storageDate, OaApprovalApplicationStorageGeneralDTO baseDto) {
- OaApprovalApplicationStorageAsset assetMain = new OaApprovalApplicationStorageAsset();
- assetMain.setApprovalApplicationId(applicationId.intValue());
- assetMain.setAssetOriginalCode(item.getAssetOriginalCode());
- assetMain.setAssetName(item.getAssetName());
- assetMain.setCategory(item.getCategory());
- assetMain.setSpecificationModel(item.getSpecificationModel());
+ OaApprovalApplicationStorageAsset assetMain = BeanUtil.copyProperties(item, OaApprovalApplicationStorageAsset.class);
+ assetMain.setApprovalApplicationId(applicationId);
assetMain.setAssetTypeId(assetTypeId);
- assetMain.setMeasurementUnit(item.getMeasurementUnit());
- assetMain.setUnitPrice(item.getUnitPrice());
- assetMain.setUsefulLife(item.getUsefulLife());
// 根据权属单位/部门名称填充ID
if (item.getOwnershipDeptName() != null && !item.getOwnershipDeptName().isEmpty()) {
TDept ownerDept = tDeptService.lambdaQuery()
@@ -237,18 +227,9 @@
assetMain.setOwnershipDeptId(ownerDept.getId());
}
}
- assetMain.setUserName(item.getUserName());
// 根据整单 addressType 写入使用部门ID或仓库ID
- applyUseDeptInfoToAssetMain(assetMain, baseDto.getUseDeptName());
+ applyAddressToAssetMain(assetMain, item.getAddressType(), item.getUseDeptName(), item.getWarehouseName(), item.getAddress());
assetMain.setAssetMainType(AssetTypeEnum.GENERAL.getCode());
- assetMain.setAssetStatus(item.getAssetStatus());
- assetMain.setRemarks(item.getRemarks());
- assetMain.setAccountingStatus(item.getAccountingStatus());
- assetMain.setAccountingDate(item.getAccountingDate());
- assetMain.setAccountingVoucherNo(item.getAccountingVoucherNo());
- assetMain.setAccountingSubject(item.getAccountingSubject());
- assetMain.setAccountingAmount(item.getAccountingAmount());
- assetMain.setDisabled(false);
return assetMain;
}
@@ -256,16 +237,9 @@
* 构建房产资产主表数据
*/
private OaApprovalApplicationStorageAsset buildAssetMainFromProperty(OaApprovalApplicationStoragePropertyDTO.PropertyAssetItemDTO item, Integer applicationId, Integer assetTypeId, LocalDate storageDate, OaApprovalApplicationStoragePropertyDTO baseDto) {
- OaApprovalApplicationStorageAsset assetMain = new OaApprovalApplicationStorageAsset();
- assetMain.setApprovalApplicationId(applicationId.intValue());
- assetMain.setAssetOriginalCode(item.getAssetOriginalCode());
- assetMain.setAssetName(item.getAssetName());
- assetMain.setCategory(item.getCategory());
- assetMain.setSpecificationModel(item.getSpecificationModel());
+ OaApprovalApplicationStorageAsset assetMain = BeanUtil.copyProperties(item, OaApprovalApplicationStorageAsset.class);
+ assetMain.setApprovalApplicationId(applicationId);
assetMain.setAssetTypeId(assetTypeId);
- assetMain.setMeasurementUnit(item.getMeasurementUnit());
- assetMain.setUnitPrice(item.getUnitPrice());
- assetMain.setUsefulLife(item.getUsefulLife());
if (item.getOwnershipDeptName() != null && !item.getOwnershipDeptName().isEmpty()) {
TDept ownerDept = tDeptService.lambdaQuery()
.eq(TDept::getDeptName, item.getOwnershipDeptName())
@@ -274,17 +248,8 @@
assetMain.setOwnershipDeptId(ownerDept.getId());
}
}
- assetMain.setUserName(item.getUserName());
- applyUseDeptInfoToAssetMain(assetMain, baseDto.getUseDeptName());
+ applyAddressToAssetMain(assetMain, item.getAddressType(), item.getUseDeptName(), item.getWarehouseName(), item.getAddress());
assetMain.setAssetMainType(AssetTypeEnum.HOUSE.getCode());
- assetMain.setAssetStatus(item.getAssetStatus());
- assetMain.setRemarks(item.getRemarks());
- assetMain.setAccountingStatus(item.getAccountingStatus());
- assetMain.setAccountingDate(item.getAccountingDate());
- assetMain.setAccountingVoucherNo(item.getAccountingVoucherNo());
- assetMain.setAccountingSubject(item.getAccountingSubject());
- assetMain.setAccountingAmount(item.getAccountingAmount());
- assetMain.setDisabled(false);
return assetMain;
}
@@ -292,16 +257,9 @@
* 构建车辆资产主表数据
*/
private OaApprovalApplicationStorageAsset buildAssetMainFromVehicle(OaApprovalApplicationStorageVehicleDTO.VehicleAssetItemDTO item, Integer applicationId, Integer assetTypeId, LocalDate storageDate, OaApprovalApplicationStorageVehicleDTO baseDto) {
- OaApprovalApplicationStorageAsset assetMain = new OaApprovalApplicationStorageAsset();
- assetMain.setApprovalApplicationId(applicationId.intValue());
- assetMain.setAssetOriginalCode(item.getAssetOriginalCode());
- assetMain.setAssetName(item.getAssetName());
- assetMain.setCategory(item.getCategory());
- assetMain.setSpecificationModel(item.getSpecificationModel());
+ OaApprovalApplicationStorageAsset assetMain = BeanUtil.copyProperties(item, OaApprovalApplicationStorageAsset.class);
+ assetMain.setApprovalApplicationId(applicationId);
assetMain.setAssetTypeId(assetTypeId);
- assetMain.setMeasurementUnit(item.getMeasurementUnit());
- assetMain.setUnitPrice(item.getUnitPrice());
- assetMain.setUsefulLife(item.getUsefulLife());
if (item.getOwnershipDeptName() != null && !item.getOwnershipDeptName().isEmpty()) {
TDept ownerDept = tDeptService.lambdaQuery()
.eq(TDept::getDeptName, item.getOwnershipDeptName())
@@ -310,59 +268,59 @@
assetMain.setOwnershipDeptId(ownerDept.getId());
}
}
- assetMain.setUserName(item.getUserName());
- applyUseDeptInfoToAssetMain(assetMain, baseDto.getUseDeptName());
+ applyAddressToAssetMain(assetMain, item.getAddressType(), item.getUseDeptName(), item.getWarehouseName(), item.getAddress());
assetMain.setAssetMainType(AssetTypeEnum.VEHICLE.getCode());
- assetMain.setAssetStatus(item.getAssetStatus());
- assetMain.setRemarks(item.getRemarks());
- assetMain.setAccountingStatus(item.getAccountingStatus());
- assetMain.setAccountingDate(item.getAccountingDate());
- assetMain.setAccountingVoucherNo(item.getAccountingVoucherNo());
- assetMain.setAccountingSubject(item.getAccountingSubject());
- assetMain.setAccountingAmount(item.getAccountingAmount());
- assetMain.setDisabled(false);
return assetMain;
}
/**
* 按整单地址类型设置资产主表位置信息（使用部门ID或仓库ID或地址）
*/
- private void applyUseDeptInfoToAssetMain(OaApprovalApplicationStorageAsset assetMain, String useDeptName) {
- // 使用部门
- if (useDeptName != null && !useDeptName.isEmpty()) {
- TDept dept = tDeptService.lambdaQuery()
- .eq(TDept::getDeptName, useDeptName)
- .one();
- if (dept != null) {
- assetMain.setUseDeptId(dept.getId());
- }
+ private void applyAddressToAssetMain(OaApprovalApplicationStorageAsset 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
}
}
+
/**
* 构建房产资产扩展数据
*/
private OaApprovalApplicationStorageAssetPropertyExt buildAssetPropertyExt(OaApprovalApplicationStoragePropertyDTO.PropertyAssetItemDTO item, Integer assetMainId) {
- OaApprovalApplicationStorageAssetPropertyExt propertyExt = new OaApprovalApplicationStorageAssetPropertyExt();
+ OaApprovalApplicationStorageAssetPropertyExt propertyExt = BeanUtil.copyProperties(item, OaApprovalApplicationStorageAssetPropertyExt.class);
propertyExt.setStorageAssetId(assetMainId);
- propertyExt.setRegion(item.getRegion());
- propertyExt.setDesignPurpose(item.getDesignPurpose());
- propertyExt.setBuilding(item.getBuilding());
- propertyExt.setRoomNumber(item.getRoomNumber());
- propertyExt.setConstructionArea(item.getConstructionArea());
- propertyExt.setStructureType(item.getStructureType());
- propertyExt.setCertificateNumber(item.getCertificateNumber());
- propertyExt.setCompletionDate(item.getCompletionDate());
- propertyExt.setDetailedLocation(item.getDetailedLocation());
- propertyExt.setProvincialPlatformValue(item.getProvincialPlatformValue());
- propertyExt.setResettlementSituation(item.getResettlementSituation());
- propertyExt.setMortgaged(item.getMortgaged());
- propertyExt.setTenantName(item.getTenantName());
- propertyExt.setRentalAmount(item.getRentalAmount());
- propertyExt.setLeaseStartDate(item.getLeaseStartDate());
- propertyExt.setLeaseEndDate(item.getLeaseEndDate());
- propertyExt.setDisabled(false);
return propertyExt;
}
@@ -370,17 +328,8 @@
* 构建车辆资产扩展数据
*/
private OaApprovalApplicationStorageAssetVehicleExt buildAssetVehicleExt(OaApprovalApplicationStorageVehicleDTO.VehicleAssetItemDTO item, Integer assetMainId) {
- OaApprovalApplicationStorageAssetVehicleExt vehicleExt = new OaApprovalApplicationStorageAssetVehicleExt();
+ OaApprovalApplicationStorageAssetVehicleExt vehicleExt = BeanUtil.copyProperties(item, OaApprovalApplicationStorageAssetVehicleExt.class);
vehicleExt.setStorageAssetId(assetMainId);
- vehicleExt.setLicensePlate(item.getLicensePlate());
- vehicleExt.setVinCode(item.getVinCode());
- vehicleExt.setEngineNumber(item.getEngineNumber());
- vehicleExt.setDisplacement(item.getDisplacement());
- vehicleExt.setStaffingSituation(item.getStaffingSituation());
- vehicleExt.setOrigin(item.getOrigin());
- vehicleExt.setAcquisitionDate(item.getAcquisitionDate());
- vehicleExt.setPropertyRightForm(item.getPropertyRightForm());
- vehicleExt.setDisabled(false);
return vehicleExt;
}
@@ -407,39 +356,20 @@
*/
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());
- applications.setApplicantName(generalDTO.getApplicantName());
- applications.setDeptId(generalDTO.getDeptId());
- applications.setDeptName(generalDTO.getDeptName());
- applications.setApplicationDate(LocalDate.now());
- applications.setApplicationReason(generalDTO.getApplicationReason());
- applications.setAttachmentUrl(generalDTO.getAttachmentUrl());
+ BeanUtils.copyProperties(generalDTO, applications);
} else if (dto instanceof OaApprovalApplicationStoragePropertyDTO) {
OaApprovalApplicationStoragePropertyDTO propertyDTO = (OaApprovalApplicationStoragePropertyDTO) dto;
- applications.setApplicantUserId(propertyDTO.getApplicantUserId());
- applications.setApplicantName(propertyDTO.getApplicantName());
- applications.setDeptId(propertyDTO.getDeptId());
- applications.setDeptName(propertyDTO.getDeptName());
- applications.setApplicationDate(LocalDate.now());
- applications.setApplicationReason(propertyDTO.getApplicationReason());
- applications.setAttachmentUrl(propertyDTO.getAttachmentUrl());
+ BeanUtils.copyProperties(propertyDTO, applications);
} else if (dto instanceof OaApprovalApplicationStorageVehicleDTO) {
OaApprovalApplicationStorageVehicleDTO vehicleDTO = (OaApprovalApplicationStorageVehicleDTO) dto;
- applications.setApplicantUserId(vehicleDTO.getApplicantUserId());
- applications.setApplicantName(vehicleDTO.getApplicantName());
- applications.setDeptId(vehicleDTO.getDeptId());
- applications.setDeptName(vehicleDTO.getDeptName());
- applications.setApplicationDate(LocalDate.now());
- applications.setApplicationReason(vehicleDTO.getApplicationReason());
- applications.setAttachmentUrl(vehicleDTO.getAttachmentUrl());
+ BeanUtils.copyProperties(vehicleDTO, applications);
}
-
+ applications.setApprovalId(ApprovalTypeEnum.IN_STOCK.getCode());
+ applications.setApplicationDate(LocalDate.now());
applications.setApplicationCode(generateApplicationCode());
- applications.setDisabled(0);
applications.setApprovalStatus(ApprovalStatusEnum.PENDING.getCode());
return applications;
}
@@ -449,26 +379,17 @@
*/
private OaApprovalApplicationStorage buildOaApprovalApplicationStorage(Object dto, Integer applicationId) {
OaApprovalApplicationStorage storage = new OaApprovalApplicationStorage();
- storage.setApprovalApplicationId(applicationId.intValue());
+ storage.setApprovalApplicationId(applicationId);
if (dto instanceof OaApprovalApplicationStorageGeneralDTO) {
OaApprovalApplicationStorageGeneralDTO generalDTO = (OaApprovalApplicationStorageGeneralDTO) dto;
- storage.setTitle(generalDTO.getTitle());
- storage.setAssetTypeId(generalDTO.getAssetTypeId());
- storage.setStorageType(generalDTO.getStorageType());
- storage.setStorageTime(generalDTO.getStorageTime());
+ BeanUtils.copyProperties(generalDTO, storage);
} else if (dto instanceof OaApprovalApplicationStoragePropertyDTO) {
OaApprovalApplicationStoragePropertyDTO propertyDTO = (OaApprovalApplicationStoragePropertyDTO) dto;
- storage.setTitle(propertyDTO.getTitle());
- storage.setAssetTypeId(propertyDTO.getAssetTypeId());
- storage.setStorageType(propertyDTO.getStorageType());
- storage.setStorageTime(propertyDTO.getStorageTime());
+ BeanUtils.copyProperties(propertyDTO, storage);
} else if (dto instanceof OaApprovalApplicationStorageVehicleDTO) {
OaApprovalApplicationStorageVehicleDTO vehicleDTO = (OaApprovalApplicationStorageVehicleDTO) dto;
- storage.setTitle(vehicleDTO.getTitle());
- storage.setAssetTypeId(vehicleDTO.getAssetTypeId());
- storage.setStorageType(vehicleDTO.getStorageType());
- storage.setStorageTime(vehicleDTO.getStorageTime());
+ BeanUtils.copyProperties(vehicleDTO, storage);
}
return storage;
@@ -494,31 +415,6 @@
return prefix + sequenceStr;
}
- /**
- * 生成资产编码
- * 格式：资产类型一级分类简写+资产类型子类简写+入库日期+【-】+数量顺序编号（4位）
- * 例如：GDFC20250917-0001
- */
- private 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 = assetMainService.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 IPage<OaApprovalApplicationStoragePageVO> getPageList(OaApprovalApplicationStoragePageQuery pageQuery) {
Page<OaApprovalApplicationStoragePageVO> page = new Page<>(pageQuery.getPageNum(), pageQuery.getPageSize());
@@ -526,14 +422,15 @@
}
@Override
- public OaApprovalApplicationStorageGeneralDetailVO getGeneralDetail(Integer storageId) {
- OaApprovalApplicationStorage storage = this.getById(storageId);
- if (storage == null) {
- throw new ServiceException("入库申请不存在");
- }
- OaApprovalApplications app = oaApprovalApplicationsService.getById(storage.getApprovalApplicationId());
+ public OaApprovalApplicationStorageGeneralDetailVO getGeneralDetail(Integer approvalApplicationId) {
+ OaApprovalApplications app = oaApprovalApplicationsService.getById(approvalApplicationId);
if (app == null) {
throw new ServiceException("审批主记录不存在");
+ }
+ OaApprovalApplicationStorage storage = this.lambdaQuery()
+ .eq(OaApprovalApplicationStorage::getApprovalApplicationId, approvalApplicationId).one();
+ if (storage == null) {
+ throw new ServiceException("入库申请不存在");
}
OaApprovalApplicationStorageGeneralDetailVO vo = new OaApprovalApplicationStorageGeneralDetailVO();
@@ -543,36 +440,35 @@
.eq(OaApprovalApplicationStorageAsset::getApprovalApplicationId, app.getId())
.eq(OaApprovalApplicationStorageAsset::getAssetTypeId, storage.getAssetTypeId())
.list();
- setAddressInfo(vo, mains);
-
if (!CollectionUtils.isEmpty(mains)) {
- // 批量查询权属部门，避免循环内查询
+ // 批量查询权属部门
List<Integer> ownerIds = mains.stream().map(OaApprovalApplicationStorageAsset::getOwnershipDeptId)
- .filter(id -> id != null).distinct().collect(Collectors.toList());
- Map<Integer, TDept> ownerDeptMap = ownerIds.isEmpty() ? java.util.Collections.emptyMap()
+ .filter(Objects::nonNull).distinct().collect(Collectors.toList());
+ Map<Integer, TDept> ownerDeptMap = ownerIds.isEmpty() ? Collections.emptyMap()
: tDeptService.listByIds(ownerIds).stream().collect(Collectors.toMap(TDept::getId, d -> d));
-
+ // 批量查询使用部门
+ List<Integer> useDeptIds = mains.stream().map(OaApprovalApplicationStorageAsset::getUseDeptId)
+ .filter(Objects::nonNull).distinct().collect(Collectors.toList());
+ Map<Integer, TDept> useDeptMap = useDeptIds.isEmpty() ? Collections.emptyMap()
+ : tDeptService.listByIds(useDeptIds).stream().collect(Collectors.toMap(TDept::getId, d -> d));
+ // 批量查询仓库
+ List<Integer> warehouseIds = mains.stream().map(OaApprovalApplicationStorageAsset::getWarehouseId)
+ .filter(Objects::nonNull).distinct().collect(Collectors.toList());
+ Map<Integer, AssetWarehouse> warehouseMap = warehouseIds.isEmpty() ? Collections.emptyMap()
+ : assetWarehouseService.listByIds(warehouseIds).stream().collect(Collectors.toMap(AssetWarehouse::getId, d -> d));
List<OaApprovalApplicationStorageGeneralDetailVO.GeneralAssetItemVO> items = mains.stream().map(m -> {
- OaApprovalApplicationStorageGeneralDetailVO.GeneralAssetItemVO item = new OaApprovalApplicationStorageGeneralDetailVO.GeneralAssetItemVO();
- item.setAssetOriginalCode(m.getAssetOriginalCode());
- item.setAssetName(m.getAssetName());
- item.setSpecificationModel(m.getSpecificationModel());
- item.setMeasurementUnit(m.getMeasurementUnit());
- item.setQuantity(m.getQuantity());
- item.setUnitPrice(m.getUnitPrice());
- item.setUsefulLife(m.getUsefulLife());
+ OaApprovalApplicationStorageGeneralDetailVO.GeneralAssetItemVO item = BeanUtil.copyProperties(m, OaApprovalApplicationStorageGeneralDetailVO.GeneralAssetItemVO.class);
if (m.getOwnershipDeptId() != null) {
TDept dept = ownerDeptMap.get(m.getOwnershipDeptId());
- item.setOwnerShipDeptName(dept != null ? dept.getDeptName() : null);
+ item.setOwnershipDeptName(dept != null ? dept.getDeptName() : null);
}
- item.setUserName(m.getUserName());
- item.setAssetStatus(m.getAssetStatus());
- item.setRemarks(m.getRemarks());
- item.setAccountingStatus(m.getAccountingStatus());
- item.setAccountingDate(m.getAccountingDate());
- item.setAccountingVoucherNo(m.getAccountingVoucherNo());
- item.setAccountingSubject(m.getAccountingSubject());
- item.setAccountingAmount(m.getAccountingAmount());
+ if (m.getAddressType().equals(0) && m.getUseDeptId() != null) {
+ TDept dept = useDeptMap.get(m.getUseDeptId());
+ item.setUseDeptName(dept != null ? dept.getDeptName() : null);
+ } else if (m.getAddressType().equals(1) && m.getWarehouseId() != null){
+ AssetWarehouse assetWarehouse = warehouseMap.get(m.getWarehouseId());
+ item.setWarehouseName(assetWarehouse != null ? assetWarehouse.getWarehouseName() : null);
+ }
return item;
}).collect(Collectors.toList());
vo.setAssetItems(items);
@@ -581,14 +477,15 @@
}
@Override
- public OaApprovalApplicationStoragePropertyDetailVO getPropertyDetail(Integer storageId) {
- OaApprovalApplicationStorage storage = this.getById(storageId);
- if (storage == null) {
- throw new ServiceException("入库申请不存在");
- }
- OaApprovalApplications app = oaApprovalApplicationsService.getById(storage.getApprovalApplicationId());
+ public OaApprovalApplicationStoragePropertyDetailVO getPropertyDetail(Integer approvalApplicationId) {
+ OaApprovalApplications app = oaApprovalApplicationsService.getById(approvalApplicationId);
if (app == null) {
throw new ServiceException("审批主记录不存在");
+ }
+ OaApprovalApplicationStorage storage = this.lambdaQuery()
+ .eq(OaApprovalApplicationStorage::getApprovalApplicationId, approvalApplicationId).one();
+ if (storage == null) {
+ throw new ServiceException("入库申请不存在");
}
OaApprovalApplicationStoragePropertyDetailVO vo = new OaApprovalApplicationStoragePropertyDetailVO();
@@ -598,7 +495,6 @@
.eq(OaApprovalApplicationStorageAsset::getApprovalApplicationId, app.getId())
.eq(OaApprovalApplicationStorageAsset::getAssetTypeId, storage.getAssetTypeId())
.list();
- setAddressInfo(vo, mains);
if (!CollectionUtils.isEmpty(mains)) {
List<Integer> mainIds = mains.stream().map(OaApprovalApplicationStorageAsset::getId).collect(Collectors.toList());
@@ -609,28 +505,30 @@
.filter(id -> id != null).distinct().collect(Collectors.toList());
Map<Integer, TDept> ownerDeptMap = ownerIds.isEmpty() ? java.util.Collections.emptyMap()
: tDeptService.listByIds(ownerIds).stream().collect(Collectors.toMap(TDept::getId, d -> d));
+ // 批量查询使用部门
+ List<Integer> useDeptIds = mains.stream().map(OaApprovalApplicationStorageAsset::getUseDeptId)
+ .filter(Objects::nonNull).distinct().collect(Collectors.toList());
+ Map<Integer, TDept> useDeptMap = useDeptIds.isEmpty() ? Collections.emptyMap()
+ : tDeptService.listByIds(useDeptIds).stream().collect(Collectors.toMap(TDept::getId, d -> d));
+ // 批量查询仓库
+ List<Integer> warehouseIds = mains.stream().map(OaApprovalApplicationStorageAsset::getWarehouseId)
+ .filter(Objects::nonNull).distinct().collect(Collectors.toList());
+ Map<Integer, AssetWarehouse> warehouseMap = warehouseIds.isEmpty() ? Collections.emptyMap()
+ : assetWarehouseService.listByIds(warehouseIds).stream().collect(Collectors.toMap(AssetWarehouse::getId, d -> d));
List<OaApprovalApplicationStoragePropertyDetailVO.PropertyAssetItemVO> items = mains.stream().map(m -> {
- OaApprovalApplicationStoragePropertyDetailVO.PropertyAssetItemVO item = new OaApprovalApplicationStoragePropertyDetailVO.PropertyAssetItemVO();
- item.setAssetOriginalCode(m.getAssetOriginalCode());
- item.setAssetName(m.getAssetName());
- item.setSpecificationModel(m.getSpecificationModel());
- item.setMeasurementUnit(m.getMeasurementUnit());
- item.setQuantity(m.getQuantity());
- item.setUnitPrice(m.getUnitPrice());
- item.setUsefulLife(m.getUsefulLife());
+ OaApprovalApplicationStoragePropertyDetailVO.PropertyAssetItemVO item = BeanUtil.copyProperties(m, OaApprovalApplicationStoragePropertyDetailVO.PropertyAssetItemVO.class);
if (m.getOwnershipDeptId() != null) {
TDept dept = ownerDeptMap.get(m.getOwnershipDeptId());
- item.setOwnerShipDeptName(dept != null ? dept.getDeptName() : null);
+ item.setOwnershipDeptName(dept != null ? dept.getDeptName() : null);
}
- item.setUserName(m.getUserName());
- item.setAssetStatus(m.getAssetStatus());
- item.setRemarks(m.getRemarks());
- item.setAccountingStatus(m.getAccountingStatus());
- item.setAccountingDate(m.getAccountingDate());
- item.setAccountingVoucherNo(m.getAccountingVoucherNo());
- item.setAccountingSubject(m.getAccountingSubject());
- item.setAccountingAmount(m.getAccountingAmount());
+ if (m.getAddressType().equals(0) && m.getUseDeptId() != null) {
+ TDept dept = useDeptMap.get(m.getUseDeptId());
+ item.setUseDeptName(dept != null ? dept.getDeptName() : null);
+ } else if (m.getAddressType().equals(1) && m.getWarehouseId() != null){
+ AssetWarehouse assetWarehouse = warehouseMap.get(m.getWarehouseId());
+ item.setWarehouseName(assetWarehouse != null ? assetWarehouse.getWarehouseName() : null);
+ }
OaApprovalApplicationStorageAssetPropertyExt ext = extMap.get(m.getId());
if (ext != null) {
item.setRegion(ext.getRegion());
@@ -658,14 +556,15 @@
}
@Override
- public OaApprovalApplicationStorageVehicleDetailVO getVehicleDetail(Integer storageId) {
- OaApprovalApplicationStorage storage = this.getById(storageId);
- if (storage == null) {
- throw new ServiceException("入库申请不存在");
- }
- OaApprovalApplications app = oaApprovalApplicationsService.getById(storage.getApprovalApplicationId());
+ public OaApprovalApplicationStorageVehicleDetailVO getVehicleDetail(Integer approvalApplicationId) {
+ OaApprovalApplications app = oaApprovalApplicationsService.getById(approvalApplicationId);
if (app == null) {
throw new ServiceException("审批主记录不存在");
+ }
+ OaApprovalApplicationStorage storage = this.lambdaQuery()
+ .eq(OaApprovalApplicationStorage::getApprovalApplicationId, approvalApplicationId).one();
+ if (storage == null) {
+ throw new ServiceException("入库申请不存在");
}
OaApprovalApplicationStorageVehicleDetailVO vo = new OaApprovalApplicationStorageVehicleDetailVO();
@@ -675,7 +574,6 @@
.eq(OaApprovalApplicationStorageAsset::getApprovalApplicationId, app.getId())
.eq(OaApprovalApplicationStorageAsset::getAssetTypeId, storage.getAssetTypeId())
.list();
- setAddressInfo(vo, mains);
if (!CollectionUtils.isEmpty(mains)) {
List<Integer> mainIds = mains.stream().map(OaApprovalApplicationStorageAsset::getId).collect(Collectors.toList());
@@ -686,28 +584,29 @@
.filter(id -> id != null).distinct().collect(Collectors.toList());
Map<Integer, TDept> ownerDeptMap = ownerIds.isEmpty() ? java.util.Collections.emptyMap()
: tDeptService.listByIds(ownerIds).stream().collect(Collectors.toMap(TDept::getId, d -> d));
-
+ // 批量查询使用部门
+ List<Integer> useDeptIds = mains.stream().map(OaApprovalApplicationStorageAsset::getUseDeptId)
+ .filter(Objects::nonNull).distinct().collect(Collectors.toList());
+ Map<Integer, TDept> useDeptMap = useDeptIds.isEmpty() ? Collections.emptyMap()
+ : tDeptService.listByIds(useDeptIds).stream().collect(Collectors.toMap(TDept::getId, d -> d));
+ // 批量查询仓库
+ List<Integer> warehouseIds = mains.stream().map(OaApprovalApplicationStorageAsset::getWarehouseId)
+ .filter(Objects::nonNull).distinct().collect(Collectors.toList());
+ Map<Integer, AssetWarehouse> warehouseMap = warehouseIds.isEmpty() ? Collections.emptyMap()
+ : assetWarehouseService.listByIds(warehouseIds).stream().collect(Collectors.toMap(AssetWarehouse::getId, d -> d));
List<OaApprovalApplicationStorageVehicleDetailVO.VehicleAssetItemVO> items = mains.stream().map(m -> {
- OaApprovalApplicationStorageVehicleDetailVO.VehicleAssetItemVO item = new OaApprovalApplicationStorageVehicleDetailVO.VehicleAssetItemVO();
- item.setAssetOriginalCode(m.getAssetOriginalCode());
- item.setAssetName(m.getAssetName());
- item.setSpecificationModel(m.getSpecificationModel());
- item.setMeasurementUnit(m.getMeasurementUnit());
- item.setQuantity(m.getQuantity());
- item.setUnitPrice(m.getUnitPrice());
- item.setUsefulLife(m.getUsefulLife());
+ OaApprovalApplicationStorageVehicleDetailVO.VehicleAssetItemVO item = BeanUtil.copyProperties(m, OaApprovalApplicationStorageVehicleDetailVO.VehicleAssetItemVO.class);
if (m.getOwnershipDeptId() != null) {
TDept dept = ownerDeptMap.get(m.getOwnershipDeptId());
- item.setOwnerShipDeptName(dept != null ? dept.getDeptName() : null);
+ item.setOwnershipDeptName(dept != null ? dept.getDeptName() : null);
}
- item.setUserName(m.getUserName());
- item.setAssetStatus(m.getAssetStatus());
- item.setRemarks(m.getRemarks());
- item.setAccountingStatus(m.getAccountingStatus());
- item.setAccountingDate(m.getAccountingDate());
- item.setAccountingVoucherNo(m.getAccountingVoucherNo());
- item.setAccountingSubject(m.getAccountingSubject());
- item.setAccountingAmount(m.getAccountingAmount());
+ if (m.getAddressType().equals(0) && m.getUseDeptId() != null) {
+ TDept dept = useDeptMap.get(m.getUseDeptId());
+ item.setUseDeptName(dept != null ? dept.getDeptName() : null);
+ } else if (m.getAddressType().equals(1) && m.getWarehouseId() != null){
+ AssetWarehouse assetWarehouse = warehouseMap.get(m.getWarehouseId());
+ item.setWarehouseName(assetWarehouse != null ? assetWarehouse.getWarehouseName() : null);
+ }
OaApprovalApplicationStorageAssetVehicleExt ext = extMap.get(m.getId());
if (ext != null) {
item.setLicensePlate(ext.getLicensePlate());
@@ -733,6 +632,7 @@
v.setDeptName(app.getDeptName());
v.setApplicantUserId(app.getApplicantUserId());
v.setApplicantName(app.getApplicantName());
+ v.setApprovalStatus(app.getApprovalStatus());
v.setApplicationDate(app.getApplicationDate());
v.setApplicationReason(app.getApplicationReason());
v.setAttachmentUrl(app.getAttachmentUrl());
@@ -746,6 +646,7 @@
v.setDeptName(app.getDeptName());
v.setApplicantUserId(app.getApplicantUserId());
v.setApplicantName(app.getApplicantName());
+ v.setApprovalStatus(app.getApprovalStatus());
v.setApplicationDate(app.getApplicationDate());
v.setApplicationReason(app.getApplicationReason());
v.setAttachmentUrl(app.getAttachmentUrl());
@@ -759,6 +660,7 @@
v.setDeptName(app.getDeptName());
v.setApplicantUserId(app.getApplicantUserId());
v.setApplicantName(app.getApplicantName());
+ v.setApprovalStatus(app.getApprovalStatus());
v.setApplicationDate(app.getApplicationDate());
v.setApplicationReason(app.getApplicationReason());
v.setAttachmentUrl(app.getAttachmentUrl());
@@ -766,51 +668,6 @@
v.setAssetTypeId(storage.getAssetTypeId());
v.setStorageType(storage.getStorageType());
v.setStorageTime(storage.getStorageTime());
- }
- }
-
- private void setAddressInfo(Object vo, List<OaApprovalApplicationStorageAsset> mains) {
- if (CollectionUtils.isEmpty(mains)) {
- return;
- }
- OaApprovalApplicationStorageAsset sample = mains.get(0);
- Integer addressType = null;
- String useDeptName = null;
- String warehouseName = null;
- String address = null;
- switch (sample.getAddressType()) {
- case 0:
- TDept dept = tDeptService.getById(sample.getUseDeptId());
- useDeptName = dept != null ? dept.getDeptName() : null;
- break;
- case 1:
- AssetWarehouse wh = assetWarehouseService.getById(sample.getWarehouseId());
- warehouseName = wh != null ? wh.getWarehouseName() : null;
- break;
- case 2:
- break;
- default:
- return;
- }
-
- if (vo instanceof OaApprovalApplicationStorageGeneralDetailVO) {
- OaApprovalApplicationStorageGeneralDetailVO v = (OaApprovalApplicationStorageGeneralDetailVO) vo;
- v.setAddressType(sample.getAddressType());
- v.setUseDeptName(useDeptName);
- v.setWarehouseName(warehouseName);
- v.setAddress(sample.getAddress());
- } else if (vo instanceof OaApprovalApplicationStoragePropertyDetailVO) {
- OaApprovalApplicationStoragePropertyDetailVO v = (OaApprovalApplicationStoragePropertyDetailVO) vo;
- v.setAddressType(sample.getAddressType());
- v.setUseDeptName(useDeptName);
- v.setWarehouseName(warehouseName);
- v.setAddress(sample.getAddress());
- } else if (vo instanceof OaApprovalApplicationStorageVehicleDetailVO) {
- OaApprovalApplicationStorageVehicleDetailVO v = (OaApprovalApplicationStorageVehicleDetailVO) vo;
- v.setAddressType(sample.getAddressType());
- v.setUseDeptName(useDeptName);
- v.setWarehouseName(warehouseName);
- v.setAddress(sample.getAddress());
}
}
@@ -818,7 +675,38 @@
public PageInfo<StorageListVO> pageList(ApprovalDetailQuery query) {
PageInfo<StorageListVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
List<StorageListVO> list = this.baseMapper.pageList(query,pageInfo);
+ for (StorageListVO storageListVO : list) {
+ BigDecimal value = new BigDecimal(storageListVO.getQuantity()).multiply(storageListVO.getUnitPrice()).setScale(2, RoundingMode.HALF_UP);
+ storageListVO.setTotalValue(value);
+ }
pageInfo.setRecords(list);
return pageInfo;
}
+
+ @Transactional(rollbackFor = Exception.class)
+ @Override
+ public void removeByApplicationId(Integer id) {
+ //删除入库申请相关数据
+ this.lambdaUpdate().eq(OaApprovalApplicationStorage::getApprovalApplicationId, id).remove();
+ List<OaApprovalApplicationStorageAsset> list = oaApprovalApplicationStorageAssetService.lambdaQuery()
+ .eq(OaApprovalApplicationStorageAsset::getApprovalApplicationId, id).list();
+ List<Integer> storageAssetIds = list.stream().map(OaApprovalApplicationStorageAsset::getId).collect(Collectors.toList());
+ if (CollUtil.isNotEmpty(storageAssetIds)) {
+ //删除资产申请扩展表数据
+ OaApprovalApplicationStorageAsset oaApprovalApplicationStorageAsset = list.get(0);
+ if (oaApprovalApplicationStorageAsset.getAssetMainType().equals(AssetTypeEnum.HOUSE.getCode())) {
+ oaApprovalApplicationStorageAssetPropertyExtService.lambdaUpdate()
+ .in(OaApprovalApplicationStorageAssetPropertyExt::getStorageAssetId, storageAssetIds).remove();
+
+ }else if (oaApprovalApplicationStorageAsset.getAssetMainType().equals(AssetTypeEnum.VEHICLE.getCode())) {
+ oaApprovalApplicationStorageAssetVehicleExtService.lambdaUpdate()
+ .in(OaApprovalApplicationStorageAssetVehicleExt::getStorageAssetId, storageAssetIds).remove();
+ }
+ }
+ //删除资产申请主表数据
+ oaApprovalApplicationStorageAssetService.lambdaUpdate()
+ .eq(OaApprovalApplicationStorageAsset::getApprovalApplicationId, id).remove();
+ //删除入库申请单
+ oaApprovalApplicationsService.removeById(id);
+ }
}
--
Gitblit v1.7.1