Explorar el Código

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

albertshaw hace 8 años
padre
commit
b13ada92bc
Se han modificado 34 ficheros con 4352 adiciones y 134 borrados
  1. 8 0
      schema/2017-03-27.sql
  2. 355 132
      src/main/java/com/goafanti/admin/controller/AdminApiController.java
  3. 257 0
      src/main/java/com/goafanti/cognizance/bo/InputOrgActivity.java
  4. 234 0
      src/main/java/com/goafanti/cognizance/bo/InputOrgActivityCost.java
  5. 108 0
      src/main/java/com/goafanti/cognizance/bo/InputOrgAnnualReport.java
  6. 192 0
      src/main/java/com/goafanti/cognizance/bo/InputOrgFinance.java
  7. 79 0
      src/main/java/com/goafanti/cognizance/bo/InputOrgHonorDatum.java
  8. 405 0
      src/main/java/com/goafanti/cognizance/bo/InputOrgHumanResource.java
  9. 125 0
      src/main/java/com/goafanti/cognizance/bo/InputOrgIntellectualProperty.java
  10. 166 0
      src/main/java/com/goafanti/cognizance/bo/InputOrgRatepay.java
  11. 82 0
      src/main/java/com/goafanti/cognizance/bo/InputOrgStandard.java
  12. 102 0
      src/main/java/com/goafanti/cognizance/bo/InputOrgTechAchievement.java
  13. 104 0
      src/main/java/com/goafanti/cognizance/bo/InputOrgTechCenter.java
  14. 196 0
      src/main/java/com/goafanti/cognizance/bo/InputOrgTechProduct.java
  15. 66 0
      src/main/java/com/goafanti/common/enums/OrgActivityCostFields.java
  16. 70 0
      src/main/java/com/goafanti/common/enums/OrgActivityFields.java
  17. 57 0
      src/main/java/com/goafanti/common/enums/OrgAnnualReportFields.java
  18. 64 0
      src/main/java/com/goafanti/common/enums/OrgFinanceFields.java
  19. 54 0
      src/main/java/com/goafanti/common/enums/OrgHonorDatumFields.java
  20. 89 0
      src/main/java/com/goafanti/common/enums/OrgHumanResourceFields.java
  21. 59 0
      src/main/java/com/goafanti/common/enums/OrgIntellectualPropertyFields.java
  22. 62 0
      src/main/java/com/goafanti/common/enums/OrgRatepayFields.java
  23. 54 0
      src/main/java/com/goafanti/common/enums/OrgStandardFields.java
  24. 56 0
      src/main/java/com/goafanti/common/enums/OrgTechAchievementFields.java
  25. 56 0
      src/main/java/com/goafanti/common/enums/OrgTechCenterFields.java
  26. 65 0
      src/main/java/com/goafanti/common/enums/OrgTechProductFields.java
  27. 102 0
      src/main/java/com/goafanti/common/enums/OrganizationIdentityFields.java
  28. 56 0
      src/main/java/com/goafanti/common/enums/UserAbilityFields.java
  29. 67 0
      src/main/java/com/goafanti/common/enums/UserIdentityFields.java
  30. 1 1
      src/main/java/com/goafanti/common/model/OrgTechProduct.java
  31. 1 1
      src/main/java/com/goafanti/common/model/UserIdentity.java
  32. 549 0
      src/main/java/com/goafanti/user/bo/InputOrganizationIdentity.java
  33. 103 0
      src/main/java/com/goafanti/user/bo/InputUserAbility.java
  34. 308 0
      src/main/java/com/goafanti/user/bo/InputUserIdentity.java

+ 8 - 0
schema/2017-03-27.sql

@@ -0,0 +1,8 @@
+
+ALTER TABLE `org_standard` 
+MODIFY COLUMN `participate_way` INT(1) NULL COMMENT '参与方式';
+
+
+
+
+

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

@@ -10,8 +10,11 @@ import java.util.UUID;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import javax.validation.Valid;
 
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Controller;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -21,6 +24,17 @@ import com.goafanti.admin.service.AftFileService;
 import com.goafanti.cognizance.bo.ActivityNumberBo;
 import com.goafanti.cognizance.bo.AnnualReportBo;
 import com.goafanti.cognizance.bo.CognizanceDetailBo;
+import com.goafanti.cognizance.bo.InputOrgActivity;
+import com.goafanti.cognizance.bo.InputOrgActivityCost;
+import com.goafanti.cognizance.bo.InputOrgAnnualReport;
+import com.goafanti.cognizance.bo.InputOrgFinance;
+import com.goafanti.cognizance.bo.InputOrgHumanResource;
+import com.goafanti.cognizance.bo.InputOrgIntellectualProperty;
+import com.goafanti.cognizance.bo.InputOrgRatepay;
+import com.goafanti.cognizance.bo.InputOrgStandard;
+import com.goafanti.cognizance.bo.InputOrgTechAchievement;
+import com.goafanti.cognizance.bo.InputOrgTechCenter;
+import com.goafanti.cognizance.bo.InputOrgTechProduct;
 import com.goafanti.cognizance.service.OrgActivityCostService;
 import com.goafanti.cognizance.service.OrgActivityService;
 import com.goafanti.cognizance.service.OrgAnnualReportService;
@@ -38,6 +52,20 @@ import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.controller.CertifyApiController;
+import com.goafanti.common.enums.OrgActivityFields;
+import com.goafanti.common.enums.OrgAnnualReportFields;
+import com.goafanti.common.enums.OrgFinanceFields;
+import com.goafanti.common.enums.OrgHonorDatumFields;
+import com.goafanti.common.enums.OrgHumanResourceFields;
+import com.goafanti.common.enums.OrgIntellectualPropertyFields;
+import com.goafanti.common.enums.OrgRatepayFields;
+import com.goafanti.common.enums.OrgStandardFields;
+import com.goafanti.common.enums.OrgTechAchievementFields;
+import com.goafanti.common.enums.OrgTechCenterFields;
+import com.goafanti.common.enums.OrgTechProductFields;
+import com.goafanti.common.enums.OrganizationIdentityFields;
+import com.goafanti.common.enums.UserAbilityFields;
+import com.goafanti.common.enums.UserIdentityFields;
 import com.goafanti.common.model.AftFile;
 import com.goafanti.common.model.OrgActivity;
 import com.goafanti.common.model.OrgActivityCost;
@@ -64,6 +92,9 @@ import com.goafanti.common.utils.StringUtils;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.patent.service.AdminService;
+import com.goafanti.user.bo.InputOrganizationIdentity;
+import com.goafanti.user.bo.InputUserAbility;
+import com.goafanti.user.bo.InputUserIdentity;
 import com.goafanti.user.bo.OrgListBo;
 import com.goafanti.user.bo.UserListBo;
 import com.goafanti.user.service.OrgHumanResourceService;
@@ -225,8 +256,16 @@ public class AdminApiController extends CertifyApiController {
 	 * @throws ParseException
 	 */
 	@RequestMapping(value = "updateUserDetail", method = RequestMethod.POST)
-	public Result updateUserDetail(UserIdentity userIdentity, String paymentDateFormattedDate) {
+	public Result updateUserDetail(@Valid InputUserIdentity userIdentity, BindingResult bindingResult,
+			String paymentDateFormattedDate) {
 		Result res = new Result();
+
+		if (bindingResult.hasErrors()) {
+			res.getError().add(buildErrorByMsg(bindingResult.getFieldError().getDefaultMessage(),
+					UserIdentityFields.getFieldDesc(bindingResult.getFieldError().getField())));
+			return res;
+		}
+
 		if (!checkAdminLogin(res)) {
 			return res;
 		}
@@ -235,19 +274,24 @@ public class AdminApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到用户", "用户"));
 			return res;
 		}
+
 		if (!StringUtils.isBlank(paymentDateFormattedDate)) {
 			try {
 				userIdentity.setPaymentDate(DateUtils.parseDate(paymentDateFormattedDate, AFTConstants.YYYYMMDD));
 			} catch (ParseException e) {
 			}
 		}
-		if (StringUtils.isBlank(userIdentity.getId())) {
-			userIdentity.setId(UUID.randomUUID().toString());
-			userIdentity.setAuditStatus(null == userIdentity.getAuditStatus() ? 0 : userIdentity.getAuditStatus());
-			userIdentity.setProcess(null == userIdentity.getProcess() ? 0 : userIdentity.getProcess());
-			res.setData(userIdentityService.insert(userIdentity));
+
+		UserIdentity ui = new UserIdentity();
+		BeanUtils.copyProperties(userIdentity, ui);
+
+		if (StringUtils.isBlank(ui.getId())) {
+			ui.setId(UUID.randomUUID().toString());
+			ui.setAuditStatus(null == userIdentity.getAuditStatus() ? 0 : userIdentity.getAuditStatus());
+			ui.setProcess(null == userIdentity.getProcess() ? 0 : userIdentity.getProcess());
+			res.setData(userIdentityService.insert(ui));
 		} else {
-			res.setData(userIdentityService.updateUserDetail(userIdentity));
+			res.setData(userIdentityService.updateUserDetail(ui));
 		}
 		return res;
 	}
@@ -313,8 +357,16 @@ public class AdminApiController extends CertifyApiController {
 	 * @throws ParseException
 	 */
 	@RequestMapping(value = "/updateOrgDetail", method = RequestMethod.POST)
-	public Result updateOrgDetail(OrganizationIdentity orgIdentity, String paymentDateFormattedDate) {
+	public Result updateOrgDetail(@Valid InputOrganizationIdentity orgIdentity, BindingResult bindingResult,
+			String paymentDateFormattedDate) {
 		Result res = new Result();
+
+		if (bindingResult.hasErrors()) {
+			res.getError().add(buildErrorByMsg(bindingResult.getFieldError().getDefaultMessage(),
+					OrganizationIdentityFields.getFieldDesc(bindingResult.getFieldError().getField())));
+			return res;
+		}
+
 		if (!checkAdminLogin(res)) {
 			return res;
 		}
@@ -329,16 +381,20 @@ public class AdminApiController extends CertifyApiController {
 			} catch (ParseException e) {
 			}
 		}
-		if (StringUtils.isBlank(orgIdentity.getId())) {
-			orgIdentity.setId(UUID.randomUUID().toString());
-			orgIdentity.setIdentityType(null == orgIdentity.getIdentityType() ? 0 : orgIdentity.getIdentityType());
-			orgIdentity.setAuditStatus(null == orgIdentity.getAuditStatus() ? 0 : orgIdentity.getAuditStatus());
-			orgIdentity.setProcess(null == orgIdentity.getProcess() ? 0 : orgIdentity.getProcess());
-			orgIdentity.setListed(null == orgIdentity.getListed() ? 0 : orgIdentity.getListed());
-			orgIdentity.setListedType(null == orgIdentity.getListedType() ? 0 : orgIdentity.getListedType());
-			res.setData(organizationIdentityService.insert(orgIdentity));
+
+		OrganizationIdentity oi = new OrganizationIdentity();
+		BeanUtils.copyProperties(orgIdentity, oi);
+
+		if (StringUtils.isBlank(oi.getId())) {
+			oi.setId(UUID.randomUUID().toString());
+			oi.setIdentityType(null == oi.getIdentityType() ? 0 : oi.getIdentityType());
+			oi.setAuditStatus(null == oi.getAuditStatus() ? 0 : oi.getAuditStatus());
+			oi.setProcess(null == oi.getProcess() ? 0 : oi.getProcess());
+			oi.setListed(null == oi.getListed() ? 0 : oi.getListed());
+			oi.setListedType(null == oi.getListedType() ? 0 : oi.getListedType());
+			res.setData(organizationIdentityService.insert(oi));
 		} else {
-			res.setData(organizationIdentityService.updateOrgDetail(orgIdentity));
+			res.setData(organizationIdentityService.updateOrgDetail(oi));
 		}
 		return res;
 	}
@@ -384,8 +440,14 @@ public class AdminApiController extends CertifyApiController {
 	 * @return
 	 */
 	@RequestMapping(value = "/updateOrgHumanResource", method = RequestMethod.POST)
-	public Result updateOrgHumanResource(OrgHumanResource orgHumanResource) {
+	public Result updateOrgHumanResource(@Valid InputOrgHumanResource orgHumanResource, BindingResult bindingResult) {
 		Result res = new Result();
+		if (bindingResult.hasErrors()) {
+			res.getError().add(buildErrorByMsg(bindingResult.getFieldError().getDefaultMessage(),
+					OrgHumanResourceFields.getFieldDesc(bindingResult.getFieldError().getField())));
+			return res;
+		}
+
 		if (!checkAdminLogin(res)) {
 			return res;
 		}
@@ -394,20 +456,28 @@ public class AdminApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到用户", "用户"));
 			return res;
 		}
+
+		if (null == orgHumanResource.getYear()) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到年份", "年份"));
+			return res;
+		}
 		if (!checkCertify(res, orgHumanResource.getUid()).getError().isEmpty()) {
 			return res;
 		}
-		if (StringUtils.isBlank(orgHumanResource.getId())) {
-			if (null != orgHumanResourceService.selectOrgHumanResourceByUidAndYear(orgHumanResource.getYear(),
-					orgHumanResource.getUid())) {
+
+		OrgHumanResource ohr = new OrgHumanResource();
+		BeanUtils.copyProperties(orgHumanResource, ohr);
+
+		if (StringUtils.isBlank(ohr.getId())) {
+			if (null != orgHumanResourceService.selectOrgHumanResourceByUidAndYear(ohr.getYear(), ohr.getUid())) {
 				res.getError().add(buildError(ErrorConstants.DUPLICATE_DATA_ERROR, "当年度人力资源情况已录入!"));
 				return res;
 			}
-			orgHumanResource.setId(UUID.randomUUID().toString());
-			orgHumanResource.setDeletedSign(0);
-			orgHumanResourceService.insert(orgHumanResource);
+			ohr.setId(UUID.randomUUID().toString());
+			ohr.setDeletedSign(0);
+			orgHumanResourceService.insert(ohr);
 		} else {
-			orgHumanResourceService.updateByPrimaryKeySelective(orgHumanResource);
+			orgHumanResourceService.updateByPrimaryKeySelective(ohr);
 		}
 		return res;
 	}
@@ -454,8 +524,15 @@ public class AdminApiController extends CertifyApiController {
 	 * @return
 	 */
 	@RequestMapping(value = "/developStandard", method = RequestMethod.POST)
-	public Result developStandard(OrgStandard orgStandard) {
+	public Result developStandard(@Valid InputOrgStandard orgStandard, BindingResult bindingResult) {
 		Result res = new Result();
+
+		if (bindingResult.hasErrors()) {
+			res.getError().add(buildErrorByMsg(bindingResult.getFieldError().getDefaultMessage(),
+					OrgStandardFields.getFieldDesc(bindingResult.getFieldError().getField())));
+			return res;
+		}
+
 		if (!checkAdminLogin(res)) {
 			return res;
 		}
@@ -466,15 +543,19 @@ public class AdminApiController extends CertifyApiController {
 		if (!checkCertify(res, orgStandard.getUid()).getError().isEmpty()) {
 			return res;
 		}
-		if (StringUtils.isBlank(orgStandard.getId())) {
-			orgStandard.setId(UUID.randomUUID().toString());
-			orgStandard.setDeletedSign(0);
+
+		OrgStandard os = new OrgStandard();
+		BeanUtils.copyProperties(orgStandard, os);
+
+		if (StringUtils.isBlank(os.getId())) {
+			os.setId(UUID.randomUUID().toString());
+			os.setDeletedSign(0);
 			Calendar now = Calendar.getInstance();
 			now.set(Calendar.MILLISECOND, 0);
-			orgStandard.setCreateTime(now.getTime());
-			orgStandardService.insert(orgStandard);
+			os.setCreateTime(now.getTime());
+			orgStandardService.insert(os);
 		} else {
-			orgStandardService.updateByPrimaryKeySelective(orgStandard);
+			orgStandardService.updateByPrimaryKeySelective(os);
 		}
 		res.setData(orgStandard);
 		return res;
@@ -487,9 +568,16 @@ public class AdminApiController extends CertifyApiController {
 	 * @throws ParseException
 	 */
 	@RequestMapping(value = "/intellectual", method = RequestMethod.POST)
-	public Result intellectual(OrgIntellectualProperty orgIntellectualProperty, String authorizationDateFormattedDate,
-			String uid) {
+	public Result intellectual(@Valid InputOrgIntellectualProperty orgIntellectualProperty, BindingResult bindingResult,
+			String authorizationDateFormattedDate) {
 		Result res = new Result();
+
+		if (bindingResult.hasErrors()) {
+			res.getError().add(buildErrorByMsg(bindingResult.getFieldError().getDefaultMessage(),
+					OrgIntellectualPropertyFields.getFieldDesc(bindingResult.getFieldError().getField())));
+			return res;
+		}
+
 		if (!checkAdminLogin(res)) {
 			return res;
 		}
@@ -507,16 +595,17 @@ public class AdminApiController extends CertifyApiController {
 			} catch (ParseException e) {
 			}
 		}
-		if (StringUtils.isBlank(orgIntellectualProperty.getId())) {
-			orgIntellectualProperty.setId(UUID.randomUUID().toString());
-			orgIntellectualProperty.setUid(uid);
-			orgIntellectualProperty.setEvaluationCategory(
-					(orgIntellectualProperty.getCatagory() >= 2 && orgIntellectualProperty.getCatagory() <= 4) ? 1 : 0);
-			orgIntellectualProperty.setDeletedSign(0);
-			res.setData(orgIntellectualPropertyService.insert(orgIntellectualProperty));
+		OrgIntellectualProperty oip = new OrgIntellectualProperty();
+		BeanUtils.copyProperties(orgIntellectualProperty, oip);
+
+		if (StringUtils.isBlank(oip.getId())) {
+			oip.setId(UUID.randomUUID().toString());
+			oip.setEvaluationCategory((oip.getCatagory() >= 2 && oip.getCatagory() <= 4) ? 1 : 0);
+			oip.setDeletedSign(0);
+			res.setData(orgIntellectualPropertyService.insert(oip));
 		} else {
-			orgIntellectualProperty.setEvaluationCategory(orgIntellectualProperty.getCatagory() <= 2 ? 1 : 0);
-			res.setData(orgIntellectualPropertyService.updateByPrimaryKeySelective(orgIntellectualProperty));
+			oip.setEvaluationCategory(orgIntellectualProperty.getCatagory() <= 2 ? 1 : 0);
+			res.setData(orgIntellectualPropertyService.updateByPrimaryKeySelective(oip));
 		}
 		return res;
 	}
@@ -633,8 +722,16 @@ public class AdminApiController extends CertifyApiController {
 	 * @throws ParseException
 	 */
 	@RequestMapping(value = "/activity", method = RequestMethod.POST)
-	public Result activity(OrgActivity orgActivity, String startDateFormattedDate, String endDateFormattedDate) {
+	public Result activity(@Valid InputOrgActivity orgActivity, BindingResult bindingResult,
+			String startDateFormattedDate, String endDateFormattedDate) {
 		Result res = new Result();
+
+		if (bindingResult.hasErrors()) {
+			res.getError().add(buildErrorByMsg(bindingResult.getFieldError().getDefaultMessage(),
+					OrgActivityFields.getFieldDesc(bindingResult.getFieldError().getField())));
+			return res;
+		}
+
 		if (!checkAdminLogin(res)) {
 			return res;
 		}
@@ -646,7 +743,7 @@ public class AdminApiController extends CertifyApiController {
 		if (!checkCertify(res, orgActivity.getUid()).getError().isEmpty()) {
 			return res;
 		}
-		orgActivity.setDeletedSign(0);
+		
 		if (!StringUtils.isBlank(startDateFormattedDate)) {
 			try {
 				orgActivity.setStartDate(DateUtils.parseDate(startDateFormattedDate, AFTConstants.YYYYMMDD));
@@ -660,11 +757,15 @@ public class AdminApiController extends CertifyApiController {
 			} catch (ParseException e) {
 			}
 		}
-		if (StringUtils.isBlank(orgActivity.getId())) {
-			orgActivity.setId(UUID.randomUUID().toString());
-			orgActivityService.insert(orgActivity);
+		
+		OrgActivity oa = new OrgActivity();
+		BeanUtils.copyProperties(orgActivity, oa);
+		oa.setDeletedSign(0);
+		if (StringUtils.isBlank(oa.getId())) {
+			oa.setId(UUID.randomUUID().toString());
+			orgActivityService.insert(oa);
 		} else {
-			orgActivityService.updateOrgActivity(orgActivity);
+			orgActivityService.updateOrgActivity(oa);
 		}
 		res.setData(orgActivity);
 		return res;
@@ -712,8 +813,15 @@ public class AdminApiController extends CertifyApiController {
 	 * @throws ParseException
 	 */
 	@RequestMapping(value = "/activityCost", method = RequestMethod.POST)
-	public Result activityCost(OrgActivityCost orgActivityCost, String signDateFormattedDate) throws ParseException {
+	public Result activityCost(@Valid InputOrgActivityCost orgActivityCost, BindingResult bindingResult, String signDateFormattedDate)  {
 		Result res = new Result();
+		
+		if (bindingResult.hasErrors()) {
+			res.getError().add(buildErrorByMsg(bindingResult.getFieldError().getDefaultMessage(),
+					OrgActivityFields.getFieldDesc(bindingResult.getFieldError().getField())));
+			return res;
+		}
+		
 		if (!checkAdminLogin(res)) {
 			return res;
 		}
@@ -727,23 +835,29 @@ public class AdminApiController extends CertifyApiController {
 			return res;
 		}
 		if (StringUtils.isBlank(signDateFormattedDate)) {
-			orgActivityCost.setSignDate(DateUtils.parseDate(signDateFormattedDate, AFTConstants.YYYYMMDD));
+			try {
+				orgActivityCost.setSignDate(DateUtils.parseDate(signDateFormattedDate, AFTConstants.YYYYMMDD));
+			} catch (ParseException e) {
+			}
 		}
+		
+		OrgActivityCost oac = new OrgActivityCost();
+		BeanUtils.copyProperties(orgActivityCost, oac);
 
-		if (StringUtils.isBlank(orgActivityCost.getId())) {
-			if (null != orgActivityCostService.selectOrgActivityCostByUidAndAid(orgActivityCost.getAid(),
-					orgActivityCost.getUid())) {
+		if (StringUtils.isBlank(oac.getId())) {
+			if (null != orgActivityCostService.selectOrgActivityCostByUidAndAid(oac.getAid(),
+					oac.getUid())) {
 				res.getError().add(buildError(ErrorConstants.DUPLICATE_DATA_ERROR, "该研究项目费用详情已录入!"));
 				return res;
 			}
-			OrgActivity ac = orgActivityService.selectOrgActivityByPrimaryKey(orgActivityCost.getAid());
-			orgActivityCost.setStartDate(ac.getStartDate());
-			orgActivityCost.setEndDate(ac.getEndDate());
-			orgActivityCost.setId(UUID.randomUUID().toString());
-			orgActivityCost.setDeletedSign(0);
-			orgActivityCostService.insert(orgActivityCost);
+			OrgActivity ac = orgActivityService.selectOrgActivityByPrimaryKey(oac.getAid());
+			oac.setStartDate(null == ac.getStartDate() ? null : ac.getStartDate());
+			oac.setEndDate(null == ac.getEndDate() ? null : ac.getEndDate());
+			oac.setId(UUID.randomUUID().toString());
+			oac.setDeletedSign(0);
+			orgActivityCostService.insert(oac);
 		} else {
-			orgActivityCostService.updateByPrimaryKeySelective(orgActivityCost);
+			orgActivityCostService.updateByPrimaryKeySelective(oac);
 		}
 		return res;
 	}
@@ -755,8 +869,15 @@ public class AdminApiController extends CertifyApiController {
 	 * @return
 	 */
 	@RequestMapping(value = "/techProduct", method = RequestMethod.POST)
-	public Result techProduct(OrgTechProduct orgTechProduct) {
+	public Result techProduct(@Valid InputOrgTechProduct orgTechProduct, BindingResult bindingResult) {
 		Result res = new Result();
+		
+		if (bindingResult.hasErrors()) {
+			res.getError().add(buildErrorByMsg(bindingResult.getFieldError().getDefaultMessage(),
+					OrgTechProductFields.getFieldDesc(bindingResult.getFieldError().getField())));
+			return res;
+		}
+		
 		if (!checkAdminLogin(res)) {
 			return res;
 		}
@@ -768,16 +889,20 @@ public class AdminApiController extends CertifyApiController {
 		if (!checkCertify(res, orgTechProduct.getUid()).getError().isEmpty()) {
 			return res;
 		}
-		if (StringUtils.isBlank(orgTechProduct.getId())) {
-			orgTechProduct.setId(UUID.randomUUID().toString());
-			orgTechProduct.setDeletedSign(0);
+		
+		OrgTechProduct otp = new OrgTechProduct();
+		BeanUtils.copyProperties(orgTechProduct, otp);
+		
+		if (StringUtils.isBlank(otp.getId())) {
+			otp.setId(UUID.randomUUID().toString());
+			otp.setDeletedSign(0);
 			Calendar now = Calendar.getInstance();
 			now.set(Calendar.MILLISECOND, 0);
-			orgTechProduct.setCreateTime(now.getTime());
-			orgTechProduct.setYear(Calendar.getInstance().get(Calendar.YEAR) - 1);
-			orgTechProductService.insert(orgTechProduct);
+			otp.setCreateTime(now.getTime());
+			otp.setYear(Calendar.getInstance().get(Calendar.YEAR) - 1);
+			orgTechProductService.insert(otp);
 		} else {
-			orgTechProductService.updateByPrimaryKeySelective(orgTechProduct);
+			orgTechProductService.updateByPrimaryKeySelective(otp);
 		}
 		res.setData(orgTechProduct);
 		return res;
@@ -819,8 +944,15 @@ public class AdminApiController extends CertifyApiController {
 	 * 企业纳税申报信息录入+修改
 	 */
 	@RequestMapping(value = "/disposeRatepay", method = RequestMethod.POST)
-	public Result disposeRatepay(OrgRatepay orgRatepay) {
+	public Result disposeRatepay(@Valid InputOrgRatepay orgRatepay, BindingResult bindingResult) {
 		Result res = new Result();
+		
+		if (bindingResult.hasErrors()) {
+			res.getError().add(buildErrorByMsg(bindingResult.getFieldError().getDefaultMessage(),
+					OrgRatepayFields.getFieldDesc(bindingResult.getFieldError().getField())));
+			return res;
+		}
+		
 		if (!checkAdminLogin(res)) {
 			return res;
 		}
@@ -828,21 +960,30 @@ public class AdminApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到用户", "用户"));
 			return res;
 		}
+		
+		if (null == orgRatepay.getYear()){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到年份", "年份"));
+			return res;
+		}
 
 		if (!checkCertify(res, orgRatepay.getUid()).getError().isEmpty()) {
 			return res;
 		}
-		if (StringUtils.isBlank(orgRatepay.getId())) {
-			if (null == orgRatepayService.selectRatepayByUidAndYear(orgRatepay.getUid(), orgRatepay.getYear())) {
-				orgRatepay.setId(UUID.randomUUID().toString());
-				orgRatepay.setDeletedSign(0);
-				orgRatepayService.insert(orgRatepay);
+		
+		OrgRatepay rate = new OrgRatepay();
+		BeanUtils.copyProperties(orgRatepay, rate);
+		
+		if (StringUtils.isBlank(rate.getId())) {
+			if (null == orgRatepayService.selectRatepayByUidAndYear(rate.getUid(), rate.getYear())) {
+				rate.setId(UUID.randomUUID().toString());
+				rate.setDeletedSign(0);
+				orgRatepayService.insert(rate);
 			} else {
 				res.getError().add(buildError(ErrorConstants.DUPLICATE_DATA_ERROR, "当年度纳税申报表已录入!"));
 				return res;
 			}
 		} else {
-			orgRatepayService.updateByPrimaryKeySelective(orgRatepay);
+			orgRatepayService.updateByPrimaryKeySelective(rate);
 		}
 		return res;
 	}
@@ -885,30 +1026,47 @@ public class AdminApiController extends CertifyApiController {
 	 * @return
 	 */
 	@RequestMapping(value = "/disposeFinance", method = RequestMethod.POST)
-	public Result disposeFinance(OrgFinance orgFinance) {
+	public Result disposeFinance(@Valid InputOrgFinance orgFinance, BindingResult bindingResult) {
 		Result res = new Result();
+		
+		if (bindingResult.hasErrors()) {
+			res.getError().add(buildErrorByMsg(bindingResult.getFieldError().getDefaultMessage(),
+					OrgFinanceFields.getFieldDesc(bindingResult.getFieldError().getField())));
+			return res;
+		}
+		
 		if (!checkAdminLogin(res)) {
 			return res;
 		}
+		
 		if (StringUtils.isBlank(orgFinance.getUid())) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到用户", "用户"));
 			return res;
 		}
+		
+		if (null == orgFinance.getYear()){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到年份", "年份"));
+			return res;
+		}
 
 		if (!checkCertify(res, orgFinance.getUid()).getError().isEmpty()) {
 			return res;
 		}
-		if (StringUtils.isBlank(orgFinance.getId())) {
-			if (null == orgFinanceService.selectFinanceByUidAndYear(orgFinance.getUid(), orgFinance.getYear())) {
-				orgFinance.setId(UUID.randomUUID().toString());
-				orgFinance.setDeletedSign(0);
-				orgFinanceService.insert(orgFinance);
+		
+		OrgFinance of = new OrgFinance();
+		BeanUtils.copyProperties(orgFinance, of);
+		
+		if (StringUtils.isBlank(of.getId())) {
+			if (null == orgFinanceService.selectFinanceByUidAndYear(of.getUid(), of.getYear())) {
+				of.setId(UUID.randomUUID().toString());
+				of.setDeletedSign(0);
+				orgFinanceService.insert(of);
 			} else {
 				res.getError().add(buildError(ErrorConstants.DUPLICATE_DATA_ERROR, "当年度财务报表已录入!"));
 				return res;
 			}
 		} else {
-			orgFinanceService.updateByPrimaryKeySelective(orgFinance);
+			orgFinanceService.updateByPrimaryKeySelective(of);
 		}
 		return res;
 	}
@@ -977,8 +1135,15 @@ public class AdminApiController extends CertifyApiController {
 	 * @throws ParseException
 	 */
 	@RequestMapping(value = "/disposeAchievement", method = RequestMethod.POST)
-	public Result disposeAchievement(OrgTechAchievement achievement) throws ParseException {
+	public Result disposeAchievement(@Valid InputOrgTechAchievement achievement, BindingResult bindingResult)  {
 		Result res = new Result();
+		
+		if (bindingResult.hasErrors()) {
+			res.getError().add(buildErrorByMsg(bindingResult.getFieldError().getDefaultMessage(),
+					OrgTechAchievementFields.getFieldDesc(bindingResult.getFieldError().getField())));
+			return res;
+		}
+		
 		if (!checkAdminLogin(res)) {
 			return res;
 		}
@@ -990,12 +1155,16 @@ public class AdminApiController extends CertifyApiController {
 		if (!checkCertify(res, achievement.getUid()).getError().isEmpty()) {
 			return res;
 		}
-		if (StringUtils.isBlank(achievement.getId())) {
-			achievement.setId(UUID.randomUUID().toString());
-			achievement.setDeletedSign(0);
-			orgTechAchievementService.insert(achievement);
+		
+		OrgTechAchievement ota = new OrgTechAchievement();
+		BeanUtils.copyProperties(achievement, ota);
+		
+		if (StringUtils.isBlank(ota.getId())) {
+			ota.setId(UUID.randomUUID().toString());
+			ota.setDeletedSign(0);
+			orgTechAchievementService.insert(ota);
 		} else {
-			orgTechAchievementService.updateByPrimaryKeySelective(achievement);
+			orgTechAchievementService.updateByPrimaryKeySelective(ota);
 		}
 		return res;
 	}
@@ -1039,8 +1208,15 @@ public class AdminApiController extends CertifyApiController {
 	 * @throws ParseException
 	 */
 	@RequestMapping(value = "/disposeHonor", method = RequestMethod.POST)
-	public Result disposeHonor(OrgHonorDatum honor, String issuingTimeFormattedDate) throws ParseException {
+	public Result disposeHonor(OrgHonorDatum honor, BindingResult bindingResult, String issuingTimeFormattedDate)  {
 		Result res = new Result();
+		
+		if (bindingResult.hasErrors()) {
+			res.getError().add(buildErrorByMsg(bindingResult.getFieldError().getDefaultMessage(),
+					OrgHonorDatumFields.getFieldDesc(bindingResult.getFieldError().getField())));
+			return res;
+		}
+		
 		if (!checkAdminLogin(res)) {
 			return res;
 		}
@@ -1053,14 +1229,21 @@ public class AdminApiController extends CertifyApiController {
 			return res;
 		}
 		if (!StringUtils.isBlank(issuingTimeFormattedDate)) {
-			honor.setIssuingTime(DateUtils.parseDate(issuingTimeFormattedDate, AFTConstants.YYYYMMDD));
+			try {
+				honor.setIssuingTime(DateUtils.parseDate(issuingTimeFormattedDate, AFTConstants.YYYYMMDD));
+			} catch (ParseException e) {
+			}
 		}
-		if (StringUtils.isBlank(honor.getId())) {
-			honor.setId(UUID.randomUUID().toString());
-			honor.setDeletedSign(0);
-			orgHonorDatumService.insert(honor);
+		
+		OrgHonorDatum ohd = new OrgHonorDatum();
+		BeanUtils.copyProperties(honor, ohd);
+		
+		if (StringUtils.isBlank(ohd.getId())) {
+			ohd.setId(UUID.randomUUID().toString());
+			ohd.setDeletedSign(0);
+			orgHonorDatumService.insert(ohd);
 		} else {
-			orgHonorDatumService.updateByPrimaryKeySelective(honor);
+			orgHonorDatumService.updateByPrimaryKeySelective(ohd);
 		}
 		return res;
 	}
@@ -1076,7 +1259,7 @@ public class AdminApiController extends CertifyApiController {
 		if (!checkAdminLogin(res)) {
 			return res;
 		}
-		if (StringUtils.isBlank(uid)){
+		if (StringUtils.isBlank(uid)) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到用户", "用户"));
 			return res;
 		}
@@ -1094,13 +1277,20 @@ public class AdminApiController extends CertifyApiController {
 	 * @throws ParseException
 	 */
 	@RequestMapping(value = "/disposeCenter", method = RequestMethod.POST)
-	public Result disposeCenter(OrgTechCenter orgTechCenter, String foundingTimeFormattedDate) throws ParseException {
+	public Result disposeCenter(@Valid InputOrgTechCenter orgTechCenter, BindingResult bindingResult, String foundingTimeFormattedDate)  {
 		Result res = new Result();
-		if (!checkAdminLogin(res)) {
+		
+		if (bindingResult.hasErrors()) {
+			res.getError().add(buildErrorByMsg(bindingResult.getFieldError().getDefaultMessage(),
+					OrgTechCenterFields.getFieldDesc(bindingResult.getFieldError().getField())));
 			return res;
 		}
 		
-		if (StringUtils.isBlank(orgTechCenter.getUid())){
+		if (!checkAdminLogin(res)) {
+			return res;
+		}
+
+		if (StringUtils.isBlank(orgTechCenter.getUid())) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到用户", "用户"));
 			return res;
 		}
@@ -1108,14 +1298,21 @@ public class AdminApiController extends CertifyApiController {
 			return res;
 		}
 		if (!StringUtils.isBlank(foundingTimeFormattedDate)) {
-			orgTechCenter.setFoundingTime(DateUtils.parseDate(foundingTimeFormattedDate, AFTConstants.YYYYMMDD));
+			try {
+				orgTechCenter.setFoundingTime(DateUtils.parseDate(foundingTimeFormattedDate, AFTConstants.YYYYMMDD));
+			} catch (ParseException e) {
+			}
 		}
-		if (StringUtils.isBlank(orgTechCenter.getId())) {
-			orgTechCenter.setId(UUID.randomUUID().toString());
-			orgTechCenter.setDeletedSign(0);
-			orgTechCenterService.insert(orgTechCenter);
+		
+		OrgTechCenter otc = new OrgTechCenter();
+		BeanUtils.copyProperties(orgTechCenter, otc);
+		
+		if (StringUtils.isBlank(otc.getId())) {
+			otc.setId(UUID.randomUUID().toString());
+			otc.setDeletedSign(0);
+			orgTechCenterService.insert(otc);
 		} else {
-			orgTechCenterService.updateByPrimaryKeySelective(orgTechCenter);
+			orgTechCenterService.updateByPrimaryKeySelective(otc);
 		}
 		return res;
 	}
@@ -1131,7 +1328,7 @@ public class AdminApiController extends CertifyApiController {
 		if (!checkAdminLogin(res)) {
 			return res;
 		}
-		if (StringUtils.isBlank(uid)){
+		if (StringUtils.isBlank(uid)) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到用户", "用户"));
 			return res;
 		}
@@ -1151,11 +1348,11 @@ public class AdminApiController extends CertifyApiController {
 		if (!checkAdminLogin(res)) {
 			return res;
 		}
-		if (StringUtils.isBlank(uid)){
+		if (StringUtils.isBlank(uid)) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到用户", "用户"));
 			return res;
 		}
-		
+
 		if (!checkCertify(res, uid).getError().isEmpty()) {
 			return res;
 		}
@@ -1211,8 +1408,8 @@ public class AdminApiController extends CertifyApiController {
 		if (!checkAdminLogin(res)) {
 			return res;
 		}
-		
-		if (StringUtils.isBlank(cid)){
+
+		if (StringUtils.isBlank(cid)) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "高企ID"));
 			return res;
 		}
@@ -1234,11 +1431,11 @@ public class AdminApiController extends CertifyApiController {
 		if (!checkAdminLogin(res)) {
 			return res;
 		}
-		if (StringUtils.isBlank(uid)){
+		if (StringUtils.isBlank(uid)) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到用户", "用户"));
 			return res;
 		}
-		
+
 		if (!checkCertify(res, uid).getError().isEmpty()) {
 			return res;
 		}
@@ -1258,7 +1455,7 @@ public class AdminApiController extends CertifyApiController {
 		if (!checkAdminLogin(res)) {
 			return res;
 		}
-		if (StringUtils.isBlank(cog.getUid())){
+		if (StringUtils.isBlank(cog.getUid())) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到用户", "用户"));
 			return res;
 		}
@@ -1321,17 +1518,28 @@ public class AdminApiController extends CertifyApiController {
 	 * @return
 	 */
 	@RequestMapping(value = "/disposeAble", method = RequestMethod.POST)
-	public Result disposeAble(UserAbility u) {
+	public Result disposeAble(@Valid InputUserAbility u, BindingResult bindingResult) {
 		Result res = new Result();
+		
+		if (bindingResult.hasErrors()) {
+			res.getError().add(buildErrorByMsg(bindingResult.getFieldError().getDefaultMessage(),
+					UserAbilityFields.getFieldDesc(bindingResult.getFieldError().getField())));
+			return res;
+		}
+		
 		if (StringUtils.isBlank(u.getUid())) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到用户", "用户"));
 			return res;
 		}
-		if (StringUtils.isBlank(u.getId())) {
-			u.setId(UUID.randomUUID().toString());
-			userAbilityService.insert(u);
+		
+		UserAbility user = new UserAbility();
+		BeanUtils.copyProperties(u, user);
+		
+		if (StringUtils.isBlank(user.getId())) {
+			user.setId(UUID.randomUUID().toString());
+			userAbilityService.insert(user);
 		} else {
-			userAbilityService.updateByPrimaryKeySelective(u);
+			userAbilityService.updateByPrimaryKeySelective(user);
 		}
 		return res;
 	}
@@ -1384,32 +1592,47 @@ public class AdminApiController extends CertifyApiController {
 	 * @return
 	 */
 	@RequestMapping(value = "/disposeAnnualReport", method = RequestMethod.POST)
-	public Result disposeAnnualReport(OrgAnnualReport orgAnnualReport) {
+	public Result disposeAnnualReport(@Valid InputOrgAnnualReport orgAnnualReport, BindingResult bindingResult) {
 		Result res = new Result();
-		if (StringUtils.isBlank(orgAnnualReport.getUid())
-				|| !checkCertify(res, orgAnnualReport.getUid()).getError().isEmpty()) {
+		if (bindingResult.hasErrors()) {
+			res.getError().add(buildErrorByMsg(bindingResult.getFieldError().getDefaultMessage(),
+					OrgAnnualReportFields.getFieldDesc(bindingResult.getFieldError().getField())));
+			return res;
+		}
+		
+		if (StringUtils.isBlank(orgAnnualReport.getUid())){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到用户", "用户"));
+			return res;
+		}
+		
+		
+		if (!checkCertify(res, orgAnnualReport.getUid()).getError().isEmpty()) {
 			res.getError().add(buildError(ErrorConstants.NON_CERTIFIED, "未通过实名认证,无法操作!"));
 			return res;
 		}
-		if (StringUtils.isBlank(orgAnnualReport.getId())) {
-			if (null != orgAnnualReportService.selectAnnualReportByYearAndUid(orgAnnualReport.getYear(),
-					orgAnnualReport.getUid())) {
+		
+		OrgAnnualReport oar = new OrgAnnualReport();
+		BeanUtils.copyProperties(orgAnnualReport, oar);
+		
+		if (StringUtils.isBlank(oar.getId())) {
+			if (null != orgAnnualReportService.selectAnnualReportByYearAndUid(oar.getYear(),
+					oar.getUid())) {
 				res.getError().add(buildError(ErrorConstants.DUPLICATE_DATA_ERROR, "当年企业年报已录入!"));
 				return res;
 			} else {
-				orgAnnualReport.setId(UUID.randomUUID().toString());
+				oar.setId(UUID.randomUUID().toString());
 				Calendar now = Calendar.getInstance();
 				now.set(Calendar.MILLISECOND, 0);
-				orgAnnualReport.setCreateTime(now.getTime());
-				orgAnnualReport.setLastUpdateTime(orgAnnualReport.getCreateTime());
-				orgAnnualReport.setDeletedSign(0);
-				orgAnnualReportService.insert(orgAnnualReport);
+				oar.setCreateTime(now.getTime());
+				oar.setLastUpdateTime(oar.getCreateTime());
+				oar.setDeletedSign(0);
+				orgAnnualReportService.insert(oar);
 			}
 		} else {
 			Calendar now = Calendar.getInstance();
 			now.set(Calendar.MILLISECOND, 0);
-			orgAnnualReport.setLastUpdateTime(now.getTime());
-			orgAnnualReportService.updateByPrimaryKeySelective(orgAnnualReport);
+			oar.setLastUpdateTime(now.getTime());
+			orgAnnualReportService.updateByPrimaryKeySelective(oar);
 		}
 		return res;
 	}

+ 257 - 0
src/main/java/com/goafanti/cognizance/bo/InputOrgActivity.java

@@ -0,0 +1,257 @@
+package com.goafanti.cognizance.bo;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
+import javax.validation.constraints.Size;
+
+import com.goafanti.common.constant.ErrorConstants;
+
+public class InputOrgActivity {
+	
+	@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 = 32, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+    private String activityNumber;
+
+	@Size(min = 0, max = 32, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+    private String activityName;
+
+    /**
+    * 开始日期
+    */
+    private Date startDate;
+
+    /**
+    * 结束日期
+    */
+    private Date endDate;
+    
+    @Size(min = 0, max = 255, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+    private String participant;
+    
+    @Max(value = 1, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+    private Integer projectMode;
+
+    @Size(min = 0, max = 3, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+    private String technicalField1;
+
+    @Size(min = 0, max = 3, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+    private String technicalField2;
+
+    @Size(min = 0, max = 3, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+    private String technicalField3;
+
+    @Max(value = 9, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+   	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+    private Integer technicalSource;
+
+    @Size(min = 0, max = 500, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+    private String intellectualPropertyNumber;
+
+    @Max(value = (long)999999.99, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+   	@Min(value = (long)0.00, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+    private BigDecimal budget;
+
+    @Max(value = (long)999999.99, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+   	@Min(value = (long)0.00, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+    private BigDecimal firstYearExpenditure;
+
+    @Max(value = (long)999999.99, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+   	@Min(value = (long)0.00, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+    private BigDecimal secondYearExpenditure;
+
+    @Max(value = (long)999999.99, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+   	@Min(value = (long)0.00, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+    private BigDecimal thirdYearExpenditure;
+
+    @Size(min = 0, max = 500, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+    private String implement;
+
+    @Size(min = 0, max = 500, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+    private String technologyInnovation;
+
+    @Size(min = 0, max = 500, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+    private String achievement;
+    
+    @Size(min = 0, max = 255, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+    private String proofUrl;
+
+	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 getActivityNumber() {
+		return activityNumber;
+	}
+
+	public void setActivityNumber(String activityNumber) {
+		this.activityNumber = activityNumber;
+	}
+
+	public String getActivityName() {
+		return activityName;
+	}
+
+	public void setActivityName(String activityName) {
+		this.activityName = activityName;
+	}
+
+	public Date getStartDate() {
+		return startDate;
+	}
+
+	public void setStartDate(Date startDate) {
+		this.startDate = startDate;
+	}
+
+	public Date getEndDate() {
+		return endDate;
+	}
+
+	public void setEndDate(Date endDate) {
+		this.endDate = endDate;
+	}
+
+	public String getParticipant() {
+		return participant;
+	}
+
+	public void setParticipant(String participant) {
+		this.participant = participant;
+	}
+
+	public Integer getProjectMode() {
+		return projectMode;
+	}
+
+	public void setProjectMode(Integer projectMode) {
+		this.projectMode = projectMode;
+	}
+
+	public String getTechnicalField1() {
+		return technicalField1;
+	}
+
+	public void setTechnicalField1(String technicalField1) {
+		this.technicalField1 = technicalField1;
+	}
+
+	public String getTechnicalField2() {
+		return technicalField2;
+	}
+
+	public void setTechnicalField2(String technicalField2) {
+		this.technicalField2 = technicalField2;
+	}
+
+	public String getTechnicalField3() {
+		return technicalField3;
+	}
+
+	public void setTechnicalField3(String technicalField3) {
+		this.technicalField3 = technicalField3;
+	}
+
+	public Integer getTechnicalSource() {
+		return technicalSource;
+	}
+
+	public void setTechnicalSource(Integer technicalSource) {
+		this.technicalSource = technicalSource;
+	}
+
+	public String getIntellectualPropertyNumber() {
+		return intellectualPropertyNumber;
+	}
+
+	public void setIntellectualPropertyNumber(String intellectualPropertyNumber) {
+		this.intellectualPropertyNumber = intellectualPropertyNumber;
+	}
+
+	public BigDecimal getBudget() {
+		return budget;
+	}
+
+	public void setBudget(BigDecimal budget) {
+		this.budget = budget;
+	}
+
+	public BigDecimal getFirstYearExpenditure() {
+		return firstYearExpenditure;
+	}
+
+	public void setFirstYearExpenditure(BigDecimal firstYearExpenditure) {
+		this.firstYearExpenditure = firstYearExpenditure;
+	}
+
+	public BigDecimal getSecondYearExpenditure() {
+		return secondYearExpenditure;
+	}
+
+	public void setSecondYearExpenditure(BigDecimal secondYearExpenditure) {
+		this.secondYearExpenditure = secondYearExpenditure;
+	}
+
+	public BigDecimal getThirdYearExpenditure() {
+		return thirdYearExpenditure;
+	}
+
+	public void setThirdYearExpenditure(BigDecimal thirdYearExpenditure) {
+		this.thirdYearExpenditure = thirdYearExpenditure;
+	}
+
+	public String getImplement() {
+		return implement;
+	}
+
+	public void setImplement(String implement) {
+		this.implement = implement;
+	}
+
+	public String getTechnologyInnovation() {
+		return technologyInnovation;
+	}
+
+	public void setTechnologyInnovation(String technologyInnovation) {
+		this.technologyInnovation = technologyInnovation;
+	}
+
+	public String getAchievement() {
+		return achievement;
+	}
+
+	public void setAchievement(String achievement) {
+		this.achievement = achievement;
+	}
+
+	public String getProofUrl() {
+		return proofUrl;
+	}
+
+	public void setProofUrl(String proofUrl) {
+		this.proofUrl = proofUrl;
+	}
+    
+    
+
+}

+ 234 - 0
src/main/java/com/goafanti/cognizance/bo/InputOrgActivityCost.java

@@ -0,0 +1,234 @@
+package com.goafanti.cognizance.bo;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
+import javax.validation.constraints.Size;
+
+import com.goafanti.common.constant.ErrorConstants;
+
+public class InputOrgActivityCost {
+	
+	@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		aid;
+	
+	@Size(min = 0, max = 36, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String		uid;
+
+	@Size(min = 0, max = 32, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String		activityNumber;
+
+	@Max(value = (long)999999.99, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = (long)0.00, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	private BigDecimal	internalLaborCost;
+
+	@Max(value = (long)999999.99, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = (long)0.00, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	private BigDecimal	internalDirectCost;
+
+	@Max(value = (long)999999.99, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = (long)0.00, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	private BigDecimal	internalDepreciationCost;
+
+	@Max(value = (long)999999.99, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = (long)0.00, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	private BigDecimal	internalAmortizationCost;
+
+	@Max(value = (long)999999.99, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = (long)0.00, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	private BigDecimal	internalDesignCost;
+
+	@Max(value = (long)999999.99, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = (long)0.00, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	private BigDecimal	internalEquipmentCost;
+
+	@Max(value = (long)999999.99, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = (long)0.00, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	private BigDecimal	internalOtherCost;
+
+	@Max(value = (long)999999.99, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = (long)0.00, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	private BigDecimal	externalTotalCost;
+
+	@Max(value = (long)999999.99, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = (long)0.00, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	private BigDecimal	externalAbroadCost;
+
+	@Size(min = 0, max = 16, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String		enterpriseFiller;
+
+	/**
+	 * 企业填报人签字日期
+	 */
+	private Date		signDate;
+
+	@Size(min = 0, max = 32, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String		sortNumber;
+
+	private Date		startDate;
+
+	private Date		endDate;
+
+	@Size(min = 0, max = 255, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String		accountUrl;
+
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public String getAid() {
+		return aid;
+	}
+
+	public void setAid(String aid) {
+		this.aid = aid;
+	}
+
+	public String getUid() {
+		return uid;
+	}
+
+	public void setUid(String uid) {
+		this.uid = uid;
+	}
+
+	public String getActivityNumber() {
+		return activityNumber;
+	}
+
+	public void setActivityNumber(String activityNumber) {
+		this.activityNumber = activityNumber;
+	}
+
+	public BigDecimal getInternalLaborCost() {
+		return internalLaborCost;
+	}
+
+	public void setInternalLaborCost(BigDecimal internalLaborCost) {
+		this.internalLaborCost = internalLaborCost;
+	}
+
+	public BigDecimal getInternalDirectCost() {
+		return internalDirectCost;
+	}
+
+	public void setInternalDirectCost(BigDecimal internalDirectCost) {
+		this.internalDirectCost = internalDirectCost;
+	}
+
+	public BigDecimal getInternalDepreciationCost() {
+		return internalDepreciationCost;
+	}
+
+	public void setInternalDepreciationCost(BigDecimal internalDepreciationCost) {
+		this.internalDepreciationCost = internalDepreciationCost;
+	}
+
+	public BigDecimal getInternalAmortizationCost() {
+		return internalAmortizationCost;
+	}
+
+	public void setInternalAmortizationCost(BigDecimal internalAmortizationCost) {
+		this.internalAmortizationCost = internalAmortizationCost;
+	}
+
+	public BigDecimal getInternalDesignCost() {
+		return internalDesignCost;
+	}
+
+	public void setInternalDesignCost(BigDecimal internalDesignCost) {
+		this.internalDesignCost = internalDesignCost;
+	}
+
+	public BigDecimal getInternalEquipmentCost() {
+		return internalEquipmentCost;
+	}
+
+	public void setInternalEquipmentCost(BigDecimal internalEquipmentCost) {
+		this.internalEquipmentCost = internalEquipmentCost;
+	}
+
+	public BigDecimal getInternalOtherCost() {
+		return internalOtherCost;
+	}
+
+	public void setInternalOtherCost(BigDecimal internalOtherCost) {
+		this.internalOtherCost = internalOtherCost;
+	}
+
+	public BigDecimal getExternalTotalCost() {
+		return externalTotalCost;
+	}
+
+	public void setExternalTotalCost(BigDecimal externalTotalCost) {
+		this.externalTotalCost = externalTotalCost;
+	}
+
+	public BigDecimal getExternalAbroadCost() {
+		return externalAbroadCost;
+	}
+
+	public void setExternalAbroadCost(BigDecimal externalAbroadCost) {
+		this.externalAbroadCost = externalAbroadCost;
+	}
+
+	public String getEnterpriseFiller() {
+		return enterpriseFiller;
+	}
+
+	public void setEnterpriseFiller(String enterpriseFiller) {
+		this.enterpriseFiller = enterpriseFiller;
+	}
+
+	public Date getSignDate() {
+		return signDate;
+	}
+
+	public void setSignDate(Date signDate) {
+		this.signDate = signDate;
+	}
+
+	public String getSortNumber() {
+		return sortNumber;
+	}
+
+	public void setSortNumber(String sortNumber) {
+		this.sortNumber = sortNumber;
+	}
+
+	public Date getStartDate() {
+		return startDate;
+	}
+
+	public void setStartDate(Date startDate) {
+		this.startDate = startDate;
+	}
+
+	public Date getEndDate() {
+		return endDate;
+	}
+
+	public void setEndDate(Date endDate) {
+		this.endDate = endDate;
+	}
+
+	public String getAccountUrl() {
+		return accountUrl;
+	}
+
+	public void setAccountUrl(String accountUrl) {
+		this.accountUrl = accountUrl;
+	}
+	
+	
+
+}

+ 108 - 0
src/main/java/com/goafanti/cognizance/bo/InputOrgAnnualReport.java

@@ -0,0 +1,108 @@
+package com.goafanti.cognizance.bo;
+
+import java.math.BigDecimal;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
+import javax.validation.constraints.Size;
+
+import com.goafanti.common.constant.ErrorConstants;
+
+public class InputOrgAnnualReport {
+	@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;
+
+	@Max(value = (long) 999999.99, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	private BigDecimal	totalTax;
+
+	@Max(value = (long) 999999.99, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	private BigDecimal	incomeTaxRelief;
+
+	@Max(value = (long) 999999.99, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	private BigDecimal	totalExportVolume;
+
+	@Max(value = (long) 999999.99, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	private BigDecimal	basicResearchCost;
+
+	@Max(value = 9999, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	private Integer		year;
+
+	@Max(value = 9, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	private Integer		state;
+
+	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 BigDecimal getTotalTax() {
+		return totalTax;
+	}
+
+	public void setTotalTax(BigDecimal totalTax) {
+		this.totalTax = totalTax;
+	}
+
+	public BigDecimal getIncomeTaxRelief() {
+		return incomeTaxRelief;
+	}
+
+	public void setIncomeTaxRelief(BigDecimal incomeTaxRelief) {
+		this.incomeTaxRelief = incomeTaxRelief;
+	}
+
+	public BigDecimal getTotalExportVolume() {
+		return totalExportVolume;
+	}
+
+	public void setTotalExportVolume(BigDecimal totalExportVolume) {
+		this.totalExportVolume = totalExportVolume;
+	}
+
+	public BigDecimal getBasicResearchCost() {
+		return basicResearchCost;
+	}
+
+	public void setBasicResearchCost(BigDecimal basicResearchCost) {
+		this.basicResearchCost = basicResearchCost;
+	}
+
+	public Integer getYear() {
+		return year;
+	}
+
+	public void setYear(Integer year) {
+		this.year = year;
+	}
+
+	public Integer getState() {
+		return state;
+	}
+
+	public void setState(Integer state) {
+		this.state = state;
+	}
+	
+	
+
+}

+ 192 - 0
src/main/java/com/goafanti/cognizance/bo/InputOrgFinance.java

@@ -0,0 +1,192 @@
+package com.goafanti.cognizance.bo;
+
+import java.math.BigDecimal;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
+import javax.validation.constraints.Size;
+
+import com.goafanti.common.constant.ErrorConstants;
+
+public class InputOrgFinance {
+	
+	@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;
+
+	@Max(value = (long) 999999.99, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+    private BigDecimal mainBusinessIncome;
+
+	@Max(value = (long) 999999.99, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+    private BigDecimal managementCost;
+
+	@Max(value = (long) 999999.99, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+    private BigDecimal operatingProfit;
+
+	@Max(value = (long) 999999.99, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+    private BigDecimal variousTax;
+
+	@Max(value = (long) 999999.99, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+    private BigDecimal currentAsset;
+
+	@Max(value = (long) 999999.99, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+    private BigDecimal netFixedAsset;
+
+	@Max(value = (long) 999999.99, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+    private BigDecimal totalAsset;
+
+	@Max(value = (long) 999999.99, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+    private BigDecimal netAsset;
+
+	@Max(value = (long) 999999.99, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+    private BigDecimal grossProfit;
+
+	@Max(value = (long) 999999.99, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+    private BigDecimal netProfit;
+
+	@Max(value = (long) 999999.99, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+    private BigDecimal salesRevenue;
+    
+	@Max(value = 9999, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+    private Integer year;
+
+	@Size(min = 0, max = 255, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+    private String financeUrl;
+
+	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 BigDecimal getMainBusinessIncome() {
+		return mainBusinessIncome;
+	}
+
+	public void setMainBusinessIncome(BigDecimal mainBusinessIncome) {
+		this.mainBusinessIncome = mainBusinessIncome;
+	}
+
+	public BigDecimal getManagementCost() {
+		return managementCost;
+	}
+
+	public void setManagementCost(BigDecimal managementCost) {
+		this.managementCost = managementCost;
+	}
+
+	public BigDecimal getOperatingProfit() {
+		return operatingProfit;
+	}
+
+	public void setOperatingProfit(BigDecimal operatingProfit) {
+		this.operatingProfit = operatingProfit;
+	}
+
+	public BigDecimal getVariousTax() {
+		return variousTax;
+	}
+
+	public void setVariousTax(BigDecimal variousTax) {
+		this.variousTax = variousTax;
+	}
+
+	public BigDecimal getCurrentAsset() {
+		return currentAsset;
+	}
+
+	public void setCurrentAsset(BigDecimal currentAsset) {
+		this.currentAsset = currentAsset;
+	}
+
+	public BigDecimal getNetFixedAsset() {
+		return netFixedAsset;
+	}
+
+	public void setNetFixedAsset(BigDecimal netFixedAsset) {
+		this.netFixedAsset = netFixedAsset;
+	}
+
+	public BigDecimal getTotalAsset() {
+		return totalAsset;
+	}
+
+	public void setTotalAsset(BigDecimal totalAsset) {
+		this.totalAsset = totalAsset;
+	}
+
+	public BigDecimal getNetAsset() {
+		return netAsset;
+	}
+
+	public void setNetAsset(BigDecimal netAsset) {
+		this.netAsset = netAsset;
+	}
+
+	public BigDecimal getGrossProfit() {
+		return grossProfit;
+	}
+
+	public void setGrossProfit(BigDecimal grossProfit) {
+		this.grossProfit = grossProfit;
+	}
+
+	public BigDecimal getNetProfit() {
+		return netProfit;
+	}
+
+	public void setNetProfit(BigDecimal netProfit) {
+		this.netProfit = netProfit;
+	}
+
+	public BigDecimal getSalesRevenue() {
+		return salesRevenue;
+	}
+
+	public void setSalesRevenue(BigDecimal salesRevenue) {
+		this.salesRevenue = salesRevenue;
+	}
+
+	public Integer getYear() {
+		return year;
+	}
+
+	public void setYear(Integer year) {
+		this.year = year;
+	}
+
+	public String getFinanceUrl() {
+		return financeUrl;
+	}
+
+	public void setFinanceUrl(String financeUrl) {
+		this.financeUrl = financeUrl;
+	}
+	
+	
+
+}

+ 79 - 0
src/main/java/com/goafanti/cognizance/bo/InputOrgHonorDatum.java

@@ -0,0 +1,79 @@
+package com.goafanti.cognizance.bo;
+
+import java.util.Date;
+
+import javax.validation.constraints.Size;
+
+import com.goafanti.common.constant.ErrorConstants;
+
+public class InputOrgHonorDatum {
+	@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 = 32, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String	name;
+
+	@Size(min = 0, max = 36, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String	issuingMechanism;
+
+	/**
+	 * 发证时间
+	 */
+	private Date	issuingTime;
+
+	@Size(min = 0, max = 255, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String	enclosureUrl;
+
+	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 getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getIssuingMechanism() {
+		return issuingMechanism;
+	}
+
+	public void setIssuingMechanism(String issuingMechanism) {
+		this.issuingMechanism = issuingMechanism;
+	}
+
+	public Date getIssuingTime() {
+		return issuingTime;
+	}
+
+	public void setIssuingTime(Date issuingTime) {
+		this.issuingTime = issuingTime;
+	}
+
+	public String getEnclosureUrl() {
+		return enclosureUrl;
+	}
+
+	public void setEnclosureUrl(String enclosureUrl) {
+		this.enclosureUrl = enclosureUrl;
+	}
+	
+	
+
+}

+ 405 - 0
src/main/java/com/goafanti/cognizance/bo/InputOrgHumanResource.java

@@ -0,0 +1,405 @@
+package com.goafanti.cognizance.bo;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
+import javax.validation.constraints.Size;
+
+import com.goafanti.common.constant.ErrorConstants;
+
+public class InputOrgHumanResource {
+	
+	@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;
+
+	@Max(value = 999999, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+    private Integer firmTotal;
+
+	@Max(value = 999999, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+    private Integer techTotal;
+
+	@Max(value = 999999, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+    private Integer firmInService;
+	
+	@Max(value = 999999, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+    private Integer techInService;
+
+	@Max(value = 999999, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+    private Integer firmPartTime;
+
+	@Max(value = 999999, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+    private Integer techPartTime;
+
+	@Max(value = 999999, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+    private Integer firmTemporary;
+
+	@Max(value = 999999, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+    private Integer techTemporary;
+
+	@Max(value = 999999, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+    private Integer firmForeign;
+
+	@Max(value = 999999, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+    private Integer techForeign;
+
+	@Max(value = 999999, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+    private Integer firmAbroad;
+
+	@Max(value = 999999, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+    private Integer techAbroad;
+
+	@Max(value = 999999, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+    private Integer firmCore;
+
+	@Max(value = 999999, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+    private Integer techCore;
+
+	@Max(value = 999999, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+    private Integer doctor;
+
+	@Max(value = 999999, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+    private Integer master;
+
+	@Max(value = 999999, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+    private Integer undergraduate;
+
+	@Max(value = 999999, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+    private Integer college;
+
+	@Max(value = 999999, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+    private Integer seniorTitle;
+
+	@Max(value = 999999, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+    private Integer intermediateTitle;
+
+	@Max(value = 999999, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+    private Integer juniorTitle;
+
+	@Max(value = 999999, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+    private Integer seniorMechanic;
+
+	@Max(value = 999999, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+    private Integer belowThirty;
+
+	@Max(value = 999999, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+    private Integer thirtyoneToThirtyfour;
+
+	@Max(value = 999999, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+    private Integer fortyoneToFifty;
+
+	@Max(value = 9999, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+    private Integer aboveFifty;
+	
+	@Max(value = 999999, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+    private Integer year;
+    
+	@Max(value = 999999, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+    private Integer newEmployment;
+    
+	@Max(value = 999999, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+    private Integer graduateNumber;
+    
+	@Size(min = 0, max = 255, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+    private String rosterUrl;
+    
+	@Size(min = 0, max = 255, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+    private String socialSecurityUrl;
+
+	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 Integer getFirmTotal() {
+		return firmTotal;
+	}
+
+	public void setFirmTotal(Integer firmTotal) {
+		this.firmTotal = firmTotal;
+	}
+
+	public Integer getTechTotal() {
+		return techTotal;
+	}
+
+	public void setTechTotal(Integer techTotal) {
+		this.techTotal = techTotal;
+	}
+
+	public Integer getFirmInService() {
+		return firmInService;
+	}
+
+	public void setFirmInService(Integer firmInService) {
+		this.firmInService = firmInService;
+	}
+
+	public Integer getTechInService() {
+		return techInService;
+	}
+
+	public void setTechInService(Integer techInService) {
+		this.techInService = techInService;
+	}
+
+	public Integer getFirmPartTime() {
+		return firmPartTime;
+	}
+
+	public void setFirmPartTime(Integer firmPartTime) {
+		this.firmPartTime = firmPartTime;
+	}
+
+	public Integer getTechPartTime() {
+		return techPartTime;
+	}
+
+	public void setTechPartTime(Integer techPartTime) {
+		this.techPartTime = techPartTime;
+	}
+
+	public Integer getFirmTemporary() {
+		return firmTemporary;
+	}
+
+	public void setFirmTemporary(Integer firmTemporary) {
+		this.firmTemporary = firmTemporary;
+	}
+
+	public Integer getTechTemporary() {
+		return techTemporary;
+	}
+
+	public void setTechTemporary(Integer techTemporary) {
+		this.techTemporary = techTemporary;
+	}
+
+	public Integer getFirmForeign() {
+		return firmForeign;
+	}
+
+	public void setFirmForeign(Integer firmForeign) {
+		this.firmForeign = firmForeign;
+	}
+
+	public Integer getTechForeign() {
+		return techForeign;
+	}
+
+	public void setTechForeign(Integer techForeign) {
+		this.techForeign = techForeign;
+	}
+
+	public Integer getFirmAbroad() {
+		return firmAbroad;
+	}
+
+	public void setFirmAbroad(Integer firmAbroad) {
+		this.firmAbroad = firmAbroad;
+	}
+
+	public Integer getTechAbroad() {
+		return techAbroad;
+	}
+
+	public void setTechAbroad(Integer techAbroad) {
+		this.techAbroad = techAbroad;
+	}
+
+	public Integer getFirmCore() {
+		return firmCore;
+	}
+
+	public void setFirmCore(Integer firmCore) {
+		this.firmCore = firmCore;
+	}
+
+	public Integer getTechCore() {
+		return techCore;
+	}
+
+	public void setTechCore(Integer techCore) {
+		this.techCore = techCore;
+	}
+
+	public Integer getDoctor() {
+		return doctor;
+	}
+
+	public void setDoctor(Integer doctor) {
+		this.doctor = doctor;
+	}
+
+	public Integer getMaster() {
+		return master;
+	}
+
+	public void setMaster(Integer master) {
+		this.master = master;
+	}
+
+	public Integer getUndergraduate() {
+		return undergraduate;
+	}
+
+	public void setUndergraduate(Integer undergraduate) {
+		this.undergraduate = undergraduate;
+	}
+
+	public Integer getCollege() {
+		return college;
+	}
+
+	public void setCollege(Integer college) {
+		this.college = college;
+	}
+
+	public Integer getSeniorTitle() {
+		return seniorTitle;
+	}
+
+	public void setSeniorTitle(Integer seniorTitle) {
+		this.seniorTitle = seniorTitle;
+	}
+
+	public Integer getIntermediateTitle() {
+		return intermediateTitle;
+	}
+
+	public void setIntermediateTitle(Integer intermediateTitle) {
+		this.intermediateTitle = intermediateTitle;
+	}
+
+	public Integer getJuniorTitle() {
+		return juniorTitle;
+	}
+
+	public void setJuniorTitle(Integer juniorTitle) {
+		this.juniorTitle = juniorTitle;
+	}
+
+	public Integer getSeniorMechanic() {
+		return seniorMechanic;
+	}
+
+	public void setSeniorMechanic(Integer seniorMechanic) {
+		this.seniorMechanic = seniorMechanic;
+	}
+
+	public Integer getBelowThirty() {
+		return belowThirty;
+	}
+
+	public void setBelowThirty(Integer belowThirty) {
+		this.belowThirty = belowThirty;
+	}
+
+	public Integer getThirtyoneToThirtyfour() {
+		return thirtyoneToThirtyfour;
+	}
+
+	public void setThirtyoneToThirtyfour(Integer thirtyoneToThirtyfour) {
+		this.thirtyoneToThirtyfour = thirtyoneToThirtyfour;
+	}
+
+	public Integer getFortyoneToFifty() {
+		return fortyoneToFifty;
+	}
+
+	public void setFortyoneToFifty(Integer fortyoneToFifty) {
+		this.fortyoneToFifty = fortyoneToFifty;
+	}
+
+	public Integer getAboveFifty() {
+		return aboveFifty;
+	}
+
+	public void setAboveFifty(Integer aboveFifty) {
+		this.aboveFifty = aboveFifty;
+	}
+
+	public Integer getYear() {
+		return year;
+	}
+
+	public void setYear(Integer year) {
+		this.year = year;
+	}
+
+	public Integer getNewEmployment() {
+		return newEmployment;
+	}
+
+	public void setNewEmployment(Integer newEmployment) {
+		this.newEmployment = newEmployment;
+	}
+
+	public Integer getGraduateNumber() {
+		return graduateNumber;
+	}
+
+	public void setGraduateNumber(Integer graduateNumber) {
+		this.graduateNumber = graduateNumber;
+	}
+
+	public String getRosterUrl() {
+		return rosterUrl;
+	}
+
+	public void setRosterUrl(String rosterUrl) {
+		this.rosterUrl = rosterUrl;
+	}
+
+	public String getSocialSecurityUrl() {
+		return socialSecurityUrl;
+	}
+
+	public void setSocialSecurityUrl(String socialSecurityUrl) {
+		this.socialSecurityUrl = socialSecurityUrl;
+	}
+	
+	
+
+}

+ 125 - 0
src/main/java/com/goafanti/cognizance/bo/InputOrgIntellectualProperty.java

@@ -0,0 +1,125 @@
+package com.goafanti.cognizance.bo;
+
+import java.util.Date;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
+import javax.validation.constraints.Size;
+
+import com.goafanti.common.constant.ErrorConstants;
+
+public class InputOrgIntellectualProperty {
+	
+	@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 = 32, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String	intellectualPropertyNumber;
+
+	@Size(min = 0, max = 32, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String	intellectualPropertyName;
+
+	@Size(min = 0, max = 36, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String	sortNumber;
+
+	@Max(value = 19, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	private Integer	catagory;
+
+	@Max(value = 9, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	private Integer	obtainWay;
+
+	@Size(min = 0, max = 32, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String	authorizationNumber;
+	
+	private Date authorizationDate;
+	
+	@Size(min = 0, max = 255, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String propertyRightUrl;
+
+	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 getIntellectualPropertyNumber() {
+		return intellectualPropertyNumber;
+	}
+
+	public void setIntellectualPropertyNumber(String intellectualPropertyNumber) {
+		this.intellectualPropertyNumber = intellectualPropertyNumber;
+	}
+
+	public String getIntellectualPropertyName() {
+		return intellectualPropertyName;
+	}
+
+	public void setIntellectualPropertyName(String intellectualPropertyName) {
+		this.intellectualPropertyName = intellectualPropertyName;
+	}
+
+	public String getSortNumber() {
+		return sortNumber;
+	}
+
+	public void setSortNumber(String sortNumber) {
+		this.sortNumber = sortNumber;
+	}
+
+	public Integer getCatagory() {
+		return catagory;
+	}
+
+	public void setCatagory(Integer catagory) {
+		this.catagory = catagory;
+	}
+
+	public Integer getObtainWay() {
+		return obtainWay;
+	}
+
+	public void setObtainWay(Integer obtainWay) {
+		this.obtainWay = obtainWay;
+	}
+
+	public String getAuthorizationNumber() {
+		return authorizationNumber;
+	}
+
+	public void setAuthorizationNumber(String authorizationNumber) {
+		this.authorizationNumber = authorizationNumber;
+	}
+
+	public Date getAuthorizationDate() {
+		return authorizationDate;
+	}
+
+	public void setAuthorizationDate(Date authorizationDate) {
+		this.authorizationDate = authorizationDate;
+	}
+
+	public String getPropertyRightUrl() {
+		return propertyRightUrl;
+	}
+
+	public void setPropertyRightUrl(String propertyRightUrl) {
+		this.propertyRightUrl = propertyRightUrl;
+	}
+
+}

+ 166 - 0
src/main/java/com/goafanti/cognizance/bo/InputOrgRatepay.java

@@ -0,0 +1,166 @@
+package com.goafanti.cognizance.bo;
+
+import java.math.BigDecimal;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
+import javax.validation.constraints.Size;
+
+import com.goafanti.common.constant.ErrorConstants;
+
+public class InputOrgRatepay {
+	
+	@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;
+
+	@Max(value = (long) 999999.99, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	private BigDecimal	operatingIncome;
+
+	@Max(value = (long) 999999.99, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	private BigDecimal	managementCost;
+
+	@Max(value = (long) 999999.99, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	private BigDecimal	operatingProfit;
+
+	@Max(value = (long) 999999.99, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	private BigDecimal	nonOperatingIncome;
+
+	@Max(value = (long) 999999.99, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	private BigDecimal	nonTaxableIncome;
+
+	@Max(value = (long) 999999.99, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	private BigDecimal	taxExemptIncome;
+
+	@Max(value = (long) 999999.99, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	private BigDecimal	subsidyIncome;
+
+	@Max(value = 9999, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	private Integer		year;
+
+	@Max(value = (long) 999999.99, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	private BigDecimal	grossProfit;
+
+	@Max(value = (long) 999999.99, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	private BigDecimal	researchCost;
+
+	@Size(min = 0, max = 255, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String		taxReturnUrl;
+
+	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 BigDecimal getOperatingIncome() {
+		return operatingIncome;
+	}
+
+	public void setOperatingIncome(BigDecimal operatingIncome) {
+		this.operatingIncome = operatingIncome;
+	}
+
+	public BigDecimal getManagementCost() {
+		return managementCost;
+	}
+
+	public void setManagementCost(BigDecimal managementCost) {
+		this.managementCost = managementCost;
+	}
+
+	public BigDecimal getOperatingProfit() {
+		return operatingProfit;
+	}
+
+	public void setOperatingProfit(BigDecimal operatingProfit) {
+		this.operatingProfit = operatingProfit;
+	}
+
+	public BigDecimal getNonOperatingIncome() {
+		return nonOperatingIncome;
+	}
+
+	public void setNonOperatingIncome(BigDecimal nonOperatingIncome) {
+		this.nonOperatingIncome = nonOperatingIncome;
+	}
+
+	public BigDecimal getNonTaxableIncome() {
+		return nonTaxableIncome;
+	}
+
+	public void setNonTaxableIncome(BigDecimal nonTaxableIncome) {
+		this.nonTaxableIncome = nonTaxableIncome;
+	}
+
+	public BigDecimal getTaxExemptIncome() {
+		return taxExemptIncome;
+	}
+
+	public void setTaxExemptIncome(BigDecimal taxExemptIncome) {
+		this.taxExemptIncome = taxExemptIncome;
+	}
+
+	public BigDecimal getSubsidyIncome() {
+		return subsidyIncome;
+	}
+
+	public void setSubsidyIncome(BigDecimal subsidyIncome) {
+		this.subsidyIncome = subsidyIncome;
+	}
+
+	public Integer getYear() {
+		return year;
+	}
+
+	public void setYear(Integer year) {
+		this.year = year;
+	}
+
+	public BigDecimal getGrossProfit() {
+		return grossProfit;
+	}
+
+	public void setGrossProfit(BigDecimal grossProfit) {
+		this.grossProfit = grossProfit;
+	}
+
+	public BigDecimal getResearchCost() {
+		return researchCost;
+	}
+
+	public void setResearchCost(BigDecimal researchCost) {
+		this.researchCost = researchCost;
+	}
+
+	public String getTaxReturnUrl() {
+		return taxReturnUrl;
+	}
+
+	public void setTaxReturnUrl(String taxReturnUrl) {
+		this.taxReturnUrl = taxReturnUrl;
+	}
+
+}

+ 82 - 0
src/main/java/com/goafanti/cognizance/bo/InputOrgStandard.java

@@ -0,0 +1,82 @@
+package com.goafanti.cognizance.bo;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
+import javax.validation.constraints.Size;
+
+import com.goafanti.common.constant.ErrorConstants;
+
+public class InputOrgStandard {
+	
+	@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 = 32, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String	standardName;
+
+	@Size(min = 0, max = 36, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String	standardNumber;
+
+
+	@Max(value = 9, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	private Integer	standardLevel;
+
+	@Max(value = 1, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	private Integer	participateWay;
+
+	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 getStandardName() {
+		return standardName;
+	}
+
+	public void setStandardName(String standardName) {
+		this.standardName = standardName;
+	}
+
+	public String getStandardNumber() {
+		return standardNumber;
+	}
+
+	public void setStandardNumber(String standardNumber) {
+		this.standardNumber = standardNumber;
+	}
+
+	public Integer getStandardLevel() {
+		return standardLevel;
+	}
+
+	public void setStandardLevel(Integer standardLevel) {
+		this.standardLevel = standardLevel;
+	}
+
+	public Integer getParticipateWay() {
+		return participateWay;
+	}
+
+	public void setParticipateWay(Integer participateWay) {
+		this.participateWay = participateWay;
+	}
+	
+	
+
+}

+ 102 - 0
src/main/java/com/goafanti/cognizance/bo/InputOrgTechAchievement.java

@@ -0,0 +1,102 @@
+package com.goafanti.cognizance.bo;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
+import javax.validation.constraints.Size;
+
+import com.goafanti.common.constant.ErrorConstants;
+
+public class InputOrgTechAchievement {
+	@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 = 32, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String	achievementName;
+
+	@Size(min = 0, max = 36, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String	source;
+
+	@Max(value = 9, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	private Integer	conversionForm;
+
+	@Size(min = 0, max = 255, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String	conversionResult;
+
+	@Max(value = 9999, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	private Integer	year;
+
+	@Size(min = 0, max = 255, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String	enclosureUrl;
+
+	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 getAchievementName() {
+		return achievementName;
+	}
+
+	public void setAchievementName(String achievementName) {
+		this.achievementName = achievementName;
+	}
+
+	public String getSource() {
+		return source;
+	}
+
+	public void setSource(String source) {
+		this.source = source;
+	}
+
+	public Integer getConversionForm() {
+		return conversionForm;
+	}
+
+	public void setConversionForm(Integer conversionForm) {
+		this.conversionForm = conversionForm;
+	}
+
+	public String getConversionResult() {
+		return conversionResult;
+	}
+
+	public void setConversionResult(String conversionResult) {
+		this.conversionResult = conversionResult;
+	}
+
+	public Integer getYear() {
+		return year;
+	}
+
+	public void setYear(Integer year) {
+		this.year = year;
+	}
+
+	public String getEnclosureUrl() {
+		return enclosureUrl;
+	}
+
+	public void setEnclosureUrl(String enclosureUrl) {
+		this.enclosureUrl = enclosureUrl;
+	}
+	
+	
+
+}

+ 104 - 0
src/main/java/com/goafanti/cognizance/bo/InputOrgTechCenter.java

@@ -0,0 +1,104 @@
+package com.goafanti.cognizance.bo;
+
+import java.util.Date;
+
+import javax.validation.constraints.Size;
+
+import com.goafanti.common.constant.ErrorConstants;
+
+public class InputOrgTechCenter {
+	@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	centerName;
+
+	/**
+	 * 成立时间
+	 */
+	private Date	foundingTime;
+
+	@Size(min = 0, max = 32, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String	principal;
+
+	@Size(min = 0, max = 1000, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String	comment;
+
+	@Size(min = 0, max = 255, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String	systemUrl;
+
+	/**
+	 * 制度目录
+	 */
+	private String	systemCatalog;
+
+	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 getCenterName() {
+		return centerName;
+	}
+
+	public void setCenterName(String centerName) {
+		this.centerName = centerName;
+	}
+
+	public Date getFoundingTime() {
+		return foundingTime;
+	}
+
+	public void setFoundingTime(Date foundingTime) {
+		this.foundingTime = foundingTime;
+	}
+
+	public String getPrincipal() {
+		return principal;
+	}
+
+	public void setPrincipal(String principal) {
+		this.principal = principal;
+	}
+
+	public String getComment() {
+		return comment;
+	}
+
+	public void setComment(String comment) {
+		this.comment = comment;
+	}
+
+	public String getSystemUrl() {
+		return systemUrl;
+	}
+
+	public void setSystemUrl(String systemUrl) {
+		this.systemUrl = systemUrl;
+	}
+
+	public String getSystemCatalog() {
+		return systemCatalog;
+	}
+
+	public void setSystemCatalog(String systemCatalog) {
+		this.systemCatalog = systemCatalog;
+	}
+	
+	
+
+}

+ 196 - 0
src/main/java/com/goafanti/cognizance/bo/InputOrgTechProduct.java

@@ -0,0 +1,196 @@
+package com.goafanti.cognizance.bo;
+
+import java.math.BigDecimal;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
+import javax.validation.constraints.Size;
+
+import com.goafanti.common.constant.ErrorConstants;
+
+public class InputOrgTechProduct {
+	@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 = 32, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String		serialNumber;
+
+	@Size(min = 0, max = 32, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String		productName;
+
+	@Max(value = 999, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	private Integer		technicalField1;
+
+	@Max(value = 999, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	private Integer		technicalField2;
+
+	@Max(value = 999, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	private Integer		technicalField3;
+
+	@Max(value = 9, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	private Integer		technicalSource;
+
+	@Max(value = (long)999999.99, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	private BigDecimal	lastYearRevenue;
+
+	@Max(value = 1, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	private Integer		mainProduct;
+
+	@Size(min = 0, max = 500, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String		intellectualPropertyNumber;
+
+	@Size(min = 0, max = 500, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String		keyTechnology;
+
+	@Size(min = 0, max = 500, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String		competitiveEdge;
+
+	@Size(min = 0, max = 500, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String		conditionEffect;
+
+	@Max(value = 999999, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	private Integer		year;
+
+	@Size(min = 0, max = 255, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String		accountUrl;
+
+	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 getSerialNumber() {
+		return serialNumber;
+	}
+
+	public void setSerialNumber(String serialNumber) {
+		this.serialNumber = serialNumber;
+	}
+
+	public String getProductName() {
+		return productName;
+	}
+
+	public void setProductName(String productName) {
+		this.productName = productName;
+	}
+
+	public Integer getTechnicalField1() {
+		return technicalField1;
+	}
+
+	public void setTechnicalField1(Integer technicalField1) {
+		this.technicalField1 = technicalField1;
+	}
+
+	public Integer getTechnicalField2() {
+		return technicalField2;
+	}
+
+	public void setTechnicalField2(Integer technicalField2) {
+		this.technicalField2 = technicalField2;
+	}
+
+	public Integer getTechnicalField3() {
+		return technicalField3;
+	}
+
+	public void setTechnicalField3(Integer technicalField3) {
+		this.technicalField3 = technicalField3;
+	}
+
+	public Integer getTechnicalSource() {
+		return technicalSource;
+	}
+
+	public void setTechnicalSource(Integer technicalSource) {
+		this.technicalSource = technicalSource;
+	}
+
+	public BigDecimal getLastYearRevenue() {
+		return lastYearRevenue;
+	}
+
+	public void setLastYearRevenue(BigDecimal lastYearRevenue) {
+		this.lastYearRevenue = lastYearRevenue;
+	}
+
+	public Integer getMainProduct() {
+		return mainProduct;
+	}
+
+	public void setMainProduct(Integer mainProduct) {
+		this.mainProduct = mainProduct;
+	}
+
+	public String getIntellectualPropertyNumber() {
+		return intellectualPropertyNumber;
+	}
+
+	public void setIntellectualPropertyNumber(String intellectualPropertyNumber) {
+		this.intellectualPropertyNumber = intellectualPropertyNumber;
+	}
+
+	public String getKeyTechnology() {
+		return keyTechnology;
+	}
+
+	public void setKeyTechnology(String keyTechnology) {
+		this.keyTechnology = keyTechnology;
+	}
+
+	public String getCompetitiveEdge() {
+		return competitiveEdge;
+	}
+
+	public void setCompetitiveEdge(String competitiveEdge) {
+		this.competitiveEdge = competitiveEdge;
+	}
+
+	public String getConditionEffect() {
+		return conditionEffect;
+	}
+
+	public void setConditionEffect(String conditionEffect) {
+		this.conditionEffect = conditionEffect;
+	}
+
+	public Integer getYear() {
+		return year;
+	}
+
+	public void setYear(Integer year) {
+		this.year = year;
+	}
+
+	public String getAccountUrl() {
+		return accountUrl;
+	}
+
+	public void setAccountUrl(String accountUrl) {
+		this.accountUrl = accountUrl;
+	}
+	
+	
+
+}

+ 66 - 0
src/main/java/com/goafanti/common/enums/OrgActivityCostFields.java

@@ -0,0 +1,66 @@
+package com.goafanti.common.enums;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum OrgActivityCostFields {
+	
+	UID("uid", "用户id"),
+	ACTIVITYNUMBER("activityNumber", "研发活动编号"),
+	INTERNALLABORCOST("internalLaborCost", "内部人员人工费用(万元)"),
+	INTERNALDIRECTCOST("internalDirectCost", "内部直接投入费用(万元)"),
+	INTERNALDEPRECIATIONCOST("internalDepreciationCost", "内部折旧费用与长期待摊费用(万元)"),
+	INTERNALAMORTIZATIONCOST("internalAmortizationCost", "内部无形资产摊销费用(万元)"),
+	INTERNALDESIGNCOST("internalDesignCost", "内部设计费用(万元)"),
+	INTERNALEQUIPMENTCOST("internalEquipmentCost", "内部装备调试费用与实验费用(万元)"),
+	INTERNALOTHERCOST("internalOtherCost", "内部其他费用(万元)"),
+	EXTERNALTOTALCOST("externalTotalCost", "委托外部研究开发总费用(万元)"),
+	EXTERNALABROADCOST("externalAbroadCost", "委托外部境内的外部研发费用(万元)"),
+	ENTERPRISEFILLER("enterpriseFiller", "企业填报人"),
+	SIGNDATE("signDate", "企业填报人签字日期"),
+	SORTNUMBER("sortNumber", "排序号"),
+	ACCOUNTURL("accountUrl", "台帐URL)"),
+	
+	OTHER("", "未知参数");
+	
+	private String	code;
+	private String	desc;
+	
+	private static Map<String, OrgActivityCostFields> status = new HashMap<String, OrgActivityCostFields>();
+	
+	private OrgActivityCostFields(String code, String desc) {
+		this.code = code;
+		this.desc = desc;
+	}
+	
+	static {
+		for (OrgActivityCostFields value : OrgActivityCostFields.values()) {
+			status.put(value.getCode(), value);
+		}
+	}
+	
+	public static OrgActivityCostFields getField(String code) {
+		if (containsType(code)) {
+			return status.get(code);
+		}
+		return OTHER;
+	}
+	
+	public static String getFieldDesc(String code) {
+		return getField(code).getDesc();
+	}
+
+	public static boolean containsType(String code) {
+		return status.containsKey(code);
+	}
+	
+	public String getCode() {
+		return code;
+	}
+
+	public String getDesc() {
+		return desc;
+	}
+
+
+}

+ 70 - 0
src/main/java/com/goafanti/common/enums/OrgActivityFields.java

@@ -0,0 +1,70 @@
+package com.goafanti.common.enums;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum OrgActivityFields {
+	
+	UID("uid", "用户id"),
+	ACTIVITYNUMBER("activityNumber", "研发活动编号"),
+	ACTIVITYNAME("activityName", "研发活动名称"),
+	STARTDATE("startDate", "开始日期"),
+	ENDDATE("endDate", "结束日期"),
+	PARTICIPANT("participant", "参与人员"),
+	PROJECTMODE("projectMode", "是否是内部立项"),
+	TECHNICALFIELD1("technicalField1", "技术领域1"),
+	TECHNICALFIELD2("technicalField2", "技术领域2"),
+	TECHNICALFIELD3("technicalField3", "技术领域3"),
+	TECHNICALSOURCE("technicalSource", "技术来源"),
+	INTELLECTUALPROPERTYNUMBER("intellectualPropertyNumber", "知识产权编号"),
+	BUDGET("budget", "预算(万元)"),
+	FIRSTYEAREXPENDITURE("firstYearExpenditure", "第一年研发经费支出(万元)"),
+	SECONDYEAREXPENDITURE("secondYearExpenditure", "第二年研发经费支出(万元)"),
+	THIRDYEAREXPENDITURE("thirdYearExpenditure", "第三年研发经费支出(万元)"),
+	IMPLEMENT("implement", "目的及组织实施方式"),
+	TECHNOLOGYINNOVATION("technologyInnovation", "核心技术及创新点"),
+	ACHIEVEMENT("achievement", "取得的阶段性成果"),
+	PROOFURL("proofUrl", "立项证明材料URL"),
+	
+	OTHER("", "未知参数");
+	
+	private String	code;
+	private String	desc;
+	
+	private static Map<String, OrgActivityFields> status = new HashMap<String, OrgActivityFields>();
+	
+	private OrgActivityFields(String code, String desc) {
+		this.code = code;
+		this.desc = desc;
+	}
+	
+	static {
+		for (OrgActivityFields value : OrgActivityFields.values()) {
+			status.put(value.getCode(), value);
+		}
+	}
+	
+	public static OrgActivityFields getField(String code) {
+		if (containsType(code)) {
+			return status.get(code);
+		}
+		return OTHER;
+	}
+	
+	public static String getFieldDesc(String code) {
+		return getField(code).getDesc();
+	}
+
+	public static boolean containsType(String code) {
+		return status.containsKey(code);
+	}
+	
+	public String getCode() {
+		return code;
+	}
+
+	public String getDesc() {
+		return desc;
+	}
+
+}

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

@@ -0,0 +1,57 @@
+package com.goafanti.common.enums;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum OrgAnnualReportFields {
+	
+	UID("uid", "用户id"),
+	TOTALTAX("totalTax", "纳税总额(万元)"),
+	INCOMETAXRELIEF("incomeTaxRelief", "所得税减免(万元)"),
+	TOTALEXPORTVOLUME("totalExportVolume", "出口创汇总额(万元)"),
+	BASICRESEARCHCOST("basicResearchCost", "基础研究投入费用"),
+	YEAR("year", "年份"),
+	STATE("state", "年报状态"),
+	
+	OTHER("", "未知参数");
+	
+	private String	code;
+	private String	desc;
+	
+	private static Map<String, OrgAnnualReportFields> status = new HashMap<String, OrgAnnualReportFields>();
+	
+	private OrgAnnualReportFields(String code, String desc) {
+		this.code = code;
+		this.desc = desc;
+	}
+	
+	static {
+		for (OrgAnnualReportFields value : OrgAnnualReportFields.values()) {
+			status.put(value.getCode(), value);
+		}
+	}
+	
+	public static OrgAnnualReportFields getField(String code) {
+		if (containsType(code)) {
+			return status.get(code);
+		}
+		return OTHER;
+	}
+	
+	public static String getFieldDesc(String code) {
+		return getField(code).getDesc();
+	}
+
+	public static boolean containsType(String code) {
+		return status.containsKey(code);
+	}
+	
+	public String getCode() {
+		return code;
+	}
+
+	public String getDesc() {
+		return desc;
+	}
+
+}

+ 64 - 0
src/main/java/com/goafanti/common/enums/OrgFinanceFields.java

@@ -0,0 +1,64 @@
+package com.goafanti.common.enums;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum OrgFinanceFields {
+	
+	UID("uid", "用户id"),
+	MAINBUSINESSINCOME("mainBusinessIncome", "主营业务收入(万元)"),
+	MANAGEMENTCOST("managementCost", "管理费用(万元)"),
+	OPERATINGPROFIT("operatingProfit", "营业利润(万元)"),
+	VARIOUSTAX("variousTax", "支付的各项税费(万元)"),
+	CURRENTASSET("currentAsset", "流动资产(万元)"),
+	NETFIXEDASSET("netFixedAsset", "固定资产净额(万元)"),
+	TOTALASSET("totalAsset", "资产总额(万元)"),
+	NETASSET("netAsset", "所有者权益合计(万元)"),
+	GROSSPROFIT("grossProfit", "利润总额(万元)"),
+	NETPROFIT("netProfit", "净利润(万元)"),
+	SALESREVENUE("salesRevenue", "销售收入(万元)"),
+	FINANCEURL("financeUrl", "财务报表URL"),
+	YEAR("year", "年份"),
+	
+	OTHER("", "未知参数");
+	
+	private String	code;
+	private String	desc;
+	
+	private static Map<String, OrgFinanceFields> status = new HashMap<String, OrgFinanceFields>();
+	
+	private OrgFinanceFields(String code, String desc) {
+		this.code = code;
+		this.desc = desc;
+	}
+	
+	static {
+		for (OrgFinanceFields value : OrgFinanceFields.values()) {
+			status.put(value.getCode(), value);
+		}
+	}
+	
+	public static OrgFinanceFields getField(String code) {
+		if (containsType(code)) {
+			return status.get(code);
+		}
+		return OTHER;
+	}
+	
+	public static String getFieldDesc(String code) {
+		return getField(code).getDesc();
+	}
+
+	public static boolean containsType(String code) {
+		return status.containsKey(code);
+	}
+	
+	public String getCode() {
+		return code;
+	}
+
+	public String getDesc() {
+		return desc;
+	}
+
+}

+ 54 - 0
src/main/java/com/goafanti/common/enums/OrgHonorDatumFields.java

@@ -0,0 +1,54 @@
+package com.goafanti.common.enums;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum OrgHonorDatumFields {
+	
+	UID("uid", "用户id"),
+	NAME("name", "荣誉或证明材料名称"),
+	ISSUINGMECHANISM("issuingMechanism", "发证机构"),
+	ENCLOSUREURL("enclosureUrl", "附件材料URL"),
+	
+	OTHER("", "未知参数");
+	
+	private String	code;
+	private String	desc;
+	
+	private static Map<String, OrgHonorDatumFields> status = new HashMap<String, OrgHonorDatumFields>();
+	
+	private OrgHonorDatumFields(String code, String desc) {
+		this.code = code;
+		this.desc = desc;
+	}
+	
+	static {
+		for (OrgHonorDatumFields value : OrgHonorDatumFields.values()) {
+			status.put(value.getCode(), value);
+		}
+	}
+	
+	public static OrgHonorDatumFields getField(String code) {
+		if (containsType(code)) {
+			return status.get(code);
+		}
+		return OTHER;
+	}
+	
+	public static String getFieldDesc(String code) {
+		return getField(code).getDesc();
+	}
+
+	public static boolean containsType(String code) {
+		return status.containsKey(code);
+	}
+	
+	public String getCode() {
+		return code;
+	}
+
+	public String getDesc() {
+		return desc;
+	}
+
+}

+ 89 - 0
src/main/java/com/goafanti/common/enums/OrgHumanResourceFields.java

@@ -0,0 +1,89 @@
+package com.goafanti.common.enums;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum OrgHumanResourceFields {
+	
+	UID("uid", "用户id"),
+	FIRMTOTAL("firmTotal", "企业职工总数"),
+	TECHTOTAL("techTotal", "科技人员总数"),
+	FIRMINSERVICE("firmInService", "企业在职员工人数"),
+	TECHINSERVICE("techInService", "科技在职员工人数"),
+	FIRMPARTTIME("firmPartTime", "企业兼职人数"),
+	TECHPARTTIME("techPartTime", "科技人员兼职人数"),
+	FIRMTEMPORARY("firmTemporary", "企业临时聘用人数"),
+	TECHTEMPORARY("techTemporary", "科技人员临时聘用人数"),
+	FIRMFOREIGN("firmForeign", "企业外籍人员数"),
+	TECHFOREIGN("techForeign", "外籍科技人员数"),
+	FIRMABROAD("firmAbroad", "企业留学归国人员数"),
+	TECHABROAD("techAbroad", "留学归国科技人员数"),
+	
+	FIRMCORE("firmCore", "企业千人计划人数"),
+	TECHCORE("techCore", "千人计划科技人员数"),
+	
+	DOCTOR("doctor", "博士人数"),
+	MASTER("master", "硕士人数"),
+	UNDERGRADUATE("undergraduate", "本科人数"),
+	COLLEGE("college", "大专人数"),
+	
+	SENIORTITLE("seniorTitle", "高级职称人数"),
+	INTERMEDIATETITLE("intermediateTitle", "中级职称人数"),
+	JUNIORTITLE("juniorTitle", "初级职称人数"),
+	SENIORMECHANIC("seniorMechanic", "高级技工人数"),
+	
+	BELOWTHIRTY("belowThirty", "三十岁及以下员工人数"),
+	THIRTYONETOTHIRTYFOUR("thirtyoneToThirtyfour", "三十一至三十四岁员工人数"),
+	FORTYTOFIFTY("fortyoneToFifty", "四十一至五十岁员工人数"),
+	ABOVEFIFTY("aboveFifty", "五十岁以上员工人数"),
+	
+	YEAR("year", "年份"),
+	NEWEMPLOYMENT("newEmployment", "新增就业人数"),
+	GRADUATENUMBER("graduateNumber", "高校应届毕业生人数"),
+	
+	ROSTERURL("rosterUrl", "花名册URL"),
+	SOCIALSECURITYURL("socialSecurityUrl", "社保情况URL"),
+	
+	OTHER("", "未知参数");
+	
+	private String	code;
+	private String	desc;
+	
+	private static Map<String, OrgHumanResourceFields> status = new HashMap<String, OrgHumanResourceFields>();
+	
+	private OrgHumanResourceFields(String code, String desc) {
+		this.code = code;
+		this.desc = desc;
+	}
+	
+	static {
+		for (OrgHumanResourceFields value : OrgHumanResourceFields.values()) {
+			status.put(value.getCode(), value);
+		}
+	}
+	
+	public static OrgHumanResourceFields getField(String code) {
+		if (containsType(code)) {
+			return status.get(code);
+		}
+		return OTHER;
+	}
+	
+	public static String getFieldDesc(String code) {
+		return getField(code).getDesc();
+	}
+
+	public static boolean containsType(String code) {
+		return status.containsKey(code);
+	}
+	
+	public String getCode() {
+		return code;
+	}
+
+	public String getDesc() {
+		return desc;
+	}
+
+
+}

+ 59 - 0
src/main/java/com/goafanti/common/enums/OrgIntellectualPropertyFields.java

@@ -0,0 +1,59 @@
+package com.goafanti.common.enums;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum OrgIntellectualPropertyFields {
+	
+	UID("uid", "用户id"),
+	INTELLECTUALPROPERTYNUMBER("intellectualPropertyNumber", "知识产权编号"),
+	INTELLECTUALPROPERTYNAME("intellectualPropertyName", "知识产权名称"),
+	SORTNUMBER("sortNumber", "排序号"),
+	CATAGORY("catagory", "类别"),
+	OBTAINWAY("obtainWay", "获得方式"),
+	AUTHORIZATIONNUMBER("authorizationNumber", "授权号"),
+	AUTHORIZATIONDATE("authorizationDate", "授权日期"),
+	PROPERTYRIGHTURL("propertyRightUrl", "知识产权证书URL"),
+	
+	OTHER("", "未知参数");
+	
+	private String	code;
+	private String	desc;
+	
+	private static Map<String, OrgIntellectualPropertyFields> status = new HashMap<String, OrgIntellectualPropertyFields>();
+	
+	private OrgIntellectualPropertyFields(String code, String desc) {
+		this.code = code;
+		this.desc = desc;
+	}
+	
+	static {
+		for (OrgIntellectualPropertyFields value : OrgIntellectualPropertyFields.values()) {
+			status.put(value.getCode(), value);
+		}
+	}
+	
+	public static OrgIntellectualPropertyFields getField(String code) {
+		if (containsType(code)) {
+			return status.get(code);
+		}
+		return OTHER;
+	}
+	
+	public static String getFieldDesc(String code) {
+		return getField(code).getDesc();
+	}
+
+	public static boolean containsType(String code) {
+		return status.containsKey(code);
+	}
+	
+	public String getCode() {
+		return code;
+	}
+
+	public String getDesc() {
+		return desc;
+	}
+
+}

+ 62 - 0
src/main/java/com/goafanti/common/enums/OrgRatepayFields.java

@@ -0,0 +1,62 @@
+package com.goafanti.common.enums;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum OrgRatepayFields {
+	
+	UID("uid", "用户id"),
+	OPERATINGINCOME("operatingIncome", "营业收入(万元)"),
+	MANAGEMENTCOST("managementCost", "管理费用(万元)"),
+	OPERATINGPROFIT("operatingProfit", "营业利润(万元)"),
+	NONOPERATINGINCOME("nonOperatingIncome", "营业外收入(万元)"),
+	NONTAXABLEINCOME("nonTaxableIncome", "不征税收入(万元)"),
+	TAXEXEMPTINCOME("taxExemptIncome", "免税收入(万元)"),
+	SUBSIDYINCOME("subsidyIncome", "政府补助收入(万元)"),
+	YEAR("year", "年份"),
+	GROSSPROFIT("grossProfit", "利润总额(万元)"),
+	RESEARCHCOST("researchCost", "研发费用(万元)"),
+	TAXRETURNURL("taxReturnUrl", "纳税申报表URL"),
+	
+	OTHER("", "未知参数");
+	
+	private String	code;
+	private String	desc;
+	
+	private static Map<String, OrgRatepayFields> status = new HashMap<String, OrgRatepayFields>();
+	
+	private OrgRatepayFields(String code, String desc) {
+		this.code = code;
+		this.desc = desc;
+	}
+	
+	static {
+		for (OrgRatepayFields value : OrgRatepayFields.values()) {
+			status.put(value.getCode(), value);
+		}
+	}
+	
+	public static OrgRatepayFields getField(String code) {
+		if (containsType(code)) {
+			return status.get(code);
+		}
+		return OTHER;
+	}
+	
+	public static String getFieldDesc(String code) {
+		return getField(code).getDesc();
+	}
+
+	public static boolean containsType(String code) {
+		return status.containsKey(code);
+	}
+	
+	public String getCode() {
+		return code;
+	}
+
+	public String getDesc() {
+		return desc;
+	}
+
+}

+ 54 - 0
src/main/java/com/goafanti/common/enums/OrgStandardFields.java

@@ -0,0 +1,54 @@
+package com.goafanti.common.enums;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum OrgStandardFields {
+	UID("uid", "用户id"),
+	STANDARDNAME("standardName", "标准名称"),
+	STANDARDNUMBER("standardNumber", "标准编号"),
+	STANDARDLEVEL("standardLevel", "标准级别"),
+	PARTICIPATEWAY("participateWay", "参与方式"),
+	
+	OTHER("", "未知参数");
+	
+	private String	code;
+	private String	desc;
+	
+	private static Map<String, OrgStandardFields> status = new HashMap<String, OrgStandardFields>();
+	
+	private OrgStandardFields(String code, String desc) {
+		this.code = code;
+		this.desc = desc;
+	}
+	
+	static {
+		for (OrgStandardFields value : OrgStandardFields.values()) {
+			status.put(value.getCode(), value);
+		}
+	}
+	
+	public static OrgStandardFields getField(String code) {
+		if (containsType(code)) {
+			return status.get(code);
+		}
+		return OTHER;
+	}
+	
+	public static String getFieldDesc(String code) {
+		return getField(code).getDesc();
+	}
+
+	public static boolean containsType(String code) {
+		return status.containsKey(code);
+	}
+	
+	public String getCode() {
+		return code;
+	}
+
+	public String getDesc() {
+		return desc;
+	}
+
+}

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

@@ -0,0 +1,56 @@
+package com.goafanti.common.enums;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum OrgTechAchievementFields {
+	UID("uid", "用户id"),
+	ACHIEVEMENTNAME("achievementName", "成果名称"),
+	SOURCE("source", "来源"),
+	CONVERSIONFORM("conversionForm", "转化形式"),
+	CONVERSIONRESULT("conversionResult", "转化结果"),
+	ENCLOSUREURL("enclosureUrl", "证明材料附件URL"),
+	YEAR("year", "年份"),
+	
+	OTHER("", "未知参数");
+	
+	private String	code;
+	private String	desc;
+	
+	private static Map<String, OrgTechAchievementFields> status = new HashMap<String, OrgTechAchievementFields>();
+	
+	private OrgTechAchievementFields(String code, String desc) {
+		this.code = code;
+		this.desc = desc;
+	}
+	
+	static {
+		for (OrgTechAchievementFields value : OrgTechAchievementFields.values()) {
+			status.put(value.getCode(), value);
+		}
+	}
+	
+	public static OrgTechAchievementFields getField(String code) {
+		if (containsType(code)) {
+			return status.get(code);
+		}
+		return OTHER;
+	}
+	
+	public static String getFieldDesc(String code) {
+		return getField(code).getDesc();
+	}
+
+	public static boolean containsType(String code) {
+		return status.containsKey(code);
+	}
+	
+	public String getCode() {
+		return code;
+	}
+
+	public String getDesc() {
+		return desc;
+	}
+
+}

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

@@ -0,0 +1,56 @@
+package com.goafanti.common.enums;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum OrgTechCenterFields {
+	
+	UID("uid", "用户id"),
+	CENTERNAME("centerName", "技术中心名称"),
+	PRINCIPAL("principal", "负责人"),
+	COMMENT("comment", "备注"),
+	SYSTEMURL("systemUrl", "制度目录URL"),
+	SYSTEMCATALOG("systemCatalog", "制度目录"),
+	
+	OTHER("", "未知参数");
+	
+	private String	code;
+	private String	desc;
+	
+	private static Map<String, OrgTechCenterFields> status = new HashMap<String, OrgTechCenterFields>();
+	
+	private OrgTechCenterFields(String code, String desc) {
+		this.code = code;
+		this.desc = desc;
+	}
+	
+	static {
+		for (OrgTechCenterFields value : OrgTechCenterFields.values()) {
+			status.put(value.getCode(), value);
+		}
+	}
+	
+	public static OrgTechCenterFields getField(String code) {
+		if (containsType(code)) {
+			return status.get(code);
+		}
+		return OTHER;
+	}
+	
+	public static String getFieldDesc(String code) {
+		return getField(code).getDesc();
+	}
+
+	public static boolean containsType(String code) {
+		return status.containsKey(code);
+	}
+	
+	public String getCode() {
+		return code;
+	}
+
+	public String getDesc() {
+		return desc;
+	}
+
+}

+ 65 - 0
src/main/java/com/goafanti/common/enums/OrgTechProductFields.java

@@ -0,0 +1,65 @@
+package com.goafanti.common.enums;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum OrgTechProductFields {
+	UID("uid", "用户id"),
+	SERIALNUMBER("serialNumber", "编号"),
+	PRODUCTNAME("productName", "产品名称"),
+	TECHNICALFIELD1("technicalField1", "技术领域1st select"),
+	TECHNICALFIELD2("technicalField2", "技术领域2nd select"),
+	TECHNICALFIELD3("technicalField3", "技术领域3rd select"),
+	TECHNICALSOURCE("technicalSource", "技术来源"),
+	LASTYEARREVENUE("lastYearRevenue", "上年度销售收入(万元)"),
+	MAINPRODUCT("mainProduct", "是否是主要产品(服务)"),
+	INTELLECTUALPROPERTYNUMBER("intellectualPropertyNumber", "知识产权编号"),
+	KEYTECHNOLOGY("keyTechnology", "关键技术及主要技术指标"),
+	COMPETITIVEEDGE("competitiveEdge", "与同类产品(服务)的竞争优势"),
+	CONDITIONEFFECT("conditionEffect", "知识产权获得情况及其对产品(服务)在技术上发挥的支持作用"),
+	YEAR("year", "年份"),
+	ACCOUNTURL("accountUrl", "台帐URL"),
+	
+	OTHER("", "未知参数");
+	
+	private String	code;
+	private String	desc;
+	
+	private static Map<String, OrgTechProductFields> status = new HashMap<String, OrgTechProductFields>();
+	
+	private OrgTechProductFields(String code, String desc) {
+		this.code = code;
+		this.desc = desc;
+	}
+	
+	static {
+		for (OrgTechProductFields value : OrgTechProductFields.values()) {
+			status.put(value.getCode(), value);
+		}
+	}
+	
+	public static OrgTechProductFields getField(String code) {
+		if (containsType(code)) {
+			return status.get(code);
+		}
+		return OTHER;
+	}
+	
+	public static String getFieldDesc(String code) {
+		return getField(code).getDesc();
+	}
+
+	public static boolean containsType(String code) {
+		return status.containsKey(code);
+	}
+	
+	public String getCode() {
+		return code;
+	}
+
+	public String getDesc() {
+		return desc;
+	}
+
+
+}

+ 102 - 0
src/main/java/com/goafanti/common/enums/OrganizationIdentityFields.java

@@ -0,0 +1,102 @@
+package com.goafanti.common.enums;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum OrganizationIdentityFields {
+	UID("uid", "用户id"),
+	CONTACTS("contacts", "联系人"),
+	CONTACTMOBILE("contactMobile", "联系方式"),
+	FIXEDTEL("fixedTel", "固定电话"),
+	QQ("qq", "QQ号"),
+	POSTALADDRESS("postalAddress", "通讯地址"),
+	POSTCODE("postcode", "邮政编码"),
+	AFTUSERNAME("aftUsername", "用户名"),
+	UNITNAME("unitName", "单位名称"),
+	REGISTEREDCAPITAL("registeredCapital", "注册资金"),
+	LICENCENUMBER("licenceNumber", "营业执照注册号"),
+	LICENCEPROVINCE("licenceProvince", "营业执照所在地--省"),
+	LICENCECITY("licenceCity", "营业执照所在地-市"),
+	LICENCEAREA("licenceArea", "营业执照所在地-区(县)"),
+	LICENCESCANNINGURL("licenceScanningUrl", "营业执照副本扫描件URL"),
+	ORGCODE("orgCode", "组织机构代码"),
+	
+	ORGCODEURL("orgCodeUrl", "组织机构代码证URL"),
+	BANKACCOUNT("bankAccount", "银行账号"),
+	BANKS("banks", "开户行"),
+	BANKBRANCH("bankBranch", "开户行支行"),
+	BANKCARDNUMBER("bankCardNumber", "银行卡号"),
+	VALIDATIONAMOUNT("validationAmount", "打入账内金额"),
+	IDENTITYTYPE("identityType", "身份类型"),
+	LOCATIONPROVINCE("locationProvince", "开户行所在地-省"),
+	LOCATIONCITY("locationCity", "开户行所在地-市"),
+	LOCATIONAREA("locationArea", "开户行所在地-区(县)"),
+	
+	LEGALPERSON("legalPerson", "法人"),
+	LEGALPERSONCARD("legalPersonIdCard", "法人身份证号"),
+	LASTYEARTAXREPORTURL("lastYearTaxReportUrl", "上年度纳税报表URL"),
+	AUDITSTATUS("auditStatus", "审核状态"),
+	
+	PROCESS("process", "实名认证流程"),
+	WRONGCOUNT("wrongCount", "输入错误打款金额次数"),
+	PAYMENTDATE("paymentDate", "打款日期"),
+	
+	FIRSTCONTACTS("firstContacts", "第一联系人"),
+	FIRSTMOBILE("firstMobile", "第一联系人电话"),
+	SECONDCONTACTS("secondContacts", "第二联系人"),
+	SECONDMOBILE("secondMobile", "第二联系人电话"),
+	THIRDCONTACTS("thirdContacts", "第三联系人"),
+	THIRDMOBILE("thirdMobile", "第三联系人电话"),
+	
+	LISTED("listed", "是否上市"),
+	LISTEDDATE("listedDate", "上市时间"),
+	LISTEDTYPE("listedType", "上市类型"),
+	STOCKCODE("stockCode", "股票代码"),
+	CERTIFICATENUMBER("certificateNumber", "高企认订证书编号"),
+	ISSUINGDATE("issuingDate", "高企认定发证时间"),
+	
+	COGCONTACTS("cogContacts", "高企认定联系人及联系方式"),
+	CONSULTANT("consultant", "高企认定咨询师"),
+	
+	OTHER("", "未知参数");
+	
+	private String	code;
+	private String	desc;
+	
+	private static Map<String, OrganizationIdentityFields> status = new HashMap<String, OrganizationIdentityFields>();
+	
+	private OrganizationIdentityFields(String code, String desc) {
+		this.code = code;
+		this.desc = desc;
+	}
+	
+	static {
+		for (OrganizationIdentityFields value : OrganizationIdentityFields.values()) {
+			status.put(value.getCode(), value);
+		}
+	}
+	
+	public static OrganizationIdentityFields getField(String code) {
+		if (containsType(code)) {
+			return status.get(code);
+		}
+		return OTHER;
+	}
+	
+	public static String getFieldDesc(String code) {
+		return getField(code).getDesc();
+	}
+
+	public static boolean containsType(String code) {
+		return status.containsKey(code);
+	}
+	
+	public String getCode() {
+		return code;
+	}
+
+	public String getDesc() {
+		return desc;
+	}
+
+}

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

@@ -0,0 +1,56 @@
+package com.goafanti.common.enums;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum UserAbilityFields {
+	
+	UID("uid", "用户id"),
+	ABILITYLABEL("abilityLabel", "能力标签"),
+	INTELLECTRIGHT("intellectRight", "知识产权对企业竞争力的作用 "),
+	SCIENCEACHIEVEMENT("scienceAchievement", "科技成果转化情况"),
+	RESEARCHINNOVATION("researchInnovation", "研究开发与技术创新组织管理情况"),
+	PERSONNEL("personnel", " 管理与科技人员情况"),
+	
+	OTHER("", "未知参数");
+	
+	private String	code;
+	private String	desc;
+	
+	private static Map<String, UserAbilityFields> status = new HashMap<String, UserAbilityFields>();
+	
+	private UserAbilityFields(String code, String desc) {
+		this.code = code;
+		this.desc = desc;
+	}
+	
+	static {
+		for (UserAbilityFields value : UserAbilityFields.values()) {
+			status.put(value.getCode(), value);
+		}
+	}
+	
+	public static UserAbilityFields getField(String code) {
+		if (containsType(code)) {
+			return status.get(code);
+		}
+		return OTHER;
+	}
+	
+	public static String getFieldDesc(String code) {
+		return getField(code).getDesc();
+	}
+
+	public static boolean containsType(String code) {
+		return status.containsKey(code);
+	}
+	
+	public String getCode() {
+		return code;
+	}
+
+	public String getDesc() {
+		return desc;
+	}
+
+}

+ 67 - 0
src/main/java/com/goafanti/common/enums/UserIdentityFields.java

@@ -0,0 +1,67 @@
+package com.goafanti.common.enums;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum UserIdentityFields {
+	UID("uid", "用户id"),
+	USERNAME("username", " 姓名"),
+	SEX("sex", "性别"),
+	DATEOFBIRTH("dateOfBirthYear", "出生年"),
+	DATEOFMONTH("dateOfBirthMonth", "出生月"),
+	IDNUMBER("idNumber", "身份证号"),
+	POSITIVEIDURL("positiveIdUrl", "身份证正面照URL"),
+	OPPOSITEIDURL("oppositeIdUrl", "身份证反面照URL"),
+	AFTUSERNAME("aftUsername", "用户名"),
+	PROVINCE("province", "所在地省"),
+	CITY("city", "所在地市"),
+	AREA("area", "所在地区"),
+	CONTACTMOBILE("contactMobile", "联系方式"),
+	BANKNAME("bankName", "开户银行"),
+	BANKCARDNUMBER("bankCardNumber", "银行卡号"),
+	AMOUNTMONEY("amountMoney", "打款金额"),
+	AUDITSTATUS("auditStatus", "审核状态"),
+	PROCESS("process", "实名认证流程"),
+	WRONGCOUNT("wrongCount", "输入错误打款金额次数"),
+	PAYMENTDATE("paymentDate", "打款日期"),
+	OTHER("", "未知参数");
+	
+	private String	code;
+	private String	desc;
+	
+	private static Map<String, UserIdentityFields> status = new HashMap<String, UserIdentityFields>();
+	
+	private UserIdentityFields(String code, String desc) {
+		this.code = code;
+		this.desc = desc;
+	}
+	
+	static {
+		for (UserIdentityFields value : UserIdentityFields.values()) {
+			status.put(value.getCode(), value);
+		}
+	}
+	
+	public static UserIdentityFields getField(String code) {
+		if (containsType(code)) {
+			return status.get(code);
+		}
+		return OTHER;
+	}
+	
+	public static String getFieldDesc(String code) {
+		return getField(code).getDesc();
+	}
+
+	public static boolean containsType(String code) {
+		return status.containsKey(code);
+	}
+	
+	public String getCode() {
+		return code;
+	}
+
+	public String getDesc() {
+		return desc;
+	}
+}

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

@@ -89,7 +89,7 @@ public class OrgTechProduct {
     private Date createTime;
     
     /**
-     * 
+     * 台帐URL
      */
     private String accountUrl;
     

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

@@ -34,7 +34,7 @@ public class UserIdentity {
     private String dateOfBirthMonth;
 
     /**
-    * 份证号码
+    * 份证号码
     */
     private String idNumber;
 

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

@@ -0,0 +1,549 @@
+package com.goafanti.user.bo;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
+import javax.validation.constraints.Size;
+
+import com.goafanti.common.constant.ErrorConstants;
+
+public class InputOrganizationIdentity {
+	@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 = 6, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String		contacts;
+
+	@Size(min = 0, max = 16, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String		contactMobile;
+
+	@Size(min = 0, max = 16, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String		fixedTel;
+
+	@Size(min = 0, max = 16, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String		qq;
+
+	@Size(min = 0, max =255, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String		postalAddress;
+
+	@Size(min = 0, max = 8, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String		postcode;
+
+	@Size(min = 0, max = 32, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String		aftUsername;
+
+	@Size(min = 0, max = 45, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String		unitName;
+
+	@Max(value = 999999, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	private Integer		registeredCapital;
+
+	@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;
+
+	@Size(min = 0, max = 12, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String		licenceCity;
+
+	@Size(min = 0, max = 12, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String		licenceArea;
+
+	@Size(min = 0, max = 255, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String		licenceScanningUrl;
+
+	@Size(min = 0, max = 32, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String		orgCode;
+
+	@Size(min = 0, max = 255, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String		orgCodeUrl;
+
+	@Size(min = 0, max = 32, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String		bankAccount;
+
+	@Size(min = 0, max = 32, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String		banks;
+
+	@Size(min = 0, max = 32, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String		bankBranch;
+
+	@Size(min = 0, max = 32, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String		bankCardNumber;
+
+	@Max(value = (long)99.9999, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = (long)0.0000, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	private BigDecimal	validationAmount;
+
+	@Max(value = 9, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	private Integer		identityType;
+
+	@Size(min = 0, max = 32, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String		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;
+
+	@Size(min = 0, max = 16, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String		legalPerson;
+
+	@Size(min = 0, max = 32, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String		legalPersonIdCard;
+
+	@Size(min = 0, max = 255, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String		lastYearTaxReportUrl;
+
+	@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;
+
+	@Size(min = 0, max = 16, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String		firstContacts;
+
+	@Size(min = 0, max = 16, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String		firstMobile;
+
+	@Size(min = 0, max = 16, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String		secondContacts;
+
+	@Size(min = 0, max = 16, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String		secondMobile;
+
+	@Size(min = 0, max = 16, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String		thirdContacts;
+
+	@Size(min = 0, max = 16, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String		thirdMobile;
+
+	@Max(value = 1, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	private Integer		listed;
+
+	private Date		listedDate;
+
+	@Max(value = 9, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	private Integer		listedType;
+
+	@Size(min = 0, max = 32, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String		stockCode;
+
+	@Size(min = 0, max = 36, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String		certificateNumber;
+
+	private Date		issuingDate;
+
+	@Max(value = 3, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 1, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	private Integer		cogContacts;
+
+	@Size(min = 0, max = 36, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String		consultant;
+
+	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 getContacts() {
+		return contacts;
+	}
+
+	public void setContacts(String contacts) {
+		this.contacts = contacts;
+	}
+
+	public String getContactMobile() {
+		return contactMobile;
+	}
+
+	public void setContactMobile(String contactMobile) {
+		this.contactMobile = contactMobile;
+	}
+
+	public String getFixedTel() {
+		return fixedTel;
+	}
+
+	public void setFixedTel(String fixedTel) {
+		this.fixedTel = fixedTel;
+	}
+
+	public String getQq() {
+		return qq;
+	}
+
+	public void setQq(String qq) {
+		this.qq = qq;
+	}
+
+	public String getPostalAddress() {
+		return postalAddress;
+	}
+
+	public void setPostalAddress(String postalAddress) {
+		this.postalAddress = postalAddress;
+	}
+
+	public String getPostcode() {
+		return postcode;
+	}
+
+	public void setPostcode(String postcode) {
+		this.postcode = postcode;
+	}
+
+	public String getAftUsername() {
+		return aftUsername;
+	}
+
+	public void setAftUsername(String aftUsername) {
+		this.aftUsername = aftUsername;
+	}
+
+	public String getUnitName() {
+		return unitName;
+	}
+
+	public void setUnitName(String unitName) {
+		this.unitName = unitName;
+	}
+
+	public Integer getRegisteredCapital() {
+		return registeredCapital;
+	}
+
+	public void setRegisteredCapital(Integer registeredCapital) {
+		this.registeredCapital = registeredCapital;
+	}
+
+	public String getLicenceNumber() {
+		return licenceNumber;
+	}
+
+	public void setLicenceNumber(String licenceNumber) {
+		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;
+	}
+
+	public void setLicenceScanningUrl(String licenceScanningUrl) {
+		this.licenceScanningUrl = licenceScanningUrl;
+	}
+
+	public String getOrgCode() {
+		return orgCode;
+	}
+
+	public void setOrgCode(String orgCode) {
+		this.orgCode = orgCode;
+	}
+
+	public String getOrgCodeUrl() {
+		return orgCodeUrl;
+	}
+
+	public void setOrgCodeUrl(String orgCodeUrl) {
+		this.orgCodeUrl = orgCodeUrl;
+	}
+
+	public String getBankAccount() {
+		return bankAccount;
+	}
+
+	public void setBankAccount(String bankAccount) {
+		this.bankAccount = bankAccount;
+	}
+
+	public String getBanks() {
+		return banks;
+	}
+
+	public void setBanks(String banks) {
+		this.banks = banks;
+	}
+
+	public String getBankBranch() {
+		return bankBranch;
+	}
+
+	public void setBankBranch(String bankBranch) {
+		this.bankBranch = bankBranch;
+	}
+
+	public String getBankCardNumber() {
+		return bankCardNumber;
+	}
+
+	public void setBankCardNumber(String bankCardNumber) {
+		this.bankCardNumber = bankCardNumber;
+	}
+
+	public BigDecimal getValidationAmount() {
+		return validationAmount;
+	}
+
+	public void setValidationAmount(BigDecimal validationAmount) {
+		this.validationAmount = validationAmount;
+	}
+
+	public Integer getIdentityType() {
+		return identityType;
+	}
+
+	public void setIdentityType(Integer identityType) {
+		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;
+	}
+
+	public void setLegalPerson(String legalPerson) {
+		this.legalPerson = legalPerson;
+	}
+
+	public String getLegalPersonIdCard() {
+		return legalPersonIdCard;
+	}
+
+	public void setLegalPersonIdCard(String legalPersonIdCard) {
+		this.legalPersonIdCard = legalPersonIdCard;
+	}
+
+	public String getLastYearTaxReportUrl() {
+		return lastYearTaxReportUrl;
+	}
+
+	public void setLastYearTaxReportUrl(String lastYearTaxReportUrl) {
+		this.lastYearTaxReportUrl = lastYearTaxReportUrl;
+	}
+
+	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;
+	}
+
+	public Date getPaymentDate() {
+		return paymentDate;
+	}
+
+	public void setPaymentDate(Date paymentDate) {
+		this.paymentDate = paymentDate;
+	}
+
+	public String getFirstContacts() {
+		return firstContacts;
+	}
+
+	public void setFirstContacts(String firstContacts) {
+		this.firstContacts = firstContacts;
+	}
+
+	public String getFirstMobile() {
+		return firstMobile;
+	}
+
+	public void setFirstMobile(String firstMobile) {
+		this.firstMobile = firstMobile;
+	}
+
+	public String getSecondContacts() {
+		return secondContacts;
+	}
+
+	public void setSecondContacts(String secondContacts) {
+		this.secondContacts = secondContacts;
+	}
+
+	public String getSecondMobile() {
+		return secondMobile;
+	}
+
+	public void setSecondMobile(String secondMobile) {
+		this.secondMobile = secondMobile;
+	}
+
+	public String getThirdContacts() {
+		return thirdContacts;
+	}
+
+	public void setThirdContacts(String thirdContacts) {
+		this.thirdContacts = thirdContacts;
+	}
+
+	public String getThirdMobile() {
+		return thirdMobile;
+	}
+
+	public void setThirdMobile(String thirdMobile) {
+		this.thirdMobile = thirdMobile;
+	}
+
+	public Integer getListed() {
+		return listed;
+	}
+
+	public void setListed(Integer listed) {
+		this.listed = listed;
+	}
+
+	public Date getListedDate() {
+		return listedDate;
+	}
+
+	public void setListedDate(Date listedDate) {
+		this.listedDate = listedDate;
+	}
+
+	public Integer getListedType() {
+		return listedType;
+	}
+
+	public void setListedType(Integer listedType) {
+		this.listedType = listedType;
+	}
+
+	public String getStockCode() {
+		return stockCode;
+	}
+
+	public void setStockCode(String stockCode) {
+		this.stockCode = stockCode;
+	}
+
+	public String getCertificateNumber() {
+		return certificateNumber;
+	}
+
+	public void setCertificateNumber(String certificateNumber) {
+		this.certificateNumber = certificateNumber;
+	}
+
+	public Date getIssuingDate() {
+		return issuingDate;
+	}
+
+	public void setIssuingDate(Date issuingDate) {
+		this.issuingDate = issuingDate;
+	}
+
+	public Integer getCogContacts() {
+		return cogContacts;
+	}
+
+	public void setCogContacts(Integer cogContacts) {
+		this.cogContacts = cogContacts;
+	}
+
+	public String getConsultant() {
+		return consultant;
+	}
+
+	public void setConsultant(String consultant) {
+		this.consultant = consultant;
+	}
+	
+	
+	
+}

+ 103 - 0
src/main/java/com/goafanti/user/bo/InputUserAbility.java

@@ -0,0 +1,103 @@
+package com.goafanti.user.bo;
+
+import javax.validation.constraints.Size;
+
+import com.goafanti.common.constant.ErrorConstants;
+
+public class InputUserAbility {
+	@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 = 255, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+    private String abilityLabel;
+    
+	@Size(min = 0, max = 300, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+    private String intellectRight;
+    
+	@Size(min = 0, max = 300, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+    private String scienceAchievement;
+    
+    
+	@Size(min = 0, max = 300, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+    private String researchInnovation;
+    
+    
+	@Size(min = 0, max = 300, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+    private String personnel;
+
+
+	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 getAbilityLabel() {
+		return abilityLabel;
+	}
+
+
+	public void setAbilityLabel(String abilityLabel) {
+		this.abilityLabel = abilityLabel;
+	}
+
+
+	public String getIntellectRight() {
+		return intellectRight;
+	}
+
+
+	public void setIntellectRight(String intellectRight) {
+		this.intellectRight = intellectRight;
+	}
+
+
+	public String getScienceAchievement() {
+		return scienceAchievement;
+	}
+
+
+	public void setScienceAchievement(String scienceAchievement) {
+		this.scienceAchievement = scienceAchievement;
+	}
+
+
+	public String getResearchInnovation() {
+		return researchInnovation;
+	}
+
+
+	public void setResearchInnovation(String researchInnovation) {
+		this.researchInnovation = researchInnovation;
+	}
+
+
+	public String getPersonnel() {
+		return personnel;
+	}
+
+
+	public void setPersonnel(String personnel) {
+		this.personnel = personnel;
+	}
+	
+	
+
+}

+ 308 - 0
src/main/java/com/goafanti/user/bo/InputUserIdentity.java

@@ -0,0 +1,308 @@
+package com.goafanti.user.bo;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
+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;
+
+	@Size(min = 0, max = 255, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String		positiveIdUrl;
+
+	@Size(min = 0, max = 255, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String		oppositeIdUrl;
+
+	@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;
+
+	@Size(min = 0, max = 16, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String		area;
+
+	@Size(min = 0, max = 16, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String		contactMobile;
+
+	@Size(min = 0, max = 32, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String		bankName;
+
+	@Size(min = 0, max = 32, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String		bankAccount;
+
+	@Size(min = 0, max = 32, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String		bankCardNumber;
+
+
+	@Max(value = (long)99.9999, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = (long)0.0000, 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;
+
+
+	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() {
+		return province;
+	}
+
+
+	public void setProvince(String province) {
+		this.province = province;
+	}
+
+
+	public String getCity() {
+		return city;
+	}
+
+
+	public void setCity(String city) {
+		this.city = city;
+	}
+
+
+	public String getArea() {
+		return area;
+	}
+
+
+	public void setArea(String 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;
+	}
+	
+	
+}