Merge remote-tracking branch 'origin/dev' into dev

zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/domain/BmCompanyInfo.java

@@ -150,7 +150,7 @@ public class BmCompanyInfo implements Serializable {
     * 创建人
     */
     @Excel(name = "创建人")
-    private String creator;
+    private Integer creator;
 
     /**
     * 审核人
@@ -182,5 +182,11 @@ public class BmCompanyInfo implements Serializable {
     @Excel(name = "修改时间")
     private String updateTime;
 
+    @Excel(name = "法人身份证头像面")
+    private String legalFaceUrl;
+
+    @Excel(name = "法人身份证国徽面")
+    private String legalNationUrl;
+
 
 }

zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/service/impl/BmCompanyInfoServiceImpl.java

@@ -64,7 +64,7 @@ public class BmCompanyInfoServiceImpl implements BmCompanyInfoService {
     public int insertSelective(BmCompanyInfoDto record) {
 
         record.getBmCompanyInfo().setCreateTime(LocalDateTime.now().toString());
-        record.getBmCompanyInfo().setCreator(SecurityUtils.getUsername());
+        record.getBmCompanyInfo().setCreator(SecurityUtils.getUserId().intValue());
         record.getBmCompanyInfo().setStatus("0");
         bmCompanyInfoMapper.insertSelective(record.getBmCompanyInfo());
         record.getBmCoBank().setCoId(record.getBmCompanyInfo().getCompanyId());
@@ -110,9 +110,9 @@ public class BmCompanyInfoServiceImpl implements BmCompanyInfoService {
         //根据id查询企业详情
         BmCompanyInfo bmCompanyInfo = bmCompanyInfoMapper.selectByPrimaryKey(id);
         //获取被授权人手机号
-        String authPhone = bmCompanyInfo.getAuthPhone();
+        Integer userId = bmCompanyInfo.getCreator();
         //根据手机号查询被授权人邮箱
-        SysUser sysUser = bmCompanyInfoMapper.selectUserByPhoneNumber(authPhone);
+        SysUser sysUser = sysUserMapper.selectUserById(userId.longValue());
         BmCompanyVo bmCompanyVo = new BmCompanyVo();
         bmCompanyVo.setBmCompanyInfo(bmCompanyInfo);
         bmCompanyVo.setAuthEmail(sysUser.getEmail());
@@ -132,9 +132,9 @@ public class BmCompanyInfoServiceImpl implements BmCompanyInfoService {
 
         for (BmCompanyInfo bmCompanyInfo : list) {
 
-            String authPhone = bmCompanyInfo.getAuthPhone();
+            Integer userId = bmCompanyInfo.getCreator();
             //获取当前被授权用户信息
-            SysUser sysUser = bmCompanyInfoMapper.selectUserByPhoneNumber(authPhone);
+            SysUser sysUser = sysUserMapper.selectUserById(userId.longValue());
             int count = selectUserCount(sysUser);
             BmCompanyInfoVo bmCompanyInfoVo = new BmCompanyInfoVo();
             bmCompanyInfoVo.setUserCount(count);

zlpt-modules/zlpt-company/src/main/resources/mapper/BmCompanyInfoMapper.xml

@@ -25,13 +25,15 @@
     <result column="id_face_url" jdbcType="VARCHAR" property="idFaceUrl" />
     <result column="id_nation_url" jdbcType="VARCHAR" property="idNationUrl" />
     <result column="create_time" jdbcType="VARCHAR" property="createTime" />
-    <result column="creator" jdbcType="VARCHAR" property="creator" />
+    <result column="creator" jdbcType="INTEGER" property="creator" />
     <result column="auditor" jdbcType="INTEGER" property="auditor" />
     <result column="audit_time" jdbcType="VARCHAR" property="auditTime" />
     <result column="audit_remark" jdbcType="VARCHAR" property="auditRemark" />
     <result column="status" jdbcType="VARCHAR" property="status" />
     <result column="logo_url" jdbcType="VARCHAR" property="logoUrl" />
     <result column="update_time" jdbcType="VARCHAR" property="updateTime" />
+    <result column="legal_face_url" jdbcType="VARCHAR" property="legalFaceUrl" />
+    <result column="legal_nation_url" jdbcType="VARCHAR" property="legalNationUrl" />
   </resultMap>
 
   <sql id="Base_Column_List">
@@ -40,7 +42,7 @@
     operate_address, certificateType, id_number, business_license, legal_person, invitation_code, 
     invitation_co_name, business_scope, auth_person, auth_id_number, auth_phone, auth_document, 
     id_face_url, id_nation_url, create_time, creator, auditor, audit_time, audit_remark, 
-    `status`, logo_url,update_time
+    `status`, logo_url,update_time,legal_face_url,legal_nation_url
   </sql>
 
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
@@ -65,16 +67,16 @@
       auth_phone, auth_document, id_face_url, 
       id_nation_url, create_time, creator, 
       auditor, audit_time, audit_remark, 
-      `status`,logo_url update_time)
+      `status`,logo_url update_time,legal_face_url,legal_nation_url)
     values (#{companyName,jdbcType=VARCHAR}, #{companyType,jdbcType=VARCHAR}, #{companyLtd,jdbcType=VARCHAR}, 
       #{creditCode,jdbcType=VARCHAR}, #{registerAddress,jdbcType=VARCHAR}, #{operateAddress,jdbcType=VARCHAR}, 
       #{certificatetype,jdbcType=VARCHAR}, #{idNumber,jdbcType=VARCHAR}, #{businessLicense,jdbcType=VARCHAR}, 
       #{legalPerson,jdbcType=VARCHAR}, #{invitationCode,jdbcType=VARCHAR}, #{invitationCoName,jdbcType=VARCHAR}, 
       #{businessScope,jdbcType=VARCHAR}, #{authPerson,jdbcType=VARCHAR}, #{authIdNumber,jdbcType=VARCHAR}, 
       #{authPhone,jdbcType=VARCHAR}, #{authDocument,jdbcType=VARCHAR}, #{idFaceUrl,jdbcType=VARCHAR}, 
-      #{idNationUrl,jdbcType=VARCHAR}, #{createTime,jdbcType=VARCHAR}, #{creator,jdbcType=VARCHAR}, 
+      #{idNationUrl,jdbcType=VARCHAR}, #{createTime,jdbcType=VARCHAR}, #{creator,jdbcType=INTEGER},
       #{auditor,jdbcType=INTEGER}, #{auditTime,jdbcType=VARCHAR}, #{auditRemark,jdbcType=VARCHAR}, 
-      #{status,jdbcType=VARCHAR},#{logoUrl,jdbcType=VARCHAR}, #{updateTime,jdbcType=VARCHAR})
+      #{status,jdbcType=VARCHAR},#{logoUrl,jdbcType=VARCHAR}, #{updateTime,jdbcType=VARCHAR},#{legalFaceUrl,jdbcType=VARCHAR},#{legalNationUrl,jdbcType=VARCHAR})
   </insert>
 
   <insert id="insertSelective" keyColumn="company_id" keyProperty="companyId" parameterType="com.bonus.zlpt.company.domain.BmCompanyInfo" useGeneratedKeys="true">
@@ -162,6 +164,12 @@
       <if test="updateTime != null and updateTime != ''">
         update_time,
       </if>
+      <if test="legalFaceUrl != null and legalFaceUrl != ''">
+        legal_face_url,
+      </if>
+      <if test="legalNationUrl != null and legalNationUrl != ''">
+        legal_nation_url,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="companyName != null and companyName != ''">
@@ -225,7 +233,7 @@
         #{createTime,jdbcType=VARCHAR},
       </if>
       <if test="creator != null and creator != ''">
-        #{creator,jdbcType=VARCHAR},
+        #{creator,jdbcType=INTEGER},
       </if>
       <if test="auditor != null">
         #{auditor,jdbcType=INTEGER},
@@ -245,6 +253,12 @@
       <if test="updateTime != null and updateTime != ''">
         #{updateTime,jdbcType=VARCHAR},
       </if>
+      <if test="legalFaceUrl != null and legalFaceUrl != ''">
+      #{legalFaceUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="legalNationUrl != null and legalNationUrl != ''">
+      #{legalNationUrl,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
 
@@ -313,7 +327,7 @@
         create_time = #{createTime,jdbcType=VARCHAR},
       </if>
       <if test="creator != null and creator != ''">
-        creator = #{creator,jdbcType=VARCHAR},
+        creator = #{creator,jdbcType=INTEGER},
       </if>
       <if test="auditor != null">
         auditor = #{auditor,jdbcType=INTEGER},
@@ -333,6 +347,12 @@
       <if test="updateTime != null and updateTime != ''">
         update_time = #{updateTime,jdbcType=VARCHAR},
       </if>
+      <if test="legalFaceUrl != null and legalFaceUrl != ''">
+        legal_face_url = #{legalFaceUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="legalNationUrl != null and legalNationUrl != ''">
+        legal_nation_url = #{legalNationUrl,jdbcType=VARCHAR},
+      </if>
     </set>
     where company_id = #{companyId,jdbcType=INTEGER}
   </update>
@@ -360,13 +380,15 @@
       id_face_url = #{idFaceUrl,jdbcType=VARCHAR},
       id_nation_url = #{idNationUrl,jdbcType=VARCHAR},
       create_time = #{createTime,jdbcType=VARCHAR},
-      creator = #{creator,jdbcType=VARCHAR},
+      creator = #{creator,jdbcType=INTEGER},
       auditor = #{auditor,jdbcType=INTEGER},
       audit_time = #{auditTime,jdbcType=VARCHAR},
       audit_remark = #{auditRemark,jdbcType=VARCHAR},
       `status` = #{status,jdbcType=VARCHAR},
       logo_url = #{logoUrl,jdbcType=VARCHAR},
-      update_time = #{updateTime,jdbcType=VARCHAR}
+      update_time = #{updateTime,jdbcType=VARCHAR},
+    legal_face_url = #{legalFaceUrl,javaType=VARCHAR},
+    legal_nation_url = #{legalNationUrl,javaType=VARCHAR}
     where company_id = #{companyId,jdbcType=INTEGER}
   </update>