Antiloveg 8 anos atrás
pai
commit
7e60868baa
58 arquivos alterados com 508 adições e 585 exclusões
  1. 9 9
      src/main/java/com/goafanti/achievement/service/impl/AchievementServiceImpl.java
  2. 2 2
      src/main/java/com/goafanti/admin/bo/AdminListBo.java
  3. 3 7
      src/main/java/com/goafanti/admin/bo/AdminLocationBo.java
  4. 3 5
      src/main/java/com/goafanti/admin/bo/InputAdmin.java
  5. 5 9
      src/main/java/com/goafanti/admin/bo/NoticeBo.java
  6. 10 0
      src/main/java/com/goafanti/admin/controller/AdminApiController.java
  7. 54 56
      src/main/java/com/goafanti/cognizance/bo/InputOrgActivity.java
  8. 13 17
      src/main/java/com/goafanti/cognizance/bo/InputOrgActivityCost.java
  9. 1 1
      src/main/java/com/goafanti/common/mapper/OrgActivityCostMapper.xml
  10. 1 1
      src/main/java/com/goafanti/demand/bo/DemandAchievementListBo.java
  11. 18 22
      src/main/java/com/goafanti/demand/bo/DemandImportBo.java
  12. 0 2
      src/main/java/com/goafanti/demand/bo/DemandManageDetailBo.java
  13. 4 6
      src/main/java/com/goafanti/demand/bo/DemandManageListBo.java
  14. 1 1
      src/main/java/com/goafanti/demand/bo/DemandOrderListBo.java
  15. 0 2
      src/main/java/com/goafanti/demand/bo/DemandOrderLogAdminBo.java
  16. 2 3
      src/main/java/com/goafanti/demand/bo/DemandOrderLogUserBo.java
  17. 38 43
      src/main/java/com/goafanti/demand/bo/InputDemand.java
  18. 12 14
      src/main/java/com/goafanti/demand/bo/InputDemandOrder.java
  19. 2 1
      src/main/java/com/goafanti/demand/service/impl/DemandServiceImpl.java
  20. 2 4
      src/main/java/com/goafanti/portal/bo/AchievementInterestListBo.java
  21. 1 1
      src/main/java/com/goafanti/portal/bo/AchievementPortalSimilarListBo.java
  22. 2 2
      src/main/java/com/goafanti/portal/bo/DemandOrderListBasicBo.java
  23. 1 1
      src/main/java/com/goafanti/portal/bo/DemandPortalSimilarListBo.java
  24. 26 27
      src/main/java/com/goafanti/portal/bo/DemandSearchDetailBo.java
  25. 31 35
      src/main/java/com/goafanti/portal/bo/DemandSearchListBo.java
  26. 1 1
      src/main/java/com/goafanti/portal/bo/InterestListBo.java
  27. 0 2
      src/main/java/com/goafanti/portal/bo/OrgSubscriberListBo.java
  28. 0 2
      src/main/java/com/goafanti/portal/bo/UserSubscriberListBo.java
  29. 8 10
      src/main/java/com/goafanti/techproject/bo/InputTechProject.java
  30. 5 7
      src/main/java/com/goafanti/techproject/bo/InputTechWebsite.java
  31. 50 54
      src/main/java/com/goafanti/techproject/bo/TechProjectClientListBo.java
  32. 15 17
      src/main/java/com/goafanti/techproject/bo/TechProjectContractListBo.java
  33. 15 18
      src/main/java/com/goafanti/techproject/bo/TechProjectManageListBo.java
  34. 2 3
      src/main/java/com/goafanti/techproject/bo/TechWebsiteDetailBo.java
  35. 16 18
      src/main/java/com/goafanti/techproject/bo/TechWebsiteListBo.java
  36. 4 6
      src/main/java/com/goafanti/user/bo/AuditorOrgIdentityDetailBo.java
  37. 4 7
      src/main/java/com/goafanti/user/bo/AuditorUserIdentityDetailBo.java
  38. 4 5
      src/main/java/com/goafanti/user/bo/InputOrganizationIdentity.java
  39. 2 3
      src/main/java/com/goafanti/user/bo/InputOrganizationTech.java
  40. 11 29
      src/main/java/com/goafanti/user/bo/InputUserAbility.java
  41. 1 3
      src/main/java/com/goafanti/user/bo/InputUserCareer.java
  42. 2 4
      src/main/java/com/goafanti/user/bo/InputUserEdu.java
  43. 7 7
      src/main/java/com/goafanti/user/bo/InputUserIdentity.java
  44. 0 2
      src/main/java/com/goafanti/user/bo/OrgIdentityDetailAdmin.java
  45. 4 4
      src/main/java/com/goafanti/user/bo/OrgIdentityDetailBo.java
  46. 2 2
      src/main/java/com/goafanti/user/bo/OrgListBo.java
  47. 1 1
      src/main/java/com/goafanti/user/bo/OrgPartnerDetailBo.java
  48. 16 14
      src/main/java/com/goafanti/user/bo/OrgProBo.java
  49. 6 8
      src/main/java/com/goafanti/user/bo/OrgUnitNames.java
  50. 6 3
      src/main/java/com/goafanti/user/bo/UidAndTypeBo.java
  51. 28 16
      src/main/java/com/goafanti/user/bo/UserDownLoadBo.java
  52. 7 6
      src/main/java/com/goafanti/user/bo/UserIdentityBo.java
  53. 0 2
      src/main/java/com/goafanti/user/bo/UserIdentityDetailAdminBo.java
  54. 8 6
      src/main/java/com/goafanti/user/bo/UserInfoBo.java
  55. 32 37
      src/main/java/com/goafanti/user/bo/UserListBo.java
  56. 2 6
      src/main/java/com/goafanti/user/bo/UserNames.java
  57. 7 10
      src/main/java/com/goafanti/user/bo/UserPageHomeBo.java
  58. 1 1
      src/main/java/com/goafanti/user/bo/UserPartnerDetailBo.java

+ 9 - 9
src/main/java/com/goafanti/achievement/service/impl/AchievementServiceImpl.java

@@ -148,7 +148,7 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 		}
 		disposeAchievementKeyword(keywords, a, true);
 		achievementMapper.updateByPrimaryKeySelective(a);
-		if (null != switchSign && AchievementSwitchSign.CLOSE.getCode().equals(switchSign)){
+		if (null != switchSign && AchievementSwitchSign.CLOSE.getCode().equals(switchSign)) {
 			achievementMapper.updateOwnerId(a.getId());
 		}
 		return 1;
@@ -165,7 +165,8 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 		achievementDemandMapper.batchDeleteByAchievementIds(id);
 		for (String s : id) {
 			Achievement a = achievementMapper.selectByPrimaryKey(s);
-			if (null != a && StringUtils.isNotBlank(a.getOwnerId())) {
+			if (null != a && AchievementAuditStatus.AUDITED.getCode().equals(a.getAuditStatus())
+					&& StringUtils.isNotBlank(a.getOwnerId())) {
 				AchievementDemandCount adc = achievementDemandCountMapper.selectByUid(a.getOwnerId());
 				if (null != adc) {
 					adc.setAchievementCount(adc.getAchievementCount() - 1);
@@ -201,7 +202,6 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 			String keyword, Integer category, Integer status, String releaseDateStartDate, String releaseDateEndDate,
 			Integer releaseStatus) {
 		Map<String, Object> params = new HashMap<>();
-		
 
 		Date rStart = null;
 		Date rEnd = null;
@@ -259,8 +259,8 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 		if (null != releaseStatus) {
 			params.put("releaseStatus", releaseStatus);
 		}
-		
-		if (TokenManager.hasRole(AFTConstants.TECHBROKER)){
+
+		if (TokenManager.hasRole(AFTConstants.TECHBROKER)) {
 			params.put("techBrokerId", TokenManager.getAdminId());
 		}
 
@@ -278,14 +278,14 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 			a.setTechBrokerId(techBroderId);
 			String ownerId = a.getOwnerId();
 			if (StringUtils.isNotBlank(ownerId)) {
-				if (UserType.PERSONAL.getCode().equals(a.getOwnerType())){
+				if (UserType.PERSONAL.getCode().equals(a.getOwnerType())) {
 					UserIdentity ui = userIdentityMapper.selectUserIdentityByUserId(ownerId);
-					if (null != ui){
+					if (null != ui) {
 						a.setOwnerName(ui.getUsername());
 					}
-				} else if (UserType.ORGANIZATION.getCode().equals(a.getOwnerType())){
+				} else if (UserType.ORGANIZATION.getCode().equals(a.getOwnerType())) {
 					OrganizationIdentity oi = organizationIdentityMapper.selectOrgIdentityByUserId(ownerId);
-					if (null != oi){
+					if (null != oi) {
 						a.setOwnerName(oi.getUnitName());
 					}
 				}

+ 2 - 2
src/main/java/com/goafanti/admin/bo/AdminListBo.java

@@ -48,12 +48,12 @@ public class AdminListBo {
 	 * 上级管理用户名称
 	 */
 	private String	superior;
-	
+
 	/**
 	 * 上级管理用户ID
 	 */
 	private String	superiorId;
-	
+
 	public String getSuperiorId() {
 		return superiorId;
 	}

+ 3 - 7
src/main/java/com/goafanti/admin/bo/AdminLocationBo.java

@@ -1,9 +1,9 @@
 package com.goafanti.admin.bo;
 
 public class AdminLocationBo {
-	private Integer province;
-	
-	private String city;
+	private Integer	province;
+
+	private String	city;
 
 	public Integer getProvince() {
 		return province;
@@ -21,8 +21,4 @@ public class AdminLocationBo {
 		this.city = city;
 	}
 
-
-	
-	
-
 }

+ 3 - 5
src/main/java/com/goafanti/admin/bo/InputAdmin.java

@@ -22,10 +22,10 @@ public class InputAdmin {
 
 	@Size(min = 0, max = 32, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String	position;
-	
+
 	@Size(min = 0, max = 36, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
-	private String superiorId;
-	
+	private String	superiorId;
+
 	public String getId() {
 		return id;
 	}
@@ -66,7 +66,6 @@ public class InputAdmin {
 		this.email = email;
 	}
 
-
 	public String getPosition() {
 		return position;
 	}
@@ -83,5 +82,4 @@ public class InputAdmin {
 		this.superiorId = superiorId;
 	}
 
-	
 }

+ 5 - 9
src/main/java/com/goafanti/admin/bo/NoticeBo.java

@@ -2,12 +2,11 @@ package com.goafanti.admin.bo;
 
 import com.goafanti.common.model.Notice;
 
-public class NoticeBo extends Notice{
-	
-	private String unitName;
-	
-	private String principle;
-	
+public class NoticeBo extends Notice {
+
+	private String	unitName;
+
+	private String	principle;
 
 	public String getUnitName() {
 		return unitName;
@@ -24,8 +23,5 @@ public class NoticeBo extends Notice{
 	public void setPrinciple(String principle) {
 		this.principle = principle;
 	}
-	
-	
-	
 
 }

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

@@ -1364,6 +1364,16 @@ public class AdminApiController extends CertifyApiController {
 			return res;
 		}
 
+		if (StringUtils.isBlank(startDateFormattedDate)) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "开始时间"));
+			return res;
+		}
+
+		if (StringUtils.isBlank(endDateFormattedDate)) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "结束时间"));
+			return res;
+		}
+
 		if (!StringUtils.isBlank(startDateFormattedDate)) {
 			try {
 				orgActivity.setStartDate(DateUtils.parseDate(startDateFormattedDate, AFTConstants.YYYYMMDD));

+ 54 - 56
src/main/java/com/goafanti/cognizance/bo/InputOrgActivity.java

@@ -10,79 +10,79 @@ 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;
-	
+	private String		id;
+
 	@Size(min = 0, max = 36, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
-    private String uid;
+	private String		uid;
 
 	@Size(min = 0, max = 32, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
-    private String activityNumber;
+	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 + "}")
+	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;
+	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		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		technicalField2;
 
-    @Size(min = 0, max = 3, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
-    private String technicalField3;
+	@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;
 
-    @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;
 
-    @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 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 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 secondYearExpenditure;
+	@Max(value = (long) 999999.99, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = (long) 0.00, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	private BigDecimal	thirdYearExpenditure;
 
-    @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 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 technologyInnovation;
+	@Size(min = 0, max = 500, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String		achievement;
 
-    @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;
+	@Size(min = 0, max = 255, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String		proofUrl;
 
 	public String getId() {
 		return id;
@@ -251,7 +251,5 @@ public class InputOrgActivity {
 	public void setProofUrl(String proofUrl) {
 		this.proofUrl = proofUrl;
 	}
-    
-    
 
 }

+ 13 - 17
src/main/java/com/goafanti/cognizance/bo/InputOrgActivityCost.java

@@ -10,56 +10,56 @@ 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;
-	
+
 	@Max(value = 3000, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	@Min(value = 2000, message = "{" + ErrorConstants.PARAM_ERROR + "}")
-	private Integer year;
+	private Integer		year;
 
 	@Size(min = 0, max = 32, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String		activityNumber;
 
-	@Max(value = (long)999999.99, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Max(value = (long) 999999.99, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	private BigDecimal	internalLaborCost;
 
-	@Max(value = (long)999999.99, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Max(value = (long) 999999.99, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	private BigDecimal	internalDirectCost;
 
-	@Max(value = (long)999999.99, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Max(value = (long) 999999.99, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	private BigDecimal	internalDepreciationCost;
 
-	@Max(value = (long)999999.99, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Max(value = (long) 999999.99, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	private BigDecimal	internalAmortizationCost;
 
-	@Max(value = (long)999999.99, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Max(value = (long) 999999.99, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	private BigDecimal	internalDesignCost;
 
-	@Max(value = (long)999999.99, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Max(value = (long) 999999.99, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	private BigDecimal	internalEquipmentCost;
 
-	@Max(value = (long)999999.99, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Max(value = (long) 999999.99, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	private BigDecimal	internalOtherCost;
 
-	@Max(value = (long)999999.99, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Max(value = (long) 999999.99, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	private BigDecimal	externalTotalCost;
 
-	@Max(value = (long)999999.99, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Max(value = (long) 999999.99, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	private BigDecimal	externalAbroadCost;
 
@@ -104,8 +104,6 @@ public class InputOrgActivityCost {
 	public void setUid(String uid) {
 		this.uid = uid;
 	}
-	
-	
 
 	public Integer getYear() {
 		return year;
@@ -242,7 +240,5 @@ public class InputOrgActivityCost {
 	public void setAccountUrl(String accountUrl) {
 		this.accountUrl = accountUrl;
 	}
-	
-	
 
 }

+ 1 - 1
src/main/java/com/goafanti/common/mapper/OrgActivityCostMapper.xml

@@ -291,7 +291,7 @@
 	    and  uid = #{uid,jdbcType=VARCHAR}
 	</if>
 	<if test="year != null">
-		and year = #{year,jdbcType=INTEGER}
+		and  year = #{year,jdbcType=INTEGER}
 	</if>
     <if test="activityNumber != null">
     	and  activity_number = #{activityNumber,jdbcType=VARCHAR}

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

@@ -34,7 +34,7 @@ public class DemandAchievementListBo {
 	private String	username;
 
 	private String	uid;
-	
+
 	public String getUid() {
 		return uid;
 	}

+ 18 - 22
src/main/java/com/goafanti/demand/bo/DemandImportBo.java

@@ -3,58 +3,54 @@ package com.goafanti.demand.bo;
 import java.util.List;
 
 public class DemandImportBo {
-	
+
 	/**
 	 * 数据类别(0-个人需求,1-单位需求)
 	 */
-	private Integer	dataCategory;
-	
+	private Integer			dataCategory;
+
 	/**
 	 * 名称
 	 */
-	private String	name;
-	
+	private String			name;
+
 	/**
 	 * 关键词
 	 */
-	private String	keyword;
-	
+	private String			keyword;
+
 	/**
 	 * 需求类型
 	 */
-	private Integer	demandType;
-	
+	private Integer			demandType;
+
 	/**
 	 * 问题说明
 	 */
-	private String	problemDes;
-	
-	
+	private String			problemDes;
+
 	/**
 	 * 雇主名称
 	 */
-	private String	employerName;
-	
+	private String			employerName;
 
 	/**
 	 * 雇主联系人名称
 	 */
-	private String	employerContacts;
-	
+	private String			employerContacts;
 
 	/**
 	 * 雇主联系人电话
 	 */
-	private String	employerContactsMobile;
-	
+	private String			employerContactsMobile;
 
 	/**
 	 * 雇主联系人邮箱
 	 */
-	private String	employerContactsMailbox;
-	
-	private List<String> keywords;
-	
+	private String			employerContactsMailbox;
+
+	private List<String>	keywords;
+
 	public List<String> getKeywords() {
 		return keywords;
 	}

+ 0 - 2
src/main/java/com/goafanti/demand/bo/DemandManageDetailBo.java

@@ -48,8 +48,6 @@ public class DemandManageDetailBo extends DemandManageListBo {
 	private String		employerContactsMobile;
 
 	private String		employerContactsMailbox;
-	
-	
 
 	public String getEmployerAddress() {
 		return employerAddress;

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

@@ -1,11 +1,9 @@
 package com.goafanti.demand.bo;
 
-
-
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonFormat.Shape;
 
-public class DemandManageListBo extends DemandListBo{
+public class DemandManageListBo extends DemandListBo {
 
 	/**
 	 * 信息来源(0-平台采集,1-客户发布)
@@ -22,12 +20,12 @@ public class DemandManageListBo extends DemandListBo{
 	 * 负责人(营销员)
 	 */
 	private String	principalId;
-	
+
 	/**
 	 * 技术经纪人
 	 */
-	private String techBrokerId;
-	
+	private String	techBrokerId;
+
 	public String getTechBrokerId() {
 		return techBrokerId;
 	}

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

@@ -84,7 +84,7 @@ public class DemandOrderListBo {
 	public void setDeletedSign(Integer deletedSign) {
 		this.deletedSign = deletedSign;
 	}
-	
+
 	@JsonFormat(shape = Shape.STRING)
 	public Integer getAuditStatus() {
 		return auditStatus;

+ 0 - 2
src/main/java/com/goafanti/demand/bo/DemandOrderLogAdminBo.java

@@ -10,7 +10,5 @@ public class DemandOrderLogAdminBo extends DemandOrderLogUserBo {
 	public void setOperator(String operator) {
 		this.operator = operator;
 	}
-	
-	
 
 }

+ 2 - 3
src/main/java/com/goafanti/demand/bo/DemandOrderLogUserBo.java

@@ -14,8 +14,7 @@ public class DemandOrderLogUserBo {
 	private Integer	status;
 
 	private String	comment;
-	
-	
+
 	public Date getRecordTime() {
 		return recordTime;
 	}
@@ -23,7 +22,7 @@ public class DemandOrderLogUserBo {
 	public void setRecordTime(Date recordTime) {
 		this.recordTime = recordTime;
 	}
-	
+
 	@JsonFormat(shape = Shape.STRING)
 	public Integer getStatus() {
 		return status;

+ 38 - 43
src/main/java/com/goafanti/demand/bo/InputDemand.java

@@ -10,109 +10,109 @@ import javax.validation.constraints.Size;
 import com.goafanti.common.constant.ErrorConstants;
 
 public class InputDemand {
-    
+
 	@Size(min = 0, max = 36, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String		id;
-	
+
 	@Max(value = 1, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	private Integer		dataCategory;
-	
+
 	@Max(value = 99999999, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
-	private Integer serialNumber;
-	
+	private Integer		serialNumber;
+
 	@Size(min = 0, max = 32, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String		name;
-	
+
 	@Size(min = 0, max = 45, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String		keyword;
-	
+
 	@Max(value = 1, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	private Integer		infoSources;
-	
+
 	@Max(value = 999, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	private Integer		industryCategoryA;
-	
+
 	@Max(value = 999, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	private Integer		industryCategoryB;
-	
+
 	@Max(value = 999, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	private Integer		industryCategoryC;
-	
+
 	@Max(value = 9, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	private Integer		demandType;
-	
+
 	@Size(min = 0, max = 256, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String		problemDes;
-	
+
 	@Size(min = 0, max = 256, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String		technicalRequirements;
-	
+
 	@Size(min = 0, max = 1000, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String		pictureUrl;
-	
+
 	@Size(min = 0, max = 255, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String		textFileUrl;
-	
+
 	@Size(min = 0, max = 255, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String		videoUrl;
-	
-	@Max(value = (long)999999.99, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+
+	@Max(value = (long) 999999.99, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	private BigDecimal	fixedBudget;
-	
+
 	@Size(min = 0, max = 12, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String		fixedCycle;
-	
+
 	@Max(value = 99999, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	private Integer		peopleNumber;
-	
+
 	@Size(min = 0, max = 200, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String		fixedScheme;
-	
-	@Max(value = (long)999999.99, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+
+	@Max(value = (long) 999999.99, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	private BigDecimal	costEscrow;
-	
-	@Max(value = (long)999999.99, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+
+	@Max(value = (long) 999999.99, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	private BigDecimal	budgetCost;
 
 	private Date		validityPeriod;
-	
+
 	@Size(min = 0, max = 36, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String		employerId;
-	
+
 	@Size(min = 0, max = 45, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String		employerName;
-	
+
 	@Size(min = 0, max = 128, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String		employerAddress;
-	
+
 	@Size(min = 0, max = 16, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String		employerContacts;
-	
+
 	@Size(min = 0, max = 36, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String		employerContactsMobile;
-	
+
 	@Size(min = 0, max = 255, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String		employerContactsMailbox;
-	
+
 	@Max(value = 3, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	@Min(value = 1, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	private Integer		contacts;
-	
+
 	@Max(value = 2, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	private Integer		status;
-	
+
 	@Max(value = 1, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	private Integer		releaseStatus;
@@ -121,13 +121,13 @@ public class InputDemand {
 
 	@Size(min = 0, max = 36, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String		principalId;
-	
+
 	@Max(value = 4, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
-	private Integer auditStatus;
-	
+	private Integer		auditStatus;
+
 	@Size(min = 0, max = 36, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
-	private String techBrokerId;
+	private String		techBrokerId;
 
 	public String getId() {
 		return id;
@@ -137,7 +137,6 @@ public class InputDemand {
 		this.id = id;
 	}
 
-
 	public Integer getDataCategory() {
 		return dataCategory;
 	}
@@ -409,9 +408,5 @@ public class InputDemand {
 	public void setTechBrokerId(String techBrokerId) {
 		this.techBrokerId = techBrokerId;
 	}
-	
-	
-	
-	
 
 }

+ 12 - 14
src/main/java/com/goafanti/demand/bo/InputDemandOrder.java

@@ -9,41 +9,40 @@ import com.goafanti.common.constant.ErrorConstants;
 public class InputDemandOrder {
 	@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	demandId;
-	
+
 	@Size(min = 0, max = 255, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String	enclosureUrl;
-	
+
 	@Max(value = 6, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	private Integer	status;
-	
+
 	@Max(value = 99999999, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	private Integer	intentionMoney;
-	
+
 	@Max(value = 99999999, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	private Integer	contractMoney;
-	
+
 	@Max(value = 99999999, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	private Integer	commission;
-	
+
 	@Max(value = 99999999, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	private Integer	serviceMoney;
-	
+
 	@Max(value = 1, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	private Integer	refund;
-	
+
 	@Size(min = 0, max = 128, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
-	private String comment;
-	
-	
+	private String	comment;
+
 	public String getId() {
 		return id;
 	}
@@ -123,6 +122,5 @@ public class InputDemandOrder {
 	public void setComment(String comment) {
 		this.comment = comment;
 	}
-	
-	
+
 }

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

@@ -221,7 +221,8 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 		achievementDemandMapper.batchDeleteByDemandIds(id);
 		for (String s : id) {
 			Demand d = demandMapper.selectByPrimaryKey(s);
-			if (null != d && StringUtils.isNotBlank(d.getEmployerId())) {
+			if (null != d && DemandAuditStatus.AUDITED.getCode().equals(d.getAuditStatus())
+					&& StringUtils.isNotBlank(d.getEmployerId())) {
 				AchievementDemandCount adc = achievementDemandCountMapper.selectByUid(d.getEmployerId());
 				if (null != adc) {
 					adc.setDemandCount(adc.getDemandCount() - 1);

+ 2 - 4
src/main/java/com/goafanti/portal/bo/AchievementInterestListBo.java

@@ -1,9 +1,8 @@
 package com.goafanti.portal.bo;
 
+public class AchievementInterestListBo extends InterestListBo {
 
-public class AchievementInterestListBo extends InterestListBo{
-
-	private String	achievementId;
+	private String achievementId;
 
 	public String getAchievementId() {
 		return achievementId;
@@ -13,5 +12,4 @@ public class AchievementInterestListBo extends InterestListBo{
 		this.achievementId = achievementId;
 	}
 
-
 }

+ 1 - 1
src/main/java/com/goafanti/portal/bo/AchievementPortalSimilarListBo.java

@@ -20,7 +20,7 @@ public class AchievementPortalSimilarListBo {
 	private String		maturityS;
 
 	private String		transferPriceS;
-	
+
 	public String getTransferPriceS() {
 		return transferPriceS;
 	}

+ 2 - 2
src/main/java/com/goafanti/portal/bo/DemandOrderListBasicBo.java

@@ -60,7 +60,7 @@ public class DemandOrderListBasicBo {
 	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
 	}
-	
+
 	@JsonFormat(shape = Shape.STRING)
 	public Integer getStatus() {
 		return status;
@@ -101,7 +101,7 @@ public class DemandOrderListBasicBo {
 	public void setServiceMoney(Integer serviceMoney) {
 		this.serviceMoney = serviceMoney;
 	}
-	
+
 	@JsonFormat(shape = Shape.STRING)
 	public Integer getRefund() {
 		return refund;

+ 1 - 1
src/main/java/com/goafanti/portal/bo/DemandPortalSimilarListBo.java

@@ -20,7 +20,7 @@ public class DemandPortalSimilarListBo {
 	private String		industryCategory;
 
 	private String		budgetCostS;
-	
+
 	public String getBudgetCostS() {
 		return budgetCostS;
 	}

+ 26 - 27
src/main/java/com/goafanti/portal/bo/DemandSearchDetailBo.java

@@ -9,68 +9,67 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonFormat.Shape;
 import com.goafanti.common.constant.AFTConstants;
 
-public class DemandSearchDetailBo extends DemandSearchListBo{
+public class DemandSearchDetailBo extends DemandSearchListBo {
 	/**
 	 * 技术指标要求
 	 */
-	private String technicalRequirements;
-	
+	private String		technicalRequirements;
+
 	/**
 	 * 需求文件--图片URL
 	 */
-	private String pictureUrl;
-	
+	private String		pictureUrl;
+
 	/**
 	 * 需求文件--文本文件
 	 */
-	private String textFileUrl;
-	
+	private String		textFileUrl;
+
 	/**
 	 * 需求文件--视屏文件URL
 	 */
-	private String videoUrl;
-	
+	private String		videoUrl;
+
 	/**
 	 * 固定周期
 	 */
-	private String fixedCycle;
-	
+	private String		fixedCycle;
+
 	/**
 	 * 固定人数
 	 */
-	private Integer peopleNumber; 
-	
+	private Integer		peopleNumber;
+
 	/**
 	 * 固定方案
 	 */
-	private String fixedScheme;
-	
+	private String		fixedScheme;
+
 	/**
 	 * 费用托管
 	 */
-	private BigDecimal costEscrow;
-	
+	private BigDecimal	costEscrow;
+
 	/**
 	 * 有效期限
 	 */
-	private Date validityPeriod;
-	
+	private Date		validityPeriod;
+
 	/**
 	 * 关注ID
 	 */
-	private String demandInterestId;
-	
+	private String		demandInterestId;
+
 	/**
 	 * 订单ID
 	 */
-	private String demandOrderId;
-	
+	private String		demandOrderId;
+
 	/**
 	 * 订单状态
 	 */
-	private Integer orderStatus;
-	
-	
+	private Integer		orderStatus;
+
 	@JsonFormat(shape = Shape.STRING)
 	public Integer getOrderStatus() {
 		return orderStatus;
@@ -167,7 +166,7 @@ public class DemandSearchDetailBo extends DemandSearchListBo{
 	public void setValidityPeriod(Date validityPeriod) {
 		this.validityPeriod = validityPeriod;
 	}
-	
+
 	public String getValidityPeriodFormattedDate() {
 		if (this.validityPeriod == null) {
 			return null;

+ 31 - 35
src/main/java/com/goafanti/portal/bo/DemandSearchListBo.java

@@ -10,70 +10,68 @@ import com.fasterxml.jackson.annotation.JsonFormat.Shape;
 import com.goafanti.common.constant.AFTConstants;
 
 public class DemandSearchListBo {
-	private String id;
-	
+	private String		id;
+
 	/**
 	 * 编号
 	 */
-	private Integer serialNumber;
-	
-	
+	private Integer		serialNumber;
+
 	/**
 	 * 关键词
 	 */
-	private String keyword;
-	
+	private String		keyword;
+
 	/**
 	 * 数据类别(0-个人需求,1-单位需求)
 	 */
-	private Integer dataCategory;
-	
+	private Integer		dataCategory;
+
 	/**
 	 * 名称
 	 */
-	private String name;
-	
+	private String		name;
+
 	/**
 	 * 行业类别下拉A
 	 */
-	private Integer industryCategoryA;
-	
+	private Integer		industryCategoryA;
 
 	/**
 	 * 行业类别下拉B
 	 */
-	private Integer industryCategoryB;
-	
+	private Integer		industryCategoryB;
+
 	/**
 	 * 需求类型
 	 */
-	private Integer demandType;
-	
+	private Integer		demandType;
+
 	/**
 	 * 预算价格
 	 */
-	private BigDecimal budgetCost;
-	
+	private BigDecimal	budgetCost;
+
 	/**
 	 * 问题说明
 	 */
-	private String problemDes;
-	
+	private String		problemDes;
+
 	/**
 	 * 发布时间
 	 */
-	private Date releaseDate;
-	
+	private Date		releaseDate;
+
 	/**
 	 * 雇主名称
 	 */
-	private String employerName;
-	
+	private String		employerName;
+
 	/**
 	 * 用户等级
 	 */
-	private Integer level;
-	
+	private Integer		level;
+
 	public String getEmployerName() {
 		return employerName;
 	}
@@ -97,7 +95,7 @@ public class DemandSearchListBo {
 	public void setId(String id) {
 		this.id = id;
 	}
-	
+
 	public String getKeyword() {
 		return keyword;
 	}
@@ -113,7 +111,7 @@ public class DemandSearchListBo {
 	public void setSerialNumber(Integer serialNumber) {
 		this.serialNumber = serialNumber;
 	}
-	
+
 	@JsonFormat(shape = Shape.STRING)
 	public Integer getDataCategory() {
 		return dataCategory;
@@ -130,7 +128,7 @@ public class DemandSearchListBo {
 	public void setName(String name) {
 		this.name = name;
 	}
-	
+
 	@JsonFormat(shape = Shape.STRING)
 	public Integer getIndustryCategoryA() {
 		return industryCategoryA;
@@ -139,7 +137,7 @@ public class DemandSearchListBo {
 	public void setIndustryCategoryA(Integer industryCategoryA) {
 		this.industryCategoryA = industryCategoryA;
 	}
-	
+
 	@JsonFormat(shape = Shape.STRING)
 	public Integer getIndustryCategoryB() {
 		return industryCategoryB;
@@ -148,7 +146,7 @@ public class DemandSearchListBo {
 	public void setIndustryCategoryB(Integer industryCategoryB) {
 		this.industryCategoryB = industryCategoryB;
 	}
-	
+
 	@JsonFormat(shape = Shape.STRING)
 	public Integer getDemandType() {
 		return demandType;
@@ -181,7 +179,6 @@ public class DemandSearchListBo {
 	public void setReleaseDate(Date releaseDate) {
 		this.releaseDate = releaseDate;
 	}
-	
 
 	public String getReleaseDateFormattedDate() {
 		if (this.releaseDate == null) {
@@ -194,6 +191,5 @@ public class DemandSearchListBo {
 	public void setReleaseDateFormattedDate(String releaseDateFormattedDate) {
 
 	}
-	
-	
+
 }

+ 1 - 1
src/main/java/com/goafanti/portal/bo/InterestListBo.java

@@ -22,7 +22,7 @@ public class InterestListBo {
 	private Integer	auditStatus;
 
 	private String	keyword;
-	
+
 	public String getKeyword() {
 		return keyword;
 	}

+ 0 - 2
src/main/java/com/goafanti/portal/bo/OrgSubscriberListBo.java

@@ -70,7 +70,5 @@ public class OrgSubscriberListBo {
 	public void setProvince(Integer province) {
 		this.province = province;
 	}
-	
-	
 
 }

+ 0 - 2
src/main/java/com/goafanti/portal/bo/UserSubscriberListBo.java

@@ -70,7 +70,5 @@ public class UserSubscriberListBo {
 	public void setProvince(String province) {
 		this.province = province;
 	}
-	
-	
 
 }

+ 8 - 10
src/main/java/com/goafanti/techproject/bo/InputTechProject.java

@@ -51,23 +51,23 @@ public class InputTechProject {
 
 	@Size(min = 0, max = 36, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String		consultant;
-	
+
 	@Size(min = 0, max = 255, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
-	private String approvalUrl;
-	
+	private String		approvalUrl;
+
 	@Max(value = 10, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	private Integer		state;
 
 	@Size(min = 0, max = 36, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String		principal;
-	
+
 	@Size(min = 0, max = 128, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String		comment;
-	
+
 	@Size(min = 0, max = 36, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
-	private String salesman;
-	
+	private String		salesman;
+
 	public String getSalesman() {
 		return salesman;
 	}
@@ -99,7 +99,7 @@ public class InputTechProject {
 	public void setComment(String comment) {
 		this.comment = comment;
 	}
-     
+
 	public String getId() {
 		return id;
 	}
@@ -211,7 +211,5 @@ public class InputTechProject {
 	public void setApprovalUrl(String approvalUrl) {
 		this.approvalUrl = approvalUrl;
 	}
-	
-	
 
 }

+ 5 - 7
src/main/java/com/goafanti/techproject/bo/InputTechWebsite.java

@@ -7,19 +7,19 @@ import com.goafanti.common.constant.ErrorConstants;
 public class InputTechWebsite {
 	@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 = 45, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String	department;
-    
+
 	@Size(min = 0, max = 255, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String	website;
-    
+
 	@Size(min = 0, max = 45, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String	accountNumber;
-    
+
 	@Size(min = 0, max = 32, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String	password;
 
@@ -70,7 +70,5 @@ public class InputTechWebsite {
 	public void setPassword(String password) {
 		this.password = password;
 	}
-	
-	
 
 }

+ 50 - 54
src/main/java/com/goafanti/techproject/bo/TechProjectClientListBo.java

@@ -7,43 +7,44 @@ import org.apache.commons.lang3.time.DateFormatUtils;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonFormat.Shape;
 import com.goafanti.common.constant.AFTConstants;
+
 /**
  * 用户科技申报项目列表
  */
 public class TechProjectClientListBo {
-	private String id;
-	
-	private String uid;
-	
-	private Integer serialNumber;
-	
-	private Integer province;
-	
-	private Integer contacts;
-	
-	private String unitName;
-	
-	private String projectName;
-	
-	private String projectCatagory;
-	
-	private String techField;
-	
-	private Integer state;
-	
-	private Date createTime;
-	
-	private String consultant;
-	
-	private Date acceptDate;
-	
-	private Date approvedDate;
-	
-	private String firstContacts;
-	
-	private String secondContacts;
-	
-	private String thirdContacts;
+	private String	id;
+
+	private String	uid;
+
+	private Integer	serialNumber;
+
+	private Integer	province;
+
+	private Integer	contacts;
+
+	private String	unitName;
+
+	private String	projectName;
+
+	private String	projectCatagory;
+
+	private String	techField;
+
+	private Integer	state;
+
+	private Date	createTime;
+
+	private String	consultant;
+
+	private Date	acceptDate;
+
+	private Date	approvedDate;
+
+	private String	firstContacts;
+
+	private String	secondContacts;
+
+	private String	thirdContacts;
 
 	public String getId() {
 		return id;
@@ -61,7 +62,6 @@ public class TechProjectClientListBo {
 		this.uid = uid;
 	}
 
-
 	public Integer getSerialNumber() {
 		return serialNumber;
 	}
@@ -117,7 +117,7 @@ public class TechProjectClientListBo {
 	public void setTechField(String techField) {
 		this.techField = techField;
 	}
-	
+
 	@JsonFormat(shape = Shape.STRING)
 	public Integer getState() {
 		return state;
@@ -135,7 +135,6 @@ public class TechProjectClientListBo {
 		this.createTime = createTime;
 	}
 
-    
 	public String getConsultant() {
 		return consultant;
 	}
@@ -159,9 +158,7 @@ public class TechProjectClientListBo {
 	public void setApprovedDate(Date approvedDate) {
 		this.approvedDate = approvedDate;
 	}
-	
-	
-	
+
 	public String getFirstContacts() {
 		return firstContacts;
 	}
@@ -186,41 +183,40 @@ public class TechProjectClientListBo {
 		this.thirdContacts = thirdContacts;
 	}
 
-	public String getCreateTimeFormattedDate(){
+	public String getCreateTimeFormattedDate() {
 		if (this.createTime == null) {
 			return null;
 		} else {
 			return DateFormatUtils.format(this.getCreateTime(), AFTConstants.YYYYMMDD);
 		}
 	}
-	
-	public void setCreateTimeFormattedDate(String createTimeFormattedDate){
-		
+
+	public void setCreateTimeFormattedDate(String createTimeFormattedDate) {
+
 	}
-	
-	public String getAcceptDateFormattedDate(){
+
+	public String getAcceptDateFormattedDate() {
 		if (this.acceptDate == null) {
 			return null;
 		} else {
 			return DateFormatUtils.format(this.getAcceptDate(), AFTConstants.YYYYMMDD);
 		}
 	}
-	
-	public void setAcceptDateFormattedDate(String acceptDateFormattedDate){
-		
+
+	public void setAcceptDateFormattedDate(String acceptDateFormattedDate) {
+
 	}
-	
-	public String getApprovedDateFormattedDate(){
+
+	public String getApprovedDateFormattedDate() {
 		if (this.approvedDate == null) {
 			return null;
 		} else {
 			return DateFormatUtils.format(this.getApprovedDate(), AFTConstants.YYYYMMDD);
 		}
 	}
-	
-	public void setApprovedDateFormattedDate(String approvedDateFormattedDate){
-		
-	}
 
+	public void setApprovedDateFormattedDate(String approvedDateFormattedDate) {
+
+	}
 
 }

+ 15 - 17
src/main/java/com/goafanti/techproject/bo/TechProjectContractListBo.java

@@ -4,21 +4,21 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonFormat.Shape;
 
 public class TechProjectContractListBo {
-	private String id;
-	
-	private String uid;
-	
-	private String contractId;
-	
-	private String projectName;
-	
-	private String projectCatagory;
-	
-	private Integer state;
-	
-	private String techField;
-	
-	private String principle;
+	private String	id;
+
+	private String	uid;
+
+	private String	contractId;
+
+	private String	projectName;
+
+	private String	projectCatagory;
+
+	private Integer	state;
+
+	private String	techField;
+
+	private String	principle;
 
 	public String getId() {
 		return id;
@@ -84,7 +84,5 @@ public class TechProjectContractListBo {
 	public void setPrinciple(String principle) {
 		this.principle = principle;
 	}
-	
-	
 
 }

+ 15 - 18
src/main/java/com/goafanti/techproject/bo/TechProjectManageListBo.java

@@ -1,22 +1,23 @@
 package com.goafanti.techproject.bo;
+
 /**
  * 科技申报项目
  */
 public class TechProjectManageListBo extends TechProjectClientListBo {
-	private String wid;
-	
-	private String website;
-	
-	private String accountNumber;
-	
-	private String password;
-	
-	private String founder;
-	
-	private String contractId;
-	
-	private Integer contractNumber;
-	
+	private String	wid;
+
+	private String	website;
+
+	private String	accountNumber;
+
+	private String	password;
+
+	private String	founder;
+
+	private String	contractId;
+
+	private Integer	contractNumber;
+
 	public Integer getContractNumber() {
 		return contractNumber;
 	}
@@ -73,8 +74,4 @@ public class TechProjectManageListBo extends TechProjectClientListBo {
 		this.password = password;
 	}
 
-	
-	
-	
-	
 }

+ 2 - 3
src/main/java/com/goafanti/techproject/bo/TechWebsiteDetailBo.java

@@ -2,7 +2,7 @@ package com.goafanti.techproject.bo;
 
 import com.goafanti.common.model.TechWebsite;
 
-public class TechWebsiteDetailBo extends TechWebsite{
+public class TechWebsiteDetailBo extends TechWebsite {
 	private String unitName;
 
 	public String getUnitName() {
@@ -12,6 +12,5 @@ public class TechWebsiteDetailBo extends TechWebsite{
 	public void setUnitName(String unitName) {
 		this.unitName = unitName;
 	}
-	
-	
+
 }

+ 16 - 18
src/main/java/com/goafanti/techproject/bo/TechWebsiteListBo.java

@@ -1,22 +1,21 @@
 package com.goafanti.techproject.bo;
 
-
 public class TechWebsiteListBo {
-	private String id;
-	
-	private String uid;
-	
-	private String unitName;
-	
-	private Integer province;
-	
-	private String department;
-	
-	private String website;
-	
-	private String accountNumber;
-	
-	private String password;
+	private String	id;
+
+	private String	uid;
+
+	private String	unitName;
+
+	private Integer	province;
+
+	private String	department;
+
+	private String	website;
+
+	private String	accountNumber;
+
+	private String	password;
 
 	public String getId() {
 		return id;
@@ -81,6 +80,5 @@ public class TechWebsiteListBo {
 	public void setPassword(String password) {
 		this.password = password;
 	}
-	
-	
+
 }

+ 4 - 6
src/main/java/com/goafanti/user/bo/AuditorOrgIdentityDetailBo.java

@@ -1,9 +1,9 @@
 package com.goafanti.user.bo;
 
-public class AuditorOrgIdentityDetailBo extends OrgIdentityDetailBo{
-	private String aid;
-	
-	private String mid;
+public class AuditorOrgIdentityDetailBo extends OrgIdentityDetailBo {
+	private String	aid;
+
+	private String	mid;
 
 	public String getAid() {
 		return aid;
@@ -21,6 +21,4 @@ public class AuditorOrgIdentityDetailBo extends OrgIdentityDetailBo{
 		this.mid = mid;
 	}
 
-	
-	
 }

+ 4 - 7
src/main/java/com/goafanti/user/bo/AuditorUserIdentityDetailBo.java

@@ -2,10 +2,10 @@ package com.goafanti.user.bo;
 
 import com.goafanti.common.model.UserIdentity;
 
-public class AuditorUserIdentityDetailBo extends UserIdentity{
-	private String aid;
-	
-	private String mid;
+public class AuditorUserIdentityDetailBo extends UserIdentity {
+	private String	aid;
+
+	private String	mid;
 
 	public String getAid() {
 		return aid;
@@ -23,7 +23,4 @@ public class AuditorUserIdentityDetailBo extends UserIdentity{
 		this.mid = mid;
 	}
 
-	
-	
-
 }

+ 4 - 5
src/main/java/com/goafanti/user/bo/InputOrganizationIdentity.java

@@ -165,11 +165,11 @@ public class InputOrganizationIdentity {
 
 	@Size(min = 0, max = 36, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String		consultant;
-	
+
 	@Max(value = 5, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
-	private Integer level;
-	
+	private Integer		level;
+
 	/**
 	 * 领域
 	 */
@@ -575,6 +575,5 @@ public class InputOrganizationIdentity {
 	public void setField(String field) {
 		this.field = field;
 	}
-	
-	
+
 }

+ 2 - 3
src/main/java/com/goafanti/user/bo/InputOrganizationTech.java

@@ -7,7 +7,7 @@ import com.goafanti.common.constant.ErrorConstants;
 public class InputOrganizationTech {
 	@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;
 
@@ -71,6 +71,5 @@ public class InputOrganizationTech {
 	public void setSpecialty(String specialty) {
 		this.specialty = specialty;
 	}
-	
-	
+
 }

+ 11 - 29
src/main/java/com/goafanti/user/bo/InputUserAbility.java

@@ -6,98 +6,80 @@ import com.goafanti.common.constant.ErrorConstants;
 
 public class InputUserAbility {
 	@Size(min = 0, max = 36, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
-	private String id;
+	private String	id;
 
 	@Size(min = 0, max = 36, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
-    private String uid;
+	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;
-    
+	private String	abilityLabel;
+
 	@Size(min = 0, max = 300, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
-    private String scienceAchievement;
-    
-    
+	private String	intellectRight;
+
 	@Size(min = 0, max = 300, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
-    private String researchInnovation;
-    
-    
+	private String	scienceAchievement;
+
 	@Size(min = 0, max = 300, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
-    private String personnel;
+	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;
 	}
-	
-	
 
 }

+ 1 - 3
src/main/java/com/goafanti/user/bo/InputUserCareer.java

@@ -7,7 +7,7 @@ import com.goafanti.common.constant.ErrorConstants;
 public class InputUserCareer {
 	@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;
 
@@ -158,7 +158,5 @@ public class InputUserCareer {
 	public void setAchievement(String achievement) {
 		this.achievement = achievement;
 	}
-	
-	
 
 }

+ 2 - 4
src/main/java/com/goafanti/user/bo/InputUserEdu.java

@@ -6,8 +6,8 @@ import com.goafanti.common.constant.ErrorConstants;
 
 public class InputUserEdu {
 	@Size(min = 0, max = 36, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
-	private String id;
-	
+	private String	id;
+
 	@Size(min = 0, max = 36, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String	uid;
 
@@ -147,7 +147,5 @@ public class InputUserEdu {
 	public void setDegreeCode(String degreeCode) {
 		this.degreeCode = degreeCode;
 	}
-	
-	
 
 }

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

@@ -80,21 +80,21 @@ public class InputUserIdentity {
 	@Max(value = 3, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	private Integer		wrongCount;
-	
+
 	@Max(value = 5, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
-	private Integer level;
+	private Integer		level;
 
 	private Date		paymentDate;
-	
+
 	@Max(value = 1, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
-	private Integer expert;
-	
+	private Integer		expert;
+
 	@Max(value = 1, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
-	private Integer celebrity;
-	
+	private Integer		celebrity;
+
 	public Integer getExpert() {
 		return expert;
 	}

+ 0 - 2
src/main/java/com/goafanti/user/bo/OrgIdentityDetailAdmin.java

@@ -13,6 +13,4 @@ public class OrgIdentityDetailAdmin extends OrganizationIdentity {
 		this.level = level;
 	}
 
-	
-	
 }

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

@@ -342,7 +342,7 @@ public class OrgIdentityDetailBo {
 	public void setLicenceCity(Integer licenceCity) {
 		this.licenceCity = licenceCity;
 	}
-	
+
 	public Integer getLicenceArea() {
 		return licenceArea;
 	}
@@ -350,7 +350,7 @@ public class OrgIdentityDetailBo {
 	public void setLicenceArea(Integer licenceArea) {
 		this.licenceArea = licenceArea;
 	}
-	
+
 	public Integer getLocationProvince() {
 		return locationProvince;
 	}
@@ -358,7 +358,7 @@ public class OrgIdentityDetailBo {
 	public void setLocationProvince(Integer locationProvince) {
 		this.locationProvince = locationProvince;
 	}
-	
+
 	public Integer getLocationCity() {
 		return locationCity;
 	}
@@ -366,7 +366,7 @@ public class OrgIdentityDetailBo {
 	public void setLocationCity(Integer locationCity) {
 		this.locationCity = locationCity;
 	}
-	
+
 	public Integer getLocationArea() {
 		return locationArea;
 	}

+ 2 - 2
src/main/java/com/goafanti/user/bo/OrgListBo.java

@@ -123,7 +123,7 @@ public class OrgListBo {
 	public void setType(Integer type) {
 		this.type = type;
 	}
-	
+
 	@JsonFormat(shape = Shape.STRING)
 	public Integer getOrgAuditStatus() {
 		return orgAuditStatus;
@@ -132,7 +132,7 @@ public class OrgListBo {
 	public void setOrgAuditStatus(Integer orgAuditStatus) {
 		this.orgAuditStatus = orgAuditStatus;
 	}
-	
+
 	@JsonFormat(shape = Shape.STRING)
 	public Integer getUserAuditStatus() {
 		return userAuditStatus;

+ 1 - 1
src/main/java/com/goafanti/user/bo/OrgPartnerDetailBo.java

@@ -22,7 +22,7 @@ public class OrgPartnerDetailBo {
 	private String	companyIntroduction;
 
 	private String	interestId;
-	
+
 	public String getInterestId() {
 		return interestId;
 	}

+ 16 - 14
src/main/java/com/goafanti/user/bo/OrgProBo.java

@@ -4,30 +4,32 @@ import com.goafanti.common.model.OrganizationInfo;
 import com.goafanti.common.model.OrganizationProperties;
 
 public class OrgProBo {
-      private OrganizationInfo info;
-      private OrganizationProperties pro;
-      
-    public OrgProBo(){
-    	
-    }
-      
-    public OrgProBo(OrganizationInfo info,OrganizationProperties pro){
-    	this.info = info;
-    	this.pro =pro;
-    }
-      
+	private OrganizationInfo		info;
+	private OrganizationProperties	pro;
+
+	public OrgProBo() {
+
+	}
+
+	public OrgProBo(OrganizationInfo info, OrganizationProperties pro) {
+		this.info = info;
+		this.pro = pro;
+	}
+
 	public OrganizationInfo getInfo() {
 		return info;
 	}
+
 	public void setInfo(OrganizationInfo info) {
 		this.info = info;
 	}
+
 	public OrganizationProperties getPro() {
 		return pro;
 	}
+
 	public void setPro(OrganizationProperties pro) {
 		this.pro = pro;
 	}
-      
-      
+
 }

+ 6 - 8
src/main/java/com/goafanti/user/bo/OrgUnitNames.java

@@ -1,12 +1,12 @@
 package com.goafanti.user.bo;
 
 public class OrgUnitNames {
-	private String uid;
-	
-	private String unitName;
-	
-	private String mobile;
-	
+	private String	uid;
+
+	private String	unitName;
+
+	private String	mobile;
+
 	public String getMobile() {
 		return mobile;
 	}
@@ -30,7 +30,5 @@ public class OrgUnitNames {
 	public void setUnitName(String unitName) {
 		this.unitName = unitName;
 	}
-	
-	
 
 }

+ 6 - 3
src/main/java/com/goafanti/user/bo/UidAndTypeBo.java

@@ -1,20 +1,23 @@
 package com.goafanti.user.bo;
 
 public class UidAndTypeBo {
-	private String uid;
-	private Integer type;
+	private String	uid;
+	private Integer	type;
+
 	public String getUid() {
 		return uid;
 	}
+
 	public void setUid(String uid) {
 		this.uid = uid;
 	}
+
 	public Integer getType() {
 		return type;
 	}
+
 	public void setType(Integer type) {
 		this.type = type;
 	}
-	
 
 }

+ 28 - 16
src/main/java/com/goafanti/user/bo/UserDownLoadBo.java

@@ -1,62 +1,74 @@
 package com.goafanti.user.bo;
 
 public class UserDownLoadBo {
-	private String id;
-	
-	private String diplomaUrl;
-	
-	private String degreeDiplomaUrl;
-	
-	private String professionalCertificateUrl;
-	
-	private String qualificationCertificateUrl;
-	
-	private String positiveIdUrl;
-	
-	private String oppositeIdUrl;
-	
+	private String	id;
+
+	private String	diplomaUrl;
+
+	private String	degreeDiplomaUrl;
+
+	private String	professionalCertificateUrl;
+
+	private String	qualificationCertificateUrl;
+
+	private String	positiveIdUrl;
+
+	private String	oppositeIdUrl;
+
 	public String getId() {
 		return id;
 	}
+
 	public void setId(String id) {
 		this.id = id;
 	}
+
 	public String getDiplomaUrl() {
 		return diplomaUrl;
 	}
+
 	public void setDiplomaUrl(String diplomaUrl) {
 		this.diplomaUrl = diplomaUrl;
 	}
+
 	public String getDegreeDiplomaUrl() {
 		return degreeDiplomaUrl;
 	}
+
 	public void setDegreeDiplomaUrl(String degreeDiplomaUrl) {
 		this.degreeDiplomaUrl = degreeDiplomaUrl;
 	}
+
 	public String getProfessionalCertificateUrl() {
 		return professionalCertificateUrl;
 	}
+
 	public void setProfessionalCertificateUrl(String professionalCertificateUrl) {
 		this.professionalCertificateUrl = professionalCertificateUrl;
 	}
+
 	public String getQualificationCertificateUrl() {
 		return qualificationCertificateUrl;
 	}
+
 	public void setQualificationCertificateUrl(String qualificationCertificateUrl) {
 		this.qualificationCertificateUrl = qualificationCertificateUrl;
 	}
+
 	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;
 	}
-	
-	
+
 }

+ 7 - 6
src/main/java/com/goafanti/user/bo/UserIdentityBo.java

@@ -2,23 +2,24 @@ package com.goafanti.user.bo;
 
 import com.goafanti.common.model.UserIdentity;
 
-public class UserIdentityBo extends UserIdentity{
-	private Long number;
-	private String mobile;
-	
-	
+public class UserIdentityBo extends UserIdentity {
+	private Long	number;
+	private String	mobile;
+
 	public Long getNumber() {
 		return number;
 	}
+
 	public void setNumber(Long number) {
 		this.number = number;
 	}
+
 	public String getMobile() {
 		return mobile;
 	}
+
 	public void setMobile(String mobile) {
 		this.mobile = mobile;
 	}
-	
 
 }

+ 0 - 2
src/main/java/com/goafanti/user/bo/UserIdentityDetailAdminBo.java

@@ -13,6 +13,4 @@ public class UserIdentityDetailAdminBo extends UserIdentity {
 		this.level = level;
 	}
 
-	
-	
 }

+ 8 - 6
src/main/java/com/goafanti/user/bo/UserInfoBo.java

@@ -5,24 +5,26 @@ import javax.validation.constraints.Size;
 import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.model.UserInfo;
 
+public class UserInfoBo extends UserInfo {
 
-public class UserInfoBo extends UserInfo{
-	
 	@Size(min = 0, max = 16, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
-	private String nickname;
-	
+	private String	nickname;
+
 	@Size(min = 0, max = 127, message = "{" + ErrorConstants.EMAIL_SIZE_ERROR + "}")
-	private String email;
-	
+	private String	email;
+
 	public String getEmail() {
 		return email;
 	}
+
 	public void setEmail(String email) {
 		this.email = email;
 	}
+
 	public String getNickname() {
 		return nickname;
 	}
+
 	public void setNickname(String nickname) {
 		this.nickname = nickname;
 	}

+ 32 - 37
src/main/java/com/goafanti/user/bo/UserListBo.java

@@ -8,28 +8,26 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonFormat.Shape;
 import com.goafanti.common.constant.AFTConstants;
 
-
 public class UserListBo {
-	
-	private String id;
-	
-    private	String mobile;
-    
-    private String email;
-    
-    private Date createTime;
-    
-    private Integer number;
-    
-    private String aftUsername;
-    
-    private Integer auditStatus;
-    
-    private String adminName;
-    
-    private String managerName;
-    
-    
+
+	private String	id;
+
+	private String	mobile;
+
+	private String	email;
+
+	private Date	createTime;
+
+	private Integer	number;
+
+	private String	aftUsername;
+
+	private Integer	auditStatus;
+
+	private String	adminName;
+
+	private String	managerName;
+
 	public String getId() {
 		return id;
 	}
@@ -69,8 +67,7 @@ public class UserListBo {
 	public void setNumber(Integer number) {
 		this.number = number;
 	}
-	
-	
+
 	public String getAftUsername() {
 		return aftUsername;
 	}
@@ -78,7 +75,7 @@ public class UserListBo {
 	public void setAftUsername(String aftUsername) {
 		this.aftUsername = aftUsername;
 	}
-	
+
 	@JsonFormat(shape = Shape.STRING)
 	public Integer getAuditStatus() {
 		return auditStatus;
@@ -87,7 +84,7 @@ public class UserListBo {
 	public void setAuditStatus(Integer auditStatus) {
 		this.auditStatus = auditStatus;
 	}
-	
+
 	public String getAdminName() {
 		return adminName;
 	}
@@ -95,8 +92,6 @@ public class UserListBo {
 	public void setAdminName(String adminName) {
 		this.adminName = adminName;
 	}
-	
-	
 
 	public String getManagerName() {
 		return managerName;
@@ -106,16 +101,16 @@ public class UserListBo {
 		this.managerName = managerName;
 	}
 
-	//注册时间
-	public String getCreateTimeFormattedDate(){
+	// 注册时间
+	public String getCreateTimeFormattedDate() {
 		if (this.createTime == null) {
-			 return null;
-		   } else {
-			 return DateFormatUtils.format(this.getCreateTime(), AFTConstants.YYYYMMDD);
-		   }
-	}
-		
-	public void setCreateTimeFormattedDate(String createTimeFormattedDate){
-			
+			return null;
+		} else {
+			return DateFormatUtils.format(this.getCreateTime(), AFTConstants.YYYYMMDD);
+		}
+	}
+
+	public void setCreateTimeFormattedDate(String createTimeFormattedDate) {
+
 	}
 }

+ 2 - 6
src/main/java/com/goafanti/user/bo/UserNames.java

@@ -5,8 +5,8 @@ public class UserNames {
 	private String	uid;
 
 	private String	username;
-	
-	private String mobile;
+
+	private String	mobile;
 
 	public String getUid() {
 		return uid;
@@ -31,9 +31,5 @@ public class UserNames {
 	public void setMobile(String mobile) {
 		this.mobile = mobile;
 	}
-	
-	
-	
-	
 
 }

+ 7 - 10
src/main/java/com/goafanti/user/bo/UserPageHomeBo.java

@@ -36,38 +36,36 @@ public class UserPageHomeBo {
 	 * 公司LogoUrl
 	 */
 	private String	logoUrl;
-	
+
 	/**
 	 * 专利数量
 	 */
 	private Integer	patentNum;
-	
+
 	/**
 	 * 软著数量
 	 */
 	private Integer	copyrightNum;
-	
+
 	/**
 	 * 科技成果数量
 	 */
 	private Integer	techProjectNum;
-	
+
 	/**
 	 * 发布需求数量
 	 */
 	private Integer	demandNum;
-	
+
 	/**
 	 * 发布成果数量
 	 */
 	private Integer	achievementNum;
-	
+
 	/**
 	 * 知识产权数量
 	 */
 	private Integer	intellectualPropertyNum;
-	
-
 
 	public String getUid() {
 		return uid;
@@ -180,6 +178,5 @@ public class UserPageHomeBo {
 	public void setIntellectualPropertyNum(Integer intellectualPropertyNum) {
 		this.intellectualPropertyNum = intellectualPropertyNum;
 	}
-	
-	
+
 }

+ 1 - 1
src/main/java/com/goafanti/user/bo/UserPartnerDetailBo.java

@@ -22,7 +22,7 @@ public class UserPartnerDetailBo {
 	private String	lifePhotoUrl;
 
 	private String	interestId;
-	
+
 	public String getInterestId() {
 		return interestId;
 	}