【更新】注册逻辑优化
This commit is contained in:
nmy
parent
6599ea248a
commit
b3b8cdede3
|
|
@ -58,6 +58,14 @@ public class BmCompanyInfo implements Serializable {
|
|||
@ApiModelProperty(value = "统一社会信用代码", required = true)
|
||||
private String creditCode;
|
||||
|
||||
@Excel(name = "注册地址")
|
||||
@ApiModelProperty(value = "注册地址", required = true)
|
||||
private String registerId;
|
||||
|
||||
@Excel(name = "经营地址")
|
||||
@ApiModelProperty(value = "经营地址", required = true)
|
||||
private String operateId;
|
||||
|
||||
/**
|
||||
* 注册地址
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -5,6 +5,8 @@ import com.bonus.zlpt.company.api.domain.BmCoBank;
|
|||
import com.bonus.zlpt.company.api.domain.BmCompanyInfo;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
public class BmCompanyVo {
|
||||
|
||||
|
|
@ -12,7 +14,7 @@ public class BmCompanyVo {
|
|||
private BmCompanyInfo bmCompanyInfo;
|
||||
|
||||
//企业开户行信息
|
||||
private BmCoBank bmCoBank;
|
||||
private List<BmCoBank> bmCoBank;
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,6 +3,8 @@ package com.bonus.zlpt.company.mapper;
|
|||
import com.bonus.zlpt.company.api.domain.BmCoBank;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* Description:
|
||||
* @Author 阮世耀
|
||||
|
|
@ -59,5 +61,5 @@ public interface BmCoBankMapper {
|
|||
* @param companyId
|
||||
* @return
|
||||
*/
|
||||
BmCoBank selectByCompanyId(Integer companyId);
|
||||
List<BmCoBank> selectByCompanyId(Integer companyId);
|
||||
}
|
||||
|
|
@ -91,7 +91,7 @@ public class BmCompanyInfoServiceImpl implements BmCompanyInfoService {
|
|||
|
||||
List<BmCompanyInfo> bmCompanyInfos = bmCompanyInfoMapper.selectList(bmCompanyDto);
|
||||
for (BmCompanyInfo bmCompanyInfo : bmCompanyInfos) {
|
||||
SysUser data = remoteUserService.selectUserById(bmCompanyInfo.getAuditor().longValue()).getData();
|
||||
SysUser data = remoteUserService.selectUserById(bmCompanyInfo.getCreator().longValue()).getData();
|
||||
bmCompanyInfo.setUserName(data.getUserName());
|
||||
}
|
||||
return bmCompanyInfos;
|
||||
|
|
|
|||
|
|
@ -9,6 +9,8 @@
|
|||
<result column="company_type" jdbcType="VARCHAR" property="companyType" />
|
||||
<result column="company_ltd" jdbcType="VARCHAR" property="companyLtd" />
|
||||
<result column="credit_code" jdbcType="VARCHAR" property="creditCode" />
|
||||
<result column="register_id" jdbcType="VARCHAR" property="registerId" />
|
||||
<result column="operate_id" jdbcType="VARCHAR" property="operateId" />
|
||||
<result column="register_address" jdbcType="VARCHAR" property="registerAddress" />
|
||||
<result column="operate_address" jdbcType="VARCHAR" property="operateAddress" />
|
||||
<result column="certificateType" jdbcType="VARCHAR" property="certificatetype" />
|
||||
|
|
@ -39,7 +41,7 @@
|
|||
|
||||
<sql id="Base_Column_List">
|
||||
<!--@mbg.generated-->
|
||||
company_id, company_name, company_type, company_ltd, credit_code, register_address,
|
||||
company_id, company_name, company_type, company_ltd, credit_code,register_id,operate_id, register_address,
|
||||
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, auth_email,create_time, creator, auditor, audit_time, audit_remark,
|
||||
|
|
@ -61,7 +63,7 @@
|
|||
<insert id="insert" keyColumn="company_id" keyProperty="companyId" parameterType="com.bonus.zlpt.company.api.domain.BmCompanyInfo" useGeneratedKeys="true">
|
||||
<!--@mbg.generated-->
|
||||
insert into bm_company_info (company_name, company_type, company_ltd,
|
||||
credit_code, register_address, operate_address,
|
||||
credit_code,register_id,operate_id, register_address, operate_address,
|
||||
certificateType, id_number, business_license,
|
||||
legal_person, invitation_code, invitation_co_name,
|
||||
business_scope, auth_person, auth_id_number,
|
||||
|
|
@ -70,7 +72,7 @@
|
|||
auditor, audit_time, audit_remark,
|
||||
`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},
|
||||
#{creditCode,jdbcType=VARCHAR},#{registerId,jdbcType=VARCHAR},#{operateId,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},
|
||||
|
|
@ -96,6 +98,12 @@
|
|||
<if test="creditCode != null and creditCode != ''">
|
||||
credit_code,
|
||||
</if>
|
||||
<if test="registerId != null and registerId != ''">
|
||||
register_id,
|
||||
</if>
|
||||
<if test="operateId != null and operateId != ''">
|
||||
operate_id,
|
||||
</if>
|
||||
<if test="registerAddress != null and registerAddress != ''">
|
||||
register_address,
|
||||
</if>
|
||||
|
|
@ -188,6 +196,12 @@
|
|||
<if test="creditCode != null and creditCode != ''">
|
||||
#{creditCode,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="registerId != null and registerId != ''">
|
||||
#{registerId,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="operateId != null and operateId != ''">
|
||||
#{operateId,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="registerAddress != null and registerAddress != ''">
|
||||
#{registerAddress,jdbcType=VARCHAR},
|
||||
</if>
|
||||
|
|
@ -285,6 +299,12 @@
|
|||
<if test="creditCode != null and creditCode != ''">
|
||||
credit_code = #{creditCode,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="registerId != null and registerId != ''">
|
||||
register_id = #{registerId,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="operateId != null and operateId != ''">
|
||||
operate_id = #{operateId,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="registerAddress != null and registerAddress != ''">
|
||||
register_address = #{registerAddress,jdbcType=VARCHAR},
|
||||
</if>
|
||||
|
|
@ -374,6 +394,8 @@
|
|||
company_type = #{companyType,jdbcType=VARCHAR},
|
||||
company_ltd = #{companyLtd,jdbcType=VARCHAR},
|
||||
credit_code = #{creditCode,jdbcType=VARCHAR},
|
||||
register_id = #{registerId,jdbcType=VARCHAR},
|
||||
operate_id = #{operateId,jdbcType=VARCHAR},
|
||||
register_address = #{registerAddress,jdbcType=VARCHAR},
|
||||
operate_address = #{operateAddress,jdbcType=VARCHAR},
|
||||
certificateType = #{certificatetype,jdbcType=VARCHAR},
|
||||
|
|
@ -417,7 +439,7 @@
|
|||
</select>
|
||||
<select id="selectCountByCompanyType" resultType="java.lang.Integer">
|
||||
|
||||
select count(*) form bm_company_info
|
||||
select count(*) from bm_company_info
|
||||
<where>
|
||||
status = '1'
|
||||
<if test="companyName!= null and companyName!= ''">
|
||||
|
|
@ -439,7 +461,7 @@
|
|||
and date_format( #{endTime}, '%Y-%m-%d' )
|
||||
</if>
|
||||
<if test="userName != null and userName != ''">
|
||||
and auditor in (select user_id from sys_user where user_name LIKE CONCAT('%', #{userName}, '%'))
|
||||
and creator in (select user_id from sys_user where user_name LIKE CONCAT('%', #{userName}, '%'))
|
||||
</if>
|
||||
</where>
|
||||
</select>
|
||||
|
|
|
|||
Loading…
Reference in New Issue