更新了模糊查询 新建DTOS

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

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

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

@@ -4,6 +4,7 @@ import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
 import com.ruoyi.common.core.domain.R;
+import com.ruoyi.equity.domain.dto.SendMessageRecordDTO;
 import com.ruoyi.equity.domain.vo.SendMessageRecordVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -46,10 +47,10 @@ public class SendMessageRecordController extends BaseController
     @ApiOperation("查询消息发布列表")
     @PreAuthorize("@ss.hasPermi('equity:send-message:list')")
     @GetMapping("/list")
-    public TableDataInfo<SendMessageRecordVO> list(SendMessageRecordVO sendMessageRecord)
+    public TableDataInfo<SendMessageRecordVO> list(SendMessageRecordDTO sendMessageRecordDTO)
     {
         startPage();
-        List<SendMessageRecordVO> list = sendMessageRecordService.selectSendMessageRecordList(sendMessageRecord);
+        List<SendMessageRecordVO> list = sendMessageRecordService.selectSendMessageRecordList(sendMessageRecordDTO);
         return getDataTable(list);
     }
 

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

@@ -5,6 +5,7 @@ import javax.servlet.http.HttpServletResponse;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.ruoyi.common.core.domain.R;
+import com.ruoyi.equity.domain.dto.ShareholderInfoDTO;
 import com.ruoyi.equity.domain.vo.ShareholderInfoVO;
 import com.ruoyi.equity.domain.vo.ShareholderPicVO;
 import io.swagger.annotations.Api;
@@ -94,9 +95,9 @@ public class ShareholderInfoController extends BaseController {
     @ApiOperation("获取股东列表")
     @PreAuthorize("@ss.hasPermi('equity:info:list')")
     @GetMapping("/list")
-    public TableDataInfo<ShareholderInfoVO> list(ShareholderInfo shareholderInfo) {
+    public TableDataInfo<ShareholderInfoVO> list(ShareholderInfoDTO shareholderInfoDTO) {
         startPage();
-        List<ShareholderInfoVO> list = shareholderInfoService.selectShareholderInfoList(shareholderInfo);
+        List<ShareholderInfoVO> list = shareholderInfoService.selectShareholderInfoList(shareholderInfoDTO);
         return getDataTable(list);
     }
 

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

@@ -0,0 +1,22 @@
+package com.ruoyi.equity.domain.dto;
+
+import com.ruoyi.equity.domain.SendMessageRecord;
+import com.ruoyi.equity.domain.vo.SendMessageRecordVO;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.checkerframework.checker.units.qual.A;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@AllArgsConstructor
+@NoArgsConstructor
+@Component
+@Data
+public class SendMessageRecordDTO extends SendMessageRecord {
+    @ApiModelProperty("通知公司名称")
+    private String companyName;
+
+}

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

@@ -0,0 +1,27 @@
+package com.ruoyi.equity.domain.dto;
+
+import com.ruoyi.equity.domain.ShareholderInfo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.stereotype.Component;
+
+@AllArgsConstructor
+@NoArgsConstructor
+@Data
+@Component
+public class ShareholderInfoDTO extends ShareholderInfo {
+
+    @ApiModelProperty("股东名称")
+    private String shareholderName;
+
+    /** 股东类型 */
+    @ApiModelProperty("股东类型")
+    private String shareholderType;
+
+
+    @ApiModelProperty("公司名称")
+    private String companyName;
+
+}

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

@@ -3,6 +3,7 @@ package com.ruoyi.equity.mapper;
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.equity.domain.SendMessageRecord;
+import com.ruoyi.equity.domain.dto.SendMessageRecordDTO;
 import com.ruoyi.equity.domain.vo.SendMessageRecordVO;
 import org.apache.ibatis.annotations.Param;
 
@@ -25,10 +26,10 @@ public interface SendMessageRecordMapper extends BaseMapper<SendMessageRecord>
     /**
      * 查询消息发布列表
      * 
-     * @param sendMessageRecord 消息发布
+     * @param sendMessageRecordDTO 消息发布
      * @return 消息发布集合
      */
-    public List<SendMessageRecordVO> selectSendMessageRecordList(SendMessageRecord sendMessageRecord);
+    public List<SendMessageRecordVO> selectSendMessageRecordList(SendMessageRecordDTO sendMessageRecordDTO);
 
     /**
      * 新增消息发布

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

@@ -5,6 +5,7 @@ import java.util.List;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.equity.domain.ShareholderInfo;
+import com.ruoyi.equity.domain.dto.ShareholderInfoDTO;
 import com.ruoyi.equity.domain.vo.ShareholderDownPicVO;
 import com.ruoyi.equity.domain.vo.ShareholderInfoVO;
 import com.ruoyi.equity.domain.vo.ShareholderUpPicVO;
@@ -29,10 +30,10 @@ public interface ShareholderInfoMapper extends BaseMapper<ShareholderInfo>
     /**
      * 查询股东信息列表
      * 
-     * @param shareholderInfo 股东信息
+     * @param shareholderInfoDTO 股东信息
      * @return 股东信息集合
      */
-    public List<ShareholderInfoVO> selectShareholderInfoList(ShareholderInfo shareholderInfo);
+    public List<ShareholderInfoVO> selectShareholderInfoList(ShareholderInfoDTO shareholderInfoDTO);
 
     /**
      * 新增股东信息

ruoyi-equity/src/main/java/com/ruoyi/equity/service/ISendMessageRecordService.java

@@ -3,6 +3,7 @@ package com.ruoyi.equity.service;
 import java.util.List;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.equity.domain.SendMessageRecord;
+import com.ruoyi.equity.domain.dto.SendMessageRecordDTO;
 import com.ruoyi.equity.domain.vo.SendMessageRecordVO;
 
 /**
@@ -24,10 +25,10 @@ public interface ISendMessageRecordService extends IService<SendMessageRecord>
     /**
      * 查询消息发布列表
      * 
-     * @param sendMessageRecord 消息发布
+     * @param sendMessageRecordDTO 消息发布
      * @return 消息发布集合
      */
-    public List<SendMessageRecordVO> selectSendMessageRecordList(SendMessageRecord sendMessageRecord);
+    public List<SendMessageRecordVO> selectSendMessageRecordList(SendMessageRecordDTO sendMessageRecordDTO);
 
     /**
      * 新增消息发布

ruoyi-equity/src/main/java/com/ruoyi/equity/service/IShareholderInfoService.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.equity.domain.ShareholderInfo;
 
+import com.ruoyi.equity.domain.dto.ShareholderInfoDTO;
 import com.ruoyi.equity.domain.vo.ShareholderInfoVO;
 import com.ruoyi.equity.domain.vo.ShareholderPicVO;
 
@@ -31,7 +32,7 @@ public interface IShareholderInfoService extends IService<ShareholderInfo>
         股东信息
      * @return 股东信息集合
      */
-    public List<ShareholderInfoVO> selectShareholderInfoList(ShareholderInfo shareholderInfoDTO);
+    public List<ShareholderInfoVO> selectShareholderInfoList(ShareholderInfoDTO shareholderInfoDTO);
 
     /**
      * 新增股东信息

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

@@ -65,7 +65,7 @@ public class BecomeShareholderRecordServiceImpl extends ServiceImpl<BecomeShareh
     /**
      * 查询股东入股记录列表
      *
-     * @param becomeShareholderRecordVO 股东入股记录
+     * @param becomeShareholderRecordDTO 股东入股记录
      * @return 股东入股记录
      */
     @Override

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

@@ -13,6 +13,7 @@ import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.equity.domain.EquityMessageRecord;
 import com.ruoyi.equity.domain.ShareholderInfo;
+import com.ruoyi.equity.domain.dto.SendMessageRecordDTO;
 import com.ruoyi.equity.domain.vo.SendMessageRecordVO;
 import com.ruoyi.equity.mapper.SendMessageRecordMapper;
 import com.ruoyi.common.utils.DateUtils;
@@ -62,14 +63,14 @@ public class SendMessageRecordServiceImpl extends ServiceImpl<SendMessageRecordM
     /**
      * 查询消息发布列表
      * 
-     * @param sendMessageRecord 消息发布
+     * @param sendMessageRecordDTO 消息发布
      * @return 消息发布
      */
     @Override
-    public List<SendMessageRecordVO> selectSendMessageRecordList(SendMessageRecord sendMessageRecord)
+    public List<SendMessageRecordVO> selectSendMessageRecordList(SendMessageRecordDTO sendMessageRecordDTO)
     {
         //查询出所有的列表消息
-        List<SendMessageRecordVO> vos = sendMessageRecordMapper.selectSendMessageRecordList(sendMessageRecord);
+        List<SendMessageRecordVO> vos = sendMessageRecordMapper.selectSendMessageRecordList(sendMessageRecordDTO);
         if (CollectionUtil.isNotEmpty(vos)) {
             //获取出所有的消息发布接收人并按照消息id分组
             List<Long> sendIds = vos.stream().map(SendMessageRecord::getSendMessageId).collect(Collectors.toList());

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

@@ -2,19 +2,16 @@ package com.ruoyi.equity.service.impl;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
-import java.time.LocalDateTime;
-import java.time.ZoneId;
-import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.stream.Collectors;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.exception.user.OnlyOneMainCompanyAllowedException;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.bean.BeanValidators;
+import com.ruoyi.equity.domain.dto.ShareholderInfoDTO;
 import com.ruoyi.equity.domain.vo.ShareholderDownPicVO;
 import com.ruoyi.equity.domain.vo.ShareholderInfoVO;
 import com.ruoyi.equity.domain.vo.ShareholderPicVO;
@@ -46,6 +43,8 @@ public class ShareholderInfoServiceImpl extends ServiceImpl<ShareholderInfoMappe
 
     @Autowired
     protected Validator validator;
+    @Autowired
+    private ShareholderInfoDTO shareholderInfoDTO;
 
     /**
      * 查询股东信息
@@ -61,13 +60,13 @@ public class ShareholderInfoServiceImpl extends ServiceImpl<ShareholderInfoMappe
     /**
      * 查询股东信息列表
      *
-     * @param shareholderInfo 股东信息
+     * @param shareholderInfoDTO 股东信息
      * @return 股东信息
      */
     @Override
-    public List<ShareholderInfoVO> selectShareholderInfoList(ShareholderInfo shareholderInfo) {
+    public List<ShareholderInfoVO> selectShareholderInfoList(ShareholderInfoDTO shareholderInfoDTO) {
 
-        return shareholderInfoMapper.selectShareholderInfoList(shareholderInfo);
+        return shareholderInfoMapper.selectShareholderInfoList(shareholderInfoDTO);
     }
 
     /**

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

@@ -33,6 +33,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
         del_flag = '0'
         <if test="msgType != null and msgType != ''"> and msg_type = #{msgType}</if>
+        <if test="companyName != null and companyName != ''"> and (select shareholder_name from e_shareholder_info e where e.shareholder_id = esmr.company_id )like concat('%', #{companyName}, '%') </if>
         </where>
         order by create_time desc
     </select>

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

@@ -26,14 +26,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select shareholder_id, parent_id, ancestors, shareholder_name, shareholder_type, shareholding_ratio, controlled_company, company_valuation, is_subject, node_type, create_by, create_time, update_by, update_time, remark from e_shareholder_info
     </sql>
 
-    <select id="selectShareholderInfoList" parameterType="ShareholderInfoVO" resultType="com.ruoyi.equity.domain.vo.ShareholderInfoVO">
+    <select id="selectShareholderInfoList" parameterType="ShareholderInfoDTO" resultType="com.ruoyi.equity.domain.vo.ShareholderInfoVO">
         select esi.*,
         esi2.shareholder_name as companyName
         from e_shareholder_info esi left join e_shareholder_info esi2 on esi.controlled_company = esi2.shareholder_id
         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="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>