Selaa lähdekoodia

location type varchar to int

Antiloveg 8 vuotta sitten
vanhempi
commit
5554138817
76 muutettua tiedostoa jossa 923 lisäystä ja 895 poistoa
  1. 1 1
      schema/2017-03-30.sql
  2. 1 1
      schema/2017-06-06.sql
  3. 35 0
      schema/2017-06-07.sql
  4. 15 15
      schema/init.sql
  5. 19 12
      src/main/java/com/goafanti/achievement/bo/AchievementUserOwnerDetailBo.java
  6. 0 20
      src/main/java/com/goafanti/admin/bo/InputAdmin.java
  7. 3 3
      src/main/java/com/goafanti/admin/controller/AdminApiController.java
  8. 1 1
      src/main/java/com/goafanti/admin/controller/AdminContractApiController.java
  9. 1 1
      src/main/java/com/goafanti/admin/controller/AdminCopyrightApiController.java
  10. 2 2
      src/main/java/com/goafanti/admin/controller/AdminDemandApiController.java
  11. 11 11
      src/main/java/com/goafanti/admin/controller/AdminPatentApiController.java
  12. 2 2
      src/main/java/com/goafanti/admin/controller/AdminTechProjectApiController.java
  13. 1 1
      src/main/java/com/goafanti/admin/service/AdminService.java
  14. 1 1
      src/main/java/com/goafanti/admin/service/impl/AdminServiceImpl.java
  15. 107 109
      src/main/java/com/goafanti/cognizance/bo/AnnualReportBo.java
  16. 18 11
      src/main/java/com/goafanti/cognizance/bo/AnnualReportMainBo.java
  17. 4 3
      src/main/java/com/goafanti/cognizance/bo/CognizanceBo.java
  18. 6 3
      src/main/java/com/goafanti/cognizance/bo/CultivationListBo.java
  19. 1 4
      src/main/java/com/goafanti/cognizance/controller/CognizanceApiController.java
  20. 2 2
      src/main/java/com/goafanti/cognizance/service/OrgCognizanceService.java
  21. 4 4
      src/main/java/com/goafanti/cognizance/service/impl/OrgCognizanceServiceImpl.java
  22. 12 12
      src/main/java/com/goafanti/common/mapper/AdminMapper.xml
  23. 2 2
      src/main/java/com/goafanti/common/mapper/ContractMapper.xml
  24. 2 2
      src/main/java/com/goafanti/common/mapper/CopyrightInfoMapper.xml
  25. 4 4
      src/main/java/com/goafanti/common/mapper/DemandMapper.xml
  26. 4 4
      src/main/java/com/goafanti/common/mapper/OrgCognizanceMapper.xml
  27. 28 28
      src/main/java/com/goafanti/common/mapper/OrganizationIdentityMapper.xml
  28. 13 13
      src/main/java/com/goafanti/common/mapper/OrganizationInfoMapper.xml
  29. 2 2
      src/main/java/com/goafanti/common/mapper/PatentCostMapper.xml
  30. 6 6
      src/main/java/com/goafanti/common/mapper/PatentInfoMapper.xml
  31. 2 2
      src/main/java/com/goafanti/common/mapper/TechProjectMapper.xml
  32. 2 2
      src/main/java/com/goafanti/common/mapper/TechWebsiteMapper.xml
  33. 2 2
      src/main/java/com/goafanti/common/mapper/UserIdentityMapper.xml
  34. 17 17
      src/main/java/com/goafanti/common/mapper/UserInfoMapper.xml
  35. 13 11
      src/main/java/com/goafanti/common/model/Admin.java
  36. 1 1
      src/main/java/com/goafanti/common/model/AftUser.java
  37. 45 37
      src/main/java/com/goafanti/common/model/OrganizationIdentity.java
  38. 109 114
      src/main/java/com/goafanti/common/model/OrganizationInfo.java
  39. 1 1
      src/main/java/com/goafanti/common/model/User.java
  40. 24 14
      src/main/java/com/goafanti/common/model/UserInfo.java
  41. 4 3
      src/main/java/com/goafanti/contract/bo/ContractManageListBo.java
  42. 1 1
      src/main/java/com/goafanti/contract/service/ContractService.java
  43. 3 3
      src/main/java/com/goafanti/contract/service/impl/ContractServiceImpl.java
  44. 11 7
      src/main/java/com/goafanti/copyright/bo/CopyrightInfoDetail.java
  45. 4 3
      src/main/java/com/goafanti/copyright/bo/CopyrightInfoSummary.java
  46. 1 1
      src/main/java/com/goafanti/copyright/controller/CopyrightApiController.java
  47. 2 2
      src/main/java/com/goafanti/copyright/service/CopyrightInfoService.java
  48. 4 4
      src/main/java/com/goafanti/copyright/service/impl/CopyrightInfoServiceImpl.java
  49. 1 1
      src/main/java/com/goafanti/core/shiro/token/TokenManager.java
  50. 4 3
      src/main/java/com/goafanti/demand/bo/DemandManageListBo.java
  51. 2 2
      src/main/java/com/goafanti/demand/service/DemandService.java
  52. 4 4
      src/main/java/com/goafanti/demand/service/impl/DemandServiceImpl.java
  53. 4 3
      src/main/java/com/goafanti/patent/bo/PatentApplicationFeeBo.java
  54. 6 3
      src/main/java/com/goafanti/patent/bo/PatentCompositeBo.java
  55. 13 10
      src/main/java/com/goafanti/patent/bo/PatentInfoDetailBo.java
  56. 4 3
      src/main/java/com/goafanti/patent/bo/PatentManageListBo.java
  57. 119 118
      src/main/java/com/goafanti/patent/bo/PatentNoticeOfCorrectionBo.java
  58. 6 3
      src/main/java/com/goafanti/patent/bo/PatentPendingBo.java
  59. 6 3
      src/main/java/com/goafanti/patent/bo/PatentRecieveSendBo.java
  60. 1 1
      src/main/java/com/goafanti/patent/service/PatentCostService.java
  61. 3 3
      src/main/java/com/goafanti/patent/service/PatentInfoService.java
  62. 2 2
      src/main/java/com/goafanti/patent/service/impl/PatentCostServiceImpl.java
  63. 6 6
      src/main/java/com/goafanti/patent/service/impl/PatentInfoServiceImpl.java
  64. 4 3
      src/main/java/com/goafanti/techproject/bo/TechProjectClientListBo.java
  65. 6 3
      src/main/java/com/goafanti/techproject/bo/TechProjectDetailBo.java
  66. 7 3
      src/main/java/com/goafanti/techproject/bo/TechWebsiteListBo.java
  67. 1 1
      src/main/java/com/goafanti/techproject/service/TechProjectService.java
  68. 1 1
      src/main/java/com/goafanti/techproject/service/TechWebsiteService.java
  69. 2 2
      src/main/java/com/goafanti/techproject/service/impl/TechProjectServiceImpl.java
  70. 2 2
      src/main/java/com/goafanti/techproject/service/impl/TechWebsiteServiceImpl.java
  71. 26 27
      src/main/java/com/goafanti/user/bo/InputOrgBasicInfo.java
  72. 17 15
      src/main/java/com/goafanti/user/bo/InputOrgPro.java
  73. 40 49
      src/main/java/com/goafanti/user/bo/InputOrganizationIdentity.java
  74. 24 70
      src/main/java/com/goafanti/user/bo/InputUserIdentity.java
  75. 14 11
      src/main/java/com/goafanti/user/bo/OrgBasicInfoBo.java
  76. 44 38
      src/main/java/com/goafanti/user/bo/OrgIdentityDetailBo.java

+ 1 - 1
schema/2017-03-30.sql

@@ -1,5 +1,5 @@
 ALTER TABLE `admin` 
-add COLUMN `province` VARCHAR(12) NULL COMMENT '所在省份',
+add COLUMN `province` int(2) NULL COMMENT '所在省份',
 ADD INDEX index_number(number),
 MODIFY COLUMN `number` int(6) NOT NULL auto_increment;
 

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

@@ -1,6 +1,6 @@
 alter table `admin` 
 add column `superior_id` varchar(36) null comment '上级管理用户ID',
-add column `city` varchar(16) null comment '所在市';
+add column `city` int(3) null comment '所在市';
 
 CREATE TABLE `industry_category` (
   `id` INT NOT NULL,

+ 35 - 0
schema/2017-06-07.sql

@@ -0,0 +1,35 @@
+UPDATE `organization_identity`
+SET licence_area = NULL,
+ licence_city = NULL,
+ licence_province = NULL,
+ location_area = NULL,
+ location_city = NULL,
+ location_province = NULL;
+
+UPDATE `user_identity`
+SET province = NULL,
+ city = NULL,
+ area = NULL;
+
+UPDATE `user_info`
+SET	residence_area = null,
+residence_city = null,
+residence_province = null;
+
+alter table user_identity
+modify column `province` int(2) null comment '所在地-省份',
+modify column `city` int(3) null comment '所在地--市',
+modify column `area` int(4) null comment '所在地--区';
+
+alter table organization_identity
+modify column `licence_province` int(2) null comment '营业执照所在地--省',
+modify column `licence_city` int(3) null comment '营业执照所在地-市',
+modify column `licence_area` int(4) null comment '营业执照所在地-区(县)',
+modify column `location_province` int(2) null comment '开户行所在地-省',
+modify column `location_city` int(3) null comment '开户行所在地-市',
+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 '居住地--区';

+ 15 - 15
schema/init.sql

@@ -408,9 +408,9 @@ CREATE TABLE `organization_identity` (
   `unit_name` varchar(45) DEFAULT NULL COMMENT '单位名称',
   `registered_capital` int(6) DEFAULT NULL COMMENT '注册资金',
   `licence_number` varchar(32) DEFAULT NULL COMMENT '营业执照注册号',
-  `licence_province` varchar(12) DEFAULT NULL COMMENT '营业执照所在地--省',
-  `licence_city` varchar(12) DEFAULT NULL COMMENT '营业执照所在地-市',
-  `licence_area` varchar(12) DEFAULT NULL COMMENT '营业执照所在地-区(县)',
+  `licence_province` int(2) DEFAULT NULL COMMENT '营业执照所在地--省',
+  `licence_city` int(3) DEFAULT NULL COMMENT '营业执照所在地-市',
+  `licence_area` int(4) DEFAULT NULL COMMENT '营业执照所在地-区(县)',
   `licence_scanning_url` varchar(255) DEFAULT NULL COMMENT '营业执照副本扫描件URL',
   `org_code` varchar(32) DEFAULT NULL COMMENT '组织机构代码证号码',
   `org_code_url` varchar(255) DEFAULT NULL COMMENT '组织机构代码证URL',
@@ -420,9 +420,9 @@ CREATE TABLE `organization_identity` (
   `bank_card_number` varchar(32) DEFAULT NULL COMMENT '银行卡号',
   `validation_amount` decimal(6,4) DEFAULT '0.0000' COMMENT '打入账内信息',
   `identity_type` int(1) DEFAULT NULL COMMENT '身份类型',
-  `location_province` varchar(12) DEFAULT NULL COMMENT '开户行所在地-省',
-  `location_city` varchar(12) DEFAULT NULL COMMENT '开户行所在地-市',
-  `location_area` varchar(12) DEFAULT NULL COMMENT '开户行所在地-区(县)',
+  `location_province` int(2) DEFAULT NULL COMMENT '开户行所在地-省',
+  `location_city` int(3) DEFAULT NULL COMMENT '开户行所在地-市',
+  `location_area` int(4) DEFAULT NULL COMMENT '开户行所在地-区(县)',
   `legal_person` varchar(16) DEFAULT NULL COMMENT '法人',
   `legal_person_id_card` varchar(32) DEFAULT NULL COMMENT '法人身份证号',
   `last_year_tax_report_url` varchar(255) DEFAULT NULL COMMENT '上年度纳税报表',
@@ -452,9 +452,9 @@ CREATE TABLE `organization_info` (
   `identity_type` varchar(6) DEFAULT NULL COMMENT '身份类型',
   `company_name` varchar(45) DEFAULT NULL COMMENT '公司名称',
   `legal_person` varchar(6) DEFAULT NULL COMMENT '法人代表',
-  `location_province` varchar(12) DEFAULT NULL COMMENT '所在地--省',
-  `location_city` varchar(12) DEFAULT NULL COMMENT '所在地--市',
-  `location_area` varchar(12) DEFAULT NULL COMMENT '所在地--区',
+  `location_province` int(2) DEFAULT NULL COMMENT '所在地--省',
+  `location_city` int(3) DEFAULT NULL COMMENT '所在地--市',
+  `location_area` int(4) DEFAULT NULL COMMENT '所在地--区',
   `unit_size` varchar(12) DEFAULT NULL COMMENT '单位规模',
   `company_introduction` varchar(1002) DEFAULT NULL COMMENT '单位简介',
   `home_unit` varchar(45) DEFAULT NULL COMMENT '所属单位',
@@ -761,9 +761,9 @@ CREATE TABLE `user_identity` (
   `positive_id_url` varchar(255) DEFAULT NULL COMMENT '身份证正面照',
   `opposite_id_url` varchar(255) DEFAULT NULL COMMENT '身份证反面照',
   `aft_username` varchar(16) DEFAULT NULL COMMENT '用户名',
-  `province` varchar(16) DEFAULT NULL COMMENT '所在地-省份',
-  `city` varchar(16) DEFAULT NULL COMMENT '所在地--市',
-  `area` varchar(16) DEFAULT NULL COMMENT '所在地--区',
+  `province` int(2) DEFAULT NULL COMMENT '所在地-省份',
+  `city` int(3) DEFAULT NULL COMMENT '所在地--市',
+  `area` int(4) DEFAULT NULL COMMENT '所在地--区',
   `contact_mobile` varchar(16) DEFAULT NULL COMMENT '联系方式',
   `bank_name` varchar(32) DEFAULT NULL COMMENT '银行开户名',
   `bank_account` varchar(32) DEFAULT NULL COMMENT '开户银行',
@@ -786,9 +786,9 @@ DROP TABLE IF EXISTS `user_info`;
 CREATE TABLE `user_info` (
   `id` varchar(36) NOT NULL,
   `uid` varchar(36) NOT NULL,
-  `residence_province` varchar(8) DEFAULT NULL COMMENT '居住地--省',
-  `residence_city` varchar(12) DEFAULT NULL COMMENT '居住地--市',
-  `residence_area` varchar(12) DEFAULT NULL COMMENT '居住地--区',
+  `residence_province` int(2) DEFAULT NULL COMMENT '居住地--省',
+  `residence_city` int(3) DEFAULT NULL COMMENT '居住地--市',
+  `residence_area` int(4) DEFAULT NULL COMMENT '居住地--区',
   `person_portrait_url` varchar(255) DEFAULT NULL COMMENT '个人头像',
   `life_photo_url` varchar(255) DEFAULT NULL COMMENT '生活照',
   `personal_profile` longtext COMMENT '个人简介',

+ 19 - 12
src/main/java/com/goafanti/achievement/bo/AchievementUserOwnerDetailBo.java

@@ -1,36 +1,43 @@
 package com.goafanti.achievement.bo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonFormat.Shape;
+
 public class AchievementUserOwnerDetailBo extends AchievementOrgOwnerDetailBo {
 	
-	private String province;
+	private Integer province;
 	
-	private String city;
+	private Integer city;
 	
-	private String area;
-
+	private Integer area;
 
-	public String getProvince() {
+	@JsonFormat(shape = Shape.STRING)
+	public Integer getProvince() {
 		return province;
 	}
 
-	public void setProvince(String province) {
+	public void setProvince(Integer province) {
 		this.province = province;
 	}
-
-	public String getCity() {
+	
+	@JsonFormat(shape = Shape.STRING)
+	public Integer getCity() {
 		return city;
 	}
 
-	public void setCity(String city) {
+	public void setCity(Integer city) {
 		this.city = city;
 	}
-
-	public String getArea() {
+	
+	@JsonFormat(shape = Shape.STRING)
+	public Integer getArea() {
 		return area;
 	}
 
-	public void setArea(String area) {
+	public void setArea(Integer area) {
 		this.area = area;
 	}
+
+
 	
 }

+ 0 - 20
src/main/java/com/goafanti/admin/bo/InputAdmin.java

@@ -20,18 +20,12 @@ public class InputAdmin {
 	@Size(min = 0, max = 255, message = "{" + ErrorConstants.EMAIL_SIZE_ERROR + "}")
 	private String	email;
 
-	@Size(min = 0, max = 12, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
-	private String	province;
-	
 	@Size(min = 0, max = 32, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String	position;
 	
 	@Size(min = 0, max = 36, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String superiorId;
 	
-	@Size(min = 0, max = 16, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
-	private String city;
-	
 	public String getId() {
 		return id;
 	}
@@ -72,13 +66,6 @@ public class InputAdmin {
 		this.email = email;
 	}
 
-	public String getProvince() {
-		return province;
-	}
-
-	public void setProvince(String province) {
-		this.province = province;
-	}
 
 	public String getPosition() {
 		return position;
@@ -96,12 +83,5 @@ public class InputAdmin {
 		this.superiorId = superiorId;
 	}
 
-	public String getCity() {
-		return city;
-	}
-
-	public void setCity(String city) {
-		this.city = city;
-	}
 	
 }

+ 3 - 3
src/main/java/com/goafanti/admin/controller/AdminApiController.java

@@ -381,7 +381,7 @@ public class AdminApiController extends CertifyApiController {
 	 * 管理员列表
 	 */
 	@RequestMapping(value = "/adminList", method = RequestMethod.GET)
-	public Result adminList(String province, Integer number, String mobile, String name, String pageNo,
+	public Result adminList(Integer province, Integer number, String mobile, String name, String pageNo,
 			String pageSize) {
 		Result res = new Result();
 		Integer pNo = 1;
@@ -2636,7 +2636,7 @@ public class AdminApiController extends CertifyApiController {
 	 * 高企认定列表
 	 */
 	@RequestMapping(value = "/listCognizance", method = RequestMethod.POST)
-	public Result listCognizance(String contractId, String uid, String unitName, String locationProvince, String pageNo,
+	public Result listCognizance(String contractId, String uid, String unitName, Integer locationProvince, String pageNo,
 			String pageSize) {
 		Result res = new Result();
 		Integer pNo = 1;
@@ -3029,7 +3029,7 @@ public class AdminApiController extends CertifyApiController {
 	 * 高企培育列表
 	 */
 	@RequestMapping(value = "/cultivate", method = RequestMethod.POST)
-	public Result cultivationList(String uid, String province, String unitName, String pageNo, String pageSize) {
+	public Result cultivationList(String uid, Integer province, String unitName, String pageNo, String pageSize) {
 		Result res = new Result();
 		Integer pNo = 1;
 		Integer pSize = 10;

+ 1 - 1
src/main/java/com/goafanti/admin/controller/AdminContractApiController.java

@@ -272,7 +272,7 @@ public class AdminContractApiController extends CertifyApiController {
 	 */
 	@RequestMapping(value = "/list", method = RequestMethod.GET)
 	public Result listContract(String contractId, Integer serialNumber, Integer type, Integer status, String startDateFormattedDate,
-			String endDateFormattedDate, String province, String unitName, String uid, String pageNo, String pageSize) {
+			String endDateFormattedDate, Integer province, String unitName, String uid, String pageNo, String pageSize) {
 		Result res = new Result();
 		Integer pNo = 1;
 		Integer pSize = 10;

+ 1 - 1
src/main/java/com/goafanti/admin/controller/AdminCopyrightApiController.java

@@ -224,7 +224,7 @@ public class AdminCopyrightApiController extends CertifyApiController {
 	}
 
 	@RequestMapping(value = "/list", method = RequestMethod.GET)
-	public Result list(String contractId, String province, String unitName, String uid, String copyrightName, String status, String pageNo,
+	public Result list(String contractId, Integer province, String unitName, String uid, String copyrightName, String status, String pageNo,
 			String pageSize, @RequestParam(name = "createTime[]", required = false) String[] createTime,
 			@RequestParam(name = "acceptTime[]", required = false) String[] acceptTime,
 			@RequestParam(name = "authTime[]", required = false) String[] authTime) {

+ 2 - 2
src/main/java/com/goafanti/admin/controller/AdminDemandApiController.java

@@ -180,7 +180,7 @@ public class AdminDemandApiController extends CertifyApiController {
 	 * 个人用户--需求列表
 	 */
 	@RequestMapping(value = "/userList", method = RequestMethod.GET)
-	public Result userList(Integer auditStatus, String province, Integer serialNumber, String name, String keyword,
+	public Result userList(Integer auditStatus, Integer province, Integer serialNumber, String name, String keyword,
 			Integer infoSources, Integer demandType, String validityPeriodStartDate, String validityPeriodEndDate,
 			String username, Integer status, Integer releaseStatus, String releaseDateStartDate,
 			String releaseDateEndDate, String pageNo, String pageSize) {
@@ -204,7 +204,7 @@ public class AdminDemandApiController extends CertifyApiController {
 	 * 组织用户--需求列表
 	 */
 	@RequestMapping(value = "/orgList", method = RequestMethod.GET)
-	public Result orgList(Integer auditStatus, String province, Integer serialNumber, String name, String keyword,
+	public Result orgList(Integer auditStatus, Integer province, Integer serialNumber, String name, String keyword,
 			Integer infoSources, Integer demandType, String validityPeriodStartDate, String validityPeriodEndDate,
 			String username, Integer status, Integer releaseStatus, String releaseDateStartDate,
 			String releaseDateEndDate, String pageNo, String pageSize) {

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

@@ -157,7 +157,7 @@ public class AdminPatentApiController extends CertifyApiController {
 	 */
 	@RequestMapping(value = "/patentList", method = RequestMethod.GET)
 	public Result patentList(String contractId, Integer serialNumber, String patentNumber, String office,
-			String locationProvince, String unitName, Integer patentCatagory, String patentName, Integer patentState,
+			Integer locationProvince, String unitName, Integer patentCatagory, String patentName, Integer patentState,
 			String uid, @RequestParam(name = "createTime[]", required = false) String[] createTime,
 			@RequestParam(name = "patentApplicationDate[]", required = false) String[] patentApplicationDate,
 			String author, String pageNo, String pageSize) {
@@ -579,7 +579,7 @@ public class AdminPatentApiController extends CertifyApiController {
 	 * 待缴费专利管理列表
 	 */
 	@RequestMapping(value = "/pendingPaymentList", method = RequestMethod.GET)
-	public Result managePendingPaymentList(String locationProvince, String pageNo, String pageSize) {
+	public Result managePendingPaymentList(Integer locationProvince, String pageNo, String pageSize) {
 		Result res = new Result();
 		Integer pNo = 1;
 		Integer pSize = 10;
@@ -642,7 +642,7 @@ public class AdminPatentApiController extends CertifyApiController {
 	 */
 	@RequestMapping(value = "/noticeOfCorrectionList", method = RequestMethod.POST)
 	public Result noticeOfCorrectionList(Date authorizedDate, Integer serialNumber, String patentNumber, String office,
-			String locationProvince, String unitName, Integer patentCatagory, String patentName, Integer patentState,
+			Integer locationProvince, String unitName, Integer patentCatagory, String patentName, Integer patentState,
 			String author, String pageNo, String pageSize) {
 		Result res = new Result();
 		Integer pNo = 1;
@@ -749,7 +749,7 @@ public class AdminPatentApiController extends CertifyApiController {
 	@RequestMapping(value = "/getApplicationFeeList", method = RequestMethod.GET)
 	public Result getApplicationFeeList(
 			@RequestParam(name = "patentApplicationDate[]", required = false) String[] patentApplicationDate,
-			String locationProvince, String pageNo, String pageSize) throws ParseException {
+			Integer locationProvince, String pageNo, String pageSize) throws ParseException {
 		Result res = new Result();
 		Integer pNo = 1;
 		Integer pSize = 10;
@@ -819,7 +819,7 @@ public class AdminPatentApiController extends CertifyApiController {
 	@RequestMapping(value = "/exportComposite", method = RequestMethod.GET)
 	public Result exportComposite(String contractId,
 			@RequestParam(name = "serialNumber", required = false) String serialNumber, String patentNumber,
-			String office, String locationProvince, String unitName, String uid,
+			String office, Integer locationProvince, String unitName, String uid,
 			@RequestParam(name = "patentCatagory", required = false) String patentCatagory, String patentName,
 			@RequestParam(name = "patentState", required = false) String patentState,
 			@RequestParam(name = "createTime[]", required = false) String[] createTime,
@@ -830,7 +830,7 @@ public class AdminPatentApiController extends CertifyApiController {
 		Integer sn = (!StringUtils.isNumeric(serialNumber) ? null : Integer.parseInt(serialNumber));
 		Integer pc = (!StringUtils.isNumeric(patentCatagory) ? null : Integer.parseInt(patentCatagory));
 		Integer ps = (!StringUtils.isNumeric(patentState) ? null : Integer.parseInt(patentState));
-		String lp = ("undefined".equals(locationProvince)) ? null : locationProvince;
+		Integer lp = (null == locationProvince) ? null : locationProvince;
 		List<PatentManageListBo> composites = (List<PatentManageListBo>) getManagePatentList(contractId, sn,
 				patentNumber, office, lp, unitName, pc, patentName, ps, createTime, patentApplicationDate, author, uid,
 				1, 1000).getList();
@@ -846,7 +846,7 @@ public class AdminPatentApiController extends CertifyApiController {
 	 * 待缴年登印费专利管理报表导出
 	 */
 	@RequestMapping(value = "/exportPending", method = RequestMethod.GET)
-	public Result exportPending(String locationProvince, HttpServletResponse response) {
+	public Result exportPending(Integer locationProvince, HttpServletResponse response) {
 		Result res = new Result();
 		@SuppressWarnings("unchecked")
 		List<PatentPendingBo> pendings = (List<PatentPendingBo>) getManagePendingPaymentList(locationProvince, 1, 1000)
@@ -868,7 +868,7 @@ public class AdminPatentApiController extends CertifyApiController {
 	@RequestMapping(value = "/exportApplicationFee", method = RequestMethod.GET)
 	public Result exportApplicationFee(
 			@RequestParam(name = "patentApplicationDate[]", required = false) String[] patentApplicationDate,
-			String locationProvince, HttpServletResponse response) throws ParseException {
+			Integer locationProvince, HttpServletResponse response) throws ParseException {
 		Result res = new Result();
 		List<PatentApplicationFeeBo> fees = (List<PatentApplicationFeeBo>) getApplicationFeeList(patentApplicationDate,
 				locationProvince, 1, 1000).getList();
@@ -1128,19 +1128,19 @@ public class AdminPatentApiController extends CertifyApiController {
 
 	// 专利申请费用管理
 	private Pagination<PatentApplicationFeeBo> getApplicationFeeList(String[] patentApplicationDate,
-			String locationProvince, Integer pNo, Integer pSize) throws ParseException {
+			Integer locationProvince, Integer pNo, Integer pSize) throws ParseException {
 		return patentCostService.getApplicationFeeList(patentApplicationDate, locationProvince, pNo, pSize);
 	}
 
 	// 待缴费专利管理
-	private Pagination<PatentPendingBo> getManagePendingPaymentList(String locationProvince, Integer pNo,
+	private Pagination<PatentPendingBo> getManagePendingPaymentList(Integer locationProvince, Integer pNo,
 			Integer pSize) {
 		return patentInfoService.getManagePendingPaymentList(locationProvince, pNo, pSize);
 	}
 
 	// 管理端申请专利列表(专利综合管理)
 	private Pagination<PatentManageListBo> getManagePatentList(String contractId, Integer serialNumber,
-			String patentNumber, String office, String locationProvince, String unitName, Integer patentCatagory,
+			String patentNumber, String office, Integer locationProvince, String unitName, Integer patentCatagory,
 			String patentName, Integer patentState, String[] createTime, String[] patentApplicationDate, String author,
 			String uid, Integer pNo, Integer pSize) throws ParseException {
 		return patentInfoService.getManagePatentList(contractId, serialNumber, patentNumber, office, locationProvince,

+ 2 - 2
src/main/java/com/goafanti/admin/controller/AdminTechProjectApiController.java

@@ -125,7 +125,7 @@ public class AdminTechProjectApiController extends CertifyApiController {
 	 */
 	@SuppressWarnings("unchecked")
 	@RequestMapping(value = "/listTechProject", method = RequestMethod.POST)
-	public Result listTechProject(String contractId, String province, String unitName, String uid, String pageNo, String pageSize) {
+	public Result listTechProject(String contractId, Integer province, String unitName, String uid, String pageNo, String pageSize) {
 		Result res = new Result();
 		Integer pNo = 1;
 		Integer pSize = 10;
@@ -340,7 +340,7 @@ public class AdminTechProjectApiController extends CertifyApiController {
 	 */
 	@SuppressWarnings("unchecked")
 	@RequestMapping(value = "/listTechWebsite", method = RequestMethod.POST)
-	public Result listTechWebsite(String province, String unitName, String pageNo, String pageSize) {
+	public Result listTechWebsite(Integer province, String unitName, String pageNo, String pageSize) {
 		Result res = new Result();
 		Integer pNo = 1;
 		Integer pSize = 10;

+ 1 - 1
src/main/java/com/goafanti/admin/service/AdminService.java

@@ -16,7 +16,7 @@ public interface AdminService {
 
 	Admin selectByPrimaryKey(String key);
 
-	Pagination<Admin> listAdmin(String province, Integer number, String mobile, String name, Integer pNo,
+	Pagination<Admin> listAdmin(Integer province, Integer number, String mobile, String name, Integer pNo,
 			Integer pSize);
 
 	int insert(Admin ad);

+ 1 - 1
src/main/java/com/goafanti/admin/service/impl/AdminServiceImpl.java

@@ -48,7 +48,7 @@ public class AdminServiceImpl extends BaseMybatisDao<AdminMapper> implements Adm
 
 	@SuppressWarnings("unchecked")
 	@Override
-	public Pagination<Admin> listAdmin(String province, Integer number, String mobile, String name, Integer pageNo,
+	public Pagination<Admin> listAdmin(Integer province, Integer number, String mobile, String name, Integer pageNo,
 			Integer pageSize) {
 		Map<String, Object> params = new HashMap<>();
 

+ 107 - 109
src/main/java/com/goafanti/cognizance/bo/AnnualReportBo.java

@@ -2,180 +2,181 @@ package com.goafanti.cognizance.bo;
 
 import java.math.BigDecimal;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonFormat.Shape;
 
 /**
  * 企业年报
  */
 
 public class AnnualReportBo {
-	
-	private String uid;
-	
+
+	private String		uid;
+
 	/**
 	 * 企业名称
 	 */
-	private String unitName;
-	
+	private String		unitName;
+
 	/**
 	 * 组织机构代码
 	 */
-	private String orgCode;
-	
+	private String		orgCode;
+
 	/**
 	 * 所属地区--省
 	 */
-	private String locationProvince;
-	
+	private Integer		locationProvince;
+
 	/**
 	 * 所属地区--市
 	 */
-	private String locationCity;
-	
+	private Integer		locationCity;
+
 	/**
 	 * 所属地区--区
 	 */
-	private String locationArea;
-	
+	private Integer		locationArea;
+
 	/**
 	 * 高企认定证书编号
 	 */
-	private String certificateNumber;
-	
+	private String		certificateNumber;
+
 	/**
 	 * 高企认定时间
 	 */
-	private String issuingDate;
-	
-	 /**
-     * 是否上市
-     */
-    private String listed;
-    
-    /**
-     * 上市时间
-     */
-    private String listedDate;
-    
-    /**
-     * 上市类型
-     */
-    private String listedType;
-    
-    /**
-     * 股票代码
-     */
-    private String stockCode; 
-	
+	private String		issuingDate;
+
+	/**
+	 * 是否上市
+	 */
+	private String		listed;
+
+	/**
+	 * 上市时间
+	 */
+	private String		listedDate;
+
+	/**
+	 * 上市类型
+	 */
+	private String		listedType;
+
+	/**
+	 * 股票代码
+	 */
+	private String		stockCode;
+
 	/**
 	 * 企业联系人及联系方式
 	 */
-	private String contacts;
-	
+	private String		contacts;
+
 	/**
 	 * 发明专利数
 	 */
-	private Integer inventionPatent;
-	
+	private Integer		inventionPatent;
+
 	/**
 	 * 国防专利数
 	 */
-	private Integer defensePatent;
-	
+	private Integer		defensePatent;
+
 	/**
 	 * 国家级农作物品种数
 	 */
-	private Integer nationalCrop;
-	
+	private Integer		nationalCrop;
+
 	/**
 	 * 植物新品种数
 	 */
-	private Integer newPlantCariety;
-	
+	private Integer		newPlantCariety;
+
 	/**
 	 * 国家新药数
 	 */
-	private Integer nationalDrug;
-	
+	private Integer		nationalDrug;
+
 	/**
 	 * 国家一级中药保护品种数
 	 */
-	private Integer chineseMedicine;
-	
+	private Integer		chineseMedicine;
+
 	/**
 	 * 实用新型专利数
 	 */
-	private Integer utilityPatent;
-	
+	private Integer		utilityPatent;
+
 	/**
 	 * 集成电路布图设计专有权数
 	 */
-	private Integer circuitDesign;
-	
+	private Integer		circuitDesign;
+
 	/**
 	 * 外观设计专利数
 	 */
-	private Integer exteriorPatent;
-	
+	private Integer		exteriorPatent;
+
 	/**
 	 * 软件著作权数
 	 */
-	private Integer softwareWorks;
-	
+	private Integer		softwareWorks;
+
 	/**
 	 * 职工总人数
 	 */
-	private Integer firmTotal;
-	
+	private Integer		firmTotal;
+
 	/**
 	 * 科技人员数
 	 */
-	private Integer techTotal;
-	
-	 /**
-     * 新增就业人数
-     */
-    private Integer newEmployment;
-    
-    /**
-     * 高校应届毕业生人数
-     */
-    private Integer graduateNumber;
-    
-    /**
+	private Integer		techTotal;
+
+	/**
+	 * 新增就业人数
+	 */
+	private Integer		newEmployment;
+
+	/**
+	 * 高校应届毕业生人数
+	 */
+	private Integer		graduateNumber;
+
+	/**
 	 * 企业总收入
 	 */
-	private BigDecimal totalRevenue;
-	
-	 /**
-	  * 销售收入(万元)
+	private BigDecimal	totalRevenue;
+
+	/**
+	 * 销售收入(万元)
 	 */
-	private BigDecimal salesRevenue; 
-	
+	private BigDecimal	salesRevenue;
+
 	/**
 	 * 所有者权益合计(万元)
-	*/
-	private BigDecimal netAsset;
-	
+	 */
+	private BigDecimal	netAsset;
+
 	/**
 	 * 高新技术产品(服务)收入
 	 */
-	private BigDecimal lastYearRevenue;
-	
+	private BigDecimal	lastYearRevenue;
+
+	/**
+	 * 利润总额
+	 */
+	private BigDecimal	grossProfit;
+
 	/**
-     * 利润总额
-     */
-    private BigDecimal grossProfit;
-    
-    /**
 	 * 研发费用总额
 	 */
-	private BigDecimal researchCost;
-    
-    /**
+	private BigDecimal	researchCost;
+
+	/**
 	 * 在中国境内研发费用
 	 */
-	private BigDecimal territory;
-	
+	private BigDecimal	territory;
 
 	public String getUid() {
 		return uid;
@@ -201,32 +202,32 @@ public class AnnualReportBo {
 		this.orgCode = orgCode;
 	}
 
-	public String getLocationProvince() {
+	@JsonFormat(shape = Shape.STRING)
+	public Integer getLocationProvince() {
 		return locationProvince;
 	}
 
-	public void setLocationProvince(String locationProvince) {
+	public void setLocationProvince(Integer locationProvince) {
 		this.locationProvince = locationProvince;
 	}
-
-	public String getLocationCity() {
+	
+	@JsonFormat(shape = Shape.STRING)
+	public Integer getLocationCity() {
 		return locationCity;
 	}
 
-	public void setLocationCity(String locationCity) {
+	public void setLocationCity(Integer locationCity) {
 		this.locationCity = locationCity;
 	}
-
-	public String getLocationArea() {
+	
+	@JsonFormat(shape = Shape.STRING)
+	public Integer getLocationArea() {
 		return locationArea;
 	}
 
-	public void setLocationArea(String locationArea) {
+	public void setLocationArea(Integer locationArea) {
 		this.locationArea = locationArea;
 	}
-	
-	
-	
 
 	public String getIssuingDate() {
 		return issuingDate;
@@ -452,7 +453,4 @@ public class AnnualReportBo {
 		this.territory = territory;
 	}
 
-
-	
-	
 }

+ 18 - 11
src/main/java/com/goafanti/cognizance/bo/AnnualReportMainBo.java

@@ -2,6 +2,9 @@ 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;
 /**
  * 年报详情主要信息
  */
@@ -12,11 +15,11 @@ public class AnnualReportMainBo {
 	
 	private String orgCode;
 	
-	private String locationProvince;
+	private Integer locationProvince;
 	
-	private String locationCity;
+	private Integer locationCity;
 	
-	private String locationArea;
+	private Integer locationArea;
 	
 	private Integer listed;
 	
@@ -77,27 +80,31 @@ public class AnnualReportMainBo {
 		this.orgCode = orgCode;
 	}
 
-	public String getLocationProvince() {
+
+	@JsonFormat(shape =Shape.STRING)
+	public Integer getLocationProvince() {
 		return locationProvince;
 	}
 
-	public void setLocationProvince(String locationProvince) {
+	public void setLocationProvince(Integer locationProvince) {
 		this.locationProvince = locationProvince;
 	}
-
-	public String getLocationCity() {
+	
+	@JsonFormat(shape =Shape.STRING)
+	public Integer getLocationCity() {
 		return locationCity;
 	}
 
-	public void setLocationCity(String locationCity) {
+	public void setLocationCity(Integer locationCity) {
 		this.locationCity = locationCity;
 	}
-
-	public String getLocationArea() {
+	
+	@JsonFormat(shape =Shape.STRING)
+	public Integer getLocationArea() {
 		return locationArea;
 	}
 
-	public void setLocationArea(String locationArea) {
+	public void setLocationArea(Integer locationArea) {
 		this.locationArea = locationArea;
 	}
 

+ 4 - 3
src/main/java/com/goafanti/cognizance/bo/CognizanceBo.java

@@ -15,7 +15,7 @@ public class CognizanceBo {
 
 	private String	serialNumber;
 
-	private String	locationProvince;
+	private Integer	locationProvince;
 
 	private String	unitName;
 
@@ -97,11 +97,12 @@ public class CognizanceBo {
 		this.serialNumber = serialNumber;
 	}
 
-	public String getLocationProvince() {
+	@JsonFormat(shape = Shape.STRING)
+	public Integer getLocationProvince() {
 		return locationProvince;
 	}
 
-	public void setLocationProvince(String locationProvince) {
+	public void setLocationProvince(Integer locationProvince) {
 		this.locationProvince = locationProvince;
 	}
 

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

@@ -4,6 +4,8 @@ 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;
 
 /**
@@ -12,7 +14,7 @@ import com.goafanti.common.constant.AFTConstants;
 public class CultivationListBo {
 	private String uid;
 	
-	private String province;
+	private Integer province;
 	
 	private String unitName;
 	
@@ -40,11 +42,12 @@ public class CultivationListBo {
 		this.uid = uid;
 	}
 
-	public String getProvince() {
+	@JsonFormat(shape = Shape.STRING)
+	public Integer getProvince() {
 		return province;
 	}
 
-	public void setProvince(String province) {
+	public void setProvince(Integer province) {
 		this.province = province;
 	}
 

+ 1 - 4
src/main/java/com/goafanti/cognizance/controller/CognizanceApiController.java

@@ -2238,12 +2238,9 @@ public class CognizanceApiController extends CertifyApiController {
 	/**
 	 * 高企认定列表入口
 	 * 
-	 * @param locationProvince
-	 * @param unitName
-	 * @return
 	 */
 	@RequestMapping(value = "/listCognizance", method = RequestMethod.POST)
-	public Result listCognizance(String contractId, String locationProvince, String pageNo, String pageSize) {
+	public Result listCognizance(String contractId, Integer locationProvince, String pageNo, String pageSize) {
 		Result res = new Result();
 
 		if (!checkUserLogin(res)) {

+ 2 - 2
src/main/java/com/goafanti/cognizance/service/OrgCognizanceService.java

@@ -22,7 +22,7 @@ public interface OrgCognizanceService {
 
 	OrgCognizance insert(OrgCognizance c);
 
-	Pagination<CognizanceBo> listCognizance(String contractId, String uid, String unitName, String locationProvince, Integer pNo, Integer pSize);
+	Pagination<CognizanceBo> listCognizance(String contractId, String uid, String unitName, Integer locationProvince, Integer pNo, Integer pSize);
 
 	CognizanceOrgInfoBo selectCognizanceOrgInfoBoByUidAndCid(String uid, String cid);
 
@@ -46,7 +46,7 @@ public interface OrgCognizanceService {
 
 	OrgCognizance insertCognizance(OrgCognizance cog, String aid);
 
-	Pagination<CultivationListBo> listCultivation(String uid, String province, String unitName, Integer pNo, Integer pSize);
+	Pagination<CultivationListBo> listCultivation(String uid, Integer province, String unitName, Integer pNo, Integer pSize);
 
 	OrgCognizance selectByPrimaryKey(String id);
 

+ 4 - 4
src/main/java/com/goafanti/cognizance/service/impl/OrgCognizanceServiceImpl.java

@@ -81,7 +81,7 @@ public class OrgCognizanceServiceImpl extends BaseMybatisDao<OrgCognizanceMapper
 
 	@SuppressWarnings("unchecked")
 	@Override
-	public Pagination<CognizanceBo> listCognizance(String contractId, String uid, String unitName, String locationProvince, Integer pageNo,
+	public Pagination<CognizanceBo> listCognizance(String contractId, String uid, String unitName, 	Integer locationProvince, Integer pageNo,
 			Integer pageSize) {
 		Map<String, Object> params = new HashMap<>();
 
@@ -101,7 +101,7 @@ public class OrgCognizanceServiceImpl extends BaseMybatisDao<OrgCognizanceMapper
 			params.put("uid", uid);
 		}
 
-		if (!StringUtils.isBlank(locationProvince)) {
+		if (null == locationProvince) {
 			params.put("locationProvince", locationProvince);
 		}
 
@@ -306,7 +306,7 @@ public class OrgCognizanceServiceImpl extends BaseMybatisDao<OrgCognizanceMapper
 
 	@SuppressWarnings("unchecked")
 	@Override
-	public Pagination<CultivationListBo> listCultivation(String uid, String province, String unitName, Integer pageNo,
+	public Pagination<CultivationListBo> listCultivation(String uid, Integer province, String unitName, Integer pageNo,
 			Integer pageSize) {
 		Map<String, Object> params = new HashMap<>();
 
@@ -318,7 +318,7 @@ public class OrgCognizanceServiceImpl extends BaseMybatisDao<OrgCognizanceMapper
 			params.put("uid", uid);
 		}
 
-		if (!StringUtils.isBlank(province)) {
+		if (null != province) {
 			params.put("province", province);
 		}
 

+ 12 - 12
src/main/java/com/goafanti/common/mapper/AdminMapper.xml

@@ -9,10 +9,10 @@
     <result column="email" property="email" jdbcType="VARCHAR" />
     <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
     <result column="number" property="number" jdbcType="INTEGER" />
-    <result column="province" property="province" jdbcType="VARCHAR" />
+    <result column="province" property="province" jdbcType="INTEGER" />
     <result column="position" property="position" jdbcType="VARCHAR" />
     <result column="superior_id" property="superiorId" jdbcType="VARCHAR" />
-    <result column="city" property="city" jdbcType="VARCHAR" />
+    <result column="city" property="city" jdbcType="INTEGER" />
   </resultMap>
   <sql id="Base_Column_List" >
     id, mobile, name, password, email, create_time, number, province, position, superior_id,
@@ -34,8 +34,8 @@
       number, province, position, superior_id)
     values (#{id,jdbcType=VARCHAR}, #{mobile,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, 
       #{password,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
-      #{number,jdbcType=INTEGER}, #{province,jdbcType=VARCHAR}, #{position,jdbcType=VARCHAR},
-      #{superiorId,jdbcType=VARCHAR}, #{city,jdbcType=VARCHAR}
+      #{number,jdbcType=INTEGER}, #{province,jdbcType=INTEGER}, #{position,jdbcType=VARCHAR},
+      #{superiorId,jdbcType=VARCHAR}, #{city,jdbcType=INTEGER}
       )
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.Admin" >
@@ -98,7 +98,7 @@
         #{number,jdbcType=INTEGER},
       </if>
       <if test="province != null" >
-        #{province,jdbcType=VARCHAR},
+        #{province,jdbcType=INTEGER},
       </if>
       <if test="position != null" >
         #{position,jdbcType=VARCHAR},
@@ -107,7 +107,7 @@
         #{superiorId,jdbcType=VARCHAR},
       </if>
       <if test="city != null" >
-        #{city,jdbcType=VARCHAR},
+        #{city,jdbcType=INTEGER},
       </if>
     </trim>
   </insert>
@@ -133,7 +133,7 @@
         number = #{number,jdbcType=INTEGER},
       </if>
        <if test="province != null" >
-        province = #{province,jdbcType=VARCHAR},
+        province = #{province,jdbcType=INTEGER},
       </if>
       <if test="position != null" >
         position = #{position,jdbcType=VARCHAR},
@@ -142,7 +142,7 @@
         superior_id = #{superiorId,jdbcType=VARCHAR},
       </if>
        <if test="city != null" >
-        city = #{city,jdbcType=VARCHAR},
+        city = #{city,jdbcType=INTEGER},
       </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
@@ -155,10 +155,10 @@
       email = #{email,jdbcType=VARCHAR},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       number = #{number,jdbcType=INTEGER},
-      province = #{province,jdbcType=VARCHAR},
+      province = #{province,jdbcType=INTEGER},
       position = #{position,jdbcType=VARCHAR},
       superior_id = #{superiorId,jdbcType=VARCHAR},
-      city = #{city,jdbcType=VARCHAR}
+      city = #{city,jdbcType=INTEGER}
     where id = #{id,jdbcType=VARCHAR}
   </update>
   
@@ -181,7 +181,7 @@
     from admin
     where id <![CDATA[ <> ]]> '1'
     <if test = "province != null">
-    	and province = #{province,jdbcType=VARCHAR}
+    	and province = #{province,jdbcType=INTEGER}
     </if>
     <if test = "mobile != null"> 
     	and mobile = #{mobile,jdbcType=VARCHAR}
@@ -202,7 +202,7 @@
    select count(1) from admin
      where id <![CDATA[ <> ]]> '1'
     <if test = "province != null">
-    	and province = #{province,jdbcType=VARCHAR}
+    	and province = #{province,jdbcType=INTEGER}
     </if>
     <if test = "mobile != null"> 
     	and mobile = #{mobile,jdbcType=VARCHAR}

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

@@ -343,7 +343,7 @@
     and c.sign_date <![CDATA[ < ]]> #{cEnd,jdbcType=TIMESTAMP}
   </if>
    <if test="province !=null">
-    and oi.licence_province= #{province,jdbcType=VARCAHR}
+    and oi.licence_province= #{province,jdbcType=INTEGER}
   </if>
    <if test="unitName !=null">
     and oi.unit_name= #{unitName,jdbcType=VARCAHR}
@@ -392,7 +392,7 @@
     and c.sign_date <![CDATA[ < ]]> #{cEnd,jdbcType=TIMESTAMP}
   </if>
    <if test="province !=null">
-    and oi.licence_province= #{province,jdbcType=VARCAHR}
+    and oi.licence_province= #{province,jdbcType=INTEGER}
   </if>
    <if test="unitName !=null">
     and oi.unit_name= #{unitName,jdbcType=VARCAHR}

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

@@ -305,7 +305,7 @@
 		and cl.principal = #{principal,jdbcType=VARCHAR}
 	</if>
 	<if test="province != null">
-	    and oi.licence_province =  #{province,jdbcType=VARCHAR}
+	    and oi.licence_province =  #{province,jdbcType=INTEGER}
 	</if>
 	<if test="status != null">
 	    and ci.status = #{status,jdbcType=INTEGER}
@@ -361,7 +361,7 @@
 		and cl.principal = #{principal,jdbcType=VARCHAR}
 	</if>
 	<if test="province != null">
-	    and oi.licence_province =  #{province,jdbcType=VARCHAR}
+	    and oi.licence_province =  #{province,jdbcType=INTEGER}
 	</if>
 	<if test="contractId != null">
 	    and ci.contract_id = #{contractId,jdbcType=INTEGER}

+ 4 - 4
src/main/java/com/goafanti/common/mapper/DemandMapper.xml

@@ -495,7 +495,7 @@
 		and  d.tech_broker_id = #{techBroker,jdbcType=VARCHAR}
 	</if>
 	<if test="province != null">
-		and  ui.province = #{province,jdbcType=VARCHAR}
+		and  ui.province = #{province,jdbcType=INTEGER}
 	</if>
 	<if test="auditStatus != null">
 		and  d.audit_status = #{auditStatus,jdbcType=INTEGER}
@@ -565,7 +565,7 @@
 		and  d.serial_number = #{serialNumber,jdbcType=INTEGER}
 	</if>
 	<if test="province != null">
-		and  ui.province = #{province,jdbcType=VARCHAR}
+		and  ui.province = #{province,jdbcType=INTEGER}
 	</if>
 	<if test="auditStatus != null">
 		and  d.audit_status = #{auditStatus,jdbcType=INTEGER}
@@ -631,7 +631,7 @@
 		and  d.tech_broker_id = #{techBroker,jdbcType=VARCHAR}
 	</if>
 	<if test="province != null">
-		and  oi.licence_province = #{province,jdbcType=VARCHAR}
+		and  oi.licence_province = #{province,jdbcType=INTEGER}
 	</if>
 	<if test="serialNumber != null">
 		and  d.serial_number = #{serialNumber,jdbcType=INTEGER}
@@ -704,7 +704,7 @@
 		and  d.audit_status = #{auditStatus,jdbcType=INTEGER}
 	</if>
 	<if test="province != null">
-		and  oi.licence_province = #{province,jdbcType=VARCHAR}
+		and  oi.licence_province = #{province,jdbcType=INTEGER}
 	</if>
 	<if test="name != null">
 		and  d.name = #{name,jdbcType=VARCHAR}

+ 4 - 4
src/main/java/com/goafanti/common/mapper/OrgCognizanceMapper.xml

@@ -347,7 +347,7 @@
 		and c.contract_id = #{contractId,jdbcType=VARCHAR}
 	</if>
 	<if test="locationProvince != null">
-		and i.licence_province = #{locationProvince, jdbcType=VARCHAR}
+		and i.licence_province = #{locationProvince, jdbcType=INTEGER}
 	</if>
 	<if test="principal != null">
 		group by c.id
@@ -379,7 +379,7 @@
 		and i.unit_name like  CONCAT('%', #{unitName,jdbcType=VARCHAR}, '%')
 	</if>
 	<if test="locationProvince != null">
-		and i.licence_province = #{locationProvince, jdbcType=VARCHAR}
+		and i.licence_province = #{locationProvince, jdbcType=INTEGER}
 	</if>
 	<if test="principal != null">
 		group by c.id
@@ -495,7 +495,7 @@
 	    and u.id = #{uid,jdbcType=VARCHAR}
 	</if>
 	<if test="province != null">
-	    and i.licence_province = #{province,jdbcType=VARCHAR}
+	    and i.licence_province = #{province,jdbcType=INTEGER}
 	</if>
 	<if test="page_sql!=null">
 		${page_sql}
@@ -515,7 +515,7 @@
 	    and u.id = #{uid,jdbcType=VARCHAR}
 	</if>
 	<if test="province != null">
-	    and i.licence_province = #{province,jdbcType=VARCHAR}
+	    and i.licence_province = #{province,jdbcType=INTEGER}
 	</if>
   </select>
   

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

@@ -20,9 +20,9 @@
 		<result column="licence_number" property="licenceNumber"
 			jdbcType="VARCHAR" />
 		<result column="licence_province" property="licenceProvince"
-			jdbcType="VARCHAR" />
-		<result column="licence_city" property="licenceCity" jdbcType="VARCHAR" />
-		<result column="licence_area" property="licenceArea" jdbcType="VARCHAR" />
+			jdbcType="INTEGER" />
+		<result column="licence_city" property="licenceCity" jdbcType="INTEGER" />
+		<result column="licence_area" property="licenceArea" jdbcType="INTEGER" />
 		<result column="licence_scanning_url" property="licenceScanningUrl"
 			jdbcType="VARCHAR" />
 		<result column="org_code" property="orgCode" jdbcType="VARCHAR" />
@@ -37,11 +37,11 @@
 		<result column="identity_type" property="identityType"
 			jdbcType="INTEGER" />
 		<result column="location_province" property="locationProvince"
-			jdbcType="VARCHAR" />
+			jdbcType="INTEGER" />
 		<result column="location_city" property="locationCity"
-			jdbcType="VARCHAR" />
+			jdbcType="INTEGER" />
 		<result column="location_area" property="locationArea"
-			jdbcType="VARCHAR" />
+			jdbcType="INTEGER" />
 		<result column="legal_person" property="legalPerson" jdbcType="VARCHAR" />
 		<result column="legal_person_id_card" property="legalPersonIdCard"
 			jdbcType="VARCHAR" />
@@ -196,8 +196,8 @@
 		#{aftUsername,jdbcType=VARCHAR},
 		#{unitName,jdbcType=VARCHAR}, #{registeredCapital,jdbcType=DECIMAL},
 		#{licenceNumber,jdbcType=VARCHAR},
-		#{licenceProvince,jdbcType=VARCHAR}, #{licenceCity,jdbcType=VARCHAR},
-		#{licenceArea,jdbcType=VARCHAR},
+		#{licenceProvince,jdbcType=INTEGER}, #{licenceCity,jdbcType=INTEGER},
+		#{licenceArea,jdbcType=INTEGER},
 		#{licenceScanningUrl,jdbcType=VARCHAR}, #{orgCode,jdbcType=VARCHAR},
 		#{orgCodeUrl,jdbcType=VARCHAR},
 		#{bankAccount,jdbcType=VARCHAR},
@@ -205,8 +205,8 @@
 		#{bankCardNumber,jdbcType=VARCHAR},
 		#{validationAmount,jdbcType=DECIMAL},
 		#{identityType,jdbcType=INTEGER},
-		#{locationProvince,jdbcType=VARCHAR},
-		#{locationCity,jdbcType=VARCHAR}, #{locationArea,jdbcType=VARCHAR},
+		#{locationProvince,jdbcType=INTEGER},
+		#{locationCity,jdbcType=INTEGER}, #{locationArea,jdbcType=INTEGER},
 		#{legalPerson,jdbcType=VARCHAR},
 		#{legalPersonIdCard,jdbcType=VARCHAR},
 		#{lastYearTaxReportUrl,jdbcType=VARCHAR},
@@ -482,13 +482,13 @@
 				#{licenceNumber,jdbcType=VARCHAR},
 			</if>
 			<if test="licenceProvince != null">
-				#{licenceProvince,jdbcType=VARCHAR},
+				#{licenceProvince,jdbcType=INTEGER},
 			</if>
 			<if test="licenceCity != null">
-				#{licenceCity,jdbcType=VARCHAR},
+				#{licenceCity,jdbcType=INTEGER},
 			</if>
 			<if test="licenceArea != null">
-				#{licenceArea,jdbcType=VARCHAR},
+				#{licenceArea,jdbcType=INTEGER},
 			</if>
 			<if test="licenceScanningUrl != null">
 				#{licenceScanningUrl,jdbcType=VARCHAR},
@@ -518,13 +518,13 @@
 				#{identityType,jdbcType=INTEGER},
 			</if>
 			<if test="locationProvince != null">
-				#{locationProvince,jdbcType=VARCHAR},
+				#{locationProvince,jdbcType=INTEGER},
 			</if>
 			<if test="locationCity != null">
-				#{locationCity,jdbcType=VARCHAR},
+				#{locationCity,jdbcType=INTEGER},
 			</if>
 			<if test="locationArea != null">
-				#{locationArea,jdbcType=VARCHAR},
+				#{locationArea,jdbcType=INTEGER},
 			</if>
 			<if test="legalPerson != null">
 				#{legalPerson,jdbcType=VARCHAR},
@@ -687,13 +687,13 @@
 				licence_number = #{licenceNumber,jdbcType=VARCHAR},
 			</if>
 			<if test="licenceProvince != null">
-				licence_province = #{licenceProvince,jdbcType=VARCHAR},
+				licence_province = #{licenceProvince,jdbcType=INTEGER},
 			</if>
 			<if test="licenceCity != null">
-				licence_city = #{licenceCity,jdbcType=VARCHAR},
+				licence_city = #{licenceCity,jdbcType=INTEGER},
 			</if>
 			<if test="licenceArea != null">
-				licence_area = #{licenceArea,jdbcType=VARCHAR},
+				licence_area = #{licenceArea,jdbcType=INTEGER},
 			</if>
 			<if test="licenceScanningUrl != null">
 				licence_scanning_url =
@@ -724,13 +724,13 @@
 				identity_type = #{identityType,jdbcType=INTEGER},
 			</if>
 			<if test="locationProvince != null">
-				location_province = #{locationProvince,jdbcType=VARCHAR},
+				location_province = #{locationProvince,jdbcType=INTEGER},
 			</if>
 			<if test="locationCity != null">
-				location_city = #{locationCity,jdbcType=VARCHAR},
+				location_city = #{locationCity,jdbcType=INTEGER},
 			</if>
 			<if test="locationArea != null">
-				location_area = #{locationArea,jdbcType=VARCHAR},
+				location_area = #{locationArea,jdbcType=INTEGER},
 			</if>
 			<if test="legalPerson != null">
 				legal_person = #{legalPerson,jdbcType=VARCHAR},
@@ -886,11 +886,11 @@
 		licence_number =
 		#{licenceNumber,jdbcType=VARCHAR},
 		licence_province =
-		#{licenceProvince,jdbcType=VARCHAR},
+		#{licenceProvince,jdbcType=INTEGER},
 		licence_city =
-		#{licenceCity,jdbcType=VARCHAR},
+		#{licenceCity,jdbcType=INTEGER},
 		licence_area =
-		#{licenceArea,jdbcType=VARCHAR},
+		#{licenceArea,jdbcType=INTEGER},
 		licence_scanning_url =
 		#{licenceScanningUrl,jdbcType=VARCHAR},
 		org_code =
@@ -908,11 +908,11 @@
 		identity_type =
 		#{identityType,jdbcType=INTEGER},
 		location_province =
-		#{locationProvince,jdbcType=VARCHAR},
+		#{locationProvince,jdbcType=INTEGER},
 		location_city =
-		#{locationCity,jdbcType=VARCHAR},
+		#{locationCity,jdbcType=INTEGER},
 		location_area =
-		#{locationArea,jdbcType=VARCHAR},
+		#{locationArea,jdbcType=INTEGER},
 		legal_person =
 		#{legalPerson,jdbcType=VARCHAR},
 		legal_person_id_card =

+ 13 - 13
src/main/java/com/goafanti/common/mapper/OrganizationInfoMapper.xml

@@ -6,9 +6,9 @@
     <result column="uid" property="uid" jdbcType="VARCHAR" />
     <result column="identity_type" property="identityType" jdbcType="VARCHAR" />
     <result column="company_name" property="companyName" jdbcType="VARCHAR" />
-    <result column="location_province" property="locationProvince" jdbcType="VARCHAR" />
-    <result column="location_city" property="locationCity" jdbcType="VARCHAR" />
-    <result column="location_area" property="locationArea" jdbcType="VARCHAR" />
+    <result column="location_province" property="locationProvince" jdbcType="INTEGER" />
+    <result column="location_city" property="locationCity" jdbcType="INTEGER" />
+    <result column="location_area" property="locationArea" jdbcType="INTEGER" />
     <result column="unit_size" property="unitSize" jdbcType="VARCHAR" />
     <result column="company_introduction" property="companyIntroduction" jdbcType="VARCHAR" />
     <result column="home_unit" property="homeUnit" jdbcType="VARCHAR" />
@@ -38,7 +38,7 @@
       logo_url, publicity_picture_url)
     values (#{id,jdbcType=VARCHAR}, #{uid,jdbcType=VARCHAR}, #{identityType,jdbcType=VARCHAR}, 
       #{companyName,jdbcType=VARCHAR},
-      #{locationProvince,jdbcType=VARCHAR}, #{locationCity,jdbcType=VARCHAR}, #{locationArea,jdbcType=VARCHAR}, 
+      #{locationProvince,jdbcType=INTEGER}, #{locationCity,jdbcType=INTEGER}, #{locationArea,jdbcType=INTEGER}, 
       #{unitSize,jdbcType=VARCHAR}, 
       #{companyIntroduction,jdbcType=VARCHAR}, #{homeUnit,jdbcType=VARCHAR},  
       #{logoUrl,jdbcType=VARCHAR}, #{publicityPictureUrl,jdbcType=VARCHAR})
@@ -97,13 +97,13 @@
         #{companyName,jdbcType=VARCHAR},
       </if>
       <if test="locationProvince != null" >
-        #{locationProvince,jdbcType=VARCHAR},
+        #{locationProvince,jdbcType=INTEGER},
       </if>
        <if test="locationCity != null" >
-        #{locationCity,jdbcType=VARCHAR},
+        #{locationCity,jdbcType=INTEGER},
       </if>
        <if test="locationArea != null" >
-        #{locationArea,jdbcType=VARCHAR},
+        #{locationArea,jdbcType=INTEGER},
       </if>
       <if test="unitSize != null" >
         #{unitSize,jdbcType=VARCHAR},
@@ -135,13 +135,13 @@
         company_name = #{companyName,jdbcType=VARCHAR},
       </if>
        <if test="locationProvince != null" >
-       location_Province =  #{locationProvince,jdbcType=VARCHAR},
+       location_Province =  #{locationProvince,jdbcType=INTEGER},
       </if>
        <if test="locationCity != null" >
-        location_City = #{locationCity,jdbcType=VARCHAR},
+        location_City = #{locationCity,jdbcType=INTEGER},
       </if>
        <if test="locationArea != null" >
-       location_Area = #{locationArea,jdbcType=VARCHAR},
+       location_Area = #{locationArea,jdbcType=INTEGER},
       </if>
       <if test="unitSize != null" >
         unit_size = #{unitSize,jdbcType=VARCHAR},
@@ -166,9 +166,9 @@
     set uid = #{uid,jdbcType=VARCHAR},
       identity_type = #{identityType,jdbcType=VARCHAR},
       company_name = #{companyName,jdbcType=VARCHAR},
-      location_province = #{locationProvince,jdbcType=VARCHAR},
-      location_city = #{locationCity,jdbcType=VARCHAR},
-      location_area = #{locationArea,jdbcType=VARCHAR},
+      location_province = #{locationProvince,jdbcType=INTEGER},
+      location_city = #{locationCity,jdbcType=INTEGER},
+      location_area = #{locationArea,jdbcType=INTEGER},
       unit_size = #{unitSize,jdbcType=VARCHAR},
       company_introduction = #{companyIntroduction,jdbcType=VARCHAR},
       home_unit = #{homeUnit,jdbcType=VARCHAR},

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

@@ -177,7 +177,7 @@
 		</if>
 		WHERE p.deleted_sign = 0
 		<if test="locationProvince != null">
-			and o.licence_province = #{locationProvince,jdbcType=VARCHAR}
+			and o.licence_province = #{locationProvince,jdbcType=INTEGER}
 		</if>
 		<if test="pStart != null">
 			and p.patent_application_date <![CDATA[ > ]]>
@@ -207,7 +207,7 @@
 		</if>
 		 WHERE p.deleted_sign = 0
 		<if test="locationProvince != null">
-			and o.licence_province = #{locationProvince,jdbcType=VARCHAR}
+			and o.licence_province = #{locationProvince,jdbcType=INTEGER}
 		</if>
 		<if test="pStart != null">
 			and p.patent_application_date <![CDATA[ > ]]>

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

@@ -674,7 +674,7 @@
 		</if>
 		<if test="locationProvince != null">
 			and o.licence_province =
-			#{locationProvince,jdbcType=VARCHAR}
+			#{locationProvince,jdbcType=INTEGER}
 		</if>
 		<if test="principal != null">
 			group by p.id
@@ -751,7 +751,7 @@
 		</if>
 		<if test="locationProvince != null">
 			and
-			o.licence_province=#{locationProvince,jdbcType=VARCHAR}
+			o.licence_province=#{locationProvince,jdbcType=INTEGER}
 		</if>
 		<if test="principal != null">
 			group by p.id
@@ -780,7 +780,7 @@
 		
 		<if test="locationProvince != null">
 			and o.licence_province =
-			#{locationProvince,jdbcType=VARCHAR}
+			#{locationProvince,jdbcType=INTEGER}
 		</if>
 		<if test="principal != null">
 			group by p.id
@@ -806,7 +806,7 @@
 		</if>
 		<if test="locationProvince != null">
 			and o.licence_province =
-			#{locationProvince,jdbcType=VARCHAR}
+			#{locationProvince,jdbcType=INTEGER}
 		</if>
 		<if test="principal != null">
 			group by p.id
@@ -866,7 +866,7 @@
 		</if>
 		<if test="locationProvince != null">
 			and
-			o.licence_province=#{locationProvince,jdbcType=VARCHAR}
+			o.licence_province=#{locationProvince,jdbcType=INTEGER}
 		</if>
 		<if test="principal != null">
 			group by p.id
@@ -922,7 +922,7 @@
 		</if>
 		<if test="locationProvince != null">
 			and
-			o.licence_province=#{locationProvince,jdbcType=VARCHAR}
+			o.licence_province=#{locationProvince,jdbcType=INTEGER}
 		</if>
 		<if test="principal != null">
 			group by p.id

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

@@ -391,7 +391,7 @@
     	and p.contract_id = #{contractId,jdbcType=VARCHAR}
     </if>
       <if test="province != null">
-    	and i.licence_province = #{province,jdbcType=VARCHAR}
+    	and i.licence_province = #{province,jdbcType=INTEGER}
     </if>
      <if test="uid != null">
     	and p.uid = #{uid,jdbcType=VARCHAR}
@@ -424,7 +424,7 @@
     	and p.contract_id = #{contractId,jdbcType=VARCHAR}
     </if>
       <if test="province != null">
-    	and i.licence_province = #{province,jdbcType=VARCHAR}
+    	and i.licence_province = #{province,jdbcType=INTEGER}
     </if>
      <if test="uid != null">
     	and p.uid = #{uid,jdbcType=VARCHAR}

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

@@ -140,7 +140,7 @@
 		from tech_website w 
 	LEFT JOIN organization_identity i on w.uid = i.uid where w.deleted_sign = 0 
     <if test="province != null">
-    	and i.licence_province = #{province,jdbcType=VARCHAR}
+    	and i.licence_province = #{province,jdbcType=INTEGER}
     </if>
     <if test="unitName != null" >
     	and i.unit_name like CONCAT('%', #{unitName,jdbcType=VARCHAR}, '%')  
@@ -157,7 +157,7 @@
 	LEFT JOIN organization_identity i on w.uid = i.uid 
 	where w.deleted_sign = 0 
     <if test="province != null">
-    	and i.licence_province = #{province,jdbcType=VARCHAR}
+    	and i.licence_province = #{province,jdbcType=INTEGER}
     </if>
     <if test="uid != null" >
     	and w.uid = #{uid,jdbcType=VARCHAR}

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

@@ -51,8 +51,8 @@
     values (#{id,jdbcType=VARCHAR}, #{uid,jdbcType=VARCHAR}, #{username,jdbcType=VARCHAR}, 
       #{sex,jdbcType=VARCHAR}, #{dateOfBirthYear,jdbcType=VARCHAR}, #{dateOfBirthMonth,jdbcType=VARCHAR}, 
       #{idNumber,jdbcType=VARCHAR}, #{positiveIdUrl,jdbcType=VARCHAR}, #{oppositeIdUrl,jdbcType=VARCHAR}, 
-      #{aftUsername,jdbcType=VARCHAR}, #{province,jdbcType=VARCHAR}, #{city,jdbcType=VARCHAR}, 
-      #{area,jdbcType=VARCHAR}, #{contactMobile,jdbcType=VARCHAR}, #{bankName,jdbcType=VARCHAR}, 
+      #{aftUsername,jdbcType=VARCHAR}, #{province,jdbcType=INTEGER}, #{city,jdbcType=INTEGER}, 
+      #{area,jdbcType=INTEGER}, #{contactMobile,jdbcType=VARCHAR}, #{bankName,jdbcType=VARCHAR}, 
       #{bankAccount,jdbcType=VARCHAR}, #{bankCardNumber,jdbcType=VARCHAR}, #{amountMoney,jdbcType=DECIMAL}, 
       #{auditStatus,jdbcType=INTEGER}, #{process,jdbcType=INTEGER}, #{wrongCount,jdbcType=INTEGER}, #{paymentDate,jdbcType=TIMESTAMP})
   </insert>

+ 17 - 17
src/main/java/com/goafanti/common/mapper/UserInfoMapper.xml

@@ -4,9 +4,9 @@
   <resultMap id="BaseResultMap" type="com.goafanti.common.model.UserInfo" >
     <id column="id" property="id" jdbcType="VARCHAR" />
     <result column="uid" property="uid" jdbcType="VARCHAR" />
-    <result column="residence_province" property="residenceProvince" jdbcType="VARCHAR" />
-    <result column="residence_city" property="residenceCity" jdbcType="VARCHAR" />
-    <result column="residence_area" property="residenceArea" jdbcType="VARCHAR" />
+    <result column="residence_province" property="residenceProvince" jdbcType="INTEGER" />
+    <result column="residence_city" property="residenceCity" jdbcType="INTEGER" />
+    <result column="residence_area" property="residenceArea" jdbcType="INTEGER" />
     <result column="person_portrait_url" property="personPortraitUrl" jdbcType="VARCHAR" />
     <result column="life_photo_url" property="lifePhotoUrl" jdbcType="VARCHAR" />
     <result column="personal_profile" property="personalProfile" jdbcType="VARCHAR" />
@@ -21,9 +21,9 @@
    <resultMap id="UserInfoBoMap" type="com.goafanti.user.bo.UserInfoBo" >
     <id column="id" property="id" jdbcType="VARCHAR" />
     <result column="uid" property="uid" jdbcType="VARCHAR" />
-    <result column="residence_province" property="residenceProvince" jdbcType="VARCHAR" />
-    <result column="residence_city" property="residenceCity" jdbcType="VARCHAR" />
-    <result column="residence_area" property="residenceArea" jdbcType="VARCHAR" />
+    <result column="residence_province" property="residenceProvince" jdbcType="INTEGER" />
+    <result column="residence_city" property="residenceCity" jdbcType="INTEGER" />
+    <result column="residence_area" property="residenceArea" jdbcType="INTEGER" />
     <result column="person_portrait_url" property="personPortraitUrl" jdbcType="VARCHAR" />
     <result column="life_photo_url" property="lifePhotoUrl" jdbcType="VARCHAR" />
     <result column="personal_profile" property="personalProfile" jdbcType="VARCHAR" />
@@ -56,8 +56,8 @@
       person_portrait_url, life_photo_url, personal_profile, 
       fixed_tel_area,fixed_tel,fixed_tel_extension, qq, postal_address, 
       postcode)
-    values (#{id,jdbcType=VARCHAR}, #{uid,jdbcType=VARCHAR}, #{residenceProvince,jdbcType=VARCHAR}, 
-      #{residenceCity,jdbcType=VARCHAR}, #{residenceArea,jdbcType=VARCHAR},
+    values (#{id,jdbcType=VARCHAR}, #{uid,jdbcType=VARCHAR}, #{residenceProvince,jdbcType=INTEGER}, 
+      #{residenceCity,jdbcType=INTEGER}, #{residenceArea,jdbcType=INTEGER},
       #{personPortraitUrl,jdbcType=VARCHAR}, #{lifePhotoUrl,jdbcType=VARCHAR}, #{personalProfile,jdbcType=VARCHAR}, 
       #{fixedTelArea,jdbcType=VARCHAR}, #{fixedTel,jdbcType=VARCHAR},#{fixedTelExtension,jdbcType=VARCHAR},
       #{qq,jdbcType=VARCHAR}, #{postalAddress,jdbcType=VARCHAR}, 
@@ -117,13 +117,13 @@
         #{uid,jdbcType=VARCHAR},
       </if>
       <if test="residenceProvince != null" >
-        #{residenceProvince,jdbcType=VARCHAR},
+        #{residenceProvince,jdbcType=INTEGER},
       </if>
       <if test="residenceCity != null" >
-        #{residenceCity,jdbcType=VARCHAR},
+        #{residenceCity,jdbcType=INTEGER},
       </if>
       <if test="residenceArea != null" >
-        #{residenceArea,jdbcType=VARCHAR},
+        #{residenceArea,jdbcType=INTEGER},
       </if>
       <if test="personPortraitUrl != null" >
         #{personPortraitUrl,jdbcType=VARCHAR},
@@ -161,13 +161,13 @@
         uid = #{uid,jdbcType=VARCHAR},
       </if>
       <if test="residenceProvince != null" >
-        residence_Province = #{residenceProvince,jdbcType=VARCHAR},
+        residence_Province = #{residenceProvince,jdbcType=INTEGER},
       </if>
        <if test="residenceCity != null" >
-        residence_City = #{residenceCity,jdbcType=VARCHAR},
+        residence_City = #{residenceCity,jdbcType=INTEGER},
       </if>
        <if test="residenceArea != null" >
-        residence_Area = #{residenceArea,jdbcType=VARCHAR},
+        residence_Area = #{residenceArea,jdbcType=INTEGER},
       </if>
       <if test="personPortraitUrl != null" >
         person_portrait_url = #{personPortraitUrl,jdbcType=VARCHAR},
@@ -202,9 +202,9 @@
   <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.UserInfo" >
     update user_info
     set uid = #{uid,jdbcType=VARCHAR},
-      residence_province = #{residenceProvince,jdbcType=VARCHAR},
-      residence_city = #{residenceCity,jdbcType=VARCHAR},
-      residence_area = #{residenceArea,jdbcType=VARCHAR},
+      residence_province = #{residenceProvince,jdbcType=INTEGER},
+      residence_city = #{residenceCity,jdbcType=INTEGER},
+      residence_area = #{residenceArea,jdbcType=INTEGER},
       person_portrait_url = #{personPortraitUrl,jdbcType=VARCHAR},
       life_photo_url = #{lifePhotoUrl,jdbcType=VARCHAR},
       personal_profile = #{personalProfile,jdbcType=VARCHAR},

+ 13 - 11
src/main/java/com/goafanti/common/model/Admin.java

@@ -45,7 +45,7 @@ public class Admin extends BaseModel implements AftUser {
 	/**
 	 * 所在省份
 	 */
-	private String				province;
+	private Integer				province;
 	/**
 	 * 职位
 	 */
@@ -59,7 +59,7 @@ public class Admin extends BaseModel implements AftUser {
 	/**
 	 * 所在市
 	 */
-	private String				city;
+	private Integer				city;
 	
 	public String getSuperiorId() {
 		return superiorId;
@@ -69,13 +69,6 @@ public class Admin extends BaseModel implements AftUser {
 		this.superiorId = superiorId;
 	}
 
-	public String getCity() {
-		return city;
-	}
-
-	public void setCity(String city) {
-		this.city = city;
-	}
 
 	public String getPosition() {
 		return position;
@@ -142,14 +135,23 @@ public class Admin extends BaseModel implements AftUser {
 		this.number = number;
 	}
 
-	public String getProvince() {
+
+	public Integer getProvince() {
 		return province;
 	}
 
-	public void setProvince(String province) {
+	public void setProvince(Integer province) {
 		this.province = province;
 	}
 
+	public Integer getCity() {
+		return city;
+	}
+
+	public void setCity(Integer city) {
+		this.city = city;
+	}
+
 	// 创建时间
 	public String getCreateTimeFormattedDate() {
 		if (this.createTime == null) {

+ 1 - 1
src/main/java/com/goafanti/common/model/AftUser.java

@@ -13,5 +13,5 @@ public interface AftUser {
 
 	String getMobile();
 
-	String getProvince();
+	Integer getProvince();
 }

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

@@ -69,17 +69,17 @@ public class OrganizationIdentity {
 	/**
 	 * 营业执照所在地--省
 	 */
-	private String		licenceProvince;
+	private Integer		licenceProvince;
 
 	/**
 	 * 营业执照所在地-市
 	 */
-	private String		licenceCity;
+	private Integer		licenceCity;
 
 	/**
 	 * 营业执照所在地-区(县)
 	 */
-	private String		licenceArea;
+	private Integer		licenceArea;
 
 	/**
 	 * 营业执照副本扫描件URL
@@ -129,17 +129,17 @@ public class OrganizationIdentity {
 	/**
 	 * 开户行所在地-省
 	 */
-	private String		locationProvince;
+	private Integer		locationProvince;
 
 	/**
 	 * 开户行所在地-市
 	 */
-	private String		locationCity;
+	private Integer		locationCity;
 
 	/**
 	 * 开户行所在地-区(县)
 	 */
-	private String		locationArea;
+	private Integer		locationArea;
 
 	/**
 	 * 法人
@@ -437,29 +437,6 @@ public class OrganizationIdentity {
 		this.licenceNumber = licenceNumber;
 	}
 
-	public String getLicenceProvince() {
-		return licenceProvince;
-	}
-
-	public void setLicenceProvince(String licenceProvince) {
-		this.licenceProvince = licenceProvince;
-	}
-
-	public String getLicenceCity() {
-		return licenceCity;
-	}
-
-	public void setLicenceCity(String licenceCity) {
-		this.licenceCity = licenceCity;
-	}
-
-	public String getLicenceArea() {
-		return licenceArea;
-	}
-
-	public void setLicenceArea(String licenceArea) {
-		this.licenceArea = licenceArea;
-	}
 
 	public String getLicenceScanningUrl() {
 		return licenceScanningUrl;
@@ -534,27 +511,58 @@ public class OrganizationIdentity {
 		this.identityType = identityType;
 	}
 
-	public String getLocationProvince() {
+
+	@JsonFormat(shape = Shape.STRING)
+	public Integer getLicenceProvince() {
+		return licenceProvince;
+	}
+
+	public void setLicenceProvince(Integer licenceProvince) {
+		this.licenceProvince = licenceProvince;
+	}
+	
+	@JsonFormat(shape = Shape.STRING)
+	public Integer getLicenceCity() {
+		return licenceCity;
+	}
+
+	public void setLicenceCity(Integer licenceCity) {
+		this.licenceCity = licenceCity;
+	}
+	
+	@JsonFormat(shape = Shape.STRING)
+	public Integer getLicenceArea() {
+		return licenceArea;
+	}
+
+	public void setLicenceArea(Integer licenceArea) {
+		this.licenceArea = licenceArea;
+	}
+	
+	@JsonFormat(shape = Shape.STRING)
+	public Integer getLocationProvince() {
 		return locationProvince;
 	}
 
-	public void setLocationProvince(String locationProvince) {
+	public void setLocationProvince(Integer locationProvince) {
 		this.locationProvince = locationProvince;
 	}
-
-	public String getLocationCity() {
+	
+	@JsonFormat(shape = Shape.STRING)
+	public Integer getLocationCity() {
 		return locationCity;
 	}
 
-	public void setLocationCity(String locationCity) {
+	public void setLocationCity(Integer locationCity) {
 		this.locationCity = locationCity;
 	}
-
-	public String getLocationArea() {
+	
+	@JsonFormat(shape = Shape.STRING)
+	public Integer getLocationArea() {
 		return locationArea;
 	}
 
-	public void setLocationArea(String locationArea) {
+	public void setLocationArea(Integer locationArea) {
 		this.locationArea = locationArea;
 	}
 

+ 109 - 114
src/main/java/com/goafanti/common/model/OrganizationInfo.java

@@ -1,146 +1,145 @@
 package com.goafanti.common.model;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonFormat.Shape;
+
 public class OrganizationInfo {
-    private String id;
+	private String	id;
+
+	private String	uid;
+
+	/**
+	 * 身份类型
+	 */
+	private String	identityType;
+
+	/**
+	 * 公司名称
+	 */
+	private String	companyName;
+
+	/**
+	 * 所在地--省
+	 */
+	private Integer	locationProvince;
+
+	/**
+	 * 所在地--市
+	 */
+	private Integer	locationCity;
 
-    private String uid;
+	/**
+	 * 所在地--区
+	 */
+	private Integer	locationArea;
 
-    /**
-    * 身份类型
-    */
-    private String identityType;
+	/**
+	 * 单位规模
+	 */
+	private String	unitSize;
 
-    /**
-    * 公司名称
-    */
-    private String companyName;
-    
+	/**
+	 * 单位简介
+	 */
+	private String	companyIntroduction;
+
+	/**
+	 * 所属单位
+	 */
+	private String	homeUnit;
 
-   
+	/**
+	 * logo图
+	 */
+	private String	logoUrl;
 
 	/**
-    * 所在地--省
-    */
-    private String locationProvince;
-    
-    /**
-     * 所在地--市
-     */
-     private String locationCity;
-     
-     /**
-      * 所在地--区
-      */
-      private String locationArea;
-
-    /**
-    * 单位规模
-    */
-    private String unitSize;
-
-    /**
-    * 单位简介
-    */
-    private String companyIntroduction;
-
-    /**
-    * 所属单位
-    */
-    private String homeUnit;
-
-
-    /**
-    * logo图
-    */
-    private String logoUrl;
-
-    /**
-    * 宣传图片
-    */
-    private String publicityPictureUrl;
-    
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getUid() {
-        return uid;
-    }
-
-    public void setUid(String uid) {
-        this.uid = uid;
-    }
-
-    public String getIdentityType() {
-        return identityType;
-    }
-
-    public void setIdentityType(String identityType) {
-        this.identityType = identityType;
-    }
-
-    public String getCompanyName() {
-        return companyName;
-    }
-
-    public void setCompanyName(String companyName) {
-        this.companyName = companyName;
-    }
-    
-
-
-    public String getLocationProvince() {
+	 * 宣传图片
+	 */
+	private String	publicityPictureUrl;
+
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public String getUid() {
+		return uid;
+	}
+
+	public void setUid(String uid) {
+		this.uid = uid;
+	}
+
+	public String getIdentityType() {
+		return identityType;
+	}
+
+	public void setIdentityType(String identityType) {
+		this.identityType = identityType;
+	}
+
+	public String getCompanyName() {
+		return companyName;
+	}
+
+	public void setCompanyName(String companyName) {
+		this.companyName = companyName;
+	}
+
+	@JsonFormat(shape = Shape.STRING)
+	public Integer getLocationProvince() {
 		return locationProvince;
 	}
 
-	public void setLocationProvince(String locationProvince) {
+	public void setLocationProvince(Integer locationProvince) {
 		this.locationProvince = locationProvince;
 	}
 
-	public String getLocationCity() {
+	@JsonFormat(shape = Shape.STRING)
+	public Integer getLocationCity() {
 		return locationCity;
 	}
 
-	public void setLocationCity(String locationCity) {
+	public void setLocationCity(Integer locationCity) {
 		this.locationCity = locationCity;
 	}
 
-	public String getLocationArea() {
+	@JsonFormat(shape = Shape.STRING)
+	public Integer getLocationArea() {
 		return locationArea;
 	}
 
-	public void setLocationArea(String locationArea) {
+	public void setLocationArea(Integer locationArea) {
 		this.locationArea = locationArea;
 	}
 
 	public String getUnitSize() {
-        return unitSize;
-    }
+		return unitSize;
+	}
 
-    public void setUnitSize(String unitSize) {
-        this.unitSize = unitSize;
-    }
+	public void setUnitSize(String unitSize) {
+		this.unitSize = unitSize;
+	}
 
-    public String getCompanyIntroduction() {
-        return companyIntroduction;
-    }
+	public String getCompanyIntroduction() {
+		return companyIntroduction;
+	}
 
-    public void setCompanyIntroduction(String companyIntroduction) {
-        this.companyIntroduction = companyIntroduction;
-    }
+	public void setCompanyIntroduction(String companyIntroduction) {
+		this.companyIntroduction = companyIntroduction;
+	}
 
-    public String getHomeUnit() {
-        return homeUnit;
-    }
+	public String getHomeUnit() {
+		return homeUnit;
+	}
 
-    public void setHomeUnit(String homeUnit) {
-        this.homeUnit = homeUnit;
-    }
+	public void setHomeUnit(String homeUnit) {
+		this.homeUnit = homeUnit;
+	}
 
 	public String getLogoUrl() {
 		return logoUrl;
@@ -158,8 +157,4 @@ public class OrganizationInfo {
 		this.publicityPictureUrl = publicityPictureUrl;
 	}
 
-	
-	
-
-    
 }

+ 1 - 1
src/main/java/com/goafanti/common/model/User.java

@@ -160,7 +160,7 @@ public class User extends BaseModel implements AftUser{
 
 	@JsonIgnore
 	@Override
-	public String getProvince() {
+	public Integer getProvince() {
 		return null;
 	}
     

+ 24 - 14
src/main/java/com/goafanti/common/model/UserInfo.java

@@ -1,7 +1,11 @@
 package com.goafanti.common.model;
 
+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 {
@@ -12,20 +16,23 @@ public class UserInfo {
 	/**
 	 * 居住地--省
 	 */
-	@Size(min = 0, max = 8, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
-	private String	residenceProvince;
+	@Max(value = 99, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	private Integer	residenceProvince;
 
 	/**
 	 * 居住地--市
 	 */
-	@Size(min = 0, max = 12, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
-	private String	residenceCity;
+	@Max(value = 999, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	private Integer	residenceCity;
 
 	/**
 	 * 居住地--区
 	 */
-	@Size(min = 0, max = 12, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
-	private String	residenceArea;
+	@Max(value = 9999, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	private Integer	residenceArea;
 
 	/**
 	 * 个人头像
@@ -97,27 +104,30 @@ public class UserInfo {
 		this.uid = uid;
 	}
 
-	public String getResidenceProvince() {
+	@JsonFormat(shape = Shape.STRING)
+	public Integer getResidenceProvince() {
 		return residenceProvince;
 	}
 
-	public void setResidenceProvince(String residenceProvince) {
+	public void setResidenceProvince(Integer residenceProvince) {
 		this.residenceProvince = residenceProvince;
 	}
-
-	public String getResidenceCity() {
+	
+	@JsonFormat(shape = Shape.STRING)
+	public Integer getResidenceCity() {
 		return residenceCity;
 	}
 
-	public void setResidenceCity(String residenceCity) {
+	public void setResidenceCity(Integer residenceCity) {
 		this.residenceCity = residenceCity;
 	}
-
-	public String getResidenceArea() {
+	
+	@JsonFormat(shape = Shape.STRING)
+	public Integer getResidenceArea() {
 		return residenceArea;
 	}
 
-	public void setResidenceArea(String residenceArea) {
+	public void setResidenceArea(Integer residenceArea) {
 		this.residenceArea = residenceArea;
 	}
 

+ 4 - 3
src/main/java/com/goafanti/contract/bo/ContractManageListBo.java

@@ -3,17 +3,18 @@ package com.goafanti.contract.bo;
 
 public class ContractManageListBo extends ContractClientListBo{
 
-	private String	province;
+	private Integer	province;
 
 	private String	unitName;
 
 	private String	founder;
 
-	public String getProvince() {
+
+	public Integer getProvince() {
 		return province;
 	}
 
-	public void setProvince(String province) {
+	public void setProvince(Integer province) {
 		this.province = province;
 	}
 

+ 1 - 1
src/main/java/com/goafanti/contract/service/ContractService.java

@@ -12,7 +12,7 @@ import com.goafanti.core.mybatis.page.Pagination;
 public interface ContractService {
 
 	Pagination<ContractManageListBo> getManageList(String contractId, Integer serialNumber, Integer type, Integer status, String startDateFormattedDate,
-			String endDateFormattedDate, String province, String unitName, String uid, Integer pNo, Integer pSize);
+			String endDateFormattedDate, Integer province, String unitName, String uid, Integer pNo, Integer pSize);
 
 	Contract saveManageContract(Contract c);
 

+ 3 - 3
src/main/java/com/goafanti/contract/service/impl/ContractServiceImpl.java

@@ -61,7 +61,7 @@ public class ContractServiceImpl extends BaseMybatisDao<ContractMapper> implemen
 	@SuppressWarnings("unchecked")
 	@Override
 	public Pagination<ContractManageListBo> getManageList(String contractId, Integer serialNumber, Integer type,
-			Integer status, String startDateFormattedDate, String endDateFormattedDate, String province,
+			Integer status, String startDateFormattedDate, String endDateFormattedDate, Integer province,
 			String unitName, String uid, Integer pNo, Integer pSize) {
 		Map<String, Object> params = disposeParams(contractId, serialNumber, type,
 				status, startDateFormattedDate, endDateFormattedDate, province,
@@ -289,7 +289,7 @@ public class ContractServiceImpl extends BaseMybatisDao<ContractMapper> implemen
 	}
 	
 	private Map<String, Object> disposeParams(String contractId, Integer serialNumber, Integer type,
-			Integer status, String startDateFormattedDate, String endDateFormattedDate, String province,
+			Integer status, String startDateFormattedDate, String endDateFormattedDate, Integer province,
 			String unitName, String uid){
 		Date cStart = null;
 		Date cEnd = null;
@@ -340,7 +340,7 @@ public class ContractServiceImpl extends BaseMybatisDao<ContractMapper> implemen
 			params.put("cEnd", cEnd);
 		}
 
-		if (!StringUtils.isBlank(province)) {
+		if (null != province) {
 			params.put("province", province);
 		}
 

+ 11 - 7
src/main/java/com/goafanti/copyright/bo/CopyrightInfoDetail.java

@@ -2,12 +2,14 @@ package com.goafanti.copyright.bo;
 
 import org.apache.commons.lang3.StringUtils;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonFormat.Shape;
 import com.goafanti.common.enums.AttachmentType;
 import com.goafanti.common.utils.FileUtils;
 
 public class CopyrightInfoDetail extends CopyrightInfoSummary {
-	private String	city;
-	private String	area;
+	private Integer	city;
+	private Integer	area;
 	private String	postcode;
 	private String	orgCode;
 	private String	postalAddress;
@@ -27,19 +29,21 @@ public class CopyrightInfoDetail extends CopyrightInfoSummary {
 	 */
 	private String	applicationUrl;
 
-	public String getCity() {
+	@JsonFormat(shape = Shape.STRING)
+	public Integer getCity() {
 		return city;
 	}
 
-	public void setCity(String city) {
+	public void setCity(Integer city) {
 		this.city = city;
 	}
-
-	public String getArea() {
+	
+	@JsonFormat(shape = Shape.STRING)
+	public Integer getArea() {
 		return area;
 	}
 
-	public void setArea(String area) {
+	public void setArea(Integer area) {
 		this.area = area;
 	}
 

+ 4 - 3
src/main/java/com/goafanti/copyright/bo/CopyrightInfoSummary.java

@@ -16,7 +16,7 @@ public class CopyrightInfoSummary {
 	/**
 	 * 省份
 	 */
-	private String	province;
+	private Integer	province;
 
 	/**
 	 * 单位名称
@@ -113,11 +113,12 @@ public class CopyrightInfoSummary {
 		this.founder = founder;
 	}
 
-	public String getProvince() {
+	@JsonFormat(shape =Shape.STRING)
+	public Integer getProvince() {
 		return province;
 	}
 
-	public void setProvince(String province) {
+	public void setProvince(Integer province) {
 		this.province = province;
 	}
 

+ 1 - 1
src/main/java/com/goafanti/copyright/controller/CopyrightApiController.java

@@ -149,7 +149,7 @@ public class CopyrightApiController extends CertifyApiController {
 	}
 
 	@RequestMapping(value = "/list", method = RequestMethod.GET)
-	public Result list(String contractId, String province, String unitName, String copyrightName, String status, String pageNo,
+	public Result list(String contractId, Integer province, String unitName, String copyrightName, String status, String pageNo,
 			String pageSize, @RequestParam(name = "createTime[]", required = false) String[] createTime,
 			@RequestParam(name = "acceptTime[]", required = false) String[] acceptTime,
 			@RequestParam(name = "authTime[]", required = false) String[] authTime) {

+ 2 - 2
src/main/java/com/goafanti/copyright/service/CopyrightInfoService.java

@@ -26,11 +26,11 @@ public interface CopyrightInfoService {
 
 	int batchDeleteByPrimaryKey(List<String> id);
 
-	Pagination<CopyrightInfo> listCopyrightInfo(String contractId, String province, String unitName, String copyrightName,
+	Pagination<CopyrightInfo> listCopyrightInfo(String contractId, Integer province, String unitName, String copyrightName,
 			CopyrightStatus status, String[] createTime, String[] acceptTime, String[] authTime, Integer pageNo,
 			Integer pageSize);
 	
-	Pagination<CopyrightInfoSummary> listMyCopyrightInfo(String contractId, String province, String unitName, String copyrightName,
+	Pagination<CopyrightInfoSummary> listMyCopyrightInfo(String contractId, Integer province, String unitName, String copyrightName,
 			CopyrightStatus status, String[] createTime, String[] acceptTime, String[] authTime, Integer pageNo,
 			Integer pageSize, String uid);
 

+ 4 - 4
src/main/java/com/goafanti/copyright/service/impl/CopyrightInfoServiceImpl.java

@@ -122,7 +122,7 @@ public class CopyrightInfoServiceImpl extends BaseMybatisDao<CopyrightInfoMapper
 
 	@SuppressWarnings("unchecked")
 	@Override
-	public Pagination<CopyrightInfo> listCopyrightInfo(String contractId, String province, String unitName,
+	public Pagination<CopyrightInfo> listCopyrightInfo(String contractId, Integer province, String unitName,
 			String copyrightName, CopyrightStatus status, String[] createTime, String[] acceptTime, String[] authTime,
 			Integer pageNo, Integer pageSize) {
 		return (Pagination<CopyrightInfo>) findPage("findListByPage", "findListCount", buildListParams(contractId,
@@ -132,7 +132,7 @@ public class CopyrightInfoServiceImpl extends BaseMybatisDao<CopyrightInfoMapper
 
 	@SuppressWarnings("unchecked")
 	@Override
-	public Pagination<CopyrightInfoSummary> listMyCopyrightInfo(String contractId, String province, String unitName,
+	public Pagination<CopyrightInfoSummary> listMyCopyrightInfo(String contractId, Integer province, String unitName,
 			String copyrightName, CopyrightStatus status, String[] createTime, String[] acceptTime, String[] authTime,
 			Integer pageNo, Integer pageSize, String uid) {
 		return (Pagination<CopyrightInfoSummary>) findPage("findListByPage", "findListCount",
@@ -141,7 +141,7 @@ public class CopyrightInfoServiceImpl extends BaseMybatisDao<CopyrightInfoMapper
 				pageNo, pageSize);
 	}
 
-	private Map<String, Object> buildListParams(String contractId, String province, String unitName,
+	private Map<String, Object> buildListParams(String contractId, Integer province, String unitName,
 			String copyrightName, CopyrightStatus status, String[] createTime, String[] acceptTime, String[] authTime,
 			Integer pageNo, Integer pageSize, String uid) {
 		Map<String, Object> params = new HashMap<>();
@@ -149,7 +149,7 @@ public class CopyrightInfoServiceImpl extends BaseMybatisDao<CopyrightInfoMapper
 		if (TokenManager.getAdminToken() != null && !TokenManager.hasRole(AFTConstants.SUPERADMIN)) {
 			params.put("principal", TokenManager.getAdminId());
 		}
-		if (StringUtils.isNotBlank(province)) {
+		if (null != province) {
 			params.put("province", province);
 		}
 		if (StringUtils.isNotBlank(contractId)) {

+ 1 - 1
src/main/java/com/goafanti/core/shiro/token/TokenManager.java

@@ -137,7 +137,7 @@ public class TokenManager {
 	 * 
 	 * @return
 	 */
-	public static String getProvince() {
+	public static Integer getProvince() {
 		return getToken() == null ? null : getToken().getProvince();
 	}
 

+ 4 - 3
src/main/java/com/goafanti/demand/bo/DemandManageListBo.java

@@ -16,7 +16,7 @@ public class DemandManageListBo extends DemandListBo{
 
 	private String	employerName;
 
-	private String	province;
+	private Integer	province;
 
 	/**
 	 * 负责人(营销员)
@@ -61,11 +61,12 @@ public class DemandManageListBo extends DemandListBo{
 		this.employerName = employerName;
 	}
 
-	public String getProvince() {
+	@JsonFormat(shape = Shape.STRING)
+	public Integer getProvince() {
 		return province;
 	}
 
-	public void setProvince(String province) {
+	public void setProvince(Integer province) {
 		this.province = province;
 	}
 

+ 2 - 2
src/main/java/com/goafanti/demand/service/DemandService.java

@@ -15,12 +15,12 @@ import com.goafanti.portal.bo.DemandSearchListBo;
 
 public interface DemandService {
 
-	Pagination<DemandManageListBo> selectUserDemandManageList(Integer auditStatus, String province,
+	Pagination<DemandManageListBo> selectUserDemandManageList(Integer auditStatus, Integer province,
 			Integer serialNumber, String name, String keyword, Integer infoSources, Integer demandType,
 			String validityPeriodStartDate, String validityPeriodEndDate, String employerName, Integer status,
 			Integer releaseStatus, String releaseDateStartDate, String releaseDateEndDate, Integer pNo, Integer pSize);
 
-	Pagination<DemandManageListBo> selectOrgDemandManageList(Integer auditStatus, String province, Integer serialNumber,
+	Pagination<DemandManageListBo> selectOrgDemandManageList(Integer auditStatus, Integer province, Integer serialNumber,
 			String name, String keyword, Integer infoSources, Integer demandType, String validityPeriodStartDate,
 			String validityPeriodEndDate, String username, Integer status, Integer releaseStatus,
 			String releaseDateStartDate, String releaseDateEndDate, Integer pNo, Integer pSize);

+ 4 - 4
src/main/java/com/goafanti/demand/service/impl/DemandServiceImpl.java

@@ -68,7 +68,7 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 
 	@SuppressWarnings("unchecked")
 	@Override
-	public Pagination<DemandManageListBo> selectUserDemandManageList(Integer auditStatus, String province,
+	public Pagination<DemandManageListBo> selectUserDemandManageList(Integer auditStatus, Integer province,
 			Integer serialNumber, String name, String keyword, Integer infoSources, Integer demandType,
 			String validityPeriodStartDate, String validityPeriodEndDate, String username, Integer status,
 			Integer releaseStatus, String releaseDateStartDate, String releaseDateEndDate, Integer pNo, Integer pSize) {
@@ -104,7 +104,7 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 
 	@SuppressWarnings("unchecked")
 	@Override
-	public Pagination<DemandManageListBo> selectOrgDemandManageList(Integer auditStatus, String province,
+	public Pagination<DemandManageListBo> selectOrgDemandManageList(Integer auditStatus, Integer province,
 			Integer serialNumber, String name, String keyword, Integer infoSources, Integer demandType,
 			String validityPeriodStartDate, String validityPeriodEndDate, String username, Integer status,
 			Integer releaseStatus, String releaseDateStartDate, String releaseDateEndDate, Integer pNo, Integer pSize) {
@@ -379,7 +379,7 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 		return demandMapper.selectDemandSearchDetail(uid, id);
 	}
 
-	private Map<String, Object> disposeParams(Integer auditStatus, String province, Integer serialNumber, String name,
+	private Map<String, Object> disposeParams(Integer auditStatus, Integer province, Integer serialNumber, String name,
 			String keyword, Integer infoSources, Integer demandType, String validityPeriodStartDate,
 			String validityPeriodEndDate, String username, Integer status, Integer releaseStatus,
 			String releaseDateStartDate, String releaseDateEndDate) {
@@ -437,7 +437,7 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 			params.put("auditStatus", auditStatus);
 		}
 
-		if (!StringUtils.isBlank(province)) {
+		if (null != province) {
 			params.put("province", province);
 		}
 

+ 4 - 3
src/main/java/com/goafanti/patent/bo/PatentApplicationFeeBo.java

@@ -24,7 +24,7 @@ public class PatentApplicationFeeBo {
 
 	private String	patentNumber;
 
-	private String	locationProvince;
+	private Integer	locationProvince;
 
 	private String	unitName;
 
@@ -94,11 +94,12 @@ public class PatentApplicationFeeBo {
 		this.patentNumber = patentNumber;
 	}
 
-	public String getLocationProvince() {
+	@JsonFormat(shape = Shape.STRING)
+	public Integer getLocationProvince() {
 		return locationProvince;
 	}
 
-	public void setLocationProvince(String locationProvince) {
+	public void setLocationProvince(Integer locationProvince) {
 		this.locationProvince = locationProvince;
 	}
 

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

@@ -5,6 +5,8 @@ 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;
 
@@ -44,7 +46,7 @@ public class PatentCompositeBo {
     
     private String orgCode;
     
-    private String locationProvince;
+    private Integer locationProvince;
     
     private String locationCity;
     
@@ -196,11 +198,12 @@ public class PatentCompositeBo {
 	}
 
 
-	public String getLocationProvince() {
+	@JsonFormat(shape = Shape.STRING)
+	public Integer getLocationProvince() {
 		return locationProvince;
 	}
 
-	public void setLocationProvince(String locationProvince) {
+	public void setLocationProvince(Integer locationProvince) {
 		this.locationProvince = locationProvince;
 	}
 

+ 13 - 10
src/main/java/com/goafanti/patent/bo/PatentInfoDetailBo.java

@@ -12,11 +12,11 @@ public class PatentInfoDetailBo {
 
 	private String	orgCode;
 
-	private String	locationProvince;
+	private Integer	locationProvince;
 
-	private String	locationCity;
+	private Integer	locationCity;
 
-	private String	locationArea;
+	private Integer	locationArea;
 	
 	private String  postalAddress;
 
@@ -100,27 +100,30 @@ public class PatentInfoDetailBo {
 		this.orgCode = orgCode;
 	}
 
-	public String getLocationProvince() {
+	@JsonFormat(shape = Shape.STRING)
+	public Integer getLocationProvince() {
 		return locationProvince;
 	}
 
-	public void setLocationProvince(String locationProvince) {
+	public void setLocationProvince(Integer locationProvince) {
 		this.locationProvince = locationProvince;
 	}
 
-	public String getLocationCity() {
+	@JsonFormat(shape = Shape.STRING)
+	public Integer getLocationCity() {
 		return locationCity;
 	}
 
-	public void setLocationCity(String locationCity) {
+	public void setLocationCity(Integer locationCity) {
 		this.locationCity = locationCity;
 	}
-
-	public String getLocationArea() {
+	
+	@JsonFormat(shape = Shape.STRING)
+	public Integer getLocationArea() {
 		return locationArea;
 	}
 
-	public void setLocationArea(String locationArea) {
+	public void setLocationArea(Integer locationArea) {
 		this.locationArea = locationArea;
 	}
 

+ 4 - 3
src/main/java/com/goafanti/patent/bo/PatentManageListBo.java

@@ -19,7 +19,7 @@ public class PatentManageListBo {
 
 	private String	office;
 
-	private String	locationProvince;
+	private Integer	locationProvince;
 
 	private String	unitName;
 
@@ -114,11 +114,12 @@ public class PatentManageListBo {
 		this.unitName = unitName;
 	}
 
-	public String getLocationProvince() {
+	@JsonFormat(shape = Shape.STRING)
+	public Integer getLocationProvince() {
 		return locationProvince;
 	}
 
-	public void setLocationProvince(String locationProvince) {
+	public void setLocationProvince(Integer locationProvince) {
 		this.locationProvince = locationProvince;
 	}
 

+ 119 - 118
src/main/java/com/goafanti/patent/bo/PatentNoticeOfCorrectionBo.java

@@ -4,155 +4,156 @@ 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 PatentNoticeOfCorrectionBo {
-		private String uid;
-		
-		private String oid;
-		
-		private String pid;
-		
-		private Integer serialNumber;
-		
-		private String patentNumber;
-		
-		private String office;
-		
-	    private String locationProvince;
-		
-		private String unitName;
-		
-	    private Integer patentCatagory;
-		
-		private String patentName;
-		
-		private Integer patentState;
-		
-		private String author;
-		
-		private Date recordTime;
-
-		public String getUid() {
-			return uid;
-		}
+	private String	uid;
 
-		public void setUid(String uid) {
-			this.uid = uid;
-		}
+	private String	oid;
 
-		public String getOid() {
-			return oid;
-		}
+	private String	pid;
 
-		public void setOid(String oid) {
-			this.oid = oid;
-		}
+	private Integer	serialNumber;
 
-		public String getPid() {
-			return pid;
-		}
+	private String	patentNumber;
 
-		public void setPid(String pid) {
-			this.pid = pid;
-		}
+	private String	office;
 
+	private Integer	locationProvince;
 
-		public Integer getSerialNumber() {
-			return serialNumber;
-		}
+	private String	unitName;
 
-		public void setSerialNumber(Integer serialNumber) {
-			this.serialNumber = serialNumber;
-		}
+	private Integer	patentCatagory;
 
-		public String getPatentNumber() {
-			return patentNumber;
-		}
+	private String	patentName;
 
-		public void setPatentNumber(String patentNumber) {
-			this.patentNumber = patentNumber;
-		}
+	private Integer	patentState;
 
-		public String getOffice() {
-			return office;
-		}
+	private String	author;
 
-		public void setOffice(String office) {
-			this.office = office;
-		}
+	private Date	recordTime;
 
-		public String getLocationProvince() {
-			return locationProvince;
-		}
+	public String getUid() {
+		return uid;
+	}
 
-		public void setLocationProvince(String locationProvince) {
-			this.locationProvince = locationProvince;
-		}
+	public void setUid(String uid) {
+		this.uid = uid;
+	}
 
-		public String getUnitName() {
-			return unitName;
-		}
+	public String getOid() {
+		return oid;
+	}
 
-		public void setUnitName(String unitName) {
-			this.unitName = unitName;
-		}
+	public void setOid(String oid) {
+		this.oid = oid;
+	}
 
-		public Integer getPatentCatagory() {
-			return patentCatagory;
-		}
+	public String getPid() {
+		return pid;
+	}
 
-		public void setPatentCatagory(Integer patentCatagory) {
-			this.patentCatagory = patentCatagory;
-		}
+	public void setPid(String pid) {
+		this.pid = pid;
+	}
 
-		public String getPatentName() {
-			return patentName;
-		}
+	public Integer getSerialNumber() {
+		return serialNumber;
+	}
 
-		public void setPatentName(String patentName) {
-			this.patentName = patentName;
-		}
+	public void setSerialNumber(Integer serialNumber) {
+		this.serialNumber = serialNumber;
+	}
 
-		public Integer getPatentState() {
-			return patentState;
-		}
+	public String getPatentNumber() {
+		return patentNumber;
+	}
 
-		public void setPatentState(Integer patentState) {
-			this.patentState = patentState;
-		}
+	public void setPatentNumber(String patentNumber) {
+		this.patentNumber = patentNumber;
+	}
 
-		public String getAuthor() {
-			return author;
-		}
+	public String getOffice() {
+		return office;
+	}
 
-		public void setAuthor(String author) {
-			this.author = author;
-		}
+	public void setOffice(String office) {
+		this.office = office;
+	}
 
-		
-		public Date getRecordTime() {
-			return recordTime;
-		}
+	@JsonFormat(shape = Shape.STRING)
+	public Integer getLocationProvince() {
+		return locationProvince;
+	}
 
-		public void setRecordTime(Date recordTime) {
-			this.recordTime = recordTime;
-		}
+	public void setLocationProvince(Integer locationProvince) {
+		this.locationProvince = locationProvince;
+	}
 
-		//authorizedDate
-		public String getAuthorizedDateFormattedDate(){
-			if (this.recordTime == null) {
-				return null;
-			} else {
-				return DateFormatUtils.format(this.getRecordTime(), AFTConstants.YYYYMMDDHHMMSS);
-			}
-		}
-		
-		public void setAuthorizedDateFormattedDate(String authorizedDateFormattedDate){
-			
+	public String getUnitName() {
+		return unitName;
+	}
+
+	public void setUnitName(String unitName) {
+		this.unitName = unitName;
+	}
+
+	public Integer getPatentCatagory() {
+		return patentCatagory;
+	}
+
+	public void setPatentCatagory(Integer patentCatagory) {
+		this.patentCatagory = patentCatagory;
+	}
+
+	public String getPatentName() {
+		return patentName;
+	}
+
+	public void setPatentName(String patentName) {
+		this.patentName = patentName;
+	}
+
+	public Integer getPatentState() {
+		return patentState;
+	}
+
+	public void setPatentState(Integer patentState) {
+		this.patentState = patentState;
+	}
+
+	public String getAuthor() {
+		return author;
+	}
+
+	public void setAuthor(String author) {
+		this.author = author;
+	}
+
+	public Date getRecordTime() {
+		return recordTime;
+	}
+
+	public void setRecordTime(Date recordTime) {
+		this.recordTime = recordTime;
+	}
+
+	// authorizedDate
+	public String getAuthorizedDateFormattedDate() {
+		if (this.recordTime == null) {
+			return null;
+		} else {
+			return DateFormatUtils.format(this.getRecordTime(), AFTConstants.YYYYMMDDHHMMSS);
 		}
-		
-		
+	}
+
+	public void setAuthorizedDateFormattedDate(String authorizedDateFormattedDate) {
+
+	}
+
 }

+ 6 - 3
src/main/java/com/goafanti/patent/bo/PatentPendingBo.java

@@ -4,6 +4,8 @@ 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;
 
 /**
@@ -22,7 +24,7 @@ public class PatentPendingBo {
 	
 	private String patentNumber;
 	
-    private String locationProvince;
+    private Integer locationProvince;
 	
 	private String unitName;
 	
@@ -85,11 +87,12 @@ public class PatentPendingBo {
 		this.patentNumber = patentNumber;
 	}
 
-	public String getLocationProvince() {
+	@JsonFormat(shape = Shape.STRING)
+	public Integer getLocationProvince() {
 		return locationProvince;
 	}
 
-	public void setLocationProvince(String locationProvince) {
+	public void setLocationProvince(Integer locationProvince) {
 		this.locationProvince = locationProvince;
 	}
 

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

@@ -4,6 +4,8 @@ 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 {
@@ -19,7 +21,7 @@ public class PatentRecieveSendBo {
 
 	private String	patentNumber;
 
-	private String	locationProvince;
+	private Integer	locationProvince;
 
 	private String	unitName;
 
@@ -100,11 +102,12 @@ public class PatentRecieveSendBo {
 		this.patentNumber = patentNumber;
 	}
 
-	public String getLocationProvince() {
+	@JsonFormat(shape = Shape.STRING)
+	public Integer getLocationProvince() {
 		return locationProvince;
 	}
 
-	public void setLocationProvince(String locationProvince) {
+	public void setLocationProvince(Integer locationProvince) {
 		this.locationProvince = locationProvince;
 	}
 

+ 1 - 1
src/main/java/com/goafanti/patent/service/PatentCostService.java

@@ -10,7 +10,7 @@ public interface PatentCostService {
 
 	int updateByPrimaryKeySelective(PatentCost patentCost);
 
-	Pagination<PatentApplicationFeeBo> getApplicationFeeList(String[] patentApplicationDate, String locationProvince,
+	Pagination<PatentApplicationFeeBo> getApplicationFeeList(String[] patentApplicationDate, Integer locationProvince,
 			Integer pNo, Integer pSize) throws ParseException;
 
 	PatentCost insert(PatentCost patentCost);

+ 3 - 3
src/main/java/com/goafanti/patent/service/PatentInfoService.java

@@ -26,13 +26,13 @@ public interface PatentInfoService {
 			Integer parentCatagory, Integer patentState, Integer pNo, Integer pSize);
 
 	Pagination<PatentManageListBo> getManagePatentList(String contractId, Integer serialNumber, String patentNumber, String office,
-			String locationProvince, String unitName, Integer patentCatagory, String patentName, Integer patentState,
+			Integer locationProvince, String unitName, Integer patentCatagory, String patentName, Integer patentState,
 			String[] createTime, String[] patentApplicationDate, String author, String uid, Integer pNo, Integer pSize);
 
-	Pagination<PatentPendingBo> getManagePendingPaymentList(String locationProvince, Integer pNo, Integer pSize);
+	Pagination<PatentPendingBo> getManagePendingPaymentList(Integer locationProvince, Integer pNo, Integer pSize);
 
 	Pagination<PatentNoticeOfCorrectionBo> getNoticeOfCorrectionList(Date authorizedDate, Integer serialNumber,
-			String patentNumber, String office, String locationProvince, String unitName, Integer patentCatagory,
+			String patentNumber, String office, Integer locationProvince, String unitName, Integer patentCatagory,
 			String patentName, Integer patentState, String author, Integer pNo, Integer pSize);
 
 	int batchDeleteByPrimaryKey(List<String> id);

+ 2 - 2
src/main/java/com/goafanti/patent/service/impl/PatentCostServiceImpl.java

@@ -31,7 +31,7 @@ public class PatentCostServiceImpl extends BaseMybatisDao<PatentCostMapper> impl
 
 	@SuppressWarnings("unchecked")
 	@Override
-	public Pagination<PatentApplicationFeeBo> getApplicationFeeList(String[] pDate, String locationProvince,
+	public Pagination<PatentApplicationFeeBo> getApplicationFeeList(String[] pDate, Integer locationProvince,
 			Integer pageNo, Integer pageSize) throws ParseException {
 		Map<String, Object> params = new HashMap<>();
 		Date pStart = null;
@@ -55,7 +55,7 @@ public class PatentCostServiceImpl extends BaseMybatisDao<PatentCostMapper> impl
 			params.put("pEnd", pEnd);
 		}
 
-		if (!StringUtils.isBlank(locationProvince)) {
+		if (null != locationProvince) {
 			params.put("locationProvince", locationProvince);
 		}
 

+ 6 - 6
src/main/java/com/goafanti/patent/service/impl/PatentInfoServiceImpl.java

@@ -134,7 +134,7 @@ public class PatentInfoServiceImpl extends BaseMybatisDao<PatentInfoMapper> impl
 	@SuppressWarnings("unchecked")
 	@Override
 	public Pagination<PatentManageListBo> getManagePatentList(String contractId, Integer serialNumber,
-			String patentNumber, String office, String locationProvince, String unitName, Integer patentCatagory,
+			String patentNumber, String office, Integer locationProvince, String unitName, Integer patentCatagory,
 			String patentName, Integer patentState, String[] cDate, String[] pDate, String author, String uid,
 			Integer pageNo, Integer pageSize) {
 		Map<String, Object> params = new HashMap<>();
@@ -197,7 +197,7 @@ public class PatentInfoServiceImpl extends BaseMybatisDao<PatentInfoMapper> impl
 			params.put("office", office);
 		}
 
-		if (locationProvince != null && locationProvince != "") {
+		if (locationProvince != null ) {
 			params.put("locationProvince", locationProvince);
 		}
 
@@ -238,7 +238,7 @@ public class PatentInfoServiceImpl extends BaseMybatisDao<PatentInfoMapper> impl
 
 	@SuppressWarnings("unchecked")
 	@Override
-	public Pagination<PatentPendingBo> getManagePendingPaymentList(String locationProvince, Integer pageNo,
+	public Pagination<PatentPendingBo> getManagePendingPaymentList(Integer locationProvince, Integer pageNo,
 			Integer pageSize) {
 		Map<String, Object> params = new HashMap<>();
 
@@ -246,7 +246,7 @@ public class PatentInfoServiceImpl extends BaseMybatisDao<PatentInfoMapper> impl
 			params.put("principal", TokenManager.getAdminId());
 		}
 
-		if (locationProvince != null && locationProvince != "") {
+		if (locationProvince != null ) {
 			params.put("locationProvince", locationProvince);
 		}
 
@@ -264,7 +264,7 @@ public class PatentInfoServiceImpl extends BaseMybatisDao<PatentInfoMapper> impl
 	@SuppressWarnings("unchecked")
 	@Override
 	public Pagination<PatentNoticeOfCorrectionBo> getNoticeOfCorrectionList(Date authorizedDate, Integer serialNumber,
-			String patentNumber, String office, String locationProvince, String unitName, Integer patentCatagory,
+			String patentNumber, String office, Integer locationProvince, String unitName, Integer patentCatagory,
 			String patentName, Integer patentState, String author, Integer pageNo, Integer pageSize) {
 		Map<String, Object> params = new HashMap<>();
 
@@ -288,7 +288,7 @@ public class PatentInfoServiceImpl extends BaseMybatisDao<PatentInfoMapper> impl
 			params.put("office", office);
 		}
 
-		if (locationProvince != null && locationProvince != "") {
+		if (locationProvince != null ) {
 			params.put("locationProvince", locationProvince);
 		}
 

+ 4 - 3
src/main/java/com/goafanti/techproject/bo/TechProjectClientListBo.java

@@ -17,7 +17,7 @@ public class TechProjectClientListBo {
 	
 	private Integer serialNumber;
 	
-	private String province;
+	private Integer province;
 	
 	private Integer contacts;
 	
@@ -70,11 +70,12 @@ public class TechProjectClientListBo {
 		this.serialNumber = serialNumber;
 	}
 
-	public String getProvince() {
+	@JsonFormat(shape = Shape.STRING)
+	public Integer getProvince() {
 		return province;
 	}
 
-	public void setProvince(String province) {
+	public void setProvince(Integer province) {
 		this.province = province;
 	}
 

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

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

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

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

+ 1 - 1
src/main/java/com/goafanti/techproject/service/TechProjectService.java

@@ -21,7 +21,7 @@ public interface TechProjectService {
 
 	TechProject saveTechProject(TechProject techProject, String salesman);
 
-	Pagination<TechProjectManageListBo> listManageTechProject(String contractId, String province, String unitName, String uid, Integer pNo, Integer pSize);
+	Pagination<TechProjectManageListBo> listManageTechProject(String contractId, Integer province, String unitName, String uid, Integer pNo, Integer pSize);
 
 	TechProjectDetailBo selectProjectDetail(String pid);
 

+ 1 - 1
src/main/java/com/goafanti/techproject/service/TechWebsiteService.java

@@ -12,7 +12,7 @@ public interface TechWebsiteService {
 
 	Map<String, String> getDepartment(String uid);
 
-	Pagination<TechWebsiteListBo> listTechWebsite(String province, String uid, Integer pNo, Integer pSize);
+	Pagination<TechWebsiteListBo> listTechWebsite(Integer province, String uid, Integer pNo, Integer pSize);
 
 	int saveWebsite(TechWebsite t);
 

+ 2 - 2
src/main/java/com/goafanti/techproject/service/impl/TechProjectServiceImpl.java

@@ -153,7 +153,7 @@ public class TechProjectServiceImpl extends BaseMybatisDao<TechProjectMapper> im
 
 	@SuppressWarnings("unchecked")
 	@Override
-	public Pagination<TechProjectManageListBo> listManageTechProject(String contractId, String province,
+	public Pagination<TechProjectManageListBo> listManageTechProject(String contractId, Integer province,
 			String unitName, String uid, Integer pageNo, Integer pageSize) {
 		Map<String, Object> params = new HashMap<>();
 
@@ -165,7 +165,7 @@ public class TechProjectServiceImpl extends BaseMybatisDao<TechProjectMapper> im
 			params.put("contractId", contractId);
 		}
 
-		if (!StringUtils.isBlank(province)) {
+		if (null != province) {
 			params.put("province", province);
 		}
 		if (!StringUtils.isBlank(unitName)) {

+ 2 - 2
src/main/java/com/goafanti/techproject/service/impl/TechWebsiteServiceImpl.java

@@ -39,9 +39,9 @@ public class TechWebsiteServiceImpl extends BaseMybatisDao<TechWebsiteMapper> im
 
 	@SuppressWarnings("unchecked")
 	@Override
-	public Pagination<TechWebsiteListBo> listTechWebsite(String province, String unitName, Integer pageNo, Integer pageSize) {
+	public Pagination<TechWebsiteListBo> listTechWebsite(Integer province, String unitName, Integer pageNo, Integer pageSize) {
 		Map<String, Object> params = new HashMap<>();
-		if (!StringUtils.isBlank(province)) {
+		if (null != province) {
 			params.put("province", province);
 		}
 		if (!StringUtils.isBlank(unitName)) {

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

@@ -12,10 +12,10 @@ import com.goafanti.common.constant.ErrorConstants;
 public class InputOrgBasicInfo {
 	@Size(min = 0, max = 36, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String		id;
-	
+
 	@Size(min = 0, max = 36, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String		uid;
-	
+
 	@Size(min = 0, max = 36, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String		hid;
 
@@ -28,20 +28,23 @@ public class InputOrgBasicInfo {
 	/**
 	 * 行政区域--省
 	 */
-	@Size(min = 0, max = 12, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
-	private String		province;
+	@Max(value = 99, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	private Integer		province;
 
 	/**
 	 * 行政区域--市
 	 */
-	@Size(min = 0, max = 12, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
-	private String		city;
+	@Max(value = 999, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	private Integer		city;
 
 	/**
 	 * 行政区域--区
 	 */
-	@Size(min = 0, max = 12, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
-	private String		area;
+	@Max(value = 9999, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	private Integer		area;
 
 	/**
 	 * 通讯地址
@@ -100,7 +103,7 @@ public class InputOrgBasicInfo {
 	/**
 	 * 注册资金
 	 */
-	@Max(value = (long)999999.99, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Max(value = (long) 999999.99, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	private BigDecimal	registeredCapital;
 
@@ -219,31 +222,30 @@ public class InputOrgBasicInfo {
 	@Max(value = 999999, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	private Integer		techTotal;
-	
+
 	/**
 	 * 上市时间
 	 */
-	private Date listedDate;
-	
+	private Date		listedDate;
+
 	/**
 	 * 上市类型
 	 */
 	@Max(value = 1, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
-	private Integer listedType;
-	
+	private Integer		listedType;
+
 	/**
 	 * 股票代码
 	 */
 	@Size(min = 0, max = 32, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
-	private String stockCode;
-	
+	private String		stockCode;
+
 	/**
 	 * 国家级高新区名称
 	 */
 	@Size(min = 0, max = 32, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
-	private String highTechName;
-	
+	private String		highTechName;
 
 	public String getId() {
 		return id;
@@ -277,27 +279,27 @@ public class InputOrgBasicInfo {
 		this.unitName = unitName;
 	}
 
-	public String getProvince() {
+	public Integer getProvince() {
 		return province;
 	}
 
-	public void setProvince(String province) {
+	public void setProvince(Integer province) {
 		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;
 	}
 
@@ -317,7 +319,6 @@ public class InputOrgBasicInfo {
 		this.postcode = postcode;
 	}
 
-
 	public String getFirstContacts() {
 		return firstContacts;
 	}
@@ -438,7 +439,6 @@ public class InputOrgBasicInfo {
 		this.enterpriseScale = enterpriseScale;
 	}
 
-
 	public String getRegisterType() {
 		return registerType;
 	}
@@ -558,6 +558,5 @@ public class InputOrgBasicInfo {
 	public void setHighTechName(String highTechName) {
 		this.highTechName = highTechName;
 	}
-	
 
 }

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

@@ -19,14 +19,17 @@ public class InputOrgPro {
 	@Size(min = 0, max = 45, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String	companyName;
 
-	@Size(min = 0, max = 12, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
-	private String	locationProvince;
+	@Max(value = 99, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	private Integer	locationProvince;
 
-	@Size(min = 0, max = 12, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
-	private String	locationCity;
+	@Max(value = 999, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	private Integer	locationCity;
 
-	@Size(min = 0, max = 12, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
-	private String	locationArea;
+	@Max(value = 9999, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	private Integer	locationArea;
 
 	@Size(min = 0, max = 12, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String	unitSize;
@@ -67,7 +70,7 @@ public class InputOrgPro {
 	@Max(value = 99999, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	private Integer	masterTutor;
-	
+
 	@Max(value = 99999, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	private Integer	otherExpert;
@@ -123,27 +126,27 @@ public class InputOrgPro {
 		this.companyName = companyName;
 	}
 
-	public String getLocationProvince() {
+	public Integer getLocationProvince() {
 		return locationProvince;
 	}
 
-	public void setLocationProvince(String locationProvince) {
+	public void setLocationProvince(Integer locationProvince) {
 		this.locationProvince = locationProvince;
 	}
 
-	public String getLocationCity() {
+	public Integer getLocationCity() {
 		return locationCity;
 	}
 
-	public void setLocationCity(String locationCity) {
+	public void setLocationCity(Integer locationCity) {
 		this.locationCity = locationCity;
 	}
 
-	public String getLocationArea() {
+	public Integer getLocationArea() {
 		return locationArea;
 	}
 
-	public void setLocationArea(String locationArea) {
+	public void setLocationArea(Integer locationArea) {
 		this.locationArea = locationArea;
 	}
 
@@ -290,6 +293,5 @@ public class InputOrgPro {
 	public void setInstitutionEstablishTime(String institutionEstablishTime) {
 		this.institutionEstablishTime = institutionEstablishTime;
 	}
-	
-	
+
 }

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

@@ -28,7 +28,7 @@ public class InputOrganizationIdentity {
 	@Size(min = 0, max = 16, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String		qq;
 
-	@Size(min = 0, max =255, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	@Size(min = 0, max = 255, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String		postalAddress;
 
 	@Size(min = 0, max = 8, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
@@ -47,14 +47,17 @@ public class InputOrganizationIdentity {
 	@Size(min = 0, max = 32, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String		licenceNumber;
 
-	@Size(min = 0, max = 12, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
-	private String		licenceProvince;
+	@Max(value = 99, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	private Integer		licenceProvince;
 
-	@Size(min = 0, max = 12, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
-	private String		licenceCity;
+	@Max(value = 999, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	private Integer		licenceCity;
 
-	@Size(min = 0, max = 12, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
-	private String		licenceArea;
+	@Max(value = 9999, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	private Integer		licenceArea;
 
 	@Size(min = 0, max = 255, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String		licenceScanningUrl;
@@ -77,7 +80,7 @@ public class InputOrganizationIdentity {
 	@Size(min = 0, max = 32, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String		bankCardNumber;
 
-	@Max(value = (long)99.9999, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Max(value = (long) 99.9999, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	private BigDecimal	validationAmount;
 
@@ -85,14 +88,17 @@ public class InputOrganizationIdentity {
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	private Integer		identityType;
 
-	@Size(min = 0, max = 32, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
-	private String		locationProvince;
+	@Max(value = 99, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	private Integer		locationProvince;
 
-	@Size(min = 0, max = 32, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
-	private String		locationCity;
-	
-	@Size(min = 0, max = 32, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
-	private String		locationArea;
+	@Max(value = 999, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	private Integer		locationCity;
+
+	@Max(value = 9999, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	private Integer		locationArea;
 
 	@Size(min = 0, max = 16, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String		legalPerson;
@@ -159,7 +165,6 @@ public class InputOrganizationIdentity {
 
 	@Size(min = 0, max = 36, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String		consultant;
-	
 
 	public String getId() {
 		return id;
@@ -257,30 +262,42 @@ public class InputOrganizationIdentity {
 		this.licenceNumber = licenceNumber;
 	}
 
-	public String getLicenceProvince() {
+	public Integer getLicenceProvince() {
 		return licenceProvince;
 	}
 
-	public void setLicenceProvince(String licenceProvince) {
+	public void setLicenceProvince(Integer licenceProvince) {
 		this.licenceProvince = licenceProvince;
 	}
 
-	public String getLicenceCity() {
+	public Integer getLicenceCity() {
 		return licenceCity;
 	}
 
-	public void setLicenceCity(String licenceCity) {
+	public void setLicenceCity(Integer licenceCity) {
 		this.licenceCity = licenceCity;
 	}
 
-	public String getLicenceArea() {
+	public Integer getLicenceArea() {
 		return licenceArea;
 	}
 
-	public void setLicenceArea(String licenceArea) {
+	public void setLicenceArea(Integer licenceArea) {
 		this.licenceArea = licenceArea;
 	}
 
+	public void setLocationProvince(Integer locationProvince) {
+		this.locationProvince = locationProvince;
+	}
+
+	public void setLocationCity(Integer locationCity) {
+		this.locationCity = locationCity;
+	}
+
+	public void setLocationArea(Integer locationArea) {
+		this.locationArea = locationArea;
+	}
+
 	public String getLicenceScanningUrl() {
 		return licenceScanningUrl;
 	}
@@ -353,30 +370,6 @@ public class InputOrganizationIdentity {
 		this.identityType = identityType;
 	}
 
-	public String getLocationProvince() {
-		return locationProvince;
-	}
-
-	public void setLocationProvince(String locationProvince) {
-		this.locationProvince = locationProvince;
-	}
-
-	public String getLocationCity() {
-		return locationCity;
-	}
-
-	public void setLocationCity(String locationCity) {
-		this.locationCity = locationCity;
-	}
-
-	public String getLocationArea() {
-		return locationArea;
-	}
-
-	public void setLocationArea(String locationArea) {
-		this.locationArea = locationArea;
-	}
-
 	public String getLegalPerson() {
 		return legalPerson;
 	}
@@ -544,7 +537,5 @@ public class InputOrganizationIdentity {
 	public void setConsultant(String consultant) {
 		this.consultant = consultant;
 	}
-	
-	
-	
+
 }

+ 24 - 70
src/main/java/com/goafanti/user/bo/InputUserIdentity.java

@@ -10,25 +10,25 @@ import javax.validation.constraints.Size;
 import com.goafanti.common.constant.ErrorConstants;
 
 public class InputUserIdentity {
-	
+
 	@Size(min = 0, max = 36, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String		id;
-	
+
 	@Size(min = 0, max = 36, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String		uid;
 
 	@Size(min = 0, max = 16, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String		username;
-	
+
 	@Size(min = 0, max = 2, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String		sex;
-	
+
 	@Size(min = 0, max = 4, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String		dateOfBirthYear;
 
 	@Size(min = 0, max = 2, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String		dateOfBirthMonth;
-	
+
 	@Size(min = 0, max = 20, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String		idNumber;
 
@@ -40,15 +40,18 @@ public class InputUserIdentity {
 
 	@Size(min = 0, max = 16, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String		aftUsername;
-	
-	@Size(min = 0, max = 16, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
-	private String		province;
 
-	@Size(min = 0, max = 16, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
-	private String		city;
+	@Max(value = 99, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	private Integer		province;
 
-	@Size(min = 0, max = 16, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
-	private String		area;
+	@Max(value = 999, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	private Integer		city;
+
+	@Max(value = 9999, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	private Integer		area;
 
 	@Size(min = 0, max = 16, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String		contactMobile;
@@ -62,247 +65,198 @@ public class InputUserIdentity {
 	@Size(min = 0, max = 32, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String		bankCardNumber;
 
-
-	@Max(value = (long)99.9999, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Max(value = (long) 99.9999, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	private BigDecimal	amountMoney;
 
-
 	@Max(value = 5, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	private Integer		auditStatus;
 
-
 	@Max(value = 9, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	private Integer		process;
-	
 
 	@Max(value = 3, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	private Integer		wrongCount;
-	
-    private Date paymentDate;
 
+	private Date		paymentDate;
 
 	public Date getPaymentDate() {
 		return paymentDate;
 	}
 
-
 	public void setPaymentDate(Date paymentDate) {
 		this.paymentDate = paymentDate;
 	}
 
-
 	public String getId() {
 		return id;
 	}
 
-
 	public void setId(String id) {
 		this.id = id;
 	}
 
-
 	public String getUid() {
 		return uid;
 	}
 
-
 	public void setUid(String uid) {
 		this.uid = uid;
 	}
 
-
 	public String getUsername() {
 		return username;
 	}
 
-
 	public void setUsername(String username) {
 		this.username = username;
 	}
 
-
 	public String getSex() {
 		return sex;
 	}
 
-
 	public void setSex(String sex) {
 		this.sex = sex;
 	}
 
-
 	public String getDateOfBirthYear() {
 		return dateOfBirthYear;
 	}
 
-
 	public void setDateOfBirthYear(String dateOfBirthYear) {
 		this.dateOfBirthYear = dateOfBirthYear;
 	}
 
-
 	public String getDateOfBirthMonth() {
 		return dateOfBirthMonth;
 	}
 
-
 	public void setDateOfBirthMonth(String dateOfBirthMonth) {
 		this.dateOfBirthMonth = dateOfBirthMonth;
 	}
 
-
 	public String getIdNumber() {
 		return idNumber;
 	}
 
-
 	public void setIdNumber(String idNumber) {
 		this.idNumber = idNumber;
 	}
 
-
 	public String getPositiveIdUrl() {
 		return positiveIdUrl;
 	}
 
-
 	public void setPositiveIdUrl(String positiveIdUrl) {
 		this.positiveIdUrl = positiveIdUrl;
 	}
 
-
 	public String getOppositeIdUrl() {
 		return oppositeIdUrl;
 	}
 
-
 	public void setOppositeIdUrl(String oppositeIdUrl) {
 		this.oppositeIdUrl = oppositeIdUrl;
 	}
 
-
 	public String getAftUsername() {
 		return aftUsername;
 	}
 
-
 	public void setAftUsername(String aftUsername) {
 		this.aftUsername = aftUsername;
 	}
 
-
-	public String getProvince() {
+	public Integer getProvince() {
 		return province;
 	}
 
-
-	public void setProvince(String province) {
+	public void setProvince(Integer province) {
 		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;
 	}
 
-
 	public String getContactMobile() {
 		return contactMobile;
 	}
 
-
 	public void setContactMobile(String contactMobile) {
 		this.contactMobile = contactMobile;
 	}
 
-
 	public String getBankName() {
 		return bankName;
 	}
 
-
 	public void setBankName(String bankName) {
 		this.bankName = bankName;
 	}
 
-
 	public String getBankAccount() {
 		return bankAccount;
 	}
 
-
 	public void setBankAccount(String bankAccount) {
 		this.bankAccount = bankAccount;
 	}
 
-
 	public String getBankCardNumber() {
 		return bankCardNumber;
 	}
 
-
 	public void setBankCardNumber(String bankCardNumber) {
 		this.bankCardNumber = bankCardNumber;
 	}
 
-
 	public BigDecimal getAmountMoney() {
 		return amountMoney;
 	}
 
-
 	public void setAmountMoney(BigDecimal amountMoney) {
 		this.amountMoney = amountMoney;
 	}
 
-
 	public Integer getAuditStatus() {
 		return auditStatus;
 	}
 
-
 	public void setAuditStatus(Integer auditStatus) {
 		this.auditStatus = auditStatus;
 	}
 
-
 	public Integer getProcess() {
 		return process;
 	}
 
-
 	public void setProcess(Integer process) {
 		this.process = process;
 	}
 
-
 	public Integer getWrongCount() {
 		return wrongCount;
 	}
 
-
 	public void setWrongCount(Integer wrongCount) {
 		this.wrongCount = wrongCount;
 	}
-	
-	
+
 }

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

@@ -25,17 +25,17 @@ public class OrgBasicInfoBo {
 	/**
 	 * 行政区域--省
 	 */
-	private String province;
+	private Integer province;
 	
 	/**
 	 * 行政区域--市
 	 */
-	private String city;
+	private Integer city;
 	
 	/**
 	 * 行政区域--区
 	 */
-	private String area;
+	private Integer area;
 	
 	/**
 	 * 通讯地址
@@ -229,27 +229,30 @@ public class OrgBasicInfoBo {
 		this.unitName = unitName;
 	}
 
-	public String getProvince() {
+	@JsonFormat(shape =Shape.STRING)
+	public Integer getProvince() {
 		return province;
 	}
 
-	public void setProvince(String province) {
+	public void setProvince(Integer province) {
 		this.province = province;
 	}
-
-	public String getCity() {
+	
+	@JsonFormat(shape =Shape.STRING)
+	public Integer getCity() {
 		return city;
 	}
 
-	public void setCity(String city) {
+	public void setCity(Integer city) {
 		this.city = city;
 	}
-
-	public String getArea() {
+	
+	@JsonFormat(shape =Shape.STRING)
+	public Integer getArea() {
 		return area;
 	}
 
-	public void setArea(String area) {
+	public void setArea(Integer area) {
 		this.area = area;
 	}
 

+ 44 - 38
src/main/java/com/goafanti/user/bo/OrgIdentityDetailBo.java

@@ -82,17 +82,17 @@ public class OrgIdentityDetailBo {
 	/**
 	 * 营业执照所在地--省
 	 */
-	private String		licenceProvince;
+	private Integer		licenceProvince;
 
 	/**
 	 * 营业执照所在地-市
 	 */
-	private String		licenceCity;
+	private Integer		licenceCity;
 
 	/**
 	 * 营业执照所在地-区(县)
 	 */
-	private String		licenceArea;
+	private Integer		licenceArea;
 
 	/**
 	 * 营业执照副本扫描件URL
@@ -127,17 +127,17 @@ public class OrgIdentityDetailBo {
 	/**
 	 * 开户行所在地-省
 	 */
-	private String		locationProvince;
+	private Integer		locationProvince;
 
 	/**
 	 * 开户行所在地-市
 	 */
-	private String		locationCity;
+	private Integer		locationCity;
 
 	/**
 	 * 开户行所在地-区(县)
 	 */
-	private String		locationArea;
+	private Integer		locationArea;
 
 	/**
 	 * 打入账内信息
@@ -279,30 +279,6 @@ public class OrgIdentityDetailBo {
 		this.licenceNumber = licenceNumber;
 	}
 
-	public String getLicenceProvince() {
-		return licenceProvince;
-	}
-
-	public void setLicenceProvince(String licenceProvince) {
-		this.licenceProvince = licenceProvince;
-	}
-
-	public String getLicenceCity() {
-		return licenceCity;
-	}
-
-	public void setLicenceCity(String licenceCity) {
-		this.licenceCity = licenceCity;
-	}
-
-	public String getLicenceArea() {
-		return licenceArea;
-	}
-
-	public void setLicenceArea(String licenceArea) {
-		this.licenceArea = licenceArea;
-	}
-
 	public String getLicenceScanningUrl() {
 		return licenceScanningUrl;
 	}
@@ -351,27 +327,57 @@ public class OrgIdentityDetailBo {
 		this.bankCardNumber = bankCardNumber;
 	}
 
-	public String getLocationProvince() {
+	@JsonFormat(shape = Shape.STRING)
+	public Integer getLicenceProvince() {
+		return licenceProvince;
+	}
+
+	public void setLicenceProvince(Integer licenceProvince) {
+		this.licenceProvince = licenceProvince;
+	}
+
+	@JsonFormat(shape = Shape.STRING)
+	public Integer getLicenceCity() {
+		return licenceCity;
+	}
+
+	public void setLicenceCity(Integer licenceCity) {
+		this.licenceCity = licenceCity;
+	}
+	
+	@JsonFormat(shape = Shape.STRING)
+	public Integer getLicenceArea() {
+		return licenceArea;
+	}
+
+	public void setLicenceArea(Integer licenceArea) {
+		this.licenceArea = licenceArea;
+	}
+	
+	@JsonFormat(shape = Shape.STRING)
+	public Integer getLocationProvince() {
 		return locationProvince;
 	}
 
-	public void setLocationProvince(String locationProvince) {
+	public void setLocationProvince(Integer locationProvince) {
 		this.locationProvince = locationProvince;
 	}
-
-	public String getLocationCity() {
+	
+	@JsonFormat(shape = Shape.STRING)
+	public Integer getLocationCity() {
 		return locationCity;
 	}
 
-	public void setLocationCity(String locationCity) {
+	public void setLocationCity(Integer locationCity) {
 		this.locationCity = locationCity;
 	}
-
-	public String getLocationArea() {
+	
+	@JsonFormat(shape = Shape.STRING)
+	public Integer getLocationArea() {
 		return locationArea;
 	}
 
-	public void setLocationArea(String locationArea) {
+	public void setLocationArea(Integer locationArea) {
 		this.locationArea = locationArea;
 	}