liliang4869 лет назад: 7
Родитель
Сommit
263280d814

+ 6 - 6
src/main/java/com/goafanti/common/mapper/OrganizationIdentityMapper.xml

@@ -56,7 +56,7 @@
     <result column="registration_time" jdbcType="TIMESTAMP" property="registrationTime" />
     <result column="ratepay_code" jdbcType="VARCHAR" property="ratepayCode" />
     <result column="industry" jdbcType="INTEGER" property="industry" />
-    <result column="enterprise_scale" jdbcType="INTEGER" property="enterpriseScale" />
+    <result column="enterprise_scale" jdbcType="VARCHAR" property="enterpriseScale" />
     <result column="register_type" jdbcType="VARCHAR" property="registerType" />
     <result column="foreign_investment" jdbcType="VARCHAR" property="foreignInvestment" />
     <result column="field" jdbcType="VARCHAR" property="field" />
@@ -251,7 +251,7 @@
       #{issuingDate,jdbcType=TIMESTAMP}, #{cogContacts,jdbcType=INTEGER}, #{techPrincipal,jdbcType=VARCHAR}, 
       #{contactsFixedTel,jdbcType=VARCHAR}, #{contactsFax,jdbcType=VARCHAR}, #{legalPersonTel,jdbcType=VARCHAR}, 
       #{legalPersonFax,jdbcType=VARCHAR}, #{legalPersonEmail,jdbcType=VARCHAR}, #{registrationTime,jdbcType=TIMESTAMP}, 
-      #{ratepayCode,jdbcType=VARCHAR}, #{industry,jdbcType=INTEGER}, #{enterpriseScale,jdbcType=INTEGER}, 
+      #{ratepayCode,jdbcType=VARCHAR}, #{industry,jdbcType=INTEGER}, #{enterpriseScale,jdbcType=VARCHAR}, 
       #{registerType,jdbcType=VARCHAR}, #{foreignInvestment,jdbcType=VARCHAR}, #{field,jdbcType=VARCHAR}, 
       #{taxAuthority,jdbcType=INTEGER}, #{ratepayMethod,jdbcType=INTEGER}, #{highTechZone,jdbcType=INTEGER}, 
       #{riskInvestment,jdbcType=INTEGER}, #{businessScope,jdbcType=VARCHAR}, #{highTechName,jdbcType=VARCHAR}, 
@@ -815,7 +815,7 @@
         industry = #{record.industry,jdbcType=INTEGER},
       </if>
       <if test="record.enterpriseScale != null">
-        enterprise_scale = #{record.enterpriseScale,jdbcType=INTEGER},
+        enterprise_scale = #{record.enterpriseScale,jdbcType=VARCHAR},
       </if>
       <if test="record.registerType != null">
         register_type = #{record.registerType,jdbcType=VARCHAR},
@@ -917,7 +917,7 @@
       registration_time = #{record.registrationTime,jdbcType=TIMESTAMP},
       ratepay_code = #{record.ratepayCode,jdbcType=VARCHAR},
       industry = #{record.industry,jdbcType=INTEGER},
-      enterprise_scale = #{record.enterpriseScale,jdbcType=INTEGER},
+      enterprise_scale = #{record.enterpriseScale,jdbcType=VARCHAR},
       register_type = #{record.registerType,jdbcType=VARCHAR},
       foreign_investment = #{record.foreignInvestment,jdbcType=VARCHAR},
       field = #{record.field,jdbcType=VARCHAR},
@@ -1088,7 +1088,7 @@
         industry = #{industry,jdbcType=INTEGER},
       </if>
       <if test="enterpriseScale != null">
-        enterprise_scale = #{enterpriseScale,jdbcType=INTEGER},
+        enterprise_scale = #{enterpriseScale,jdbcType=VARCHAR},
       </if>
       <if test="registerType != null">
         register_type = #{registerType,jdbcType=VARCHAR},
@@ -1187,7 +1187,7 @@
       registration_time = #{registrationTime,jdbcType=TIMESTAMP},
       ratepay_code = #{ratepayCode,jdbcType=VARCHAR},
       industry = #{industry,jdbcType=INTEGER},
-      enterprise_scale = #{enterpriseScale,jdbcType=INTEGER},
+      enterprise_scale = #{enterpriseScale,jdbcType=VARCHAR},
       register_type = #{registerType,jdbcType=VARCHAR},
       foreign_investment = #{foreignInvestment,jdbcType=VARCHAR},
       field = #{field,jdbcType=VARCHAR},

+ 4 - 4
src/main/java/com/goafanti/common/model/OrganizationIdentity.java

@@ -1,4 +1,4 @@
-package com.goafanti.common.model;
+ package com.goafanti.common.model;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -254,7 +254,7 @@ public class OrganizationIdentity {
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column organization_identity.enterprise_scale
 	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
-	private Integer enterpriseScale;
+	private String enterpriseScale;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column organization_identity.register_type
 	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
@@ -1208,7 +1208,7 @@ public class OrganizationIdentity {
 	 * @return  the value of organization_identity.enterprise_scale
 	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
-	public Integer getEnterpriseScale() {
+	public String getEnterpriseScale() {
 		return enterpriseScale;
 	}
 
@@ -1217,7 +1217,7 @@ public class OrganizationIdentity {
 	 * @param enterpriseScale  the value for organization_identity.enterprise_scale
 	 * @mbg.generated  Thu Nov 30 17:32:28 CST 2017
 	 */
-	public void setEnterpriseScale(Integer enterpriseScale) {
+	public void setEnterpriseScale(String enterpriseScale) {
 		this.enterpriseScale = enterpriseScale;
 	}
 

+ 3 - 3
src/main/java/com/goafanti/user/bo/InputOrgBasicInfo.java

@@ -136,7 +136,7 @@ public class InputOrgBasicInfo {
 	 */
 	@Max(value = 9, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
-	private Integer		enterpriseScale;
+	private String		enterpriseScale;
 
 	/**
 	 * 注册类型
@@ -403,11 +403,11 @@ public class InputOrgBasicInfo {
 		this.industry = industry;
 	}
 
-	public Integer getEnterpriseScale() {
+	public String getEnterpriseScale() {
 		return enterpriseScale;
 	}
 
-	public void setEnterpriseScale(Integer enterpriseScale) {
+	public void setEnterpriseScale(String enterpriseScale) {
 		this.enterpriseScale = enterpriseScale;
 	}
 

+ 3 - 3
src/main/java/com/goafanti/user/bo/InputOrganizationIdentity.java

@@ -165,7 +165,7 @@ public class InputOrganizationIdentity {
 	
 	@Max(value = 1, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
-	private Integer enterpriseScale;
+	private String enterpriseScale;
 	
 	@Max(value = 1, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
@@ -561,11 +561,11 @@ public class InputOrganizationIdentity {
 		this.industry = industry;
 	}
 
-	public Integer getEnterpriseScale() {
+	public String getEnterpriseScale() {
 		return enterpriseScale;
 	}
 
-	public void setEnterpriseScale(Integer enterpriseScale) {
+	public void setEnterpriseScale(String enterpriseScale) {
 		this.enterpriseScale = enterpriseScale;
 	}
 

+ 3 - 3
src/main/java/com/goafanti/user/bo/OrgBasicInfoBo.java

@@ -109,7 +109,7 @@ public class OrgBasicInfoBo {
 	/**
 	 * 企业规模(注册资金)
 	 */
-	private Integer		enterpriseScale;
+	private String		enterpriseScale;
 
 	/**
 	 * 注册类型
@@ -356,11 +356,11 @@ public class OrgBasicInfoBo {
 	}
 
 	@JsonFormat(shape = Shape.STRING)
-	public Integer getEnterpriseScale() {
+	public String getEnterpriseScale() {
 		return enterpriseScale;
 	}
 
-	public void setEnterpriseScale(Integer enterpriseScale) {
+	public void setEnterpriseScale(String enterpriseScale) {
 		this.enterpriseScale = enterpriseScale;
 	}