更新了股东信息下拉列表

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

@@ -1,5 +1,7 @@
 package com.ruoyi.equity.controller;
 
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
@@ -147,7 +149,6 @@ public class ShareholderInfoController extends BaseController {
         return toAjax(shareholderInfoService.deleteShareholderInfoByShareholderIds(shareholderIds));
     }
 
-
     /**
      * 导出股东信息
      */
@@ -159,7 +160,11 @@ public class ShareholderInfoController extends BaseController {
         ExcelUtil<ShareholderInfoVO> util = new ExcelUtil<>(ShareholderInfoVO.class);
         util.hideColumn("controlledCompany");
         util.convertByExp("shareholderType","1=个人主题,2=公司主体","");
-        util.exportExcel(response, list, "股东信息表");
+        /*SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH-mm-ss");
+        Date date = new Date();
+        String formattedDate = formatter.format(date);*/
+        String sheetName1 = "股东信息表 ";
+        util.exportExcel(response , list , sheetName1 );
     }
     /**
      * 导入信息表

ruoyi-equity/src/main/java/com/ruoyi/equity/domain/dto/ShareholderInfoDTO.java

@@ -1,6 +1,7 @@
 package com.ruoyi.equity.domain.dto;
 
 import com.ruoyi.equity.domain.ShareholderInfo;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -16,11 +17,9 @@ public class ShareholderInfoDTO extends ShareholderInfo {
     @ApiModelProperty("股东名称")
     private String shareholderName;
 
-    /** 股东类型 */
     @ApiModelProperty("股东类型")
     private String shareholderType;
 
-
     @ApiModelProperty("公司名称")
     private String companyName;
 

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

@@ -33,7 +33,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where (esi.is_subject = 1 or esi.node_type in (1, 0))
             <if test="shareholderName != null  and shareholderName != ''"> and esi.shareholder_name like concat('%', #{shareholderName}, '%')</if>
             <if test="shareholderType != null  and shareholderType != ''"> and esi.shareholder_type = #{shareholderType}</if>
-            <if test="companyName != null and companyName !=''"> and (select shareholder_name from e_shareholder_info e where e.shareholder_id = esi.controlled_company )  like concat('%', #{companyName}, '%')</if>
+            <if test="controlledCompany != null"> and esi.controlled_company = #{controlledCompany}</if>
+            <!-- <if test="companyName != null and companyName !=''"> and (select shareholder_name from e_shareholder_info e where e.shareholder_id = esi.controlled_company )  like concat('%', #{companyName}, '%')</if>-->
         order by update_time desc
     </select>