Antiloveg 8 years ago
parent
commit
6ddb1aa223

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

@@ -2542,7 +2542,7 @@ public class AdminApiController extends CertifyApiController {
 	 */
 	@RequestMapping(value = "/disposeCenterDetail", method = RequestMethod.POST)
 	public Result disposeCenterDetail(@Valid InputOrgTechCenterDetail orgTechCenterDetail, BindingResult bindingResult,
-			String projectTimeFormattedDate, String termTimeFormattedDate) {
+			String projectTimeFormattedDate, String termStartTimeFormattedDate, String termEndTimeFormattedDate) {
 		Result res = new Result();
 
 		if (bindingResult.hasErrors()) {
@@ -2562,9 +2562,16 @@ public class AdminApiController extends CertifyApiController {
 			} catch (ParseException e) {
 			}
 		}
-		if (!StringUtils.isBlank(termTimeFormattedDate)) {
+		if (!StringUtils.isBlank(termStartTimeFormattedDate)) {
 			try {
-				orgTechCenterDetail.setTermTime(DateUtils.parseDate(termTimeFormattedDate, AFTConstants.YYYYMMDD));
+				orgTechCenterDetail.setTermStartTime(DateUtils.parseDate(termStartTimeFormattedDate, AFTConstants.YYYYMMDD));
+			} catch (ParseException e) {
+			}
+		}
+		
+		if (!StringUtils.isBlank(termEndTimeFormattedDate)){
+			try {
+				orgTechCenterDetail.setTermEndTime(DateUtils.parseDate(termEndTimeFormattedDate, AFTConstants.YYYYMMDD));
 			} catch (ParseException e) {
 			}
 		}

+ 20 - 7
src/main/java/com/goafanti/cognizance/bo/InputOrgTechCenterDetail.java

@@ -28,9 +28,14 @@ public class InputOrgTechCenterDetail {
 	private Date	projectTime;
 
 	/**
-	 * 期限
+	 * 期限开始时间
 	 */
-	private Date	termTime;
+	private Date	termStartTime;
+
+	/**
+	 * 期限截止时间
+	 */
+	private Date	termEndTime;
 
 	public String getId() {
 		return id;
@@ -80,13 +85,21 @@ public class InputOrgTechCenterDetail {
 		this.projectTime = projectTime;
 	}
 
-	public Date getTermTime() {
-		return termTime;
+	public Date getTermStartTime() {
+		return termStartTime;
 	}
 
-	public void setTermTime(Date termTime) {
-		this.termTime = termTime;
+	public void setTermStartTime(Date termStartTime) {
+		this.termStartTime = termStartTime;
 	}
-	
+
+	public Date getTermEndTime() {
+		return termEndTime;
+	}
+
+	public void setTermEndTime(Date termEndTime) {
+		this.termEndTime = termEndTime;
+	}
+
 	
 }

+ 10 - 3
src/main/java/com/goafanti/cognizance/controller/CognizanceApiController.java

@@ -939,7 +939,7 @@ public class CognizanceApiController extends CertifyApiController {
 	 */
 	@RequestMapping(value = "/disposeCenterDetail", method = RequestMethod.POST)
 	public Result disposeCenterDetail(@Valid InputOrgTechCenterDetail orgTechCenterDetail, BindingResult bindingResult, String projectTimeFormattedDate,
-			String termTimeFormattedDate)  {
+			String termStartTimeFormattedDate, String termEndTimeFormattedDate)  {
 		Result res = new Result();
 		
 		if (bindingResult.hasErrors()) {
@@ -964,9 +964,16 @@ public class CognizanceApiController extends CertifyApiController {
 			} catch (ParseException e) {
 			}
 		}
-		if (!StringUtils.isBlank(termTimeFormattedDate)) {
+		if (!StringUtils.isBlank(termStartTimeFormattedDate)) {
 			try {
-				orgTechCenterDetail.setTermTime(DateUtils.parseDate(termTimeFormattedDate, AFTConstants.YYYYMMDD));
+				orgTechCenterDetail.setTermStartTime(DateUtils.parseDate(termStartTimeFormattedDate, AFTConstants.YYYYMMDD));
+			} catch (ParseException e) {
+			}
+		}
+		
+		if (!StringUtils.isBlank(termEndTimeFormattedDate)) {
+			try {
+				orgTechCenterDetail.setTermEndTime(DateUtils.parseDate(termEndTimeFormattedDate, AFTConstants.YYYYMMDD));
 			} catch (ParseException e) {
 			}
 		}