优化了上传导出股东信息

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

@@ -10,6 +10,7 @@ import com.ruoyi.equity.domain.vo.ShareholderPicVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.catalina.User;
+import org.apache.poi.ss.formula.functions.T;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -155,9 +156,10 @@ public class ShareholderInfoController extends BaseController {
     public void exportEquityInfo(HttpServletResponse response) {
         List<ShareholderInfoVO> list = shareholderInfoService.selectShareholderInfoListByIds();
         ExcelUtil<ShareholderInfoVO> util = new ExcelUtil<>(ShareholderInfoVO.class);
+        util.hideColumn("controlledCompany");
+        util.convertByExp("shareholderType","1=个人主题,2=公司主体","");
         util.exportExcel(response, list, "股东信息表");
     }
-
     /**
      * 导入信息表
      */
@@ -188,7 +190,7 @@ public class ShareholderInfoController extends BaseController {
      */
     @ApiOperation("股东退股")
     @GetMapping("/getExitShareholderId")
-    public R shareHolderExit(Long shareholderId){
+    public R<T> shareHolderExit(Long shareholderId){
          shareholderInfoService.exitUpdateById(shareholderId);
         return R.ok();
     }

ruoyi-equity/src/main/java/com/ruoyi/equity/domain/ShareholderInfo.java

@@ -15,6 +15,7 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
+import org.springframework.data.annotation.Transient;
 import org.springframework.stereotype.Component;
 
 /**
@@ -53,7 +54,7 @@ public class ShareholderInfo extends BaseEntity
 
     /** 股东类型 */
     @ApiModelProperty("股东类型")
-    @Excel(name = "股东类型")
+    @Excel(name = "股东类型", readConverterExp = "1=个人主体,2=公司主体" ,width = 10, height = 25)
     private String shareholderType;
 
     /** 股份占比 */
@@ -66,10 +67,11 @@ public class ShareholderInfo extends BaseEntity
     @Excel(name = "受控公司(股东中为公司类型的数据)")
     private Long controlledCompany;
 
-    /** 缺少的股东信息表 中的公司信息回显：**/
+/*    * 缺少的股东信息表 中的公司信息回显：*
     @ApiModelProperty("所在公司")
     @Excel(name = "所在公司")
-    private String companyName;
+    @Transient
+    private String companyName;*/
 
     /** 公司估值 */
     @ApiModelProperty("公司估值")

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

@@ -7,6 +7,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.springframework.data.annotation.Transient;
 import org.springframework.stereotype.Component;
 
 import javax.validation.constraints.NotNull;
@@ -17,7 +18,6 @@ import java.math.BigDecimal;
 @Component
 public class ShareholderInfoVO {
     private static final long serialVersionUID = 1L;
-
     /** 股东ID */
     @TableId(type = IdType.AUTO)
     @ApiModelProperty("股东ID")
@@ -33,14 +33,14 @@ public class ShareholderInfoVO {
 
     /** 股东名称 */
     @ApiModelProperty("股东名称")
-    @Excel(name = "股东名称")
+    @Excel(name = "股东名称" ,width = 30, height = 25)
     @NotNull(message = "股东名称不能为空")
     private String shareholderName;
 
     /** 股东类型 */
     @ApiModelProperty("股东类型")
-    @Excel(name = "股东类型")
     @NotNull(message = "股东类型不能为空")
+    @Excel(name = "股东类型", readConverterExp = "1=个人主体,2=公司主体,个人主体=1，公司主体=2" ,width = 10, height = 25)
     private String shareholderType;
 
     /** 股份占比 */
@@ -50,13 +50,14 @@ public class ShareholderInfoVO {
 
     /** 受控公司(股东中为公司类型的数据) */
     @ApiModelProperty("受控公司")
-    @Excel(name = "受控公司(股东中为公司类型的数据)")
+    @Excel(name = "受控公司")
     private Long controlledCompany;
 
 
     /** 缺少的股东信息表 中的公司信息回显：**/
     @ApiModelProperty("所在公司")
-    @Excel(name = "所在公司")
+    @Excel(name = "所在公司" ,width = 35, height = 25)
+    @Transient
     private String companyName;
 
     /** 公司估值 */
@@ -66,7 +67,7 @@ public class ShareholderInfoVO {
 
     /** 是否为主体公司 */
     @ApiModelProperty("是否为主体公司")
-    @Excel(name = "是否为主体公司")
+    @Excel(name = "是否为主体公司", readConverterExp = "0=否,1=是"  ,width = 15, height = 25)
     @NotNull(message = "是否为主体公司不能为空")
     private Long isSubject;
 
@@ -76,7 +77,7 @@ public class ShareholderInfoVO {
 
     /** 返回股东备注 **/
     @ApiModelProperty("备注")
-    @Excel(name = "备注")
+    @Excel(name = "备注" ,width = 30, height = 25)
     private String remark;
 
 

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

@@ -270,6 +270,7 @@ public class ShareholderInfoServiceImpl extends ServiceImpl<ShareholderInfoMappe
                 } else if (updateSupport) {
                     BeanValidators.validateWithException(validator, info);
                     info.setCreateBy(operName);
+                    info.setShareholderId(id);
                     shareholderInfoMapper.updateShareholderInfo(info);
                     successNum++;
                     successMsg.append("<br/>" + successNum + "、股东名称： " + info.getShareholderName() + " 更新成功");

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

@@ -181,22 +181,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updateShareholderInfo" parameterType="ShareholderInfo">
         update e_shareholder_info
         <trim prefix="SET" suffixOverrides=",">
-            ancestors = #{ancestors},
-            <if test="parentId != null">parent_id = #{parentId},</if>
             <if test="shareholderName != null">shareholder_name = #{shareholderName},</if>
             <if test="shareholderType != null">shareholder_type = #{shareholderType},</if>
-            <if test="shareholdingRatio != null">shareholding_ratio = #{shareholdingRatio},</if>
-            <if test="controlledCompany != null">controlled_company = #{controlledCompany},</if>
-            <if test="companyValuation != null">company_valuation = #{companyValuation},</if>
-            <if test="isSubject != null">is_subject = #{isSubject},</if>
-            <if test="nodeType != null">node_type = #{nodeType},</if>
-            <if test="createBy != null">create_by = #{createBy},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="updateBy != null">update_by = #{updateBy},</if>
-            <if test="updateTime != null">update_time = #{updateTime},</if>
-            <if test="remark != null">remark = #{remark},</if>
         </trim>
-        where shareholder_id = #{shareholderId}
+        where
+            shareholder_id = #{shareholderId}
     </update>
     <update id="exitShareholderInfo" parameterType="com.ruoyi.equity.domain.ShareholderInfo">
         update e_shareholder_info