更新了模糊查询 新建DTOS

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

@@ -4,6 +4,7 @@ import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 
+import com.ruoyi.equity.domain.dto.BecomeShareholderRecordDTO;
 import com.ruoyi.equity.domain.vo.BecomeShareholderRecordVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -46,11 +47,11 @@ public class BecomeShareholderRecordController extends BaseController
     @ApiOperation("查询股东入股记录列表")
     @PreAuthorize("@ss.hasPermi('equity:become-shareholder:list')")
     @GetMapping("/list")
-    public TableDataInfo list(BecomeShareholderRecord becomeShareholderRecord)
+    public TableDataInfo list(BecomeShareholderRecordDTO becomeShareholderRecordDTO)
     {
 //        logger.info("查询股东入股记录列表打印出来是什么？{}",becomeShareholderRecord);
         startPage();
-        List<BecomeShareholderRecordVO> list = becomeShareholderRecordService.selectBecomeShareholderRecordList(becomeShareholderRecord);
+        List<BecomeShareholderRecordVO> list = becomeShareholderRecordService.selectBecomeShareholderRecordList(becomeShareholderRecordDTO);
         return getDataTable(list);
     }
 

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

@@ -3,6 +3,7 @@ package com.ruoyi.equity.controller;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
+import com.ruoyi.equity.domain.dto.EquityTransferRecordDTO;
 import com.ruoyi.equity.domain.vo.EquityTransferRecordVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -38,6 +39,8 @@ public class EquityTransferRecordController extends BaseController
 {
     @Autowired
     private IEquityTransferRecordService equityTransferRecordService;
+    @Autowired
+    private EquityTransferRecordDTO equityTransferRecordDTO;
 
     /**
      * 查询股权转让记录列表
@@ -45,10 +48,10 @@ public class EquityTransferRecordController extends BaseController
     @ApiOperation("查询股权转让记录列表")
     @PreAuthorize("@ss.hasPermi('equity:transfer:list')")
     @GetMapping("/list")
-    public TableDataInfo list(EquityTransferRecord equityTransferRecord)
+    public TableDataInfo list(EquityTransferRecordDTO equityTransferRecordDTO)
     {
         startPage();
-        List<EquityTransferRecordVO> list = equityTransferRecordService.selectEquityTransferRecordList(equityTransferRecord);
+        List<EquityTransferRecordVO> list = equityTransferRecordService.selectEquityTransferRecordList(equityTransferRecordDTO);
         return getDataTable(list);
     }
 
@@ -58,9 +61,9 @@ public class EquityTransferRecordController extends BaseController
     @PreAuthorize("@ss.hasPermi('equity:transfer:export')")
     @Log(title = "股权转让记录", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, EquityTransferRecord equityTransferRecord)
+    public void export(HttpServletResponse response, EquityTransferRecordDTO equityTransferRecordDTO)
     {
-        List<EquityTransferRecordVO> list = equityTransferRecordService.selectEquityTransferRecordList(equityTransferRecord);
+        List<EquityTransferRecordVO> list = equityTransferRecordService.selectEquityTransferRecordList(equityTransferRecordDTO);
         ExcelUtil<EquityTransferRecordVO> util = new ExcelUtil<EquityTransferRecordVO>(EquityTransferRecordVO.class);
         util.exportExcel(response, list, "股权转让记录数据");
     }

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

@@ -0,0 +1,18 @@
+package com.ruoyi.equity.domain.dto;
+
+import com.ruoyi.equity.domain.BecomeShareholderRecord;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.stereotype.Component;
+
+@Data
+@Component
+@AllArgsConstructor
+@NoArgsConstructor
+public class BecomeShareholderRecordDTO extends BecomeShareholderRecord {
+    //公司名称
+    private String companyName;
+    //新股东名字
+    private String becomeShareholderName;
+}

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

@@ -0,0 +1,20 @@
+package com.ruoyi.equity.domain.dto;
+
+import com.ruoyi.equity.domain.EquityTransferRecord;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.stereotype.Component;
+
+@AllArgsConstructor
+@NoArgsConstructor
+@Data
+@Component
+public class EquityTransferRecordDTO extends EquityTransferRecord {
+    // 公司名称
+    private String companyName;
+    //转让人name
+    private String equitySellerName;
+    //转让人id
+    private String equityBuyName;
+}

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

@@ -5,6 +5,7 @@ import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.equity.domain.BecomeShareholderRecord;
 import com.ruoyi.equity.domain.SendMessageRecord;
+import com.ruoyi.equity.domain.dto.BecomeShareholderRecordDTO;
 import com.ruoyi.equity.domain.vo.BecomeShareholderRecordVO;
 
 /**
@@ -26,10 +27,10 @@ public interface BecomeShareholderRecordMapper extends BaseMapper<BecomeSharehol
     /**
      * 查询股东入股记录列表
      * 
-     * @param becomeShareholderRecord 股东入股记录
+     * @param becomeShareholderRecordDTO 股东入股记录
      * @return 股东入股记录集合
      */
-    public List<BecomeShareholderRecordVO> selectBecomeShareholderRecordList(BecomeShareholderRecord becomeShareholderRecord);
+    public List<BecomeShareholderRecordVO> selectBecomeShareholderRecordList(BecomeShareholderRecordDTO becomeShareholderRecordDTO);
 
     /**
      * 新增股东入股记录

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

@@ -4,6 +4,7 @@ import java.util.List;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.equity.domain.EquityTransferRecord;
+import com.ruoyi.equity.domain.dto.EquityTransferRecordDTO;
 import com.ruoyi.equity.domain.vo.EquityTransferRecordVO;
 
 /**
@@ -25,10 +26,10 @@ public interface EquityTransferRecordMapper extends BaseMapper<EquityTransferRec
     /**
      * 查询股权转让记录列表
      * 
-     * @param equityTransferRecord 股权转让记录
+     * @param equityTransferRecordDTO 股权转让记录
      * @return 股权转让记录集合
      */
-    public List<EquityTransferRecordVO> selectEquityTransferRecordList(EquityTransferRecord equityTransferRecord);
+    public List<EquityTransferRecordVO> selectEquityTransferRecordList(EquityTransferRecordDTO equityTransferRecordDTO);
 
     /**
      * 新增股权转让记录

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

@@ -2,6 +2,7 @@ package com.ruoyi.equity.service;
 
 import java.util.List;
 import com.ruoyi.equity.domain.BecomeShareholderRecord;
+import com.ruoyi.equity.domain.dto.BecomeShareholderRecordDTO;
 import com.ruoyi.equity.domain.vo.BecomeShareholderRecordVO;
 
 /**
@@ -22,11 +23,11 @@ public interface IBecomeShareholderRecordService
 
     /**
      * 查询股东入股记录列表
-     * 
-     * @param becomeShareholderRecord 股东入股记录
+     *
+     * @param becomeShareholderRecordDTO 股东入股记录
      * @return 股东入股记录集合
      */
-    public List<BecomeShareholderRecordVO> selectBecomeShareholderRecordList(BecomeShareholderRecord becomeShareholderRecord);
+    public List<BecomeShareholderRecordVO> selectBecomeShareholderRecordList(BecomeShareholderRecordDTO becomeShareholderRecordDTO);
 
     /**
      * 新增股东入股记录

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

@@ -4,6 +4,7 @@ import java.util.List;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.equity.domain.EquityTransferRecord;
+import com.ruoyi.equity.domain.dto.EquityTransferRecordDTO;
 import com.ruoyi.equity.domain.vo.EquityTransferRecordVO;
 
 /**
@@ -25,10 +26,10 @@ public interface IEquityTransferRecordService extends IService<EquityTransferRec
     /**
      * 查询股权转让记录列表
      * 
-     * @param equityTransferRecord 股权转让记录
+     * @param equityTransferRecordDTO 股权转让记录
      * @return 股权转让记录集合
      */
-    public List<EquityTransferRecordVO> selectEquityTransferRecordList(EquityTransferRecord equityTransferRecord);
+    public List<EquityTransferRecordVO> selectEquityTransferRecordList(EquityTransferRecordDTO equityTransferRecordDTO);
 
     /**
      * 新增股权转让记录

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

@@ -1,6 +1,5 @@
 package com.ruoyi.equity.service.impl;
 
-import java.beans.Transient;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.util.ArrayList;
@@ -15,10 +14,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.equity.domain.*;
+import com.ruoyi.equity.domain.dto.BecomeShareholderRecordDTO;
 import com.ruoyi.equity.domain.vo.BecomeShareholderRecordVO;
-import com.ruoyi.equity.mapper.EquityChangeRecordMapper;
-import com.ruoyi.equity.mapper.EquityTransferRecordMapper;
-import com.ruoyi.equity.mapper.ShareholderInfoMapper;
 import com.ruoyi.equity.service.IEquityChangeRecordService;
 import com.ruoyi.equity.service.IEquityMessageRecordService;
 import com.ruoyi.equity.service.IShareholderInfoService;
@@ -67,14 +64,14 @@ public class BecomeShareholderRecordServiceImpl extends ServiceImpl<BecomeShareh
 
     /**
      * 查询股东入股记录列表
-     * 
-     * @param becomeShareholderRecord 股东入股记录
+     *
+     * @param becomeShareholderRecordVO 股东入股记录
      * @return 股东入股记录
      */
     @Override
-    public List<BecomeShareholderRecordVO> selectBecomeShareholderRecordList(BecomeShareholderRecord becomeShareholderRecord)
+    public List<BecomeShareholderRecordVO> selectBecomeShareholderRecordList(BecomeShareholderRecordDTO becomeShareholderRecordDTO)
     {
-        return becomeShareholderRecordMapper.selectBecomeShareholderRecordList(becomeShareholderRecord);
+        return becomeShareholderRecordMapper.selectBecomeShareholderRecordList(becomeShareholderRecordDTO);
     }
 
     /**

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

@@ -16,6 +16,7 @@ import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.equity.domain.EquityChangeRecord;
 import com.ruoyi.equity.domain.EquityMessageRecord;
 import com.ruoyi.equity.domain.ShareholderInfo;
+import com.ruoyi.equity.domain.dto.EquityTransferRecordDTO;
 import com.ruoyi.equity.domain.vo.EquityTransferRecordVO;
 import com.ruoyi.equity.mapper.ShareholderInfoMapper;
 import com.ruoyi.equity.service.IEquityChangeRecordService;
@@ -68,13 +69,13 @@ public class EquityTransferRecordServiceImpl extends ServiceImpl<EquityTransferR
     /**
      * 查询股权转让记录列表
      * 
-     * @param equityTransferRecord 股权转让记录
+     * @param equityTransferRecordDTO 股权转让记录
      * @return 股权转让记录
      */
     @Override
-    public List<EquityTransferRecordVO> selectEquityTransferRecordList(EquityTransferRecord equityTransferRecord)
+    public List<EquityTransferRecordVO> selectEquityTransferRecordList(EquityTransferRecordDTO equityTransferRecordDTO)
     {
-        return equityTransferRecordMapper.selectEquityTransferRecordList(equityTransferRecord);
+        return equityTransferRecordMapper.selectEquityTransferRecordList(equityTransferRecordDTO);
     }
 
     /**

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

@@ -2,6 +2,9 @@ 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;
 
@@ -85,7 +88,6 @@ public class ShareholderInfoServiceImpl extends ServiceImpl<ShareholderInfoMappe
         //校验重复添加
         Long l = shareholderInfoMapper.selectShareholderInfo(shareholderInfo.getShareholderName());
         if (l != null){
-
             throw new RuntimeException("已存在股东："+shareholderInfo.getShareholderName());
         }
         return this.save(shareholderInfo);

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

@@ -21,7 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select become_shareholder_id, shareholding_ratio, company_id, investment_amount, become_shareholder_date, create_by, create_time, update_by, update_time, remark from e_become_shareholder_record
     </sql>
 
-    <select id="selectBecomeShareholderRecordList" parameterType="BecomeShareholderRecord" resultType="com.ruoyi.equity.domain.vo.BecomeShareholderRecordVO">
+    <select id="selectBecomeShareholderRecordList" parameterType="BecomeShareholderRecordDTO" resultType="com.ruoyi.equity.domain.vo.BecomeShareholderRecordVO">
         select become_shareholder_id, shareholding_ratio, company_id as company, investment_amount, become_shareholder_date, create_by, create_time, update_by, update_time, remark,shareholder_id asshareholder ,
         (select shareholder_name from e_shareholder_info where company = shareholder_id) as companyName,
         (select shareholder_name from e_shareholder_info where asshareholder = shareholder_id) as becomeShareholderName
@@ -29,7 +29,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>  
             <if test="investmentAmount != null "> and investment_amount = #{investmentAmount}</if>
             <if test="becomeShareholderDate != null "> and become_shareholder_date = #{becomeShareholderDate}</if>
+            <if test="companyId != null"> and company_id = #{companyId}</if>
+            <if test="companyName != null and companyName != ''"> and (select shareholder_name from e_shareholder_info where company_id = shareholder_id) like CONCAT('%', #{companyName}, '%')</if>
+            <if test="becomeShareholderName != null and becomeShareholderName != ''"> and (select shareholder_name from e_shareholder_info where asshareholder = shareholder_id) like CONCAT('%', #{becomeShareholderName}, '%')</if>
         </where>
+        order by create_time desc
     </select>
     
     <select id="selectBecomeShareholderRecordByBecomeShareholderId" parameterType="Long" resultMap="BecomeShareholderRecordResult">

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

@@ -43,6 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="equityChangeRecord.equityChangeType != null">
             and r.equity_change_type = #{equityChangeRecord.equityChangeType}
         </if>
+        order by create_time desc
     </select>
     
     <select id="selectEquityChangeRecordByEquityChangeId" parameterType="Long" resultMap="EquityChangeRecordResult">
@@ -69,6 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="equityChangeRecord.equityChangeType != null">
             and r.equity_change_type = #{equityChangeRecord.equityChangeType}
             </if>
+        order by create_time desc
     </select>
 
     <insert id="insertEquityChangeRecord" parameterType="EquityChangeRecord" useGeneratedKeys="true" keyProperty="equityChangeId">

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

@@ -30,7 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     <select id="selectEquityMessageRecordList" resultType="com.ruoyi.equity.domain.vo.EquityMessageRecordVO">
        select * from e_equity_message_record
-       where user_id = #{userId} and del_flag = '0'
+       where user_id = #{userId} and del_flag = '0' order by create_time desc
         <!--            <if test="msgType != null  and msgType != ''"> and msg_type = #{msgType}</if>-->
         <!--            <if test="msgContent != null  and msgContent != ''"> and msg_content = #{msgContent}</if>-->
         <!--            <if test="msgTime != null "> and msg_time = #{msgTime}</if>-->

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

@@ -22,7 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select equity_transfer_id, company_id, equity_seller_id, equity_buyer_id, transfer_ratio, transfer_date, create_by, create_time, update_by, update_time, remark from e_equity_transfer_record
     </sql>
 
-    <select id="selectEquityTransferRecordList" parameterType="EquityTransferRecord" resultType="com.ruoyi.equity.domain.vo.EquityTransferRecordVO">
+    <select id="selectEquityTransferRecordList" parameterType="EquityTransferRecordDTO" resultType="com.ruoyi.equity.domain.vo.EquityTransferRecordVO">
         select * ,
         (select shareholder_name from e_shareholder_info where e.equity_seller_id = shareholder_id)
         as equitySellerName ,
@@ -31,13 +31,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         (select shareholder_name from e_shareholder_info where e.company_id = shareholder_id)
         as companyName
         from e_equity_transfer_record e
-        <where>  
-            <if test="companyId != null "> and company_id = #{companyId}</if>
+        <where>
             <if test="equitySellerId != null "> and equity_seller_id = #{equitySellerId}</if>
             <if test="equityBuyerId != null "> and equity_buyer_id = #{equityBuyerId}</if>
             <if test="transferRatio != null "> and transfer_ratio = #{transferRatio}</if>
             <if test="transferDate != null "> and transfer_date = #{transferDate}</if>
+            <if test="companyName != null and companyName != ''"> and (select shareholder_name from e_shareholder_info where e.company_id = shareholder_id) like CONCAT('%', #{companyName}, '%')</if>
+            <if test="equitySellerName != null and equitySellerName != ''"> and (select shareholder_name from e_shareholder_info where e.equity_seller_id = shareholder_id) like CONCAT('%', #{equitySellerName}, '%')</if>
+            <if test="equityBuyName != null and equityBuyName != ''"> and (select shareholder_name from e_shareholder_info where e.equity_buyer_id = shareholder_id) like CONCAT('%', #{equityBuyName}, '%')</if>
         </where>
+        order by create_time desc
     </select>
     
     <select id="selectEquityTransferRecordByEquityTransferId" parameterType="Long" resultMap="EquityTransferRecordResult">

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

@@ -30,7 +30,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectSendMessageRecordList" resultType="com.ruoyi.equity.domain.vo.SendMessageRecordVO">
         select *,(select shareholder_name from e_shareholder_info esi where esi.shareholder_id = esmr.company_id) as companyName
         from e_send_message_record esmr
-        where del_flag = '0'
+        <where>
+        del_flag = '0'
+        <if test="msgType != null and msgType != ''"> and msg_type = #{msgType}</if>
+        </where>
+        order by create_time desc
     </select>
 
     <insert id="insertSendMessageRecord" parameterType="SendMessageRecord" useGeneratedKeys="true" keyProperty="sendMessageId">

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

@@ -34,6 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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>
+        order by update_time desc
     </select>
     
     <select id="selectShareholderInfoByShareholderId" parameterType="Long" resultMap="ShareholderInfoResult">
@@ -76,7 +77,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="state == 2 ">
            and parent_id is not null
         </if>
-
+        order by update_time desc
     </select>
     <select id="getAllCompany" resultType="com.ruoyi.equity.domain.ShareholderInfo">
         select *