校验了一下

ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java

@@ -47,7 +47,6 @@ public class CaptchaController
     @GetMapping("/captchaImage")
     public AjaxResult getCode(HttpServletResponse response) throws IOException
     {
-        System.out.println("1111111111");
         AjaxResult ajax = AjaxResult.success();
         boolean captchaEnabled = configService.selectCaptchaEnabled();
         ajax.put("captchaEnabled", captchaEnabled);

ruoyi-common/src/main/java/com/ruoyi/common/exception/user/OnlyOneMainCompanyAllowedException.java

@@ -0,0 +1,24 @@
+package com.ruoyi.common.exception.user;
+
+public class OnlyOneMainCompanyAllowedException extends RuntimeException {
+
+    // 无参构造方法
+    public OnlyOneMainCompanyAllowedException() {
+        super("只能有一个主体公司");
+    }
+
+    // 带消息的构造方法
+    public OnlyOneMainCompanyAllowedException(String message) {
+        super(message);
+    }
+
+    // 带消息和原因的构造方法
+    public OnlyOneMainCompanyAllowedException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    // 带原因的构造方法
+    public OnlyOneMainCompanyAllowedException(Throwable cause) {
+        super(cause);
+    }
+}

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

@@ -122,7 +122,8 @@ public class ShareholderInfoController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody ShareholderInfo shareholderInfo)
     {
-        return toAjax(shareholderInfoService.insertShareholderInfo(shareholderInfo));
+        int i = shareholderInfoService.insertShareholderInfo(shareholderInfo);
+        return toAjax(i);
     }
 
     /**

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

@@ -53,6 +53,12 @@ public class BecomeShareholderRecordVO {
     @NotNull(message = "入股日期不能为空")
     private Date becomeShareholderDate;
 
+    /** 返回股东备注 **/
+    @ApiModelProperty("备注")
+    @Excel(name = "备注")
+    private String remark;
+
+
 
     //公司名称
     private String companyName;

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

@@ -11,6 +11,8 @@ import lombok.NoArgsConstructor;
 
 import org.springframework.stereotype.Component;
 
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
 import java.math.BigDecimal;
 import java.util.Date;
 
@@ -51,6 +53,11 @@ public class EquityTransferRecordVO {
     @ApiModelProperty("转让日期")
     private Date transferDate;
 
+    /** 返回股东备注 **/
+    @ApiModelProperty("备注")
+    @Excel(name = "备注")
+    private String remark;
+
     // 公司名称
     private String companyName;
     //转让人name

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

@@ -9,6 +9,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.springframework.stereotype.Component;
 
+import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
 @AllArgsConstructor
 @NoArgsConstructor
@@ -33,11 +34,13 @@ public class ShareholderInfoVO {
     /** 股东名称 */
     @ApiModelProperty("股东名称")
     @Excel(name = "股东名称")
+    @NotNull(message = "股东名称不能为空")
     private String shareholderName;
 
     /** 股东类型 */
     @ApiModelProperty("股东类型")
     @Excel(name = "股东类型")
+    @NotNull(message = "股东类型不能为空")
     private String shareholderType;
 
     /** 股份占比 */
@@ -58,12 +61,18 @@ public class ShareholderInfoVO {
     /** 是否为主体公司 */
     @ApiModelProperty("是否为主体公司")
     @Excel(name = "是否为主体公司")
+    @NotNull(message = "是否为主体公司不能为空")
     private Long isSubject;
 
     /** 节点类型1控制主体2主体控制 */
     @ApiModelProperty("节点类型1控制主体2主体控制")
     private Long nodeType;
 
+    /** 返回股东备注 **/
+    @ApiModelProperty("备注")
+    @Excel(name = "备注")
+    private String remark;
+
     /** 缺少的股东信息表 中的公司信息回显：**/
     private String companyName;
 

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

@@ -8,6 +8,7 @@ import java.util.Objects;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.exception.user.OnlyOneMainCompanyAllowedException;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.equity.domain.vo.ShareholderDownPicVO;
 import com.ruoyi.equity.domain.vo.ShareholderInfoVO;
@@ -112,36 +113,40 @@ public class ShareholderInfoServiceImpl extends ServiceImpl<ShareholderInfoMappe
 
     @Override
     public ShareholderPicVO getShareholderPic() {
-        //获取主体公司，如果未获取到，则直接提示
-        ShareholderInfo info = shareholderInfoMapper.getSubjectCompany();
-        if (Objects.isNull(info)){
-            return null;
-        }
-        //封装返回值
-        ShareholderPicVO vo =ShareholderPicVO.builder()
-                        .id(info.getShareholderId())
-                        .name(info.getShareholderName())
-                        .companyValuation(info.getCompanyValuation())
-                        .shareholdingRatio(info.getShareholdingRatio())
-                        .build();
-        //获取主体上层的所有节点
-        List<ShareholderUpPicVO> upNodes = shareholderInfoMapper.getAllUpNode();
-        List<ShareholderUpPicVO> ups = ForestNodeMerger2.merge(upNodes);
-        if (!ups.isEmpty()){
-            List<ShareholderUpPicVO> parents = ups.get(0).getParents();
-            //如果公司存在估值，则递归生成股份估值信息
-            if (Objects.nonNull(info.getCompanyValuation())){
-                setShareholdingRatio(parents,info.getCompanyValuation());
+        try {
+            //获取主体公司，如果未获取到，则直接提示
+            ShareholderInfo info = shareholderInfoMapper.getSubjectCompany();
+            if (Objects.isNull(info)){
+                return null;
             }
-            vo.setParents(parents);
-        }
-        //获取主体下层的所有节点
-        List<ShareholderDownPicVO> downNodes = shareholderInfoMapper.getAllDownNode();
-        List<ShareholderDownPicVO> downs = ForestNodeMerger.merge(downNodes);
-        if (!downs.isEmpty()){
-            vo.setChildren(downs.get(0).getChildren());
+            //封装返回值
+            ShareholderPicVO vo =ShareholderPicVO.builder()
+                            .id(info.getShareholderId())
+                            .name(info.getShareholderName())
+                            .companyValuation(info.getCompanyValuation())
+                            .shareholdingRatio(info.getShareholdingRatio())
+                            .build();
+            //获取主体上层的所有节点
+            List<ShareholderUpPicVO> upNodes = shareholderInfoMapper.getAllUpNode();
+            List<ShareholderUpPicVO> ups = ForestNodeMerger2.merge(upNodes);
+            if (!ups.isEmpty()){
+                List<ShareholderUpPicVO> parents = ups.get(0).getParents();
+                //如果公司存在估值，则递归生成股份估值信息
+                if (Objects.nonNull(info.getCompanyValuation())){
+                    setShareholdingRatio(parents,info.getCompanyValuation());
+                }
+                vo.setParents(parents);
+            }
+            //获取主体下层的所有节点
+            List<ShareholderDownPicVO> downNodes = shareholderInfoMapper.getAllDownNode();
+            List<ShareholderDownPicVO> downs = ForestNodeMerger.merge(downNodes);
+            if (!downs.isEmpty()){
+                vo.setChildren(downs.get(0).getChildren());
+            }
+            return vo;
+        } catch (Exception e) {
+            throw new OnlyOneMainCompanyAllowedException();
         }
-        return vo;
     }
 
     @Override