Antiloveg 8 years ago
parent
commit
a50f77ecb9

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

@@ -1036,8 +1036,8 @@
 	<select id="selectBasicInfo" resultType="com.goafanti.user.bo.OrgBasicInfoBo">
 		select oi.id,
 		oi.uid as
-		uid, oi.unit_name as unitName, oi.licence_province as province,
-		oi.licence_city as city, oi.licence_area as area, oi.postal_address as
+		uid, oi.unit_name as unitName, oi.licence_province as licenceProvince,
+		oi.licence_city as licenceCity, oi.licence_area as licenceArea, oi.postal_address as
 		postalAddress,
 		oi.postcode, oi.first_contacts as firstContacts,
 		oi.first_mobile as firstMobile,

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

@@ -30,21 +30,21 @@ public class InputOrgBasicInfo {
 	 */
 	@Max(value = 99, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
-	private Integer		province;
+	private Integer		licenceProvince;
 
 	/**
 	 * 行政区域--市
 	 */
 	@Max(value = 999, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
-	private Integer		city;
+	private Integer		licenceCity;
 
 	/**
 	 * 行政区域--区
 	 */
 	@Max(value = 9999, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
-	private Integer		area;
+	private Integer		licenceArea;
 
 	/**
 	 * 通讯地址
@@ -279,28 +279,28 @@ public class InputOrgBasicInfo {
 		this.unitName = unitName;
 	}
 
-	public Integer getProvince() {
-		return province;
+	public Integer getLicenceProvince() {
+		return licenceProvince;
 	}
 
-	public void setProvince(Integer province) {
-		this.province = province;
+	public void setLicenceProvince(Integer licenceProvince) {
+		this.licenceProvince = licenceProvince;
 	}
 
-	public Integer getCity() {
-		return city;
+	public Integer getLicenceCity() {
+		return licenceCity;
 	}
 
-	public void setCity(Integer city) {
-		this.city = city;
+	public void setLicenceCity(Integer licenceCity) {
+		this.licenceCity = licenceCity;
 	}
 
-	public Integer getArea() {
-		return area;
+	public Integer getLicenceArea() {
+		return licenceArea;
 	}
 
-	public void setArea(Integer area) {
-		this.area = area;
+	public void setLicenceArea(Integer licenceArea) {
+		this.licenceArea = licenceArea;
 	}
 
 	public String getPostalAddress() {

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

@@ -10,192 +10,191 @@ import com.fasterxml.jackson.annotation.JsonFormat.Shape;
 import com.goafanti.common.constant.AFTConstants;
 
 public class OrgBasicInfoBo {
-	private String id;
-	
-	private String uid;
-	
-	private String hid;
-	
+	private String		id;
+
+	private String		uid;
+
+	private String		hid;
+
 	/**
 	 * 企业名称
 	 */
-	private String unitName; 
-	
-	
+	private String		unitName;
+
 	/**
 	 * 行政区域--省
 	 */
-	private Integer province;
-	
+	private Integer		licenceProvince;
+
 	/**
 	 * 行政区域--市
 	 */
-	private Integer city;
-	
+	private Integer		licenceCity;
+
 	/**
 	 * 行政区域--区
 	 */
-	private Integer area;
-	
+	private Integer		licenceArea;
+
 	/**
 	 * 通讯地址
 	 */
-	private String postalAddress;
-	
+	private String		postalAddress;
+
 	/**
 	 * 邮编
 	 */
-	private String postcode;
-	
+	private String		postcode;
+
 	/**
 	 * 联系人姓名(第一联系人)
 	 */
-	private String firstContacts;
-	
+	private String		firstContacts;
+
 	/**
 	 * 联系人手机(第一联系人)
 	 */
-	private String firstMobile;
-	
+	private String		firstMobile;
+
 	/**
 	 * 联系人电话
 	 */
-	private String contactsFixedTel;
-	
+	private String		contactsFixedTel;
+
 	/**
 	 * 联系人传真
 	 */
-	private String contactsFax;
-	
+	private String		contactsFax;
+
 	/**
 	 * 法人电话
 	 */
-	private String legalPersonTel;
-	
+	private String		legalPersonTel;
+
 	/**
 	 * 法人传真
 	 */
-	private String legalPersonFax;
-	
+	private String		legalPersonFax;
+
 	/**
 	 * 法人Email
 	 */
-	private String legalPersonEmail;
-	
+	private String		legalPersonEmail;
+
 	/**
 	 * 注册资金
 	 */
-	private BigDecimal registeredCapital;
-	
+	private BigDecimal	registeredCapital;
+
 	/**
 	 * 注册时间
 	 */
-	private Date registrationTime;
-	
+	private Date		registrationTime;
+
 	/**
 	 * 法人代表姓名
 	 */
-	private String legalPerson;
-	
+	private String		legalPerson;
+
 	/**
 	 * 法人身份证号
 	 */
-	private String legalPersonIdCard;
-	
+	private String		legalPersonIdCard;
+
 	/**
 	 * 组织机构代码/统一社会信用代码
 	 */
-	private String orgCode;
-	
+	private String		orgCode;
+
 	/**
 	 * 税务登记号/统一社会信用代码
 	 */
-	private String ratepayCode;
-	
+	private String		ratepayCode;
+
 	/**
 	 * 所属行业
 	 */
-	private Integer industry;
-	
+	private Integer		industry;
+
 	/**
 	 * 企业规模(注册资金)
 	 */
-	private Integer enterpriseScale;
-	
+	private Integer		enterpriseScale;
+
 	/**
 	 * 注册类型
 	 */
-	private String registerType;
-	
+	private String		registerType;
+
 	/**
 	 * 外资来源地
 	 */
-	private String foreignInvestment;
-	
+	private String		foreignInvestment;
+
 	/**
 	 * 领域
 	 */
-	private String field;
-	
+	private String		field;
+
 	/**
 	 * 企业所得税主管税务机关
 	 */
-	private Integer taxAuthority;
-	
+	private Integer		taxAuthority;
+
 	/**
 	 * 企业所得税征收方式
 	 */
-	private Integer ratepayMethod;
-	
+	private Integer		ratepayMethod;
+
 	/**
 	 * 是否上市
 	 */
-	private Integer listed;
-	
+	private Integer		listed;
+
 	/**
 	 * 上市时间
 	 */
-	private Date listedDate;
-	
+	private Date		listedDate;
+
 	/**
 	 * 上市类型
 	 */
-	private Integer listedType;
-	
+	private Integer		listedType;
+
 	/**
 	 * 股票代码
 	 */
-	private String stockCode;
-	
+	private String		stockCode;
+
 	/**
 	 * 是否属于国家级高新区内企业
 	 */
-	private Integer highTechZone;
-	
+	private Integer		highTechZone;
+
 	/**
 	 * 国家级高新区名称
 	 */
-	private String highTechName;
-	
+	private String		highTechName;
+
 	/**
 	 * 是否引入风险投资
 	 */
-	private Integer riskInvestment;
-	
+	private Integer		riskInvestment;
+
 	/**
 	 * 经营范围
 	 */
-	private String businessScope;
-	
+	private String		businessScope;
+
 	/**
 	 * 企业职工
 	 */
-	private Integer firmTotal;
-	
+	private Integer		firmTotal;
+
 	/**
 	 * 科技人员
 	 */
-	private Integer techTotal;
+	private Integer		techTotal;
 
 	public String getId() {
 		return id;
@@ -229,28 +228,28 @@ public class OrgBasicInfoBo {
 		this.unitName = unitName;
 	}
 
-	public Integer getProvince() {
-		return province;
+	public Integer getLicenceProvince() {
+		return licenceProvince;
 	}
 
-	public void setProvince(Integer province) {
-		this.province = province;
+	public void setLicenceProvince(Integer licenceProvince) {
+		this.licenceProvince = licenceProvince;
 	}
-	
-	public Integer getCity() {
-		return city;
+
+	public Integer getLicenceCity() {
+		return licenceCity;
 	}
 
-	public void setCity(Integer city) {
-		this.city = city;
+	public void setLicenceCity(Integer licenceCity) {
+		this.licenceCity = licenceCity;
 	}
-	
-	public Integer getArea() {
-		return area;
+
+	public Integer getLicenceArea() {
+		return licenceArea;
 	}
 
-	public void setArea(Integer area) {
-		this.area = area;
+	public void setLicenceArea(Integer licenceArea) {
+		this.licenceArea = licenceArea;
 	}
 
 	public String getPostalAddress() {
@@ -269,7 +268,6 @@ public class OrgBasicInfoBo {
 		this.postcode = postcode;
 	}
 
-
 	public String getFirstContacts() {
 		return firstContacts;
 	}
@@ -373,7 +371,7 @@ public class OrgBasicInfoBo {
 	public void setRatepayCode(String ratepayCode) {
 		this.ratepayCode = ratepayCode;
 	}
-	
+
 	@JsonFormat(shape = Shape.STRING)
 	public Integer getIndustry() {
 		return industry;
@@ -382,7 +380,7 @@ public class OrgBasicInfoBo {
 	public void setIndustry(Integer industry) {
 		this.industry = industry;
 	}
-	
+
 	@JsonFormat(shape = Shape.STRING)
 	public Integer getEnterpriseScale() {
 		return enterpriseScale;
@@ -391,8 +389,7 @@ public class OrgBasicInfoBo {
 	public void setEnterpriseScale(Integer enterpriseScale) {
 		this.enterpriseScale = enterpriseScale;
 	}
-	
-    
+
 	public String getRegisterType() {
 		return registerType;
 	}
@@ -416,7 +413,7 @@ public class OrgBasicInfoBo {
 	public void setField(String field) {
 		this.field = field;
 	}
-	
+
 	@JsonFormat(shape = Shape.STRING)
 	public Integer getTaxAuthority() {
 		return taxAuthority;
@@ -425,7 +422,7 @@ public class OrgBasicInfoBo {
 	public void setTaxAuthority(Integer taxAuthority) {
 		this.taxAuthority = taxAuthority;
 	}
-	
+
 	@JsonFormat(shape = Shape.STRING)
 	public Integer getRatepayMethod() {
 		return ratepayMethod;
@@ -434,7 +431,7 @@ public class OrgBasicInfoBo {
 	public void setRatepayMethod(Integer ratepayMethod) {
 		this.ratepayMethod = ratepayMethod;
 	}
-	
+
 	@JsonFormat(shape = Shape.STRING)
 	public Integer getListed() {
 		return listed;
@@ -443,7 +440,7 @@ public class OrgBasicInfoBo {
 	public void setListed(Integer listed) {
 		this.listed = listed;
 	}
-	
+
 	@JsonFormat(shape = Shape.STRING)
 	public Integer getHighTechZone() {
 		return highTechZone;
@@ -452,7 +449,7 @@ public class OrgBasicInfoBo {
 	public void setHighTechZone(Integer highTechZone) {
 		this.highTechZone = highTechZone;
 	}
-	
+
 	@JsonFormat(shape = Shape.STRING)
 	public Integer getRiskInvestment() {
 		return riskInvestment;
@@ -485,7 +482,7 @@ public class OrgBasicInfoBo {
 	public void setTechTotal(Integer techTotal) {
 		this.techTotal = techTotal;
 	}
-	
+
 	public Date getListedDate() {
 		return listedDate;
 	}
@@ -493,7 +490,7 @@ public class OrgBasicInfoBo {
 	public void setListedDate(Date listedDate) {
 		this.listedDate = listedDate;
 	}
-	
+
 	@JsonFormat(shape = Shape.STRING)
 	public Integer getListedType() {
 		return listedType;
@@ -530,7 +527,7 @@ public class OrgBasicInfoBo {
 	public void setRegistrationTimeFormattedDate(String registrationTimeFormattedDate) {
 
 	}
-	
+
 	public String getListedDateFormattedDate() {
 		if (this.listedDate == null) {
 			return null;
@@ -542,9 +539,5 @@ public class OrgBasicInfoBo {
 	public void setListedDateFormattedDate(String listedDateFormattedDate) {
 
 	}
-	
-	
-	
-	
 
 }