Antiloveg 8 years ago
parent
commit
861e71209f

+ 2 - 16
src/main/java/com/goafanti/admin/controller/AdminOrderApiController.java

@@ -45,7 +45,7 @@ public class AdminOrderApiController extends CertifyApiController {
 	 */
 	@RequestMapping(value = "/updateAchievementOrder", method = RequestMethod.POST)
 	public Result updateAchievementOrder(@Valid InputAchievementOrder order, BindingResult bindingResult,
-			String recordTimeFormattedDate, Boolean flag) {
+			String recordTimeFormattedDate) {
 		Result res = new Result();
 		if (bindingResult.hasErrors()) {
 			res.getError().add(buildErrorByMsg(bindingResult.getFieldError().getDefaultMessage(),
@@ -68,16 +68,11 @@ public class AdminOrderApiController extends CertifyApiController {
 			return res;
 		}
 		
-		if (flag && StringUtils.isBlank(recordTimeFormattedDate)) {
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到科技需求记录修改时间", "科技需求记录修改时间"));
-			return res;
-		}
 		AchievementOrder achievementOrder = new AchievementOrder();
 		AchievementOrderLog aol = new AchievementOrderLog();
 		BeanUtils.copyProperties(order, achievementOrder);
 		BeanUtils.copyProperties(order, aol);
 		achievementOrderService.updateAchievementOrder(achievementOrder, aol, recordTimeFormattedDate);
-		
 		return res;
 	}
 
@@ -215,7 +210,7 @@ public class AdminOrderApiController extends CertifyApiController {
 	 */
 	@RequestMapping(value = "/updateDemandOrder", method = RequestMethod.POST)
 	public Result updateDemandOrder(@Valid InputDemandOrder inputDemandOrder, BindingResult bindingResult,
-			String recordTimeFormattedDate, Boolean flag) {
+			String recordTimeFormattedDate) {
 		Result res = new Result();
 		if (bindingResult.hasErrors()) {
 			res.getError().add(buildErrorByMsg(bindingResult.getFieldError().getDefaultMessage(),
@@ -238,15 +233,6 @@ public class AdminOrderApiController extends CertifyApiController {
 			return res;
 		}
 
-		if (null == flag) {
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到科技需求修改标记", "科技需求修改标记"));
-			return res;
-		}
-
-		if (flag && StringUtils.isBlank(recordTimeFormattedDate)) {
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到科技需求记录修改时间", "科技需求记录修改时间"));
-			return res;
-		}
 		DemandOrder order = new DemandOrder();
 		DemandOrderLog dol = new DemandOrderLog();
 		BeanUtils.copyProperties(inputDemandOrder, order);