Ver Fonte

修改企业股东构成字段

Administrator há 4 anos atrás
pai
commit
0322e5f0dd

+ 20 - 25
ruoyi-system/src/main/java/com/ruoyi/system/domain/project/BmCompanyShareholder.java

@@ -27,9 +27,9 @@ public class BmCompanyShareholder extends BaseEntity
     @Excel(name = "姓名*")
     private String name;
 
-    /** 地址* */
-    @Excel(name = "地址*")
-    private String address;
+    /** 股权比例* */
+    @Excel(name = "股权比例*")
+    private String equityRatio;
 
     /** 身份证号* */
     @Excel(name = "身份证号*")
@@ -71,15 +71,7 @@ public class BmCompanyShareholder extends BaseEntity
     {
         return name;
     }
-    public void setAddress(String address) 
-    {
-        this.address = address;
-    }
 
-    public String getAddress() 
-    {
-        return address;
-    }
     public void setIdcard(String idcard) 
     {
         this.idcard = idcard;
@@ -108,21 +100,24 @@ public class BmCompanyShareholder extends BaseEntity
         return idcardBack;
     }
 
+    public String getEquityRatio() {
+        return equityRatio;
+    }
+
+    public void setEquityRatio(String equityRatio) {
+        this.equityRatio = equityRatio;
+    }
+
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("bmProjectId", getBmProjectId())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("isDel", getIsDel())
-            .append("name", getName())
-            .append("address", getAddress())
-            .append("idcard", getIdcard())
-            .append("idcardFront", getIdcardFront())
-            .append("idcardBack", getIdcardBack())
-            .toString();
+        return "BmCompanyShareholder{" +
+                "id=" + id +
+                ", bmProjectId=" + bmProjectId +
+                ", name='" + name + '\'' +
+                ", equityRatio='" + equityRatio + '\'' +
+                ", idcard='" + idcard + '\'' +
+                ", idcardFront='" + idcardFront + '\'' +
+                ", idcardBack='" + idcardBack + '\'' +
+                '}';
     }
 }

+ 2 - 2
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/project/BmCompanyShareholderServiceImpl.java

@@ -54,7 +54,7 @@ public class BmCompanyShareholderServiceImpl implements IBmCompanyShareholderSer
     public int insertBmCompanyShareholder(BmCompanyShareholder bmCompanyShareholder)
     {
         bmCompanyShareholder.setCreateTime(DateUtils.getNowDate());
-        //bmCompanyShareholder.setCreateBy(SecurityUtils.getUsername());
+        bmCompanyShareholder.setCreateBy(SecurityUtils.getUsername());
         return bmCompanyShareholderMapper.insertBmCompanyShareholder(bmCompanyShareholder);
     }
 
@@ -68,7 +68,7 @@ public class BmCompanyShareholderServiceImpl implements IBmCompanyShareholderSer
     public int updateBmCompanyShareholder(BmCompanyShareholder bmCompanyShareholder)
     {
         bmCompanyShareholder.setUpdateTime(DateUtils.getNowDate());
-        //bmCompanyShareholder.setUpdateBy(SecurityUtils.getUsername());
+        bmCompanyShareholder.setUpdateBy(SecurityUtils.getUsername());
         return bmCompanyShareholderMapper.updateBmCompanyShareholder(bmCompanyShareholder);
     }
 

+ 6 - 6
ruoyi-system/src/main/resources/mapper/system/project/BmCompanyShareholderMapper.xml

@@ -13,14 +13,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime"    column="update_time"    />
         <result property="isDel"    column="is_del"    />
         <result property="name"    column="name"    />
-        <result property="address"    column="address"    />
+        <result property="equityRatio"    column="equity_ratio"    />
         <result property="idcard"    column="idcard"    />
         <result property="idcardFront"    column="idcard_front"    />
         <result property="idcardBack"    column="idcard_back"    />
     </resultMap>
 
     <sql id="selectBmCompanyShareholderVo">
-        select id, bm_project_id, create_by, create_time, update_by, update_time, is_del, name, address, idcard, idcard_front, idcard_back from bm_company_shareholder
+        select id, bm_project_id, create_by, create_time, update_by, update_time, is_del, name, equity_ratio, idcard, idcard_front, idcard_back from bm_company_shareholder
     </sql>
 
     <select id="selectBmCompanyShareholderList" parameterType="BmCompanyShareholder" resultMap="BmCompanyShareholderResult">
@@ -30,7 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="bmProjectId != null "> and bm_project_id = #{bmProjectId}</if>
             <if test="isDel != null "> and is_del = #{isDel}</if>
             <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
-            <if test="address != null  and address != ''"> and address = #{address}</if>
+            <if test="equityRatio != null  and equityRatio != ''"> and equity_ratio = #{equityRatio}</if>
             <if test="idcard != null  and idcard != ''"> and idcard = #{idcard}</if>
             <if test="idcardFront != null  and idcardFront != ''"> and idcard_front = #{idcardFront}</if>
             <if test="idcardBack != null  and idcardBack != ''"> and idcard_back = #{idcardBack}</if>
@@ -53,7 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time,</if>
             <if test="isDel != null">is_del,</if>
             <if test="name != null">name,</if>
-            <if test="address != null">address,</if>
+            <if test="equityRatio != null">equity_ratio,</if>
             <if test="idcard != null">idcard,</if>
             <if test="idcardFront != null">idcard_front,</if>
             <if test="idcardBack != null">idcard_back,</if>
@@ -66,7 +66,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">#{updateTime},</if>
             <if test="isDel != null">#{isDel},</if>
             <if test="name != null">#{name},</if>
-            <if test="address != null">#{address},</if>
+            <if test="equityRatio != null">#{equityRatio},</if>
             <if test="idcard != null">#{idcard},</if>
             <if test="idcardFront != null">#{idcardFront},</if>
             <if test="idcardBack != null">#{idcardBack},</if>
@@ -83,7 +83,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="isDel != null">is_del = #{isDel},</if>
             <if test="name != null">name = #{name},</if>
-            <if test="address != null">address = #{address},</if>
+            <if test="equityRatio != null">equity_ratio = #{equityRatio},</if>
             <if test="idcard != null">idcard = #{idcard},</if>
             <if test="idcardFront != null">idcard_front = #{idcardFront},</if>
             <if test="idcardBack != null">idcard_back = #{idcardBack},</if>