Antiloveg 8 years ago
parent
commit
7678af1484

+ 38 - 30
src/main/java/com/goafanti/achievement/bo/AchievementImportBo.java

@@ -6,66 +6,77 @@ import java.util.List;
  * 批量导入科技成果
  */
 public class AchievementImportBo {
-	
+
 	/**
 	 * 数据类别
 	 */
-	private Integer	dataCategory;
-	
+	private Integer			dataCategory;
+
 	/**
 	 * 名称
 	 */
-	private String	name;
-	
-	
+	private String			name;
+
 	/**
 	 * 关键词
 	 */
-	private String	keyword;
-		
+	private String			keyword;
+
 	/**
 	 * 类型
 	 */
-	private Integer	category;
-	
+	private Integer			category;
+
 	/**
 	 * 所有人名称
 	 */
-	private String ownerName;
-	
-	
+	private String			ownerName;
+
 	/**
 	 * 所有人类型
 	 * 
 	 */
-	private Integer ownerType;
-	
+	private Integer			ownerType;
+
 	/**
 	 * 所有人证件号
 	 */
-	private String ownerIdNumber;
-	
+	private String			ownerIdNumber;
+
 	/**
 	 * 所有人联系电话
 	 */
-	private String ownerMobile;
-	
+	private String			ownerMobile;
+
 	/**
 	 * 所有人电子邮箱
 	 */
-	private String ownerEmail;
-	
+	private String			ownerEmail;
+
 	/**
 	 * 所有人通讯地址
 	 */
-	private String ownerPostalAddress;
-	
+	private String			ownerPostalAddress;
+
 	/**
 	 * 合作方式
 	 */
-	private Integer cooperationMode;
+	private Integer			cooperationMode;
 	
-	private List<String> keywords;
+	/**
+	 * 成果简介
+	 */
+	private String			introduction;
+
+	private List<String>	keywords;
+
+	public String getIntroduction() {
+		return introduction;
+	}
+
+	public void setIntroduction(String introduction) {
+		this.introduction = introduction;
+	}
 
 	public Integer getDataCategory() {
 		return dataCategory;
@@ -161,9 +172,6 @@ public class AchievementImportBo {
 
 	public void setKeywords(List<String> keywords) {
 		this.keywords = keywords;
-	} 
-	
-	
-	
-	
+	}
+
 }

+ 8 - 0
src/main/java/com/goafanti/admin/controller/AdminAchievementApiController.java

@@ -483,6 +483,8 @@ public class AdminAchievementApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到合作方式", "合作方式"));
 			return res;
 		}
+		
+		
 
 		for (int i = 0; i < keywords.length; i++) {
 			if (AFTConstants.KEYWORDLENTH < keywords[i].length()) {
@@ -585,6 +587,12 @@ public class AdminAchievementApiController extends CertifyApiController {
 						AchievementImportFields.COOPERATIONMODE.getDesc()));
 				return res;
 			}
+			
+			if (bo.getIntroduction().length() > 298){
+				res.getError().add(
+						buildError(ErrorConstants.PARAM_SIZE_ERROR, "", AchievementImportFields.INTRODUCTION.getDesc()));
+				return res;
+			}
 
 			if (bo.getKeyword().length() > 44) {
 				res.getError().add(

+ 2 - 0
src/main/java/com/goafanti/common/enums/AchievementImportFields.java

@@ -17,6 +17,8 @@ public enum AchievementImportFields {
 	OWNERPOSTALADDRESS("ownerPostalAddress", "科技成果所有人通讯地址"),
 	COOPERATIONMODE("cooperationMode", "合作方式"),
 	
+	INTRODUCTION("introduction", "成果简介"),
+	
 	OTHER("", "未知参数");
 	
 	private String	code;

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

@@ -232,14 +232,14 @@
   <select id="selectCognizancePrincipal" resultMap="BaseResultMap"  >
     select a.id, a.name, a.position from admin a 
 		INNER JOIN user_role  ur on a.id = ur.uid
-	where ur.rid not in('1','2','3','4')
+	where ur.rid not in('1','2','3','4','5','6')
 	group by a.id
   </select>
   
   <select id="selectPatentAuthor" resultMap="BaseResultMap"  >
     select a.id, a.name, a.position from admin a 
 		INNER JOIN user_role  ur on a.id = ur.uid
-	where ur.rid not in('1','2','3','4')
+	where ur.rid not in('1','2','3','4','5','6')
 	group by a.id
   </select>
   

+ 6 - 0
src/main/java/com/goafanti/user/controller/UserApiController.java

@@ -665,8 +665,14 @@ public class UserApiController extends BaseApiController {
 					OrgHumanResourceFields.getFieldDesc(bindingResult.getFieldError().getField())));
 			return res;
 		}
+		
+		if (null == ohr.getYear()){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "年份"));
+			return res;
+		}
 		OrgHumanResource orgHumanResource = new OrgHumanResource();
 		BeanUtils.copyProperties(ohr, orgHumanResource);
+		
 		if (StringUtils.isBlank(orgHumanResource.getId())) {
 			if (null != orgHumanResourceService.selectOrgHumanResourceByUidAndYear(orgHumanResource.getYear(),
 					orgHumanResource.getUid())) {