Antiloveg лет назад: 8
Родитель
Сommit
a63631b0e0

+ 22 - 5
src/main/java/com/goafanti/activity/bo/InputActivity.java

@@ -4,12 +4,14 @@ import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
 import javax.validation.constraints.Size;
 
+import org.apache.commons.lang3.StringUtils;
+
 import com.goafanti.common.constant.ErrorConstants;
+import com.goafanti.common.utils.FileUtils;
 
 public class InputActivity {
-	@Max(value = 999999999999999999L, message = "{" + ErrorConstants.PARAM_ERROR + "}")
-	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
-	private Long	id;
+	@Size(min = 0, max = 18, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String	id;
 
 	@Size(min = 0, max = 45, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String	name;
@@ -47,12 +49,15 @@ public class InputActivity {
 	 * 描述
 	 */
 	private String	summary;
+	
+	
+	
 
-	public Long getId() {
+	public String getId() {
 		return id;
 	}
 
-	public void setId(Long id) {
+	public void setId(String id) {
 		this.id = id;
 	}
 
@@ -143,5 +148,17 @@ public class InputActivity {
 	public void setSummary(String summary) {
 		this.summary = summary;
 	}
+	
+	public Long getLid() {
+		if (StringUtils.isBlank(this.id) || !StringUtils.isNumeric(this.id)) {
+			return null;
+		} else {
+			return Long.parseLong(this.id);
+		}
+	}
+
+	public void setLid(String lid) {
+
+	} 
 
 }

+ 1 - 1
src/main/java/com/goafanti/activity/service/ActivityService.java

@@ -15,7 +15,7 @@ public interface ActivityService {
 			String enrollDeadlineFormattedDate);
 
 	int update(Activity data, String startTimeFormattedDate, String endTimeFormattedDate,
-			String enrollDeadlineFormattedDate);
+			String enrollDeadlineFormattedDate, Long id);
 
 	int batchDeleteByPrimaryKey(List<String> asList);
 

+ 3 - 2
src/main/java/com/goafanti/activity/service/impl/ActivityServiceImpl.java

@@ -88,7 +88,8 @@ public class ActivityServiceImpl extends BaseMybatisDao<ActivityMapper> implemen
 
 	@Override
 	public int update(Activity a, String startTimeFormattedDate, String endTimeFormattedDate,
-			String enrollDeadlineFormattedDate) {
+			String enrollDeadlineFormattedDate, Long id) {
+		a.setId(id);
 		return activityMapper.updateByPrimaryKeyWithBLOBs(
 				disposeActivity(a, startTimeFormattedDate, endTimeFormattedDate, enrollDeadlineFormattedDate));
 	}
@@ -120,7 +121,7 @@ public class ActivityServiceImpl extends BaseMybatisDao<ActivityMapper> implemen
 		return activityMapper.selectByPrimaryKey(id);
 	}
 
-	//@Cacheable(value = "ActivityPortalListCache", key = "'ActivityPortalList:Page:'+#pageNo+'Size:'+#pageSize+'Form:'+#form")
+	@Cacheable(value = "ActivityPortalListCache", key = "'ActivityPortalList:Page:'+#pageNo+'Size:'+#pageSize+'Form:'+#form")
 	public List<Activity> findPortalList(Integer pageNo, Integer pageSize, Integer form) {
 		Map<String, Object> params = new HashMap<String, Object>();
 		params.put("pageSize", pageSize);

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

@@ -84,7 +84,7 @@ public class AdminActivityApiController extends BaseApiController {
 	 */
 	@RequestMapping(value = "/update", method = RequestMethod.POST)
 	public Result update(@Valid InputActivity ia, BindingResult bindingResult, String startTimeFormattedDate,
-			String endTimeFormattedDate, String enrollDeadlineFormattedDate) {
+			String endTimeFormattedDate, String enrollDeadlineFormattedDate, String id) {
 		Result res = new Result();
 		if (bindingResult.hasErrors()) {
 			res.getError().add(buildErrorByMsg(bindingResult.getFieldError().getDefaultMessage(),
@@ -92,7 +92,7 @@ public class AdminActivityApiController extends BaseApiController {
 			return res;
 		}
 		
-		if (null == ia.getId()) {
+		if (StringUtils.isNotBlank(ia.getId())) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "活动ID"));
 			return res;
 		}
@@ -103,7 +103,7 @@ public class AdminActivityApiController extends BaseApiController {
 		}
 		
 		activityService.update((Activity) res.getData(), startTimeFormattedDate, endTimeFormattedDate,
-				enrollDeadlineFormattedDate);
+				enrollDeadlineFormattedDate, ia.getLid());
 		return res;
 	}
 	

+ 3 - 3
src/main/webapp/WEB-INF/views/portal/ipr/apply.html

@@ -61,19 +61,19 @@
 					<div class="apply_modal">
 						<h1>实用新型</h1>
 						<a
-							th:href="${basePath + '/user/account/services.html#contract.html'}">我要申请</a>
+							th:href="${basePath + '/user/account/services.html#contract'}">我要申请</a>
 					</div></li>
 				<li><img th:src="${portalHost + '/img/ipr_img_2.png'}" />
 					<div class="apply_modal">
 						<h1>实用新型</h1>
 						<a
-							th:href="${basePath + '/user/account/services.html#contract.html'}">我要申请</a>
+							th:href="${basePath + '/user/account/services.html#contract'}">我要申请</a>
 					</div></li>
 				<li><img th:src="${portalHost + '/img/ipr_img_3.png'}" />
 					<div class="apply_modal">
 						<h1>实用新型</h1>
 						<a
-							th:href="${basePath + '/user/account/services.html#contract.html'}">我要申请</a>
+							th:href="${basePath + '/user/account/services.html#contract'}">我要申请</a>
 					</div></li>
 				<li><img th:src="${portalHost + '/img/ipr_img_4.png'}" />
 					<div class="apply_modal">