Просмотр исходного кода

Merge branch 'master' of https://git.coding.net/aft/AFT.git

albertshaw лет назад: 8
Родитель
Сommit
675afa3581
35 измененных файлов с 3794 добавлено и 254 удалено
  1. 10 1
      schema/2017-06-07.sql
  2. 3248 0
      schema/district.sql
  3. 0 5
      src/main/java/com/goafanti/achievement/bo/AchievementUserOwnerDetailBo.java
  4. 87 127
      src/main/java/com/goafanti/admin/controller/AdminPatentApiController.java
  5. 0 5
      src/main/java/com/goafanti/cognizance/bo/AnnualReportBo.java
  6. 0 6
      src/main/java/com/goafanti/cognizance/bo/AnnualReportMainBo.java
  7. 0 1
      src/main/java/com/goafanti/cognizance/bo/CognizanceBo.java
  8. 0 3
      src/main/java/com/goafanti/cognizance/bo/CultivationListBo.java
  9. 17 0
      src/main/java/com/goafanti/common/dao/DistrictGlossoryMapper.java
  10. 56 0
      src/main/java/com/goafanti/common/enums/PatentApplicationFeeStatus.java
  11. 57 0
      src/main/java/com/goafanti/common/enums/PatentCategoryStatus.java
  12. 56 0
      src/main/java/com/goafanti/common/enums/PatentFundsStatus.java
  13. 56 0
      src/main/java/com/goafanti/common/enums/PatentReimbursementStatus.java
  14. 82 0
      src/main/java/com/goafanti/common/mapper/DistrictGlossoryMapper.xml
  15. 52 0
      src/main/java/com/goafanti/common/model/DistrictGlossory.java
  16. 0 6
      src/main/java/com/goafanti/common/model/OrganizationIdentity.java
  17. 0 5
      src/main/java/com/goafanti/common/model/OrganizationInfo.java
  18. 0 3
      src/main/java/com/goafanti/common/model/UserIdentity.java
  19. 0 5
      src/main/java/com/goafanti/common/model/UserInfo.java
  20. 0 1
      src/main/java/com/goafanti/copyright/bo/CopyrightInfoSummary.java
  21. 9 0
      src/main/java/com/goafanti/dataGlossory/service/DistrictGlossoryService.java
  22. 18 0
      src/main/java/com/goafanti/dataGlossory/service/impl/DistrictGlossoryServiceImpl.java
  23. 0 1
      src/main/java/com/goafanti/demand/bo/DemandManageListBo.java
  24. 0 1
      src/main/java/com/goafanti/patent/bo/PatentApplicationFeeBo.java
  25. 0 3
      src/main/java/com/goafanti/patent/bo/PatentCompositeBo.java
  26. 7 11
      src/main/java/com/goafanti/patent/bo/PatentInfoDetailBo.java
  27. 0 1
      src/main/java/com/goafanti/patent/bo/PatentManageListBo.java
  28. 0 3
      src/main/java/com/goafanti/patent/bo/PatentNoticeOfCorrectionBo.java
  29. 33 41
      src/main/java/com/goafanti/patent/bo/PatentPendingBo.java
  30. 0 3
      src/main/java/com/goafanti/patent/bo/PatentRecieveSendBo.java
  31. 0 1
      src/main/java/com/goafanti/techproject/bo/TechProjectClientListBo.java
  32. 6 9
      src/main/java/com/goafanti/techproject/bo/TechProjectDetailBo.java
  33. 0 3
      src/main/java/com/goafanti/techproject/bo/TechWebsiteListBo.java
  34. 0 3
      src/main/java/com/goafanti/user/bo/OrgBasicInfoBo.java
  35. 0 6
      src/main/java/com/goafanti/user/bo/OrgIdentityDetailBo.java

+ 10 - 1
schema/2017-06-07.sql

@@ -32,4 +32,13 @@ modify column `location_area` int(4) null comment '开户行所在地-区(县)';
 alter table user_info
 modify column `residence_province` int(2) null comment '居住地--省',
 modify column `residence_city` int(3) null comment '居住地--市',
-modify column `residence_area` int(4) null comment '居住地--区';
+modify column `residence_area` int(4) null comment '居住地--区';
+
+CREATE TABLE `district_glossory` (
+  `id` INT(4) NOT NULL,
+  `name` VARCHAR(16) NULL COMMENT '名称',
+  `pid` INT(4) NULL COMMENT '上级ID',
+  `level` INT(1) NULL COMMENT '层级',
+  PRIMARY KEY (`id`))
+ENGINE = InnoDB
+COMMENT = '地区数据字典';

Разница между файлами не показана из-за своего большого размера
+ 3248 - 0
schema/district.sql


+ 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;
 	}

+ 87 - 127
src/main/java/com/goafanti/admin/controller/AdminPatentApiController.java

@@ -41,10 +41,15 @@ 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.PatentAnnualFeeStatus;
+import com.goafanti.common.enums.PatentApplicationFeeStatus;
+import com.goafanti.common.enums.PatentCategoryStatus;
 import com.goafanti.common.enums.PatentCostFields;
+import com.goafanti.common.enums.PatentFundsStatus;
 import com.goafanti.common.enums.PatentInfoFields;
 import com.goafanti.common.enums.PatentInfoStatus;
 import com.goafanti.common.enums.PatentRegistrationFields;
+import com.goafanti.common.enums.PatentReimbursementStatus;
 import com.goafanti.common.model.Admin;
 import com.goafanti.common.model.AftFile;
 import com.goafanti.common.model.OrgRatepay;
@@ -59,6 +64,7 @@ import com.goafanti.common.utils.LoggerUtils;
 import com.goafanti.common.utils.StringUtils;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.shiro.token.TokenManager;
+import com.goafanti.dataGlossory.service.DistrictGlossoryService;
 import com.goafanti.patent.bo.InputPatentCost;
 import com.goafanti.patent.bo.InputPatentInfo;
 import com.goafanti.patent.bo.InputPatentRegistration;
@@ -97,6 +103,8 @@ public class AdminPatentApiController extends CertifyApiController {
 	private OrgRatepayService				orgRatepayService;
 	@Resource
 	private OrganizationIdentityService		organizationIdentityService;
+	@Resource
+	private DistrictGlossoryService			districtGlossoryService;
 
 	@Value(value = "${aesSecretKey}")
 	private String							secretKey	= null;
@@ -861,8 +869,6 @@ public class AdminPatentApiController extends CertifyApiController {
 
 	/**
 	 * 专利申请费用管理报表导出
-	 * 
-	 * @throws ParseException
 	 */
 	@SuppressWarnings("unchecked")
 	@RequestMapping(value = "/exportApplicationFee", method = RequestMethod.GET)
@@ -918,66 +924,43 @@ public class AdminPatentApiController extends CertifyApiController {
 	// 专利申请费用管理报表
 	private void exportFees(HttpServletResponse response, List<PatentApplicationFeeBo> fees) {
 		String sheetName = "专利申请费用管理报表";
-		HSSFWorkbook workbook = createWorkbook(sheetName, new String[] { "编号", "申请号/专利号", "省份", "公司名称", "专利名称", "缴费状态",
-				"申请费", "实审费", "文印费", "是否请款", "是否报销", "申请日", "缴费截止时间" });
+		HSSFWorkbook workbook = createWorkbook(sheetName,
+				new String[] { "编号", "申请号/专利号", "省份", "公司名称", "专利名称", "缴费状态", "申请费", "是否请款", "是否报销", "申请日", "缴费截止时间" });
 
 		HSSFSheet sheet = workbook.getSheet(sheetName);
 
 		for (int i = 0; i < fees.size(); i++) {
 			PatentApplicationFeeBo obj = fees.get(i);
 			HSSFRow row = sheet.createRow(i + 2);// 创建所需的行数
-			if (null == obj.getSerialNumber()) {
-				row.createCell(0).setCellValue("");
-			} else {
-				row.createCell(0).setCellValue(obj.getSerialNumber());
-			}
+			row.createCell(0).setCellValue(null == obj.getSerialNumber() ? "" : obj.getSerialNumber().toString());
 			row.createCell(1).setCellValue(obj.getPatentNumber());
-			row.createCell(2).setCellValue(obj.getLocationProvince());
+			Integer locationProvince = obj.getLocationProvince();
+			row.createCell(2).setCellValue(null == locationProvince ? "" : getProvince(locationProvince));
 			row.createCell(3).setCellValue(obj.getUnitName());
 			row.createCell(4).setCellValue(obj.getPatentName());
-			if (null != obj.getPaymentState()) {
-				switch (obj.getPaymentState()) {
-				case 0:
-					row.createCell(5).setCellValue("未缴费");
-					break;
-				case 1:
-					row.createCell(5).setCellValue("已缴费");
-				}
+			Integer paymentState = obj.getPaymentState();
+			if (null != paymentState && PatentApplicationFeeStatus.PAID.getCode().equals(paymentState)) {
+				row.createCell(5).setCellValue(PatentApplicationFeeStatus.PAID.getDesc());
 			} else {
-				row.createCell(5).setCellValue("未缴费");
+				row.createCell(5).setCellValue(PatentApplicationFeeStatus.UNPAID.getDesc());
 			}
 			row.createCell(6).setCellValue(null == obj.getApplicationFee() ? 0 : obj.getApplicationFee());
-			row.createCell(7).setCellValue(null == obj.getTrialFee() ? 0 : obj.getTrialFee());
-			row.createCell(8).setCellValue(null == obj.getPrintingFee() ? 0 : obj.getPrintingFee());
-
-			if (null != obj.getFunds()) {
-				switch (obj.getFunds()) {
-				case 0:
-					row.createCell(9).setCellValue("否");
-					break;
-				case 1:
-					row.createCell(9).setCellValue("是");
-				}
+			Integer funds = obj.getFunds();
+			if (null != funds && PatentFundsStatus.YES.getCode().equals(funds)) {
+				row.createCell(7).setCellValue(PatentFundsStatus.YES.getDesc());
 			} else {
-				row.createCell(9).setCellValue("否");
+				row.createCell(7).setCellValue(PatentFundsStatus.NO.getDesc());
 			}
-
-			if (null != obj.getReimbursement()) {
-				switch (obj.getReimbursement()) {
-				case 0:
-					row.createCell(10).setCellValue("否");
-					break;
-				case 1:
-					row.createCell(10).setCellValue("是");
-				}
+			Integer reimbursement = obj.getReimbursement();
+			if (null != reimbursement && PatentReimbursementStatus.YES.getCode().equals(reimbursement)) {
+				row.createCell(8).setCellValue(PatentReimbursementStatus.YES.getDesc());
 			} else {
-				row.createCell(10).setCellValue("否");
+				row.createCell(8).setCellValue(PatentReimbursementStatus.NO.getDesc());
 			}
 
-			row.createCell(11).setCellValue(obj.getPatentApplicationDateFormattedDate());
-			row.createCell(12).setCellValue(null == obj.getPatentApplicationDateFormattedDate() ? ""
+			row.createCell(9).setCellValue(obj.getPatentApplicationDateFormattedDate());
+			row.createCell(10).setCellValue(null == obj.getPatentApplicationDateFormattedDate() ? ""
 					: calDeadline(obj.getPatentApplicationDateFormattedDate()));
-
 		}
 		FileUtils.downloadExcel(response, sheetName + Calendar.getInstance().getTimeInMillis() + ".xls", workbook);
 	}
@@ -993,47 +976,38 @@ public class AdminPatentApiController extends CertifyApiController {
 		for (int i = 0; i < pendings.size(); i++) {
 			PatentPendingBo obj = pendings.get(i);
 			HSSFRow row = sheet.createRow(i + 2);// 创建所需的行数
-			if (null == obj.getSerialNumber()) {
-				row.createCell(0).setCellValue("");
-			} else {
-				row.createCell(0).setCellValue(obj.getSerialNumber());
-			}
+			row.createCell(0).setCellValue(null == obj.getSerialNumber() ? "" : obj.getSerialNumber().toString());
 			row.createCell(1).setCellValue(obj.getPatentNumber());
-			row.createCell(2).setCellValue(obj.getLocationProvince());
+			Integer locationProvince = obj.getLocationProvince();
+			row.createCell(2).setCellValue(null == locationProvince ? "" : getProvince(locationProvince));
 			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("");
 			}
 			row.createCell(5).setCellValue(obj.getPatentName());
 			row.createCell(6).setCellValue(null == obj.getPatentState() ? "" : switchPatState(obj.getPatentState()));
-			if (null != obj.getAnnualFeeState()) {
-				switch (obj.getAnnualFeeState()) {
-				case 0:
-					row.createCell(7).setCellValue("未缴费");
-					break;
-				case 1:
-					row.createCell(7).setCellValue("已缴费");
-					break;
-				}
+			Integer annualFeeState = obj.getAnnualFeeState();
+			if (null != annualFeeState && PatentAnnualFeeStatus.PAID.getCode().equals(annualFeeState)) {
+				row.createCell(7).setCellValue(PatentAnnualFeeStatus.PAID.getDesc());
 			} else {
-				row.createCell(7).setCellValue("未缴费");
+				row.createCell(7).setCellValue(PatentAnnualFeeStatus.UNPAID.getDesc());
 			}
 			row.createCell(8).setCellValue(null == obj.getAuthorizedDateFormattedDate() ? ""
 					: calDeadline(obj.getAuthorizedDateFormattedDate()));
 
 		}
+
 		FileUtils.downloadExcel(response, sheetName + Calendar.getInstance().getTimeInMillis() + ".xls", workbook);
 	}
 
@@ -1047,22 +1021,18 @@ public class AdminPatentApiController extends CertifyApiController {
 		for (int i = 0; i < composites.size(); i++) {
 			PatentManageListBo obj = composites.get(i);// 遍历每个对象
 			HSSFRow row = sheet.createRow(i + 2);// 创建所需的行数
-			if (null == obj.getSerialNumber()) {
-				row.createCell(0).setCellValue("");
-			} else {
-				row.createCell(0).setCellValue(obj.getSerialNumber());
-			}
+			row.createCell(0).setCellValue(null == obj.getSerialNumber() ? "" : obj.getSerialNumber().toString());
 			row.createCell(1).setCellValue(obj.getPatentNumber());
 			row.createCell(2).setCellValue(obj.getOffice());
-			row.createCell(3).setCellValue(obj.getLocationProvince());
+			Integer locationProvince = obj.getLocationProvince();
+			row.createCell(3).setCellValue(null == locationProvince ? "" : getProvince(locationProvince));
 			row.createCell(4).setCellValue(obj.getUnitName());
 			row.createCell(5).setCellValue(obj.getPatentName());
 			row.createCell(6).setCellValue(null == obj.getPatentState() ? "" : switchPatState(obj.getPatentState()));
-			row.createCell(7).setCellValue(null == obj.getPatentState() ? "" : switchPatState(obj.getPatentState()));
-			row.createCell(8).setCellValue(obj.getCreateTimeFormattedDate());
+			row.createCell(7).setCellValue(obj.getCreateTimeFormattedDate());
+			row.createCell(8).setCellValue(obj.getPatentApplicationFormattedDate());
 			row.createCell(9).setCellValue(obj.getPatentApplicationFormattedDate());
-			row.createCell(10).setCellValue(obj.getPatentApplicationFormattedDate());
-			row.createCell(11).setCellValue(obj.getAuthor());
+			row.createCell(10).setCellValue(obj.getAuthor());
 		}
 		FileUtils.downloadExcel(response, sheetName + Calendar.getInstance().getTimeInMillis() + ".xls", workbook);
 
@@ -1169,52 +1139,38 @@ public class AdminPatentApiController extends CertifyApiController {
 	// 专利状态
 	private String switchPatState(Integer s) {
 		String state = "";
-		switch (s) {
-		case 0:
-			state = "申请";
-			break;
-		case 1:
-			state = "签单";
-			break;
-		case 2:
-			state = "派单";
-			break;
-		case 3:
-			state = "流转";
-			break;
-		case 4:
-			state = "撰写";
-			break;
-		case 5:
-			state = "受理";
-			break;
-		case 6:
-			state = "审查意见通知";
-			break;
-		case 7:
-			state = "审查意见已答复";
-			break;
-		case 8:
-			state = "补正通知";
-			break;
-		case 9:
-			state = "补正已答复";
-			break;
-		case 10:
-			state = "授权";
-			break;
-		case 11:
-			state = "驳回";
-			break;
-		case 12:
-			state = "发证";
-			break;
-		case 13:
-			state = "已结款";
-			break;
-		case 14:
-			state = "退单";
-			break;
+		if (PatentInfoStatus.CREATE.getCode().equals(s)) {
+			state = PatentInfoStatus.CREATE.getDesc();
+		} else if (PatentInfoStatus.SIGN.getCode().equals(s)) {
+			state = PatentInfoStatus.SIGN.getDesc();
+		} else if (PatentInfoStatus.DELIVERD.getCode().equals(s)) {
+			state = PatentInfoStatus.DELIVERD.getDesc();
+		} else if (PatentInfoStatus.CIRCULATION.getCode().equals(s)) {
+			state = PatentInfoStatus.CIRCULATION.getDesc();
+		} else if (PatentInfoStatus.COMPOSE.getCode().equals(s)) {
+			state = PatentInfoStatus.COMPOSE.getDesc();
+		} else if (PatentInfoStatus.ACCEPT.getCode().equals(s)) {
+			state = PatentInfoStatus.ACCEPT.getDesc();
+		} else if (PatentInfoStatus.REVIEWNOTICE.getCode().equals(s)) {
+			state = PatentInfoStatus.REVIEWNOTICE.getDesc();
+		} else if (PatentInfoStatus.REVIEWREPLY.getCode().equals(s)) {
+			state = PatentInfoStatus.REVIEWREPLY.getDesc();
+		} else if (PatentInfoStatus.CORRECTIONNOTICE.getCode().equals(s)) {
+			state = PatentInfoStatus.CORRECTIONNOTICE.getDesc();
+		} else if (PatentInfoStatus.CORRECTIONREPLY.getCode().equals(s)) {
+			state = PatentInfoStatus.CORRECTIONREPLY.getDesc();
+		} else if (PatentInfoStatus.AUTHORIZE.getCode().equals(s)) {
+			state = PatentInfoStatus.AUTHORIZE.getDesc();
+		} else if (PatentInfoStatus.REJECT.getCode().equals(s)) {
+			state = PatentInfoStatus.REJECT.getDesc();
+		} else if (PatentInfoStatus.LICENSE.getCode().equals(s)) {
+			state = PatentInfoStatus.LICENSE.getDesc();
+		} else if (PatentInfoStatus.SETTLEMENT.getCode().equals(s)) {
+			state = PatentInfoStatus.SETTLEMENT.getDesc();
+		} else if (PatentInfoStatus.CREATE.getCode().equals(s)) {
+			state = PatentInfoStatus.CREATE.getDesc();
+		} else if (PatentInfoStatus.CALLBACK.getCode().equals(s)) {
+			state = PatentInfoStatus.CALLBACK.getDesc();
 		}
 		return state;
 	}
@@ -1295,5 +1251,9 @@ public class AdminPatentApiController extends CertifyApiController {
 		}
 		return status;
 	}
+	
+	private String getProvince(Integer province){
+		return districtGlossoryService.selectByPrimaryKey(province).getName();
+	}
 
 }

+ 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;
 	}

+ 17 - 0
src/main/java/com/goafanti/common/dao/DistrictGlossoryMapper.java

@@ -0,0 +1,17 @@
+package com.goafanti.common.dao;
+
+import com.goafanti.common.model.DistrictGlossory;
+
+public interface DistrictGlossoryMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(DistrictGlossory record);
+
+    int insertSelective(DistrictGlossory record);
+
+    DistrictGlossory selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(DistrictGlossory record);
+
+    int updateByPrimaryKey(DistrictGlossory record);
+}

+ 56 - 0
src/main/java/com/goafanti/common/enums/PatentApplicationFeeStatus.java

@@ -0,0 +1,56 @@
+package com.goafanti.common.enums;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.commons.lang3.StringUtils;
+
+public enum PatentApplicationFeeStatus {
+	
+	UNPAID(0, "未缴申请费"),
+	PAID(1, "已缴申请费"),
+	OTHER(2, "其他");
+
+	private PatentApplicationFeeStatus(Integer code, String desc) {
+		this.code = code;
+		this.desc = desc;
+	}
+
+	private static Map<Integer, PatentApplicationFeeStatus> status = new HashMap<Integer, PatentApplicationFeeStatus>();
+
+	static {
+		for (PatentApplicationFeeStatus value : PatentApplicationFeeStatus.values()) {
+			status.put(value.getCode(), value);
+		}
+	}
+
+	public static PatentApplicationFeeStatus getStatus(Integer code) {
+		if (containsType(code)) {
+			return status.get(code);
+		}
+		return OTHER;
+	}
+
+	public static PatentApplicationFeeStatus 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;
+	}
+
+}

+ 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;
+	}
+
+}

+ 56 - 0
src/main/java/com/goafanti/common/enums/PatentFundsStatus.java

@@ -0,0 +1,56 @@
+package com.goafanti.common.enums;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.commons.lang3.StringUtils;
+
+public enum PatentFundsStatus {
+	
+	NO(0, "未请款"),
+	YES(1, "已请款"),
+	OTHER(2, "其他");
+
+	private PatentFundsStatus(Integer code, String desc) {
+		this.code = code;
+		this.desc = desc;
+	}
+
+	private static Map<Integer, PatentFundsStatus> status = new HashMap<Integer, PatentFundsStatus>();
+
+	static {
+		for (PatentFundsStatus value : PatentFundsStatus.values()) {
+			status.put(value.getCode(), value);
+		}
+	}
+
+	public static PatentFundsStatus getStatus(Integer code) {
+		if (containsType(code)) {
+			return status.get(code);
+		}
+		return OTHER;
+	}
+
+	public static PatentFundsStatus 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;
+	}
+
+}

+ 56 - 0
src/main/java/com/goafanti/common/enums/PatentReimbursementStatus.java

@@ -0,0 +1,56 @@
+package com.goafanti.common.enums;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.commons.lang3.StringUtils;
+
+public enum PatentReimbursementStatus {
+	
+	NO(0, "未报销"),
+	YES(1, "已报销"),
+	OTHER(2, "其他");
+
+	private PatentReimbursementStatus(Integer code, String desc) {
+		this.code = code;
+		this.desc = desc;
+	}
+
+	private static Map<Integer, PatentReimbursementStatus> status = new HashMap<Integer, PatentReimbursementStatus>();
+
+	static {
+		for (PatentReimbursementStatus value : PatentReimbursementStatus.values()) {
+			status.put(value.getCode(), value);
+		}
+	}
+
+	public static PatentReimbursementStatus getStatus(Integer code) {
+		if (containsType(code)) {
+			return status.get(code);
+		}
+		return OTHER;
+	}
+
+	public static PatentReimbursementStatus 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;
+	}
+
+}

+ 82 - 0
src/main/java/com/goafanti/common/mapper/DistrictGlossoryMapper.xml

@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.goafanti.common.dao.DistrictGlossoryMapper" >
+  <resultMap id="BaseResultMap" type="com.goafanti.common.model.DistrictGlossory" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="name" property="name" jdbcType="VARCHAR" />
+    <result column="pid" property="pid" jdbcType="INTEGER" />
+    <result column="level" property="level" jdbcType="INTEGER" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    id, name, pid, level
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from district_glossory
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from district_glossory
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.goafanti.common.model.DistrictGlossory" >
+    insert into district_glossory (id, name, pid, 
+      level)
+    values (#{id,jdbcType=INTEGER}, #{name,jdbcType=VARCHAR}, #{pid,jdbcType=INTEGER}, 
+      #{level,jdbcType=INTEGER})
+  </insert>
+  <insert id="insertSelective" parameterType="com.goafanti.common.model.DistrictGlossory" >
+    insert into district_glossory
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="name != null" >
+        name,
+      </if>
+      <if test="pid != null" >
+        pid,
+      </if>
+      <if test="level != null" >
+        level,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="name != null" >
+        #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="pid != null" >
+        #{pid,jdbcType=INTEGER},
+      </if>
+      <if test="level != null" >
+        #{level,jdbcType=INTEGER},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.DistrictGlossory" >
+    update district_glossory
+    <set >
+      <if test="name != null" >
+        name = #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="pid != null" >
+        pid = #{pid,jdbcType=INTEGER},
+      </if>
+      <if test="level != null" >
+        level = #{level,jdbcType=INTEGER},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.DistrictGlossory" >
+    update district_glossory
+    set name = #{name,jdbcType=VARCHAR},
+      pid = #{pid,jdbcType=INTEGER},
+      level = #{level,jdbcType=INTEGER}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+</mapper>

+ 52 - 0
src/main/java/com/goafanti/common/model/DistrictGlossory.java

@@ -0,0 +1,52 @@
+package com.goafanti.common.model;
+
+public class DistrictGlossory {
+    private Integer id;
+
+    /**
+    * 名称
+    */
+    private String name;
+
+    /**
+    * 上级ID
+    */
+    private Integer pid;
+
+    /**
+    * 层级
+    */
+    private Integer level;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Integer getPid() {
+        return pid;
+    }
+
+    public void setPid(Integer pid) {
+        this.pid = pid;
+    }
+
+    public Integer getLevel() {
+        return level;
+    }
+
+    public void setLevel(Integer level) {
+        this.level = level;
+    }
+}

+ 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;
 	}

+ 9 - 0
src/main/java/com/goafanti/dataGlossory/service/DistrictGlossoryService.java

@@ -0,0 +1,9 @@
+package com.goafanti.dataGlossory.service;
+
+import com.goafanti.common.model.DistrictGlossory;
+
+public interface DistrictGlossoryService {
+
+	DistrictGlossory selectByPrimaryKey(Integer province);
+
+}

+ 18 - 0
src/main/java/com/goafanti/dataGlossory/service/impl/DistrictGlossoryServiceImpl.java

@@ -0,0 +1,18 @@
+package com.goafanti.dataGlossory.service.impl;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.goafanti.common.dao.DistrictGlossoryMapper;
+import com.goafanti.common.model.DistrictGlossory;
+import com.goafanti.dataGlossory.service.DistrictGlossoryService;
+@Service
+public class DistrictGlossoryServiceImpl implements DistrictGlossoryService {
+	@Autowired
+	private DistrictGlossoryMapper districtGlossoryMapper;
+
+	@Override
+	public DistrictGlossory selectByPrimaryKey(Integer id) {
+		return districtGlossoryMapper.selectByPrimaryKey(id);
+	}
+}

+ 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;
 	}