Antiloveg 8 years ago
parent
commit
36fda778f0

+ 6 - 7
src/main/java/com/goafanti/admin/controller/AdminTechProjectController.java

@@ -23,7 +23,7 @@ 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.CopyrightFields;
+import com.goafanti.common.enums.TechProjectFields;
 import com.goafanti.common.model.TechProject;
 import com.goafanti.common.model.TechProjectLog;
 import com.goafanti.common.model.TechWebsite;
@@ -32,7 +32,6 @@ import com.goafanti.common.utils.AesUtils;
 import com.goafanti.common.utils.StringUtils;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.techproject.bo.InputTechProject;
-import com.goafanti.techproject.bo.InputTechProjectLog;
 import com.goafanti.techproject.bo.InputTechWebsite;
 import com.goafanti.techproject.bo.TechProjectManageListBo;
 import com.goafanti.techproject.bo.TechWebsiteDetailBo;
@@ -106,7 +105,7 @@ public class AdminTechProjectController extends CertifyApiController {
 		Result res = new Result();
 		if (bindingResult.hasErrors()) {
 			res.getError().add(buildErrorByMsg(bindingResult.getFieldError().getDefaultMessage(),
-					CopyrightFields.getFieldDesc(bindingResult.getFieldError().getField())));
+					TechProjectFields.getFieldDesc(bindingResult.getFieldError().getField())));
 			return res;
 		}
 		if (!checkAdminLogin(res)) {
@@ -177,12 +176,12 @@ public class AdminTechProjectController extends CertifyApiController {
 	 * @throws ParseException
 	 */
 	@RequestMapping(value = "/updateTechProject", method = RequestMethod.POST)
-	public Result updateTechProject(@Valid InputTechProject techProject, @Valid InputTechProjectLog log,
+	public Result updateTechProject(@Valid InputTechProject techProject,
 			BindingResult bindingResult, String recordTimeFormattedDate) {
 		Result res = new Result();
 		if (bindingResult.hasErrors()) {
 			res.getError().add(buildErrorByMsg(bindingResult.getFieldError().getDefaultMessage(),
-					CopyrightFields.getFieldDesc(bindingResult.getFieldError().getField())));
+					TechProjectFields.getFieldDesc(bindingResult.getFieldError().getField())));
 			return res;
 		}
 		if (!checkAdminLogin(res)) {
@@ -212,7 +211,7 @@ public class AdminTechProjectController extends CertifyApiController {
 		TechProjectLog tpl = new TechProjectLog();
 		tp.setId(techProject.getId());
 		BeanUtils.copyProperties(techProject, tp);
-		BeanUtils.copyProperties(log, tpl);
+		BeanUtils.copyProperties(techProject, tpl);
 		res.setData(techProjectService.updateTechProject(tp, tpl, recordTime));
 		return res;
 	}
@@ -337,7 +336,7 @@ public class AdminTechProjectController extends CertifyApiController {
 		Result res = new Result();
 		if (bindingResult.hasErrors()) {
 			res.getError().add(buildErrorByMsg(bindingResult.getFieldError().getDefaultMessage(),
-					CopyrightFields.getFieldDesc(bindingResult.getFieldError().getField())));
+					TechProjectFields.getFieldDesc(bindingResult.getFieldError().getField())));
 			return res;
 		}
 		if (!checkAdminLogin(res)) {

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

@@ -0,0 +1,65 @@
+package com.goafanti.common.enums;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum TechProjectFields {
+
+	UID("uid", "用户id"),
+	CONTACTS("contacts", "联系人"),
+	DEPARTMENT("department", "科技项目申报部门"),
+	DISPATCHINFO("dispatchInfo", "派单信息"),
+	PROJECTNAME("projectName", "项目名称"),
+	PROJECTCATAGORY("projectCatagory", "项目类型"),
+	TECHHFIELD("techField", "技术领域"),
+	PROJECTDES("projectDes", "项目简介"),
+	PROJECTMODE("projectMode", "是否立项"),
+	PROJECTAPPROVAL("projectApproval", "立项金额"),
+	SUBSIDY("subsidy", "是否补助"),
+	CONSULTANT("consultant", "咨询师"),
+	APPROVALURL("approvalUrl", "科技项目资料URL"),
+	STATE("state", "科技项目状态"),
+	PRINCIPAL("principal", "负责人"),
+	COMMENT("comment", "备注"),
+	OTHER("", "未知参数");
+	
+	private String	code;
+	private String	desc;
+	
+	private static Map<String, TechProjectFields> status = new HashMap<String, TechProjectFields>();
+	
+	private TechProjectFields(String code, String desc) {
+		this.code = code;
+		this.desc = desc;
+	}
+	
+	static {
+		for (TechProjectFields value : TechProjectFields.values()) {
+			status.put(value.getCode(), value);
+		}
+	}
+	
+	public static TechProjectFields 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;
+	}
+
+}

+ 34 - 0
src/main/java/com/goafanti/techproject/bo/InputTechProject.java

@@ -54,6 +54,40 @@ public class InputTechProject {
 	
 	@Size(min = 0, max = 255, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String approvalUrl;
+	
+	@Max(value = 9, 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 = 45, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String		comment;
+
+	public Integer getState() {
+		return state;
+	}
+
+	public void setState(Integer state) {
+		this.state = state;
+	}
+
+	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 getId() {
 		return id;

+ 0 - 47
src/main/java/com/goafanti/techproject/bo/InputTechProjectLog.java

@@ -1,47 +0,0 @@
-package com.goafanti.techproject.bo;
-
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.Size;
-
-import com.goafanti.common.constant.ErrorConstants;
-
-public class InputTechProjectLog {
-	
-	@Max(value = 9, 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 = 45, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
-	private String		comment;
-
-	public Integer getState() {
-		return state;
-	}
-
-	public void setState(Integer state) {
-		this.state = state;
-	}
-
-	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;
-	}
-	
-	
-
-}