Merge remote-tracking branch 'origin/master'

# Conflicts:
#	service-manager/src/main/java/com/winsun/controller/ActivityRecordController.java

service-manager/src/main/java/com/winsun/controller/ActivityRecordController.java

@@ -10,7 +10,6 @@ import java.util.Map;
 import javax.servlet.ServletOutputStream;
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponse;
 
 
-import com.winsun.utils.PicturesUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -113,7 +112,7 @@ public class ActivityRecordController extends BaseController {
 					map.put("creator", activityRecord.getCreator());
 					map.put("creator", activityRecord.getCreator());
 					map.put("message", activityRecord.getMessage());
 					map.put("message", activityRecord.getMessage());
 					map.put("createTime", activityRecord.getCreateTime());
 					map.put("createTime", activityRecord.getCreateTime());
-					map.put("imageUrl", activityRecord.getImageUrl());
+					
 					newList.add(map);
 					newList.add(map);
 				}
 				}
 			}
 			}
@@ -139,11 +138,7 @@ public class ActivityRecordController extends BaseController {
 		HhrActivityRecord activityRecord = new HhrActivityRecord();
 		HhrActivityRecord activityRecord = new HhrActivityRecord();
 		activityRecord.setId(id);
 		activityRecord.setId(id);
 		activityRecord.setStatus(status);
 		activityRecord.setStatus(status);
-		if ("3".equals(status)) {
-			activityRecord.setRecordIntegral(0);
-		}else{
-			activityRecord.setRecordIntegral(integral);
-		}
+		activityRecord.setRecordIntegral(Integer.parseInt(integral));
 		activityRecord.setRemark(remark);
 		activityRecord.setRemark(remark);
 		activityRecord.setUpdateTime(new Date());
 		activityRecord.setUpdateTime(new Date());
 		int num = activityRecordMapper.updateById(activityRecord);
 		int num = activityRecordMapper.updateById(activityRecord);
@@ -172,7 +167,6 @@ public class ActivityRecordController extends BaseController {
 		List<HhrActivity> listActivity = activityMapper.selectList(wrapperActivity);
 		List<HhrActivity> listActivity = activityMapper.selectList(wrapperActivity);
 		
 		
 		Wrapper<HhrActivityRecord> wrapperRecord = new EntityWrapper<HhrActivityRecord>();
 		Wrapper<HhrActivityRecord> wrapperRecord = new EntityWrapper<HhrActivityRecord>();
-		wrapperRecord.eq("status", 2);
 		List<HhrActivityRecord> listRecord = activityRecordMapper.selectList(wrapperRecord);
 		List<HhrActivityRecord> listRecord = activityRecordMapper.selectList(wrapperRecord);
 		
 		
 		Wrapper<SysUser> wrapperUser = new EntityWrapper<SysUser>();
 		Wrapper<SysUser> wrapperUser = new EntityWrapper<SysUser>();
@@ -189,14 +183,15 @@ public class ActivityRecordController extends BaseController {
 			String userId = sysUser.getId();
 			String userId = sysUser.getId();
 			if(null != refMap.get(userId)) {
 			if(null != refMap.get(userId)) {
 				for(School school : schoolList) {
 				for(School school : schoolList) {
-					if(refMap.get(userId).toString().equals(school.getId() + "")) {
+					if(refMap.get(userId).toString().equals(school.getId())) {
 						sysUser.setSubstName(school.getSubName());
 						sysUser.setSubstName(school.getSubName());
-						sysUser.setSchoolName(school.getSchoolName());
+						sysUser.setSchoolName(school.getSubName());
 					}
 					}
 				}
 				}
 			}
 			}
 		}
 		}
-
+		
+		
 		Page<Map<String, Object>> page = new Page<>(pageIndex, pageSize);
 		Page<Map<String, Object>> page = new Page<>(pageIndex, pageSize);
 		List<Map<String, Object>> newList = new ArrayList<Map<String,Object>>();
 		List<Map<String, Object>> newList = new ArrayList<Map<String,Object>>();
 		for(HhrActivityRecord activityRecord : listRecord) {
 		for(HhrActivityRecord activityRecord : listRecord) {
@@ -361,27 +356,19 @@ public class ActivityRecordController extends BaseController {
      *
      *
      * @return
      * @return
      */
      */
-	@Permission(menuname = "添加活动参与记录", value = "addActivityRecord", method = RequestMethod.POST)
-    public ResponseData<String> getActivityInfo(String activityId,String message,String imageUrl) {
+    @ResponseBody
+    @RequestMapping(value = "addActivityRecord", method = RequestMethod.POST)
+    public ResponseData<String> getActivityInfo(String id,String message,String imageUrl) {
     	ShiroUser user = getShiroUser();
     	ShiroUser user = getShiroUser();
-
-    	if (user == null) {
-    		return ResponseData.error("当前用户登录失败！");
-		}
-
-    	if(StringUtils.isNotBlank(imageUrl)) {
-    		return ResponseData.error("请上传图片");
-		}
-
+    	
 		HhrActivityRecord activityRecord = new HhrActivityRecord();
 		HhrActivityRecord activityRecord = new HhrActivityRecord();
-		activityRecord.setActivityId(activityId);
+		activityRecord.setActivityId(id);
 		activityRecord.setMessage(message);
 		activityRecord.setMessage(message);
-		activityRecord.setImageUrl(PicturesUtil.uploadPictures(imageUrl, new Date().getTime() + "", "activity"));
+		activityRecord.setImageUrl(imageUrl);
 		activityRecord.setCreateId(Integer.toString(user.getId()));
 		activityRecord.setCreateId(Integer.toString(user.getId()));
 		activityRecord.setCreator(user.getName());
 		activityRecord.setCreator(user.getName());
 		activityRecord.setCreateTime(new Date());
 		activityRecord.setCreateTime(new Date());
-		activityRecord.setRecordIntegral(0);
-		activityRecord.setStatus("1");
+		
 		int num = activityRecordMapper.insert(activityRecord);
 		int num = activityRecordMapper.insert(activityRecord);
 		if(num > 0) {
 		if(num > 0) {
 			return ResponseData.success("提交成功！");
 			return ResponseData.success("提交成功！");