|
@@ -21,6 +21,7 @@ import com.caimei.utils.AppUtils;
|
|
import com.caimei.utils.DateUtils;
|
|
import com.caimei.utils.DateUtils;
|
|
import com.caimei.utils.MD5Util;
|
|
import com.caimei.utils.MD5Util;
|
|
import com.caimei.vo.JsonModel;
|
|
import com.caimei.vo.JsonModel;
|
|
|
|
+import com.fasterxml.jackson.annotation.JsonFormat;
|
|
import com.google.common.collect.Maps;
|
|
import com.google.common.collect.Maps;
|
|
import com.thinkgem.jeesite.common.config.Global;
|
|
import com.thinkgem.jeesite.common.config.Global;
|
|
import com.thinkgem.jeesite.common.persistence.Page;
|
|
import com.thinkgem.jeesite.common.persistence.Page;
|
|
@@ -1401,12 +1402,21 @@ public class AgencyController extends BaseController {
|
|
|
|
|
|
@RequestMapping("/clubPortrait")
|
|
@RequestMapping("/clubPortrait")
|
|
public String clubPortrait(CmPortrait cmPortrait, Model model) {
|
|
public String clubPortrait(CmPortrait cmPortrait, Model model) {
|
|
- CmPortrait portrait = portraitService.dataList(cmPortrait);
|
|
|
|
|
|
+ //CmPortrait portrait = portraitService.dataList(cmPortrait);
|
|
model.addAttribute("cmPortrait",cmPortrait);
|
|
model.addAttribute("cmPortrait",cmPortrait);
|
|
- model.addAttribute("portrait",portrait);
|
|
|
|
|
|
+ //model.addAttribute("portrait",portrait);
|
|
return "modules/userNew/cmClubPortrait";
|
|
return "modules/userNew/cmClubPortrait";
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ @RequestMapping("/selPortraitData")
|
|
|
|
+ @ResponseBody
|
|
|
|
+ public Map<String,Object> selPortraitData(CmPortrait cmPortrait) {
|
|
|
|
+ Map<String, Object> map = Maps.newLinkedHashMap();
|
|
|
|
+ CmPortrait portrait = portraitService.dataList(cmPortrait);
|
|
|
|
+ map.put("portrait",portrait);
|
|
|
|
+ return map;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
|
|
@RequestMapping("/clubData")
|
|
@RequestMapping("/clubData")
|
|
public String clubData(NewCmClub newCmClub, Model model, HttpServletRequest request, HttpServletResponse response) {
|
|
public String clubData(NewCmClub newCmClub, Model model, HttpServletRequest request, HttpServletResponse response) {
|