Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks

2025-07-27 21:01:18 +08:00
parent ae44ccb565 56dcc609d1
commit b3813dfe75
9 changed files with 104 additions and 77 deletions
--- 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<CapitalApplicationVo> 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()
--- 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;

    /**
     * 规格
--- 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<CapitalInfoBo> capitalInfoBolist;


--- 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;

    /**
     * 规格
--- 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<CapitalInfoVo> capitalInfoVoList;

 }
--- 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;

    /**
     * 规格
--- 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<CapitalInfo> capitalInfoWrapper = new LambdaQueryWrapper<>();
+        capitalInfoWrapper.eq(CapitalInfo::getCapitalApplicationId,capitalApplicationVo.getId());
+        List<CapitalInfoVo> 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<Asset> 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");
    }

    /**