From 7bdd9ff0728c0a3353580962fe6ec9fcd72e025d Mon Sep 17 00:00:00 2001 From: yuyongle <1150359267@qq.com> Date: Sun, 27 Jul 2025 17:10:30 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=87=87=E8=B4=AD=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CapitalApplicationController.java | 4 +- .../dromara/property/domain/CapitalInfo.java | 2 +- .../domain/bo/CapitalApplicationBo.java | 2 +- .../property/domain/bo/CapitalInfoBo.java | 2 +- .../domain/vo/CapitalApplicationVo.java | 6 ++- .../property/domain/vo/CapitalInfoVo.java | 2 +- .../impl/CapitalApplicationServiceImpl.java | 48 +++++++++++-------- 7 files changed, 38 insertions(+), 28 deletions(-) diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/CapitalApplicationController.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/CapitalApplicationController.java index aa7da895..30ea5c89 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/CapitalApplicationController.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/CapitalApplicationController.java @@ -40,7 +40,7 @@ public class CapitalApplicationController extends BaseController { /** * 查询资产申请列表 */ - @SaCheckPermission("domain:application:list") + // @SaCheckPermission("domain:application:list") @GetMapping("/list") public TableDataInfo list(CapitalApplicationBo bo, PageQuery pageQuery) { return capitalApplicationService.queryPageList(bo, pageQuery); @@ -72,7 +72,7 @@ public class CapitalApplicationController extends BaseController { /** * 新增资产申请 */ - @SaCheckPermission("domain:application:add") + // @SaCheckPermission("domain:application:add") @Log(title = "资产申请", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/CapitalInfo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/CapitalInfo.java index 9494338c..e606735f 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/CapitalInfo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/CapitalInfo.java @@ -36,7 +36,7 @@ public class CapitalInfo extends TenantEntity { /** * 资产类型 */ - private String capitalType; + private Long capitalType; /** * 规格 diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/CapitalApplicationBo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/CapitalApplicationBo.java index f7105373..1964d3ed 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/CapitalApplicationBo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/CapitalApplicationBo.java @@ -95,7 +95,7 @@ public class CapitalApplicationBo extends BaseEntity { * 申请时间 */ private Date applicationTime; - @NotEmpty(message = "资产不能为空", groups = { AddGroup.class, EditGroup.class }) + private List capitalInfoBolist; diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/CapitalInfoBo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/CapitalInfoBo.java index 13a502bc..d8960ecf 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/CapitalInfoBo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/CapitalInfoBo.java @@ -37,7 +37,7 @@ public class CapitalInfoBo extends BaseEntity { * 资产类型 */ @NotBlank(message = "资产类型不能为空", groups = { AddGroup.class, EditGroup.class }) - private String capitalType; + private Long capitalType; /** * 规格 diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/CapitalApplicationVo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/CapitalApplicationVo.java index 420776bd..f340fcde 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/CapitalApplicationVo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/CapitalApplicationVo.java @@ -14,7 +14,7 @@ import lombok.Data; import java.io.Serial; import java.io.Serializable; import java.util.Date; - +import java.util.List; /** @@ -131,5 +131,9 @@ public class CapitalApplicationVo implements Serializable { @ExcelProperty(value = "搜索值") private String searchValue; + /** + * 资产信息 + */ + private List capitalInfoVoList; } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/CapitalInfoVo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/CapitalInfoVo.java index a7ca24f4..53e2fa8f 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/CapitalInfoVo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/CapitalInfoVo.java @@ -45,7 +45,7 @@ public class CapitalInfoVo implements Serializable { * 资产类型 */ @ExcelProperty(value = "资产类型") - private String capitalType; + private Long capitalType; /** * 规格 diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CapitalApplicationServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CapitalApplicationServiceImpl.java index 60eecb0c..ed58c698 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CapitalApplicationServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CapitalApplicationServiceImpl.java @@ -1,6 +1,7 @@ package org.dromara.property.service.impl; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.ObjectUtil; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.TableDataInfo; @@ -11,7 +12,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.dromara.property.domain.*; -import org.dromara.property.domain.vo.CostItemsVo; +import org.dromara.property.domain.vo.CapitalInfoVo; import org.dromara.property.mapper.*; import org.springframework.stereotype.Service; import org.dromara.property.domain.bo.CapitalApplicationBo; @@ -19,10 +20,7 @@ import org.dromara.property.domain.vo.CapitalApplicationVo; import org.dromara.property.service.ICapitalApplicationService; import org.springframework.transaction.annotation.Transactional; -import java.util.Date; -import java.util.List; -import java.util.Map; -import java.util.Collection; +import java.util.*; /** * 资产申请Service业务层处理 @@ -86,16 +84,20 @@ public class CapitalApplicationServiceImpl implements ICapitalApplicationService if (CollUtil.isNotEmpty(suppliersList)) { Suppliers suppliers = suppliersList.stream() .filter(vo -> vo.getId() != null && vo.getId().equals(capitalApplicationVo.getSupplier())).findFirst().orElse(null); - capitalApplicationVo.setSupplierName(suppliers.getSuppliersName()); + capitalApplicationVo.setSupplierName(ObjectUtil.isNotEmpty(suppliers)?suppliers.getSuppliersName():null); } if (CollUtil.isNotEmpty(residentPeopleList)) { ResidentPerson residentPerson = residentPeopleList.stream() .filter(vo -> vo.getId() != null && vo.getId().equals(capitalApplicationVo.getApplicat())).findFirst().orElse(null); - capitalApplicationVo.setApplicatName(residentPerson.getUserName()); + capitalApplicationVo.setApplicatName(ObjectUtil.isNotEmpty(residentPerson)?residentPerson.getUserName():null); ResidentPerson residentPersons = residentPeopleList.stream() .filter(vo -> vo.getId() != null && vo.getId().equals(capitalApplicationVo.getAudit())).findFirst().orElse(null); - capitalApplicationVo.setAuditName(residentPersons.getUserName()); + capitalApplicationVo.setAuditName(ObjectUtil.isNotEmpty(residentPersons)?residentPersons.getUserName():null); } + LambdaQueryWrapper capitalInfoWrapper = new LambdaQueryWrapper<>(); + capitalInfoWrapper.eq(CapitalInfo::getCapitalApplicationId,capitalApplicationVo.getId()); + List capitalInfoVoList = capitalMapper.selectVoList(capitalInfoWrapper); + capitalApplicationVo.setCapitalInfoVoList(capitalInfoVoList); } /** @@ -137,6 +139,7 @@ public class CapitalApplicationServiceImpl implements ICapitalApplicationService @Transactional(rollbackFor = Exception.class) public Boolean insertByBo(CapitalApplicationBo bo) { CapitalApplication add = MapstructUtils.convert(bo, CapitalApplication.class); + validEntityBeforeSave(add); boolean flag = baseMapper.insert(add) > 0; if (flag) { bo.setId(add.getId()); @@ -145,7 +148,7 @@ public class CapitalApplicationServiceImpl implements ICapitalApplicationService CapitalInfo capitalInfo = MapstructUtils.convert(s, CapitalInfo.class); capitalMapper.insert(capitalInfo); //validCapitalInfoBefore(add,capitalInfo); - validEntityBeforeSave(add); + }); } return flag; @@ -162,16 +165,19 @@ public class CapitalApplicationServiceImpl implements ICapitalApplicationService public Boolean updateByBo(CapitalApplicationBo bo) { CapitalApplication update = MapstructUtils.convert(bo, CapitalApplication.class); validEntityBeforeUpdate(update); - bo.getCapitalInfoBolist().stream().forEach(s -> { - CapitalInfo capitalInfo = MapstructUtils.convert(s, CapitalInfo.class); - capitalMapper.deleteById(capitalInfo); - capitalMapper.insert(capitalInfo); - //TODO 做一些数据校验,如唯一约束 - CapitalApplication capitalApplication = baseMapper.selectById(bo.getId()); - if (bo.getState().equals("1") && !bo.getState().equals(capitalApplication.getState())) { - validCapitalInfoBefore(update, capitalInfo); - } - }); + if(CollUtil.isNotEmpty(bo.getCapitalInfoBolist())){ + bo.getCapitalInfoBolist().stream().forEach(s -> { + CapitalInfo capitalInfo = MapstructUtils.convert(s, CapitalInfo.class); + capitalMapper.deleteById(capitalInfo); + capitalMapper.insert(capitalInfo); + //TODO 做一些数据校验,如唯一约束 + CapitalApplication capitalApplication = baseMapper.selectById(bo.getId()); + if (bo.getState().equals("1") && !bo.getState().equals(capitalApplication.getState())) { + validCapitalInfoBefore(update, capitalInfo); + } + }); + } + return baseMapper.updateById(update) > 0; } @@ -186,7 +192,7 @@ public class CapitalApplicationServiceImpl implements ICapitalApplicationService List assets = assetsMapper.selectList(assetQueryWrapper); if (assets.isEmpty()) { Asset asset = new Asset(); - asset.setModel(capitalInfo.getCapitalType()); + asset.setModel(capitalInfo.getCapitalType().toString()); asset.setName(capitalInfo.getCapitalName()); asset.setSpecs(capitalInfo.getSpec()); asset.setSpecs(capitalInfo.getSpec()); @@ -214,7 +220,7 @@ public class CapitalApplicationServiceImpl implements ICapitalApplicationService * 保存前的数据校验 */ private void validEntityBeforeSave(CapitalApplication entity) { - + entity.setState("0"); } /**