历史记录

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

@@ -3,7 +3,12 @@ package com.ruoyi.equity.controller;
 import java.util.List;
 
 import com.baomidou.mybatisplus.extension.api.R;
+import com.ruoyi.common.core.domain.entity.SysRole;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.equity.domain.vo.EquityChangeRecordVO;
+import com.ruoyi.equity.domain.vo.ShareholderInfoVO;
+import com.ruoyi.system.service.ISysRoleService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -36,18 +41,24 @@ public class EquityChangeRecordController extends BaseController
     @Autowired
     private IEquityChangeRecordService equityChangeRecordService;
 
+    @Autowired
+    private ISysRoleService sysRoleService;
+
     /**
      * 查询股权变更记录列表
      */
 //    @PreAuthorize("@ss.hasPermi('equity:change:list')")
     @ApiOperation("查询股权变更记录列表")
     @GetMapping("/list")
-    public R<List<EquityChangeRecordVO>> list(EquityChangeRecord equityChangeRecord)
+    public TableDataInfo<EquityChangeRecordVO> list(EquityChangeRecord equityChangeRecord)
     {
+        //获取id 查看是不是管理员 是管理员，全查， 不是管理员
+        Long userId = SecurityUtils.getUserId();
+        List<SysRole> roles = sysRoleService.selectRolesByUserId(userId);
+        Long roleId = roles.get(0).getRoleId();
         startPage();
-        Long userId = getUserId();
-        List<EquityChangeRecordVO> list = equityChangeRecordService.selectEquityChangeRecordList(equityChangeRecord);
-        return R.ok(list);
+        List<EquityChangeRecordVO> list = equityChangeRecordService.selectEquityChangeRecordList(equityChangeRecord,roleId,userId);
+        return getDataTable(list);
         //是管理员全查，不是管理员再通过id查
     }
 

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

@@ -8,8 +8,8 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
+import lombok.*;
+import lombok.experimental.SuperBuilder;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -21,8 +21,12 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * @author ruoyi
  * @date 2025-03-05
  */
-@EqualsAndHashCode(callSuper = true)
+
 @Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@EqualsAndHashCode(callSuper = true)
 @TableName("e_equity_message_record")
 @ApiModel(value = "EquityMessageRecord", description = "股权消息通知实体")
 public class EquityMessageRecord extends BaseEntity

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

@@ -21,7 +21,7 @@ import java.util.Date;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-public class EquityChangeRecordVO<T>
+public class EquityChangeRecordVO
 {
     private static final long serialVersionUID = 1L;
 

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

@@ -29,7 +29,7 @@ public interface EquityChangeRecordMapper extends BaseMapper<EquityChangeRecord>
      * @param userId
      * @return 股权变更记录集合
      */
-    public List<EquityChangeRecordVO> selectEquityChangeRecordList(Long userId);
+    public List<EquityChangeRecordVO> selectEquityChangeRecordList(@Param("equityChangeRecord") EquityChangeRecord equityChangeRecord,Long userId);
 
     /**
      * 新增股权变更记录
@@ -63,5 +63,5 @@ public interface EquityChangeRecordMapper extends BaseMapper<EquityChangeRecord>
      */
     public int deleteEquityChangeRecordByEquityChangeIds(Long[] equityChangeIds);
 
-    List<EquityChangeRecordVO> selectEquityChangeRecordByUserId(@Param("userId") Long userId);
+    List<EquityChangeRecordVO> selectEquityChangeRecordByUserId(@Param("equityChangeRecord") EquityChangeRecord equityChangeRecord,@Param("userId") Long userId);
 }

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

@@ -27,7 +27,7 @@ public interface IEquityChangeRecordService extends IService<EquityChangeRecord>
      * @param equityChangeRecord 股权变更记录
      * @return 股权变更记录集合
      */
-    public List<EquityChangeRecordVO> selectEquityChangeRecordList(EquityChangeRecord equityChangeRecord);
+    public List<EquityChangeRecordVO> selectEquityChangeRecordList(EquityChangeRecord equityChangeRecord,Long roleId,Long userId);
 
     /**
      * 新增股权变更记录

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

@@ -29,8 +29,7 @@ public class EquityChangeRecordServiceImpl extends ServiceImpl<EquityChangeRecor
 {
     @Autowired
     private EquityChangeRecordMapper equityChangeRecordMapper;
-    @Autowired
-    private ISysRoleService sysRoleService;
+
 
     /**
      * 查询股权变更记录
@@ -52,18 +51,14 @@ public class EquityChangeRecordServiceImpl extends ServiceImpl<EquityChangeRecor
      * @return 股权变更记录
      */
     @Override
-    public List<EquityChangeRecordVO> selectEquityChangeRecordList(EquityChangeRecord equityChangeRecord)
+    public List<EquityChangeRecordVO> selectEquityChangeRecordList(EquityChangeRecord equityChangeRecord,Long roleId,Long userId)
     {
-        //获取id 查看是不是管理员 是管理员，全查， 不是管理员
-        Long userId = SecurityUtils.getUserId();
-        List<SysRole> roles = sysRoleService.selectRolesByUserId(userId);
-        Long roleId = roles.get(0).getRoleId();
         if (roleId == 102){
             //是普通股东，就查自己的：
-            return equityChangeRecordMapper.selectEquityChangeRecordByUserId(userId);
+            return equityChangeRecordMapper.selectEquityChangeRecordByUserId(equityChangeRecord,userId);
         }else {
             //是管理员或者更高级管理员 就全查
-            return equityChangeRecordMapper.selectEquityChangeRecordList(userId);
+            return equityChangeRecordMapper.selectEquityChangeRecordList(equityChangeRecord,userId);
         }
 
     }

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

@@ -38,12 +38,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         remark,
         (select shareholder_name from e_shareholder_info where shareid = shareholder_id) as changeShareholderName,
         (select  shareholder_name from e_shareholder_info where compid = shareholder_id) as companyName
-        from e_equity_change_record ;
-       <!-- <where>
-            <if test="equityChangeType != null  and equityChangeType != ''"> and equity_change_type = #{equityChangeType}</if>
-            <if test="companyId != null "> and company_id = #{companyId}</if>
-            <if test="changeShareholderId != null "> and change_shareholder_id = #{changeShareholderId}</if>
-        </where>-->
+        from e_equity_change_record r
+       where 1=1
+        <if test="equityChangeRecord.equityChangeType != null">
+            and r.equity_change_type = #{equityChangeRecord.equityChangeType}
+        </if>
     </select>
     
     <select id="selectEquityChangeRecordByEquityChangeId" parameterType="Long" resultMap="EquityChangeRecordResult">
@@ -66,7 +65,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 (select shareholder_name from e_shareholder_info where shareid = shareholder_id) as changeShareholderName,
                 (select  shareholder_name from e_shareholder_info where compid = shareholder_id) as companyName
         from e_equity_change_record r left join sys_user u on r.change_shareholder_id = u.shareholder_id
-        where u.user_id = #{userId};
+        where u.user_id = #{userId}
+            <if test="equityChangeRecord.equityChangeType != null">
+            and r.equity_change_type = #{equityChangeRecord.equityChangeType}
+            </if>
     </select>
 
     <insert id="insertEquityChangeRecord" parameterType="EquityChangeRecord" useGeneratedKeys="true" keyProperty="equityChangeId">