Antiloveg пре 8 година
родитељ
комит
6cdb1048a1
25 измењених фајлова са 116 додато и 138 уклоњено
  1. 0 5
      src/main/java/com/goafanti/achievement/bo/AchievementUserOwnerDetailBo.java
  2. 13 12
      src/main/java/com/goafanti/admin/controller/AdminPatentApiController.java
  3. 0 5
      src/main/java/com/goafanti/cognizance/bo/AnnualReportBo.java
  4. 0 6
      src/main/java/com/goafanti/cognizance/bo/AnnualReportMainBo.java
  5. 0 1
      src/main/java/com/goafanti/cognizance/bo/CognizanceBo.java
  6. 0 3
      src/main/java/com/goafanti/cognizance/bo/CultivationListBo.java
  7. 57 0
      src/main/java/com/goafanti/common/enums/PatentCategoryStatus.java
  8. 0 6
      src/main/java/com/goafanti/common/model/OrganizationIdentity.java
  9. 0 5
      src/main/java/com/goafanti/common/model/OrganizationInfo.java
  10. 0 3
      src/main/java/com/goafanti/common/model/UserIdentity.java
  11. 0 5
      src/main/java/com/goafanti/common/model/UserInfo.java
  12. 0 1
      src/main/java/com/goafanti/copyright/bo/CopyrightInfoSummary.java
  13. 0 1
      src/main/java/com/goafanti/demand/bo/DemandManageListBo.java
  14. 0 1
      src/main/java/com/goafanti/patent/bo/PatentApplicationFeeBo.java
  15. 0 3
      src/main/java/com/goafanti/patent/bo/PatentCompositeBo.java
  16. 7 11
      src/main/java/com/goafanti/patent/bo/PatentInfoDetailBo.java
  17. 0 1
      src/main/java/com/goafanti/patent/bo/PatentManageListBo.java
  18. 0 3
      src/main/java/com/goafanti/patent/bo/PatentNoticeOfCorrectionBo.java
  19. 33 41
      src/main/java/com/goafanti/patent/bo/PatentPendingBo.java
  20. 0 3
      src/main/java/com/goafanti/patent/bo/PatentRecieveSendBo.java
  21. 0 1
      src/main/java/com/goafanti/techproject/bo/TechProjectClientListBo.java
  22. 6 9
      src/main/java/com/goafanti/techproject/bo/TechProjectDetailBo.java
  23. 0 3
      src/main/java/com/goafanti/techproject/bo/TechWebsiteListBo.java
  24. 0 3
      src/main/java/com/goafanti/user/bo/OrgBasicInfoBo.java
  25. 0 6
      src/main/java/com/goafanti/user/bo/OrgIdentityDetailBo.java

+ 0 - 5
src/main/java/com/goafanti/achievement/bo/AchievementUserOwnerDetailBo.java

@@ -1,7 +1,5 @@
 package com.goafanti.achievement.bo;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonFormat.Shape;
 
 public class AchievementUserOwnerDetailBo extends AchievementOrgOwnerDetailBo {
 	
@@ -11,7 +9,6 @@ public class AchievementUserOwnerDetailBo extends AchievementOrgOwnerDetailBo {
 	
 	private Integer area;
 
-	@JsonFormat(shape = Shape.STRING)
 	public Integer getProvince() {
 		return province;
 	}
@@ -20,7 +17,6 @@ public class AchievementUserOwnerDetailBo extends AchievementOrgOwnerDetailBo {
 		this.province = province;
 	}
 	
-	@JsonFormat(shape = Shape.STRING)
 	public Integer getCity() {
 		return city;
 	}
@@ -29,7 +25,6 @@ public class AchievementUserOwnerDetailBo extends AchievementOrgOwnerDetailBo {
 		this.city = city;
 	}
 	
-	@JsonFormat(shape = Shape.STRING)
 	public Integer getArea() {
 		return area;
 	}

+ 13 - 12
src/main/java/com/goafanti/admin/controller/AdminPatentApiController.java

@@ -41,6 +41,7 @@ import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.controller.CertifyApiController;
 import com.goafanti.common.enums.AttachmentType;
 import com.goafanti.common.enums.DeleteStatus;
+import com.goafanti.common.enums.PatentCategoryStatus;
 import com.goafanti.common.enums.PatentCostFields;
 import com.goafanti.common.enums.PatentInfoFields;
 import com.goafanti.common.enums.PatentInfoStatus;
@@ -1001,18 +1002,17 @@ public class AdminPatentApiController extends CertifyApiController {
 			row.createCell(1).setCellValue(obj.getPatentNumber());
 			row.createCell(2).setCellValue(obj.getLocationProvince());
 			row.createCell(3).setCellValue(obj.getUnitName());
-			if (null != obj.getPatentCatagory()) {
-				switch (obj.getPatentCatagory()) {
-				case 0:
-					row.createCell(4).setCellValue("发明型专利");
-					break;
-				case 1:
-					row.createCell(4).setCellValue("科技型专利");
-					break;
-				case 2:
-					row.createCell(4).setCellValue("外观型专利");
-					break;
-				}
+			Integer patentCatagory = obj.getPatentCatagory();
+			if (null != patentCatagory) {
+				if (PatentCategoryStatus.OTHER.getCode().equals(patentCatagory)){
+					row.createCell(4).setCellValue(PatentCategoryStatus.OTHER.getDesc());
+				} else if (PatentCategoryStatus.UTILITY.getCode().equals(patentCatagory)){
+					row.createCell(4).setCellValue(PatentCategoryStatus.UTILITY.getDesc());
+			    } else if (PatentCategoryStatus.DESIGN.getCode().equals(patentCatagory)){
+					row.createCell(4).setCellValue(PatentCategoryStatus.DESIGN.getDesc());
+			    } else if (PatentCategoryStatus.INVENTION.getCode().equals(patentCatagory)){
+					row.createCell(4).setCellValue(PatentCategoryStatus.INVENTION.getDesc());
+			    }
 			} else {
 				row.createCell(4).setCellValue("");
 			}
@@ -1034,6 +1034,7 @@ public class AdminPatentApiController extends CertifyApiController {
 					: calDeadline(obj.getAuthorizedDateFormattedDate()));
 
 		}
+		
 		FileUtils.downloadExcel(response, sheetName + Calendar.getInstance().getTimeInMillis() + ".xls", workbook);
 	}
 

+ 0 - 5
src/main/java/com/goafanti/cognizance/bo/AnnualReportBo.java

@@ -2,8 +2,6 @@ package com.goafanti.cognizance.bo;
 
 import java.math.BigDecimal;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonFormat.Shape;
 
 /**
  * 企业年报
@@ -202,7 +200,6 @@ public class AnnualReportBo {
 		this.orgCode = orgCode;
 	}
 
-	@JsonFormat(shape = Shape.STRING)
 	public Integer getLocationProvince() {
 		return locationProvince;
 	}
@@ -211,7 +208,6 @@ public class AnnualReportBo {
 		this.locationProvince = locationProvince;
 	}
 	
-	@JsonFormat(shape = Shape.STRING)
 	public Integer getLocationCity() {
 		return locationCity;
 	}
@@ -220,7 +216,6 @@ public class AnnualReportBo {
 		this.locationCity = locationCity;
 	}
 	
-	@JsonFormat(shape = Shape.STRING)
 	public Integer getLocationArea() {
 		return locationArea;
 	}

+ 0 - 6
src/main/java/com/goafanti/cognizance/bo/AnnualReportMainBo.java

@@ -3,8 +3,6 @@ package com.goafanti.cognizance.bo;
 import java.math.BigDecimal;
 import java.util.Date;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonFormat.Shape;
 /**
  * 年报详情主要信息
  */
@@ -37,7 +35,6 @@ public class AnnualReportMainBo {
 	
 	private Integer graduateNumber;
 	
-	
 	private BigDecimal salesRevenue;
 	
 	private BigDecimal grossProfit;
@@ -81,7 +78,6 @@ public class AnnualReportMainBo {
 	}
 
 
-	@JsonFormat(shape =Shape.STRING)
 	public Integer getLocationProvince() {
 		return locationProvince;
 	}
@@ -90,7 +86,6 @@ public class AnnualReportMainBo {
 		this.locationProvince = locationProvince;
 	}
 	
-	@JsonFormat(shape =Shape.STRING)
 	public Integer getLocationCity() {
 		return locationCity;
 	}
@@ -99,7 +94,6 @@ public class AnnualReportMainBo {
 		this.locationCity = locationCity;
 	}
 	
-	@JsonFormat(shape =Shape.STRING)
 	public Integer getLocationArea() {
 		return locationArea;
 	}

+ 0 - 1
src/main/java/com/goafanti/cognizance/bo/CognizanceBo.java

@@ -97,7 +97,6 @@ public class CognizanceBo {
 		this.serialNumber = serialNumber;
 	}
 
-	@JsonFormat(shape = Shape.STRING)
 	public Integer getLocationProvince() {
 		return locationProvince;
 	}

+ 0 - 3
src/main/java/com/goafanti/cognizance/bo/CultivationListBo.java

@@ -4,8 +4,6 @@ import java.util.Date;
 
 import org.apache.commons.lang3.time.DateFormatUtils;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonFormat.Shape;
 import com.goafanti.common.constant.AFTConstants;
 
 /**
@@ -42,7 +40,6 @@ public class CultivationListBo {
 		this.uid = uid;
 	}
 
-	@JsonFormat(shape = Shape.STRING)
 	public Integer getProvince() {
 		return province;
 	}

+ 57 - 0
src/main/java/com/goafanti/common/enums/PatentCategoryStatus.java

@@ -0,0 +1,57 @@
+package com.goafanti.common.enums;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.commons.lang3.StringUtils;
+
+public enum PatentCategoryStatus {
+	
+	OTHER(0, "其他"),
+	UTILITY(1, "实用新型专利"),
+	DESIGN(2, "外观设计型专利"),
+	INVENTION(3, "发明型专利");
+
+	private PatentCategoryStatus(Integer code, String desc) {
+		this.code = code;
+		this.desc = desc;
+	}
+
+	private static Map<Integer, PatentCategoryStatus> status = new HashMap<Integer, PatentCategoryStatus>();
+
+	static {
+		for (PatentCategoryStatus value : PatentCategoryStatus.values()) {
+			status.put(value.getCode(), value);
+		}
+	}
+
+	public static PatentCategoryStatus getStatus(Integer code) {
+		if (containsType(code)) {
+			return status.get(code);
+		}
+		return OTHER;
+	}
+
+	public static PatentCategoryStatus getStatus(String code) {
+		if (StringUtils.isNumeric(code)) {
+			return getStatus(Integer.parseInt(code));
+		}
+		return OTHER;
+	}
+
+	public static boolean containsType(Integer code) {
+		return status.containsKey(code);
+	}
+
+	private Integer	code;
+	private String	desc;
+
+	public Integer getCode() {
+		return code;
+	}
+
+	public String getDesc() {
+		return desc;
+	}
+
+}

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

@@ -512,7 +512,6 @@ public class OrganizationIdentity {
 	}
 
 
-	@JsonFormat(shape = Shape.STRING)
 	public Integer getLicenceProvince() {
 		return licenceProvince;
 	}
@@ -521,7 +520,6 @@ public class OrganizationIdentity {
 		this.licenceProvince = licenceProvince;
 	}
 	
-	@JsonFormat(shape = Shape.STRING)
 	public Integer getLicenceCity() {
 		return licenceCity;
 	}
@@ -530,7 +528,6 @@ public class OrganizationIdentity {
 		this.licenceCity = licenceCity;
 	}
 	
-	@JsonFormat(shape = Shape.STRING)
 	public Integer getLicenceArea() {
 		return licenceArea;
 	}
@@ -539,7 +536,6 @@ public class OrganizationIdentity {
 		this.licenceArea = licenceArea;
 	}
 	
-	@JsonFormat(shape = Shape.STRING)
 	public Integer getLocationProvince() {
 		return locationProvince;
 	}
@@ -548,7 +544,6 @@ public class OrganizationIdentity {
 		this.locationProvince = locationProvince;
 	}
 	
-	@JsonFormat(shape = Shape.STRING)
 	public Integer getLocationCity() {
 		return locationCity;
 	}
@@ -557,7 +552,6 @@ public class OrganizationIdentity {
 		this.locationCity = locationCity;
 	}
 	
-	@JsonFormat(shape = Shape.STRING)
 	public Integer getLocationArea() {
 		return locationArea;
 	}

+ 0 - 5
src/main/java/com/goafanti/common/model/OrganizationInfo.java

@@ -1,7 +1,5 @@
 package com.goafanti.common.model;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonFormat.Shape;
 
 public class OrganizationInfo {
 	private String	id;
@@ -90,7 +88,6 @@ public class OrganizationInfo {
 		this.companyName = companyName;
 	}
 
-	@JsonFormat(shape = Shape.STRING)
 	public Integer getLocationProvince() {
 		return locationProvince;
 	}
@@ -99,7 +96,6 @@ public class OrganizationInfo {
 		this.locationProvince = locationProvince;
 	}
 
-	@JsonFormat(shape = Shape.STRING)
 	public Integer getLocationCity() {
 		return locationCity;
 	}
@@ -108,7 +104,6 @@ public class OrganizationInfo {
 		this.locationCity = locationCity;
 	}
 
-	@JsonFormat(shape = Shape.STRING)
 	public Integer getLocationArea() {
 		return locationArea;
 	}

+ 0 - 3
src/main/java/com/goafanti/common/model/UserIdentity.java

@@ -194,7 +194,6 @@ public class UserIdentity {
         this.aftUsername = aftUsername;
     }
 
-    @JsonFormat(shape = Shape.STRING)
     public Integer getProvince() {
 		return province;
 	}
@@ -204,7 +203,6 @@ public class UserIdentity {
 		this.province = province;
 	}
 	
-	 @JsonFormat(shape = Shape.STRING)
 	public Integer getCity() {
 		return city;
 	}
@@ -213,7 +211,6 @@ public class UserIdentity {
 		this.city = city;
 	}
 	
-	 @JsonFormat(shape = Shape.STRING)
 	public Integer getArea() {
 		return area;
 	}

+ 0 - 5
src/main/java/com/goafanti/common/model/UserInfo.java

@@ -4,8 +4,6 @@ import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
 import javax.validation.constraints.Size;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonFormat.Shape;
 import com.goafanti.common.constant.ErrorConstants;
 
 public class UserInfo {
@@ -104,7 +102,6 @@ public class UserInfo {
 		this.uid = uid;
 	}
 
-	@JsonFormat(shape = Shape.STRING)
 	public Integer getResidenceProvince() {
 		return residenceProvince;
 	}
@@ -113,7 +110,6 @@ public class UserInfo {
 		this.residenceProvince = residenceProvince;
 	}
 	
-	@JsonFormat(shape = Shape.STRING)
 	public Integer getResidenceCity() {
 		return residenceCity;
 	}
@@ -122,7 +118,6 @@ public class UserInfo {
 		this.residenceCity = residenceCity;
 	}
 	
-	@JsonFormat(shape = Shape.STRING)
 	public Integer getResidenceArea() {
 		return residenceArea;
 	}

+ 0 - 1
src/main/java/com/goafanti/copyright/bo/CopyrightInfoSummary.java

@@ -113,7 +113,6 @@ public class CopyrightInfoSummary {
 		this.founder = founder;
 	}
 
-	@JsonFormat(shape =Shape.STRING)
 	public Integer getProvince() {
 		return province;
 	}

+ 0 - 1
src/main/java/com/goafanti/demand/bo/DemandManageListBo.java

@@ -61,7 +61,6 @@ public class DemandManageListBo extends DemandListBo{
 		this.employerName = employerName;
 	}
 
-	@JsonFormat(shape = Shape.STRING)
 	public Integer getProvince() {
 		return province;
 	}

+ 0 - 1
src/main/java/com/goafanti/patent/bo/PatentApplicationFeeBo.java

@@ -94,7 +94,6 @@ public class PatentApplicationFeeBo {
 		this.patentNumber = patentNumber;
 	}
 
-	@JsonFormat(shape = Shape.STRING)
 	public Integer getLocationProvince() {
 		return locationProvince;
 	}

+ 0 - 3
src/main/java/com/goafanti/patent/bo/PatentCompositeBo.java

@@ -5,8 +5,6 @@ import java.util.Date;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.time.DateFormatUtils;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonFormat.Shape;
 import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.utils.FileUtils;
 
@@ -198,7 +196,6 @@ public class PatentCompositeBo {
 	}
 
 
-	@JsonFormat(shape = Shape.STRING)
 	public Integer getLocationProvince() {
 		return locationProvince;
 	}

+ 7 - 11
src/main/java/com/goafanti/patent/bo/PatentInfoDetailBo.java

@@ -17,8 +17,8 @@ public class PatentInfoDetailBo {
 	private Integer	locationCity;
 
 	private Integer	locationArea;
-	
-	private String  postalAddress;
+
+	private String	postalAddress;
 
 	private Integer	contacts;
 
@@ -65,9 +65,9 @@ public class PatentInfoDetailBo {
 	private String	patentCertificateUrl;
 
 	private String	office;
-	
-	private String author;
-	
+
+	private String	author;
+
 	public String getAuthor() {
 		return author;
 	}
@@ -100,7 +100,6 @@ public class PatentInfoDetailBo {
 		this.orgCode = orgCode;
 	}
 
-	@JsonFormat(shape = Shape.STRING)
 	public Integer getLocationProvince() {
 		return locationProvince;
 	}
@@ -109,7 +108,6 @@ public class PatentInfoDetailBo {
 		this.locationProvince = locationProvince;
 	}
 
-	@JsonFormat(shape = Shape.STRING)
 	public Integer getLocationCity() {
 		return locationCity;
 	}
@@ -117,8 +115,7 @@ public class PatentInfoDetailBo {
 	public void setLocationCity(Integer locationCity) {
 		this.locationCity = locationCity;
 	}
-	
-	@JsonFormat(shape = Shape.STRING)
+
 	public Integer getLocationArea() {
 		return locationArea;
 	}
@@ -329,6 +326,5 @@ public class PatentInfoDetailBo {
 	public void setPostalAddress(String postalAddress) {
 		this.postalAddress = postalAddress;
 	}
-	
-    
+
 }

+ 0 - 1
src/main/java/com/goafanti/patent/bo/PatentManageListBo.java

@@ -114,7 +114,6 @@ public class PatentManageListBo {
 		this.unitName = unitName;
 	}
 
-	@JsonFormat(shape = Shape.STRING)
 	public Integer getLocationProvince() {
 		return locationProvince;
 	}

+ 0 - 3
src/main/java/com/goafanti/patent/bo/PatentNoticeOfCorrectionBo.java

@@ -4,8 +4,6 @@ import java.util.Date;
 
 import org.apache.commons.lang3.time.DateFormatUtils;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonFormat.Shape;
 import com.goafanti.common.constant.AFTConstants;
 
 /**
@@ -86,7 +84,6 @@ public class PatentNoticeOfCorrectionBo {
 		this.office = office;
 	}
 
-	@JsonFormat(shape = Shape.STRING)
 	public Integer getLocationProvince() {
 		return locationProvince;
 	}

+ 33 - 41
src/main/java/com/goafanti/patent/bo/PatentPendingBo.java

@@ -4,39 +4,37 @@ import java.util.Date;
 
 import org.apache.commons.lang3.time.DateFormatUtils;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonFormat.Shape;
 import com.goafanti.common.constant.AFTConstants;
 
 /**
  * 待缴费专利管理
  */
 public class PatentPendingBo {
-    private String uid;
-	
-	private String oid;
-	
-	private String pid;
-	
-	private String cid;
-	
-	private Integer serialNumber;
-	
-	private String patentNumber;
-	
-    private Integer locationProvince;
-	
-	private String unitName;
-	
-    private Integer patentCatagory;
-	
-	private String patentName;
-	
-	private Integer patentState;
-	
-	private Integer annualFeeState;
-	
-	private Date authorizedDate;
+	private String	uid;
+
+	private String	oid;
+
+	private String	pid;
+
+	private String	cid;
+
+	private Integer	serialNumber;
+
+	private String	patentNumber;
+
+	private Integer	locationProvince;
+
+	private String	unitName;
+
+	private Integer	patentCatagory;
+
+	private String	patentName;
+
+	private Integer	patentState;
+
+	private Integer	annualFeeState;
+
+	private Date	authorizedDate;
 
 	public String getUid() {
 		return uid;
@@ -61,7 +59,7 @@ public class PatentPendingBo {
 	public void setPid(String pid) {
 		this.pid = pid;
 	}
-	
+
 	public String getCid() {
 		return cid;
 	}
@@ -70,7 +68,6 @@ public class PatentPendingBo {
 		this.cid = cid;
 	}
 
-
 	public Integer getSerialNumber() {
 		return serialNumber;
 	}
@@ -87,7 +84,6 @@ public class PatentPendingBo {
 		this.patentNumber = patentNumber;
 	}
 
-	@JsonFormat(shape = Shape.STRING)
 	public Integer getLocationProvince() {
 		return locationProvince;
 	}
@@ -143,22 +139,18 @@ public class PatentPendingBo {
 	public void setAuthorizedDate(Date authorizedDate) {
 		this.authorizedDate = authorizedDate;
 	}
-	
-	
-	//authorizedDate
-	public String getAuthorizedDateFormattedDate(){
+
+	// authorizedDate
+	public String getAuthorizedDateFormattedDate() {
 		if (this.authorizedDate == null) {
 			return null;
 		} else {
 			return DateFormatUtils.format(this.getAuthorizedDate(), AFTConstants.YYYYMMDDHHMMSS);
 		}
 	}
-			
-	public void setAuthorizedDateFormattedDate(String authorizedDateFormattedDate){
-				
+
+	public void setAuthorizedDateFormattedDate(String authorizedDateFormattedDate) {
+
 	}
-	
-	
-	
-	
+
 }

+ 0 - 3
src/main/java/com/goafanti/patent/bo/PatentRecieveSendBo.java

@@ -4,8 +4,6 @@ import java.util.Date;
 
 import org.apache.commons.lang3.time.DateFormatUtils;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonFormat.Shape;
 import com.goafanti.common.constant.AFTConstants;
 
 public class PatentRecieveSendBo {
@@ -102,7 +100,6 @@ public class PatentRecieveSendBo {
 		this.patentNumber = patentNumber;
 	}
 
-	@JsonFormat(shape = Shape.STRING)
 	public Integer getLocationProvince() {
 		return locationProvince;
 	}

+ 0 - 1
src/main/java/com/goafanti/techproject/bo/TechProjectClientListBo.java

@@ -70,7 +70,6 @@ public class TechProjectClientListBo {
 		this.serialNumber = serialNumber;
 	}
 
-	@JsonFormat(shape = Shape.STRING)
 	public Integer getProvince() {
 		return province;
 	}

+ 6 - 9
src/main/java/com/goafanti/techproject/bo/TechProjectDetailBo.java

@@ -1,7 +1,5 @@
 package com.goafanti.techproject.bo;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonFormat.Shape;
 import com.goafanti.common.model.TechProject;
 /**
  * 科技项目详情
@@ -13,9 +11,9 @@ public class TechProjectDetailBo extends TechProject {
 	
 	private Integer province;
 	
-	private String city;
+	private Integer city;
 	
-	private String area;
+	private Integer area;
 	
 	private String postalAddress;
 
@@ -36,7 +34,6 @@ public class TechProjectDetailBo extends TechProject {
 		this.orgCode = orgCode;
 	}
 
-	@JsonFormat(shape = Shape.STRING)
 	public Integer getProvince() {
 		return province;
 	}
@@ -45,19 +42,19 @@ public class TechProjectDetailBo extends TechProject {
 		this.province = province;
 	}
 
-	public String getCity() {
+	public Integer getCity() {
 		return city;
 	}
 
-	public void setCity(String city) {
+	public void setCity(Integer city) {
 		this.city = city;
 	}
 
-	public String getArea() {
+	public Integer getArea() {
 		return area;
 	}
 
-	public void setArea(String area) {
+	public void setArea(Integer area) {
 		this.area = area;
 	}
 

+ 0 - 3
src/main/java/com/goafanti/techproject/bo/TechWebsiteListBo.java

@@ -1,7 +1,5 @@
 package com.goafanti.techproject.bo;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonFormat.Shape;
 
 public class TechWebsiteListBo {
 	private String id;
@@ -44,7 +42,6 @@ public class TechWebsiteListBo {
 		this.unitName = unitName;
 	}
 
-	@JsonFormat(shape = Shape.STRING)
 	public Integer getProvince() {
 		return province;
 	}

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

@@ -229,7 +229,6 @@ public class OrgBasicInfoBo {
 		this.unitName = unitName;
 	}
 
-	@JsonFormat(shape =Shape.STRING)
 	public Integer getProvince() {
 		return province;
 	}
@@ -238,7 +237,6 @@ public class OrgBasicInfoBo {
 		this.province = province;
 	}
 	
-	@JsonFormat(shape =Shape.STRING)
 	public Integer getCity() {
 		return city;
 	}
@@ -247,7 +245,6 @@ public class OrgBasicInfoBo {
 		this.city = city;
 	}
 	
-	@JsonFormat(shape =Shape.STRING)
 	public Integer getArea() {
 		return area;
 	}

+ 0 - 6
src/main/java/com/goafanti/user/bo/OrgIdentityDetailBo.java

@@ -327,7 +327,6 @@ public class OrgIdentityDetailBo {
 		this.bankCardNumber = bankCardNumber;
 	}
 
-	@JsonFormat(shape = Shape.STRING)
 	public Integer getLicenceProvince() {
 		return licenceProvince;
 	}
@@ -336,7 +335,6 @@ public class OrgIdentityDetailBo {
 		this.licenceProvince = licenceProvince;
 	}
 
-	@JsonFormat(shape = Shape.STRING)
 	public Integer getLicenceCity() {
 		return licenceCity;
 	}
@@ -345,7 +343,6 @@ public class OrgIdentityDetailBo {
 		this.licenceCity = licenceCity;
 	}
 	
-	@JsonFormat(shape = Shape.STRING)
 	public Integer getLicenceArea() {
 		return licenceArea;
 	}
@@ -354,7 +351,6 @@ public class OrgIdentityDetailBo {
 		this.licenceArea = licenceArea;
 	}
 	
-	@JsonFormat(shape = Shape.STRING)
 	public Integer getLocationProvince() {
 		return locationProvince;
 	}
@@ -363,7 +359,6 @@ public class OrgIdentityDetailBo {
 		this.locationProvince = locationProvince;
 	}
 	
-	@JsonFormat(shape = Shape.STRING)
 	public Integer getLocationCity() {
 		return locationCity;
 	}
@@ -372,7 +367,6 @@ public class OrgIdentityDetailBo {
 		this.locationCity = locationCity;
 	}
 	
-	@JsonFormat(shape = Shape.STRING)
 	public Integer getLocationArea() {
 		return locationArea;
 	}