更新了首页,新增了未分配股份

ruoyi-equity/src/main/java/com/ruoyi/equity/domain/vo/ShareholderUpPicVO.java

@@ -9,6 +9,7 @@ import com.ruoyi.common.utils.CommonUtils;
 import com.ruoyi.equity.config.BigDecimalSerializer;
 import com.ruoyi.equity.utils.INode2;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Builder;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -55,9 +56,25 @@ public class ShareholderUpPicVO implements INode2<ShareholderUpPicVO> {
     @JsonSerialize(using = BigDecimalSerializer.class)
     private BigDecimal shareholdingRatio;
 
+    private BigDecimal notAssigned;
+
+    @ApiModelProperty(value = "未分配股份")
+    @JsonProperty("notAssigned")
+    private String getNotAssigned(){
+        if (Objects.isNull(notAssigned)){
+            return null;
+        }
+        return notAssigned.stripTrailingZeros().toPlainString()+"%";
+    } ;
+
+
+
     @ApiModelProperty(value = "股份占比值")
     @JsonProperty("percent")
     public String getPercent(){
+        if (Objects.isNull(shareholdingRatio)){
+            return null;
+        }
         return shareholdingRatio.stripTrailingZeros().toPlainString()+"%";
     }
 

ruoyi-equity/src/main/java/com/ruoyi/equity/mapper/ShareholderInfoMapper.java

@@ -1,5 +1,6 @@
 package com.ruoyi.equity.mapper;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -81,4 +82,6 @@ public interface ShareholderInfoMapper extends BaseMapper<ShareholderInfo>
     Long selectShareholderRoleIdByUserId(Long userId);
 
     List<ShareholderUpPicVO> getOneSelfNode( @Param("shareholderId") Long shareholderId,@Param("ancestors") List<Long> ancestors);
+
+    BigDecimal getNotAssigned(Long id);
 }

ruoyi-equity/src/main/java/com/ruoyi/equity/service/impl/ShareholderInfoServiceImpl.java

@@ -149,7 +149,6 @@ public class ShareholderInfoServiceImpl extends ServiceImpl<ShareholderInfoMappe
 
             log.info("当前登录用户所绑定的股东：{}", shareholderInfo.getShareholderName());
 
-
             List<ShareholderUpPicVO> ups;
             //如果是普通股东，查普通股东自己的
             if (shareholderRoleId == USER_ROLE_ID) {
@@ -158,9 +157,21 @@ public class ShareholderInfoServiceImpl extends ServiceImpl<ShareholderInfoMappe
             } else {
                 //获取主体上层的所有节点
                 List<ShareholderUpPicVO> upNodes = shareholderInfoMapper.getAllUpNode();
+                //计算 已经配股
+                upNodes.forEach(upNode -> {
+                    Long parentId = upNode.getParentId();
+                    Long id = upNode.getId();
+                    if (parentId == 1) {
+                        BigDecimal assigned = shareholderInfoMapper.getNotAssigned(id);
+                        BigDecimal hundred = new BigDecimal("100");
+                        BigDecimal result = hundred.subtract(assigned);
+                        upNode.setNotAssigned(result);
+                        upNode.setNotAssigned(result);
+                    }
+                });
                 ups = ForestNodeMerger2.merge(upNodes);
-            }
 
+            }
 
             if (!ups.isEmpty()) {
                 List<ShareholderUpPicVO> parents = ups.get(0).getParents();
@@ -169,9 +180,9 @@ public class ShareholderInfoServiceImpl extends ServiceImpl<ShareholderInfoMappe
                     setShareholdingRatio(parents, info.getCompanyValuation());
                 }
                 vo.setParents(parents);
+//                ups.get(0).getParents().get(0).setShareholdingRatio(null);
             }
 
-
             //获取主体下层的所有节点
             List<ShareholderDownPicVO> downNodes = shareholderInfoMapper.getAllDownNode();
             List<ShareholderDownPicVO> downs = ForestNodeMerger.merge(downNodes);

ruoyi-equity/src/main/resources/mapper/equity/ShareholderInfoMapper.xml

@@ -103,6 +103,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </choose>
 
     </select>
+    <select id="getNotAssigned" resultType="java.math.BigDecimal">
+        select sum(shareholding_ratio) from e_shareholder_info where parent_id =${id};
+    </select>
 
     <insert id="insertShareholderInfo" parameterType="ShareholderInfo" useGeneratedKeys="true" keyProperty="shareholderId">
         insert into e_shareholder_info