新增股权管理变更记录列表

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

@@ -1,11 +1,11 @@
 package com.ruoyi.equity.controller;
 
 import java.util.List;
-import javax.servlet.http.HttpServletResponse;
 
+import com.baomidou.mybatisplus.extension.api.R;
+import com.ruoyi.equity.domain.vo.EquityChangeRecordVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -21,8 +21,6 @@ import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.equity.domain.EquityChangeRecord;
 import com.ruoyi.equity.service.IEquityChangeRecordService;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.page.TableDataInfo;
 
 /**
  * 股权变更记录Controller
@@ -44,25 +42,29 @@ public class EquityChangeRecordController extends BaseController
 //    @PreAuthorize("@ss.hasPermi('equity:change:list')")
     @ApiOperation("查询股权变更记录列表")
     @GetMapping("/list")
-    public TableDataInfo list(EquityChangeRecord equityChangeRecord)
+    public R<List<EquityChangeRecordVO>> list(EquityChangeRecord equityChangeRecord)
     {
         startPage();
-        List<EquityChangeRecord> list = equityChangeRecordService.selectEquityChangeRecordList(equityChangeRecord);
-        return getDataTable(list);
+        List<EquityChangeRecordVO> list = equityChangeRecordService.selectEquityChangeRecordList(equityChangeRecord);
+        return R.ok(list);
     }
 
     /**
      * 导出股权变更记录列表
      */
 //    @PreAuthorize("@ss.hasPermi('equity:change:export')")
+
+/*
     @Log(title = "股权变更记录", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, EquityChangeRecord equityChangeRecord)
     {
-        List<EquityChangeRecord> list = equityChangeRecordService.selectEquityChangeRecordList(equityChangeRecord);
+        List<EquityChangeRecordVO> list = equityChangeRecordService.selectEquityChangeRecordList(equityChangeRecord);
         ExcelUtil<EquityChangeRecord> util = new ExcelUtil<EquityChangeRecord>(EquityChangeRecord.class);
         util.exportExcel(response, list, "股权变更记录数据");
     }
+*/
+
 
     /**
      * 获取股权变更记录详细信息

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

@@ -99,7 +99,7 @@ public class ShareholderInfoController extends BaseController
     {
         startPage();
         List<ShareholderInfoVO> list = shareholderInfoService.selectShareholderInfoList(shareholderInfo);
-//        logger.info("返回的集合内容是：{}",list);
+//      logger.info("返回的集合内容是：{}",list);
         return getDataTable(list);
     }
 

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

@@ -0,0 +1,72 @@
+package com.ruoyi.equity.domain.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 表格分页数据对象
+ *
+ * @author ruoyi
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class EquityChangeRecordVO<T>
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 股权变更ID */
+    @TableId(type = IdType.AUTO)
+    private Long equityChangeId;
+
+    /** 股份变更类型 */
+    @Excel(name = "股份变更类型")
+    @ApiModelProperty("股份变更类型")
+    private String equityChangeType;
+
+    /** 公司 */
+    @Excel(name = "公司")
+    @ApiModelProperty("公司")
+    private Long companyId;
+
+    @Excel(name = "公司名称")
+    @ApiModelProperty("公司名称")
+    private String companyName;
+
+    /** 被变更股东id */
+    @Excel(name = "被变更股东id")
+    @ApiModelProperty("被变更股东id")
+    private Long changeShareholderId;
+
+
+    @Excel(name = "被变更股东名称")
+    @ApiModelProperty("被变更股东名称")
+    private String changeShareholderName;
+
+
+    /** 变更前比例 */
+    @Excel(name = "变更前比例")
+    @ApiModelProperty("变更前比例")
+    private BigDecimal changeBeforeRatio;
+
+    /** 变更后比例 */
+    @Excel(name = "变更后比例")
+    @ApiModelProperty("变更后比例")
+    private BigDecimal changeAfterRatio;
+
+    /** 变更日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "变更日期", width = 30, dateFormat = "yyyy-MM-dd")
+    @ApiModelProperty("变更日期")
+    private Date changeDate;
+}

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

@@ -4,6 +4,7 @@ import java.util.List;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.equity.domain.EquityChangeRecord;
+import com.ruoyi.equity.domain.vo.EquityChangeRecordVO;
 import org.apache.ibatis.annotations.Param;
 
 /**
@@ -28,7 +29,7 @@ public interface EquityChangeRecordMapper extends BaseMapper<EquityChangeRecord>
      * @param equityChangeRecord 股权变更记录
      * @return 股权变更记录集合
      */
-    public List<EquityChangeRecord> selectEquityChangeRecordList(EquityChangeRecord equityChangeRecord);
+    public List<EquityChangeRecordVO> selectEquityChangeRecordList(EquityChangeRecord equityChangeRecord);
 
     /**
      * 新增股权变更记录

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

@@ -4,6 +4,7 @@ import java.util.List;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.equity.domain.EquityChangeRecord;
+import com.ruoyi.equity.domain.vo.EquityChangeRecordVO;
 
 /**
  * 股权变更记录Service接口
@@ -27,7 +28,7 @@ public interface IEquityChangeRecordService extends IService<EquityChangeRecord>
      * @param equityChangeRecord 股权变更记录
      * @return 股权变更记录集合
      */
-    public List<EquityChangeRecord> selectEquityChangeRecordList(EquityChangeRecord equityChangeRecord);
+    public List<EquityChangeRecordVO> selectEquityChangeRecordList(EquityChangeRecord equityChangeRecord);
 
     /**
      * 新增股权变更记录

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

@@ -4,6 +4,7 @@ import java.util.List;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.equity.domain.vo.EquityChangeRecordVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.equity.mapper.EquityChangeRecordMapper;
@@ -41,7 +42,7 @@ public class EquityChangeRecordServiceImpl extends ServiceImpl<EquityChangeRecor
      * @return 股权变更记录
      */
     @Override
-    public List<EquityChangeRecord> selectEquityChangeRecordList(EquityChangeRecord equityChangeRecord)
+    public List<EquityChangeRecordVO> selectEquityChangeRecordList(EquityChangeRecord equityChangeRecord)
     {
         return equityChangeRecordMapper.selectEquityChangeRecordList(equityChangeRecord);
     }

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

@@ -102,9 +102,6 @@ public class ShareholderInfoServiceImpl extends ServiceImpl<ShareholderInfoMappe
         //这里 加入校验 ！  如果要被删除的股东 已绑定公司，则不能删除。
         //去查 如果存在那就抛出自定义异常
         List<ShareholderInfo> shareholderInfos = shareholderInfoMapper.selectShareholderInfoByIds(shareholderIds);
-
-
-
         for (ShareholderInfo info : shareholderInfos) {
 
             if (info.getNodeType() != 0 && info.getIsSubject() != 1){

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

@@ -23,8 +23,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select equity_change_id, equity_change_type, company_id, change_shareholder_id, change_before_ratio, change_after_ratio, change_date, create_by, create_time, update_by, update_time, remark from e_equity_change_record
     </sql>
 
-    <select id="selectEquityChangeRecordList" parameterType="EquityChangeRecord" resultMap="EquityChangeRecordResult">
-        <include refid="selectEquityChangeRecordVo"/>
+    <select id="selectEquityChangeRecordList" parameterType="EquityChangeRecordVO" resultType="com.ruoyi.equity.domain.vo.EquityChangeRecordVO">
+        select equity_change_id,
+        equity_change_type,
+        company_id as compid,
+        change_shareholder_id as shareid,
+        change_before_ratio,
+        change_after_ratio,
+        change_date,
+        create_by,
+        create_time,
+        update_by,
+        update_time,
+        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>