提交代码

yy_dev
胡锐 2 years ago
parent 396011a458
commit c7b6a2eebd
  1. 2
      cweb/src/main/java/com/cweb/controller/BsMerController.java
  2. 83
      service/src/main/java/com/hfkj/dao/BsMerMapper.java
  3. 14
      service/src/main/java/com/hfkj/dao/BsMerSqlProvider.java
  4. 16
      service/src/main/java/com/hfkj/entity/BsMer.java
  5. 70
      service/src/main/java/com/hfkj/entity/BsMerExample.java

@ -263,6 +263,8 @@ public class BsMerController {
mer.getMerRegion().setAreaCode(MapUtils.getObject(regionMap, "street").getRegionId());
mer.getMerRegion().setAreaName(MapUtils.getObject(regionMap, "street").getRegionName());
bsMer.setOrgNo(mer.getOrgNo());
bsMer.setOrgName(commonService.getDictionaryCodeName("ORG_NO", mer.getOrgNo()));
bsMer.setMerType(mer.getMerType());
bsMer.setMerName(mer.getMerName());
bsMer.setMerAbbreviate(mer.getMerAbbreviate());

@ -39,44 +39,44 @@ public interface BsMerMapper extends BsMerMapperExt {
int deleteByPrimaryKey(Long id);
@Insert({
"insert into bs_mer (org_no, company_id, ",
"company_name, agent_id, ",
"agent_name, salesman_id, ",
"salesman_name, reg_phone, ",
"reg_name, reg_email, ",
"mer_type, mer_no, ",
"mer_name, mer_abbreviate, ",
"mer_mcc_code, mer_mcc_name, ",
"blis_url, blis_name, ",
"blis_no, blis_reg_address, ",
"blis_period_type, blis_period_start, ",
"blis_period_end, lar_name, ",
"lar_id_card, lar_id_card_portrait_img, ",
"lar_id_card_national_emblem_img, lar_id_card_address, ",
"lar_id_card_period_type, lar_id_card_period_start, ",
"lar_id_card_period_end, complete_status, ",
"mer_status, create_time, ",
"update_time, ext_1, ",
"ext_2, ext_3)",
"values (#{orgNo,jdbcType=VARCHAR}, #{companyId,jdbcType=BIGINT}, ",
"#{companyName,jdbcType=VARCHAR}, #{agentId,jdbcType=BIGINT}, ",
"#{agentName,jdbcType=VARCHAR}, #{salesmanId,jdbcType=BIGINT}, ",
"#{salesmanName,jdbcType=VARCHAR}, #{regPhone,jdbcType=VARCHAR}, ",
"#{regName,jdbcType=VARCHAR}, #{regEmail,jdbcType=VARCHAR}, ",
"#{merType,jdbcType=INTEGER}, #{merNo,jdbcType=VARCHAR}, ",
"#{merName,jdbcType=VARCHAR}, #{merAbbreviate,jdbcType=VARCHAR}, ",
"#{merMccCode,jdbcType=VARCHAR}, #{merMccName,jdbcType=VARCHAR}, ",
"#{blisUrl,jdbcType=VARCHAR}, #{blisName,jdbcType=VARCHAR}, ",
"#{blisNo,jdbcType=VARCHAR}, #{blisRegAddress,jdbcType=VARCHAR}, ",
"#{blisPeriodType,jdbcType=INTEGER}, #{blisPeriodStart,jdbcType=VARCHAR}, ",
"#{blisPeriodEnd,jdbcType=VARCHAR}, #{larName,jdbcType=VARCHAR}, ",
"#{larIdCard,jdbcType=VARCHAR}, #{larIdCardPortraitImg,jdbcType=VARCHAR}, ",
"#{larIdCardNationalEmblemImg,jdbcType=VARCHAR}, #{larIdCardAddress,jdbcType=VARCHAR}, ",
"#{larIdCardPeriodType,jdbcType=INTEGER}, #{larIdCardPeriodStart,jdbcType=VARCHAR}, ",
"#{larIdCardPeriodEnd,jdbcType=VARCHAR}, #{completeStatus,jdbcType=INTEGER}, ",
"#{merStatus,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, ",
"#{updateTime,jdbcType=TIMESTAMP}, #{ext1,jdbcType=VARCHAR}, ",
"#{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})"
"insert into bs_mer (org_no, org_name, ",
"company_id, company_name, ",
"agent_id, agent_name, ",
"salesman_id, salesman_name, ",
"reg_phone, reg_name, ",
"reg_email, mer_type, ",
"mer_no, mer_name, ",
"mer_abbreviate, mer_mcc_code, ",
"mer_mcc_name, blis_url, ",
"blis_name, blis_no, ",
"blis_reg_address, blis_period_type, ",
"blis_period_start, blis_period_end, ",
"lar_name, lar_id_card, ",
"lar_id_card_portrait_img, lar_id_card_national_emblem_img, ",
"lar_id_card_address, lar_id_card_period_type, ",
"lar_id_card_period_start, lar_id_card_period_end, ",
"complete_status, mer_status, ",
"create_time, update_time, ",
"ext_1, ext_2, ext_3)",
"values (#{orgNo,jdbcType=VARCHAR}, #{orgName,jdbcType=VARCHAR}, ",
"#{companyId,jdbcType=BIGINT}, #{companyName,jdbcType=VARCHAR}, ",
"#{agentId,jdbcType=BIGINT}, #{agentName,jdbcType=VARCHAR}, ",
"#{salesmanId,jdbcType=BIGINT}, #{salesmanName,jdbcType=VARCHAR}, ",
"#{regPhone,jdbcType=VARCHAR}, #{regName,jdbcType=VARCHAR}, ",
"#{regEmail,jdbcType=VARCHAR}, #{merType,jdbcType=INTEGER}, ",
"#{merNo,jdbcType=VARCHAR}, #{merName,jdbcType=VARCHAR}, ",
"#{merAbbreviate,jdbcType=VARCHAR}, #{merMccCode,jdbcType=VARCHAR}, ",
"#{merMccName,jdbcType=VARCHAR}, #{blisUrl,jdbcType=VARCHAR}, ",
"#{blisName,jdbcType=VARCHAR}, #{blisNo,jdbcType=VARCHAR}, ",
"#{blisRegAddress,jdbcType=VARCHAR}, #{blisPeriodType,jdbcType=INTEGER}, ",
"#{blisPeriodStart,jdbcType=VARCHAR}, #{blisPeriodEnd,jdbcType=VARCHAR}, ",
"#{larName,jdbcType=VARCHAR}, #{larIdCard,jdbcType=VARCHAR}, ",
"#{larIdCardPortraitImg,jdbcType=VARCHAR}, #{larIdCardNationalEmblemImg,jdbcType=VARCHAR}, ",
"#{larIdCardAddress,jdbcType=VARCHAR}, #{larIdCardPeriodType,jdbcType=INTEGER}, ",
"#{larIdCardPeriodStart,jdbcType=VARCHAR}, #{larIdCardPeriodEnd,jdbcType=VARCHAR}, ",
"#{completeStatus,jdbcType=INTEGER}, #{merStatus,jdbcType=INTEGER}, ",
"#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, ",
"#{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})"
})
@Options(useGeneratedKeys=true,keyProperty="id")
int insert(BsMer record);
@ -89,6 +89,7 @@ public interface BsMerMapper extends BsMerMapperExt {
@Results({
@Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true),
@Result(column="org_no", property="orgNo", jdbcType=JdbcType.VARCHAR),
@Result(column="org_name", property="orgName", jdbcType=JdbcType.VARCHAR),
@Result(column="company_id", property="companyId", jdbcType=JdbcType.BIGINT),
@Result(column="company_name", property="companyName", jdbcType=JdbcType.VARCHAR),
@Result(column="agent_id", property="agentId", jdbcType=JdbcType.BIGINT),
@ -131,8 +132,8 @@ public interface BsMerMapper extends BsMerMapperExt {
@Select({
"select",
"id, org_no, company_id, company_name, agent_id, agent_name, salesman_id, salesman_name, ",
"reg_phone, reg_name, reg_email, mer_type, mer_no, mer_name, mer_abbreviate, ",
"id, org_no, org_name, company_id, company_name, agent_id, agent_name, salesman_id, ",
"salesman_name, reg_phone, reg_name, reg_email, mer_type, mer_no, mer_name, mer_abbreviate, ",
"mer_mcc_code, mer_mcc_name, blis_url, blis_name, blis_no, blis_reg_address, ",
"blis_period_type, blis_period_start, blis_period_end, lar_name, lar_id_card, ",
"lar_id_card_portrait_img, lar_id_card_national_emblem_img, lar_id_card_address, ",
@ -144,6 +145,7 @@ public interface BsMerMapper extends BsMerMapperExt {
@Results({
@Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true),
@Result(column="org_no", property="orgNo", jdbcType=JdbcType.VARCHAR),
@Result(column="org_name", property="orgName", jdbcType=JdbcType.VARCHAR),
@Result(column="company_id", property="companyId", jdbcType=JdbcType.BIGINT),
@Result(column="company_name", property="companyName", jdbcType=JdbcType.VARCHAR),
@Result(column="agent_id", property="agentId", jdbcType=JdbcType.BIGINT),
@ -196,6 +198,7 @@ public interface BsMerMapper extends BsMerMapperExt {
@Update({
"update bs_mer",
"set org_no = #{orgNo,jdbcType=VARCHAR},",
"org_name = #{orgName,jdbcType=VARCHAR},",
"company_id = #{companyId,jdbcType=BIGINT},",
"company_name = #{companyName,jdbcType=VARCHAR},",
"agent_id = #{agentId,jdbcType=BIGINT},",

@ -32,6 +32,10 @@ public class BsMerSqlProvider {
sql.VALUES("org_no", "#{orgNo,jdbcType=VARCHAR}");
}
if (record.getOrgName() != null) {
sql.VALUES("org_name", "#{orgName,jdbcType=VARCHAR}");
}
if (record.getCompanyId() != null) {
sql.VALUES("company_id", "#{companyId,jdbcType=BIGINT}");
}
@ -191,6 +195,7 @@ public class BsMerSqlProvider {
sql.SELECT("id");
}
sql.SELECT("org_no");
sql.SELECT("org_name");
sql.SELECT("company_id");
sql.SELECT("company_name");
sql.SELECT("agent_id");
@ -253,6 +258,10 @@ public class BsMerSqlProvider {
sql.SET("org_no = #{record.orgNo,jdbcType=VARCHAR}");
}
if (record.getOrgName() != null) {
sql.SET("org_name = #{record.orgName,jdbcType=VARCHAR}");
}
if (record.getCompanyId() != null) {
sql.SET("company_id = #{record.companyId,jdbcType=BIGINT}");
}
@ -411,6 +420,7 @@ public class BsMerSqlProvider {
sql.SET("id = #{record.id,jdbcType=BIGINT}");
sql.SET("org_no = #{record.orgNo,jdbcType=VARCHAR}");
sql.SET("org_name = #{record.orgName,jdbcType=VARCHAR}");
sql.SET("company_id = #{record.companyId,jdbcType=BIGINT}");
sql.SET("company_name = #{record.companyName,jdbcType=VARCHAR}");
sql.SET("agent_id = #{record.agentId,jdbcType=BIGINT}");
@ -462,6 +472,10 @@ public class BsMerSqlProvider {
sql.SET("org_no = #{orgNo,jdbcType=VARCHAR}");
}
if (record.getOrgName() != null) {
sql.SET("org_name = #{orgName,jdbcType=VARCHAR}");
}
if (record.getCompanyId() != null) {
sql.SET("company_id = #{companyId,jdbcType=BIGINT}");
}

@ -23,6 +23,11 @@ public class BsMer implements Serializable {
*/
private String orgNo;
/**
* 机构名称
*/
private String orgName;
/**
* 公司id
*/
@ -217,6 +222,14 @@ public class BsMer implements Serializable {
this.orgNo = orgNo;
}
public String getOrgName() {
return orgName;
}
public void setOrgName(String orgName) {
this.orgName = orgName;
}
public Long getCompanyId() {
return companyId;
}
@ -527,6 +540,7 @@ public class BsMer implements Serializable {
BsMer other = (BsMer) that;
return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
&& (this.getOrgNo() == null ? other.getOrgNo() == null : this.getOrgNo().equals(other.getOrgNo()))
&& (this.getOrgName() == null ? other.getOrgName() == null : this.getOrgName().equals(other.getOrgName()))
&& (this.getCompanyId() == null ? other.getCompanyId() == null : this.getCompanyId().equals(other.getCompanyId()))
&& (this.getCompanyName() == null ? other.getCompanyName() == null : this.getCompanyName().equals(other.getCompanyName()))
&& (this.getAgentId() == null ? other.getAgentId() == null : this.getAgentId().equals(other.getAgentId()))
@ -572,6 +586,7 @@ public class BsMer implements Serializable {
int result = 1;
result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
result = prime * result + ((getOrgNo() == null) ? 0 : getOrgNo().hashCode());
result = prime * result + ((getOrgName() == null) ? 0 : getOrgName().hashCode());
result = prime * result + ((getCompanyId() == null) ? 0 : getCompanyId().hashCode());
result = prime * result + ((getCompanyName() == null) ? 0 : getCompanyName().hashCode());
result = prime * result + ((getAgentId() == null) ? 0 : getAgentId().hashCode());
@ -620,6 +635,7 @@ public class BsMer implements Serializable {
sb.append("Hash = ").append(hashCode());
sb.append(", id=").append(id);
sb.append(", orgNo=").append(orgNo);
sb.append(", orgName=").append(orgName);
sb.append(", companyId=").append(companyId);
sb.append(", companyName=").append(companyName);
sb.append(", agentId=").append(agentId);

@ -255,6 +255,76 @@ public class BsMerExample {
return (Criteria) this;
}
public Criteria andOrgNameIsNull() {
addCriterion("org_name is null");
return (Criteria) this;
}
public Criteria andOrgNameIsNotNull() {
addCriterion("org_name is not null");
return (Criteria) this;
}
public Criteria andOrgNameEqualTo(String value) {
addCriterion("org_name =", value, "orgName");
return (Criteria) this;
}
public Criteria andOrgNameNotEqualTo(String value) {
addCriterion("org_name <>", value, "orgName");
return (Criteria) this;
}
public Criteria andOrgNameGreaterThan(String value) {
addCriterion("org_name >", value, "orgName");
return (Criteria) this;
}
public Criteria andOrgNameGreaterThanOrEqualTo(String value) {
addCriterion("org_name >=", value, "orgName");
return (Criteria) this;
}
public Criteria andOrgNameLessThan(String value) {
addCriterion("org_name <", value, "orgName");
return (Criteria) this;
}
public Criteria andOrgNameLessThanOrEqualTo(String value) {
addCriterion("org_name <=", value, "orgName");
return (Criteria) this;
}
public Criteria andOrgNameLike(String value) {
addCriterion("org_name like", value, "orgName");
return (Criteria) this;
}
public Criteria andOrgNameNotLike(String value) {
addCriterion("org_name not like", value, "orgName");
return (Criteria) this;
}
public Criteria andOrgNameIn(List<String> values) {
addCriterion("org_name in", values, "orgName");
return (Criteria) this;
}
public Criteria andOrgNameNotIn(List<String> values) {
addCriterion("org_name not in", values, "orgName");
return (Criteria) this;
}
public Criteria andOrgNameBetween(String value1, String value2) {
addCriterion("org_name between", value1, value2, "orgName");
return (Criteria) this;
}
public Criteria andOrgNameNotBetween(String value1, String value2) {
addCriterion("org_name not between", value1, value2, "orgName");
return (Criteria) this;
}
public Criteria andCompanyIdIsNull() {
addCriterion("company_id is null");
return (Criteria) this;

Loading…
Cancel
Save