更新了首页,新增了未分配股份(完整版)

ruoyi-equity/src/main/java/com/ruoyi/equity/controller/EquityMessageRecordController.java

@@ -75,6 +75,7 @@ public class EquityMessageRecordController extends BaseController
     {
         startPage();
         List<EquityMessageRecordVO> list = equityMessageRecordService.selectEquityMessageRecordList(equityMessageRecord);
+
         return getDataTable(list);
     }
 

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

@@ -9,14 +9,17 @@ 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.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
-
+@AllArgsConstructor
+@NoArgsConstructor
 @Data
 public class ShareholderUpPicVO implements INode2<ShareholderUpPicVO> {
 
@@ -56,6 +59,7 @@ public class ShareholderUpPicVO implements INode2<ShareholderUpPicVO> {
     @JsonSerialize(using = BigDecimalSerializer.class)
     private BigDecimal shareholdingRatio;
 
+    @ApiModelProperty("未分配股份")
     private BigDecimal notAssigned;
 
     @ApiModelProperty(value = "未分配股份")

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

@@ -161,13 +161,18 @@ public class ShareholderInfoServiceImpl extends ServiceImpl<ShareholderInfoMappe
                 upNodes.forEach(upNode -> {
                     Long parentId = upNode.getParentId();
                     Long id = upNode.getId();
-                    if (parentId == 1) {
-                        BigDecimal assigned = shareholderInfoMapper.getNotAssigned(id);
+                    //不做if判断了
+                 //   if (parentId == 1) {}
+                    BigDecimal assigned = shareholderInfoMapper.getNotAssigned(id);
+                        if ( assigned == null){
+                            assigned = BigDecimal.ZERO;
+                        }
+
                         BigDecimal hundred = new BigDecimal("100");
                         BigDecimal result = hundred.subtract(assigned);
                         upNode.setNotAssigned(result);
                         upNode.setNotAssigned(result);
-                    }
+
                 });
                 ups = ForestNodeMerger2.merge(upNodes);