Skip to content

caosy / fun-admin

Go to a project
Commit 454c1c0a by chongli
Options

会服亲密度优化

parent a3411808
Inline Side-by-side
Showing with 461 additions and 48 deletions
src/main/java/com/ctrip/fun/admin/controller/JsonController.java
......@@ -2338,6 +2338,9 @@ public class JsonController {
if(eventGamePlayerForm.getPlayerName()!=null&&!"".equals(eventGamePlayerForm.getPlayerName())){
temp.setPlayerName(eventGamePlayerForm.getPlayerName());
}
if(eventGamePlayerForm.getPlayerName()!=null&&!"".equals(eventGamePlayerForm.getPlayerName())){
temp.setPlayerName(eventGamePlayerForm.getPlayerName());
}
eventGamePlayerService.update("", temp);
}
}
......@@ -2366,6 +2369,8 @@ public class JsonController {
return response;
}
@RequestMapping(value = "/playerInfoList", method = RequestMethod.GET)
@ResponseStatus(HttpStatus.OK)
@ResponseBody
......@@ -2380,15 +2385,15 @@ public class JsonController {
return response;
}
@RequestMapping(value = "/getEventCustomerInfoByName", method = RequestMethod.GET)
@RequestMapping(value = "/getEventCustomerInfoByNameOrPhone", method = RequestMethod.GET)
@ResponseStatus(HttpStatus.OK)
@ResponseBody
public Response<List<EventCustomerInfoBean>> getEventCustomerInfoByName(HttpServletRequest request, @RequestParam(value = "playerName", required = false) String playerName) {
public Response<List<EventCustomerInfoBean>> getEventCustomerInfoByName(HttpServletRequest request, @RequestParam(value = "nameOrPhone", required = false) String nameOrPhone) {
Response<List<EventCustomerInfoBean>> response = new Response<List<EventCustomerInfoBean>>();
response.setStatus(ResponseStatusEnum.SUCCESS.getValue());
response.setMessage(ResponseStatusEnum.SUCCESS.getMsg());
EventCustomerInfoQuery query = new EventCustomerInfoQuery();
query.setcName(playerName);
query.setcName(nameOrPhone);
List<EventCustomerInfoBean> list = eventCustomerInfoService.getEventCustomerInfoByName(query);
response.setBody(list);
return response;
......@@ -2418,7 +2423,7 @@ public class JsonController {
EventGamePlayerQuery query = new EventGamePlayerQuery();
query.setPlayerName(playerName);
query.setSortField("id");
PagedResponseBean<EventGamePlayerBean> pagedList = eventGamePlayerService.list("", query);
PagedResponseBean<EventGamePlayerBean> pagedList = eventGamePlayerService.playerAllInfoList("", query);
response.setBody((List<EventGamePlayerBean>)pagedList.getResult());
return response;
}
......
src/main/java/com/ctrip/fun/admin/controller/communeservice/EventGameController.java
package com.ctrip.fun.admin.controller.communeservice;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
......@@ -15,6 +16,7 @@ import com.ctrip.fun.admin.service.market.EventGameService;
import com.ctrip.fun.common.core.util.BeanConverter;
import com.ctrip.fun.common.core.util.DateUtil;
import com.ctrip.fun.common.vo.PagedResponseBean;
import com.ctrip.fun.common.vo.Response;
import com.ctrip.fun.common.vo.SortDirectionEnum;
import com.ctrip.fun.common.vo.market.EventGameBean;
import com.ctrip.fun.common.vo.market.EventGameGroupBean;
......@@ -24,12 +26,15 @@ import com.ctrip.fun.common.vo.market.EventGamePlayerQuery;
import com.ctrip.fun.common.vo.market.EventGameQuery;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.ResponseStatus;
import javax.servlet.http.HttpServletRequest;
......@@ -53,22 +58,26 @@ public class EventGameController {
if (null != request.getParameter("page")) {
currentPage = Integer.parseInt(request.getParameter("page"));
}
if(form.getPlayDateStart()==null){
Date date = new Date();//获取当前时间
Calendar calendar = Calendar.getInstance();
calendar.setTime(date);
calendar.add(Calendar.MONTH, -6);//当前时间前去一个月，即一个月前的时间
if(form.getPlayDateStart()==null){
calendar.add(Calendar.MONTH, -5);//六个月前
form.setPlayDateStart(calendar.getTime());
}
if(form.getPlayDateEnd()==null){
form.setPlayDateEnd(DateUtil.getToday());
calendar.add(Calendar.MONTH,6);//一个月后
form.setPlayDateEnd(calendar.getTime());
}
EventGameQuery query = new EventGameQuery();
query.setCourseId(form.getCourseId());
query.setCourseName(form.getGameName());
query.setPlayDateStart(form.getPlayDateStart());
query.setPlayDateEnd(form.getPlayDateEnd());
query.setPlayerName(form.getPlayerName());
query.setId(form.getId());
query.setFirstPlayer(form.getFirstPlayer());
query.setSecondPlayer(form.getSecondPlayer());
query.setPagerOffset(currentPage * query.getPagerPerPage());
query.setSortField("createTime");
......@@ -79,7 +88,8 @@ public class EventGameController {
model.put("list", response.getResult());
model.put("paginationData", new PaginationForm(currentPage, pageSize, pageCount, total));
model.put("firstPlayer",form.getFirstPlayer());
model.put("secondPlayer",form.getSecondPlayer());
return "market/eventGameList";
}
......@@ -123,7 +133,7 @@ public class EventGameController {
//根据gameId获取该赛事的所有group（list）
EventGameGroupQuery query = new EventGameGroupQuery();
query.setGameId(eventGameGroupForm.getGameId());
query.setSortField("groupNum");
query.setSortField("groupTime");
query.setSortDirection(SortDirectionEnum.ASC);
PagedResponseBean<EventGameGroupBean> list = eventGameGroupService.list("",query);
//加载每个组中的人员信息
......@@ -147,8 +157,8 @@ public class EventGameController {
public String createGroupPost(HttpServletRequest request, @ModelAttribute("eventGameGroupForm") EventGameGroupForm eventGameGroupForm, ModelMap model) {
//得到同一场赛事中当前最大组号
int maxGroupNum = 0;
//得到同一场赛事中最大的组时间
int maxGroupTime = 360;
//得到批量创建的开始时间
int beginGroupTime = eventGameGroupForm.getTeeTime();
EventGameGroupQuery query_max =new EventGameGroupQuery();
query_max.setGameId(eventGameGroupForm.getGameId());
......@@ -161,9 +171,6 @@ public class EventGameController {
if(bean.getGroupNum()>maxGroupNum){
maxGroupNum=bean.getGroupNum();
}
if(bean.getGroupTime()>maxGroupTime){
maxGroupTime=bean.getGroupTime();
}
}
}
......@@ -172,7 +179,7 @@ public class EventGameController {
EventGameGroupBean bean = new EventGameGroupBean();
bean.setGameId(eventGameGroupForm.getGameId());
bean.setGroupNum(maxGroupNum+i);
bean.setGroupTime(maxGroupTime+i*eventGameGroupForm.getJianGe());
bean.setGroupTime(beginGroupTime+(i-1)*eventGameGroupForm.getJianGe());
int groupid = eventGameGroupService.add(request.getAttribute("userName").toString(), bean);
//更新player表中的groupID
query.setGameId(eventGameGroupForm.getGameId());
......@@ -254,6 +261,78 @@ public class EventGameController {
return "market/recommendPlayer";
}
@RequestMapping(value = "/deleteGroup", method = RequestMethod.POST)
public String deleteGroup(HttpServletRequest request, @RequestParam(value = "gameId", required = false) String gameId,@RequestParam(value = "groupId", required = false) String groupId, ModelMap model) {
eventGameGroupService.deleteGroup(gameId,Integer.parseInt(groupId));
return "redirect:createGroupGet?gameId="+gameId;
}
@RequestMapping(value = "/addGroupPlayer", method = RequestMethod.POST)
public String addGroupPlayer(HttpServletRequest request, @ModelAttribute("eventGamePlayerForm") EventGamePlayerForm eventGamePlayerForm,ModelMap model) {
EventGamePlayerBean eventGamePlayerBean = new EventGamePlayerBean();
eventGamePlayerBean.setGroupId(eventGamePlayerForm.getGroupId());
eventGamePlayerBean.setPlayerName(eventGamePlayerForm.getPlayerName());
eventGamePlayerBean.setRemark(eventGamePlayerForm.getRemark());
eventGamePlayerBean.setSex(eventGamePlayerForm.getSex());
eventGamePlayerBean.setMobilePhone(eventGamePlayerForm.getMobilePhone());
eventGamePlayerBean.setGameId(eventGamePlayerForm.getGameId());
eventGamePlayerBean.setGroupNum(eventGamePlayerForm.getGroupNum());
eventGamePlayerService.add("", eventGamePlayerBean);
int gameId = eventGamePlayerForm.getGameId();
Response<Serializable> response = new Response<>();
return "redirect:createGroupGet?gameId="+gameId;
}
@RequestMapping(value = "/editGroupPlayer", method = RequestMethod.POST)
public String editGroupPlayer(HttpServletRequest request, @ModelAttribute("eventGamePlayerForm") EventGamePlayerForm eventGamePlayerForm,ModelMap model) {
EventGamePlayerBean eventGamePlayerBean = new EventGamePlayerBean();
eventGamePlayerBean.setId(eventGamePlayerForm.getId());
eventGamePlayerBean.setPlayerName(eventGamePlayerForm.getPlayerName());
eventGamePlayerBean.setRemark(eventGamePlayerForm.getRemark());
eventGamePlayerBean.setSex(eventGamePlayerForm.getSex());
eventGamePlayerBean.setMobilePhone(eventGamePlayerForm.getMobilePhone());
EventGamePlayerQuery query =new EventGamePlayerQuery();
query.setId(eventGamePlayerForm.getId());
query.setSortField("id");
PagedResponseBean<EventGamePlayerBean> players = eventGamePlayerService.list("", query);
if(players.getResult()!=null&&players.getResult().size()>0){
List<EventGamePlayerBean> list = (ArrayList<EventGamePlayerBean>)players.getResult();
for(EventGamePlayerBean temp:list){
if(eventGamePlayerForm.getMobilePhone()!=null&&!"".equals(eventGamePlayerForm.getMobilePhone())){
temp.setMobilePhone(eventGamePlayerForm.getMobilePhone());
}
if(eventGamePlayerForm.getPlayerName()!=null&&!"".equals(eventGamePlayerForm.getPlayerName())){
temp.setPlayerName(eventGamePlayerForm.getPlayerName());
}
if(eventGamePlayerForm.getSex()!=null&&!"".equals(eventGamePlayerForm.getSex())){
temp.setSex(eventGamePlayerForm.getSex());
}
if(eventGamePlayerForm.getRemark()!=null&&!"".equals(eventGamePlayerForm.getRemark())){
temp.setRemark(eventGamePlayerForm.getRemark());
}
if(eventGamePlayerForm.getSex()!=null&&!"".equals(eventGamePlayerForm.getSex())){
temp.setSex(eventGamePlayerForm.getSex());
}
eventGamePlayerService.update("", temp);
}
}
return "redirect:createGroupGet?gameId="+eventGamePlayerForm.getGameId();
}
@RequestMapping(value = "/deleteGroupPlayer", method = RequestMethod.GET)
public String deleteGroupPlayer(HttpServletRequest request, @ModelAttribute("eventGamePlayerForm") EventGamePlayerForm eventGamePlayerForm,ModelMap model) {
eventGamePlayerService.delete("", eventGamePlayerForm.getId());
return "redirect:createGroupGet?gameId="+eventGamePlayerForm.getGameId();
}
public EventGameService getService() {
return service;
}
......
src/main/java/com/ctrip/fun/admin/form/market/EventGameGroupForm.java
......@@ -6,7 +6,7 @@ public class EventGameGroupForm {
private Integer gameId;// 球场id
private Integer zuShu;// 批量创建时的组数
private Integer jianGe;// 批量创建时的每组间隔时间
private String formatTeeTime;//格式化TeeTime
private String formatTeeTime;//前台传入的格式化TeeTime
private Integer teeTime;
public Integer getId() {
......
src/main/java/com/ctrip/fun/admin/form/market/EventGamePlayerForm.java
......@@ -8,9 +8,20 @@ public class EventGamePlayerForm {
private String sex;//性别
private Integer candicate;//差点
private String remark;//备注
private Integer groupId;//组id
private Integer gameId;//赛事id
private Integer groupNum;//分组号
public Integer getGroupNum() {
return groupNum;
}
public void setGroupNum(Integer groupNum) {
this.groupNum = groupNum;
}
public Integer getId() {
return id;
}
......@@ -67,4 +78,20 @@ public class EventGamePlayerForm {
this.playerName = playerName;
}
public Integer getGroupId() {
return groupId;
}
public void setGroupId(Integer groupId) {
this.groupId = groupId;
}
public Integer getGameId() {
return gameId;
}
public void setGameId(Integer gameId) {
this.gameId = gameId;
}
}
src/main/java/com/ctrip/fun/admin/form/market/EventGameQueryForm.java
......@@ -14,6 +14,11 @@ public class EventGameQueryForm {
private Date playDateStart;// 赛事时间查询开始日期
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date playDateEnd;// 赛事时间查询结束日期
private String playerName;//打球人姓名
private String firstPlayer;//第一个打球人姓名或手机号
private String secondPlayer;//第二个打球人姓名或手机号
public Integer getId() {
return id;
......@@ -51,5 +56,23 @@ public class EventGameQueryForm {
public void setPlayDateEnd(Date playDateEnd) {
this.playDateEnd = playDateEnd;
}
public String getPlayerName() {
return playerName;
}
public void setPlayerName(String playerName) {
this.playerName = playerName;
}
public String getFirstPlayer() {
return firstPlayer;
}
public void setFirstPlayer(String firstPlayer) {
this.firstPlayer = firstPlayer;
}
public String getSecondPlayer() {
return secondPlayer;
}
public void setSecondPlayer(String secondPlayer) {
this.secondPlayer = secondPlayer;
}
}
src/main/java/com/ctrip/fun/admin/service/golf/EventCustomerInfoService.java
......@@ -54,7 +54,7 @@ public class EventCustomerInfoService extends BaseService {
* 根据用户姓名查询其在赛事中留下的电话信息
*/
public List<EventCustomerInfoBean> getEventCustomerInfoByName(EventCustomerInfoQuery query) {
String uri = super.getServiceUri("uri.eventCustomer.getEventCustomerInfoByName");
String uri = super.getServiceUri("uri.eventCustomer.getEventCustomerInfoByNameOrPhone");
Request<EventCustomerInfoQuery> request = new Request<EventCustomerInfoQuery>("", query);
HttpEntity<Request<EventCustomerInfoQuery>> entity = new HttpEntity<Request<EventCustomerInfoQuery>>(request);
Response<List<EventCustomerInfoBean>> response = null;
......
src/main/java/com/ctrip/fun/admin/service/market/EventGameGroupService.java
......@@ -114,7 +114,7 @@ public class EventGameGroupService extends BaseService{
}
/**
* 更新模板
* 更新组信息
*
* @param userId 用户ID
* @param bean 模板实体
......@@ -147,4 +147,39 @@ public class EventGameGroupService extends BaseService{
return retVal;
}
/**
* 更新模板
*
* @param userId 用户ID
* @param bean 模板实体
* @return 实体主键
*/
public boolean deleteGroup(String userId, Integer groupId) {
String uri = super.getServiceUri("uri.eventGameGroup.deleteGroup");
boolean retVal = false;
Request<Integer> request = new Request<Integer>();
request.setUserId(userId);
request.setBody(groupId);
HttpEntity<Request<Integer>> entity = new HttpEntity<Request<Integer>>(request);
Response<Integer> response = super.exchange(uri,
HttpMethod.POST,
entity,
new ParameterizedTypeReference<Response<Integer>>() {
}
).getBody();
if (null != response) {
if (response.getStatus() == ResponseStatusEnum.SUCCESS.getValue()) {
retVal = true;
} else {
logger.error(String.format("[add] status: %d, msg: %s", response.getStatus(), response.getMessage()));
}
}
return retVal;
}
}
src/main/java/com/ctrip/fun/admin/service/market/EventGamePlayerService.java
......@@ -48,6 +48,36 @@ public class EventGamePlayerService extends BaseService{
}
/**
* 删除小组成员
*
* @param userId 用户ID
* @param id 模板ID
* @return 模板实体
*/
public EventGamePlayerBean delete(String userId, int id) {
String uri = super.getServiceUri("uri.eventGamePlayer.delete");
EventGamePlayerBean retBean = null;
HttpEntity<Request<Integer>> entity = new HttpEntity<Request<Integer>>(new Request<Integer>(userId, id));
Response<EventGamePlayerBean> response = super.exchange(uri,
HttpMethod.POST,
entity,
new ParameterizedTypeReference<Response<EventGamePlayerBean>>() {
}
).getBody();
if (null != response) {
if (response.getStatus() == 0) {
retBean = (EventGamePlayerBean) response.getBody();
} else {
logger.error(String.format("[get] status: %d, msg: %s", response.getStatus(), response.getMessage()));
}
}
return retBean;
}
/**
* 创建模板
*
* @param userId 用户ID
......@@ -88,6 +118,32 @@ public class EventGamePlayerService extends BaseService{
* @param query 查询条件
* @return 供应商列表
*/
public PagedResponseBean<EventGamePlayerBean> playerAllInfoList(String userId, EventGamePlayerQuery query) {
PagedResponseBean<EventGamePlayerBean> responseBean = null;
String uri = super.getServiceUri("uri.eventGamePlayer.playerAllInfoList");
Request<EventGamePlayerQuery> request = new Request<EventGamePlayerQuery>(userId, query);
HttpEntity<Request<EventGamePlayerQuery>> entity = new HttpEntity<Request<EventGamePlayerQuery>>(request);
Response<PagedResponseBean<EventGamePlayerBean>> response = super.exchange(uri,
HttpMethod.POST,
entity,
new ParameterizedTypeReference<Response<PagedResponseBean<EventGamePlayerBean>>>() {
}
).getBody();
if (null != response) {
if (response.getStatus() == 0) {
responseBean = response.getBody();
} else {
logger.error(String.format("[list] status: %d, msg: %s", response.getStatus(), response.getMessage()));
}
}
return responseBean;
}
public PagedResponseBean<EventGamePlayerBean> list(String userId, EventGamePlayerQuery query) {
PagedResponseBean<EventGamePlayerBean> responseBean = null;
String uri = super.getServiceUri("uri.eventGamePlayer.list");
......@@ -113,6 +169,8 @@ public class EventGamePlayerService extends BaseService{
return responseBean;
}
//playerAllInfoList
/**
* 更新模板
*
......
src/main/resources/properties/service.properties
......@@ -457,15 +457,17 @@ uri.eventGameGroup.add=/fun-golf-service/eventGameGroup/add
uri.eventGameGroup.get=/fun-golf-service/eventGameGroup/get
uri.eventGameGroup.list=/fun-golf-service/eventGameGroup/list
uri.eventGameGroup.update=/fun-golf-service/eventGameGroup/update
uri.eventGameGroup.deleteGroup=/fun-golf-service/eventGameGroup/deleteGroup
#eventGameGroup
uri.eventGamePlayer.add=/fun-golf-service/eventGamePlayer/add
uri.eventGamePlayer.delete=/fun-golf-service/eventGamePlayer/delete
uri.eventGamePlayer.get=/fun-golf-service/eventGamePlayer/get
uri.eventGamePlayer.list=/fun-golf-service/eventGamePlayer/list
uri.eventGamePlayer.update=/fun-golf-service/eventGamePlayer/update
uri.eventGamePlayer.playerInfoList=/fun-golf-service/eventGamePlayer/playerInfoList
uri.eventGamePlayer.recommendPlayerByName=/fun-golf-service/eventGamePlayer/recommendPlayerByName
uri.eventGamePlayer.recommendPlayerByPhone=/fun-golf-service/eventGamePlayer/recommendPlayerByPhone
uri.eventGamePlayer.playerAllInfoList=/fun-golf-service/eventGamePlayer/playerAllInfoList
#communeExt
uri.communeExt.list=/fun-golf-service/communeExt/list
uri.communeExt.get=/fun-golf-service/communeExt/get
......@@ -500,7 +502,7 @@ uri.eventCustomer.importExcelGroupInfo=/fun-golf-service/eventCustomerInfo/impor
uri.eventCustomer.importExcelRankList=/fun-golf-service/eventCustomerInfo/importExcelRankList
uri.eventCustomer.listByResourceIdAndPriceDate=/fun-golf-service/eventCustomerInfo/listByResourceIdAndPriceDate
uri.eventCustomer.findOrderPlayers=/fun-golf-service/eventCustomerInfo/findOrderPlayers
uri.eventCustomer.getEventCustomerInfoByName=/fun-golf-service/eventCustomerInfo/getEventCustomerInfoByName
uri.eventCustomer.getEventCustomerInfoByNameOrPhone=/fun-golf-service/eventCustomerInfo/getEventCustomerInfoByNameOrPhone
uri.eventCustomer.listGroupByResourceIdAndPriceDate=/fun-golf-service/eventCustomerInfo/listGroupByResourceIdAndPriceDate
uri.eventCustomer.updateGroupNum=/fun-golf-service/eventCustomerInfo/updateGroupNum
uri.eventCustomer.getByEventCustomerId=/fun-golf-service/eventCustomerInfo/getByEventCustomerId
......
src/main/webapp/WEB-INF/templates/golf/gameList.ftl
......@@ -7,6 +7,8 @@
<@com.textInput "form.gameName" "style=\"margin-left: 5px;\"" "赛事名称"/>
<@com.textInput "form.courseId" "style=\"margin-left: 5px;\"" "球场ID"/>
<@com.textInput "form.playerName" "style=\"margin-left: 5px;\"" "打球人姓名"/>
<@com.singleSelectQuery path="form.gameType" options=enums["com.ctrip.fun.common.vo.app.GameTypeEnum"] attributes="" label="赛事类型" />
<@com.singleSelectQuery path="form.gameStatus" options=enums["com.ctrip.fun.common.vo.app.GameStatusEnum"] attributes="" label="状态"/>
<button id="J_submit" class="btn btn-primary">查询</button>
......
src/main/webapp/WEB-INF/templates/market/createGroup.ftl
......@@ -6,18 +6,23 @@
$("input[name='supplierId']").click(function(){
thisTrChildren = $(this).parents("tr")[0].children;
var name;
if(thisTrChildren.length==6){
var phone;
var nameOrPhone;
if(thisTrChildren.length==7){
name=thisTrChildren[2].innerHTML;
phone=thisTrChildren[3].innerHTML;
}else{
name=thisTrChildren[1].innerHTML;
phone=thisTrChildren[2].innerHTML;
}
nameOrPhone = phone!=""?phone:name;
$("#supplierModal").modal('show');
$.ajax({
url: "/j/getEventCustomerInfoByName" ,
url: "/j/getEventCustomerInfoByNameOrPhone" ,
type: "get",
data: {
playerName: name
nameOrPhone: nameOrPhone
},
success: function (obj) {
var template = Handlebars.compile($("#table_template_saiShiTable").html());
......@@ -29,11 +34,24 @@
url: "/j/getUserExtByName" ,
type: "get",
data: {
playerName: name
playerName: nameOrPhone
},
success: function (obj) {
var template = Handlebars.compile($("#table_template_userInfoTable").html());
$('#userInfoTable').html(template(obj));
Handlebars.registerHelper("myFormatDate" , function(v){
var date = new Date(v);
var m = date.getMonth()+1 ;
if(m<10){
m = "0" + m ;
}
var d = date.getDate();
if(d<10){
d = "0" + d ;
}
return date.getFullYear() + "年" + m + "月" + d + "日 ";
});
}
});
......@@ -41,10 +59,26 @@
url: "/j/getEventGamePlayerByName" ,
type: "get",
data: {
playerName: name
playerName: nameOrPhone
},
success: function (obj) {
var template = Handlebars.compile($("#table_template_fenZuTableTable").html());
//定义个helper，实现日期格式转换
Handlebars.registerHelper("myFormatDate" , function(v){
var date = new Date(v);
var m = date.getMonth()+1 ;
if(m<10){
m = "0" + m ;
}
var d = date.getDate();
if(d<10){
d = "0" + d ;
}
return date.getFullYear() + "年" + m + "月" + d + "日 ";
});
$('#fenZuTable').html(template(obj));
}
});
......@@ -55,7 +89,7 @@
url: "/j/playerInfoList",
type: "get",
data: {
playerName: name
playerName: nameOrPhone
},
success: function (obj) {
var template = Handlebars.compile($("#table_template_otherTable").html());
......@@ -70,20 +104,30 @@
function shiBieUser(parentTr){
$('#supplierModal').modal('hide');
for(var i=0;i<thisTrChildren.length;i++){
if(thisTrChildren.length==6&&i>2&&i<4){
thisTrChildren[i].innerHTML=parentTr[0].children[i-2].innerHTML;
}else if(thisTrChildren.length==5&&i>1&&i<3){
thisTrChildren[i].innerHTML=parentTr[0].children[i-1].innerHTML;
if(thisTrChildren.length==7&&i==3){
if(thisTrChildren[2].innerHTML.trim()==""){
thisTrChildren[2].innerHTML=parentTr[0].children[0].innerHTML;
}else{
thisTrChildren[3].innerHTML=parentTr[0].children[1].innerHTML;
}
}else if(thisTrChildren.length==6&&i==2){
if(thisTrChildren[1].innerHTML.trim()==""){
thisTrChildren[1].innerHTML=parentTr[0].children[0].innerHTML;
}else{
thisTrChildren[2].innerHTML=parentTr[0].children[1].innerHTML;
}
}
}
var player=new Object();
if(thisTrChildren.length==6){
if(thisTrChildren.length==7){
player.id = thisTrChildren[0].value.trim();
player.playerName = thisTrChildren[2].innerHTML.trim();
player.mobilePhone = thisTrChildren[3].innerHTML.trim();
player.uid = thisTrChildren[4].innerHTML.trim();
}else{
player.id = thisTrChildren[0].value.trim();
player.playerName = thisTrChildren[1].innerHTML.trim();
player.mobilePhone = thisTrChildren[2].innerHTML.trim();
player.uid = thisTrChildren[3].innerHTML.trim();
}
......@@ -94,7 +138,8 @@
data: {
id:player.id,
mobilePhone:player.mobilePhone,
uid:player.uid,
playerName:player.playerName,
uid:player.uid
},
success: function (obj) {
alert("识别成功");
......@@ -123,15 +168,33 @@
var id = thisTrChildren[0].value;
var name;
var phone;
if(thisTrChildren.length==6){
var remark;
var sex;
if(thisTrChildren.length==7){
name=thisTrChildren[2].innerHTML;
phone=thisTrChildren[3].innerHTML;
sex =thisTrChildren[4].innerHTML;
remark=thisTrChildren[5].innerHTML;
}else{
name=thisTrChildren[1].innerHTML;
phone=thisTrChildren[2].innerHTML;
sex=thisTrChildren[3].innerHTML;
remark=thisTrChildren[4].innerHTML;
}
$("#playerNameForEditPlayer").val(name);
$("#mobilePhoneForEditPlayer").val(phone);
$("#remarkForEditPlayer").val(remark);
$("#playerIdForEditPlayer").val(id);
if(sex=="M"){
$("#sex1ForEditPlayer").attr("checked",'checked');
}else if(sex=="F"){
$("#sex2ForEditPlayer").attr("checked",'checked');
}else{
$("#sex2ForEditPlayer").removeAttr('checked');
$("#sex1ForEditPlayer").removeAttr('checked');
}
$("#editPlayerTr").empty();
$("#editPlayerTr").append("<td>用户名： <input type='text' name='userName' value='"+name+"' style='height: 17px;margin-bottom:1px;'/> <p> </P> 手机号： <input type='text' name='mobilePhone' value='"+phone+"' style='height: 17px;margin-bottom:1px;'/> <input type='hidden' value='"+id+"'/> </td> <td style='text-align:center;vertical-align:middle'> <input type='button' id='editPlayerButton' value='确定'/> </td>");
$("#editPlayerModal").modal('show');
});
......@@ -184,6 +247,27 @@ $(function() {
});
});
$("input[name='addGroupPlayerButton']").click(function(){
$("input[name='datacheck']:checked").each(function(i){
var groupid =$(this).val();
var groupName = $(this).next()[0].innerHTML;
$("#addGroupPlayerModal").modal('show');
});
});
$("input[name='deleteGroupButton']").click(function(){
$("input[name='datacheck']:checked").each(function(i){
var rowspan =$(this).parent().attr("rowspan");
if(rowspan>0){
alert("分组非空,无法删除");
return;
}
var groupid =$(this).val();
$("#groupIdForDelete").val(groupid);
$("#deleteGroupform").submit();
});
});
$("#editGroupTr").on("click", "#editGroupButton", function () {
$('#editGroupModal').modal('hide');
......@@ -204,9 +288,41 @@ $("#editGroupTr").on("click", "#editGroupButton", function () {
});
$("#addGroupPlayerButtonModal").click(function(){
$("input[name='datacheck']:checked").each(function(i){
var obj = $(this);
var groupid =$(this).val();
var groupNum = $(this).nextAll()[0].innerHTML.substr(2,3);
$("#groupNumForAddPlayer").val(groupNum);
$("#groupIdForAddPlayer").val(groupid);
$("#addGroupPlayerform").submit();
});
});
$("#editGroupPlayerButtonModal").click(function(){
$("#editGroupPlayerform").submit();
});
$("input[name='deletePlayer']").click(function(){
thisTrChildren = $(this).parents("tr")[0].children;
var id = thisTrChildren[0].value;
window.location.href="/communeservice/eventGame/deleteGroupPlayer?id="+id+"&&gameId=${eventGameGroupForm.gameId!}";
});
$("#batchCreateformButton").click(function(){
var beginteetime = $("#beginteetime").val();
var zushu = $("input[name='zuShu']").val();
var jiange = $("input[name='jianGe']").val();
if(beginteetime==""){
alert('请输入开始时间');
return;
}
if(!isRealNum(zushu)){
alert('组数不是数字');
return;
......@@ -219,7 +335,7 @@ $("#batchCreateformButton").click(function(){
});
$("#singleCreateformButton").click(function(){
var formatTeeTime = $("input[name='formatTeeTime']").val();
var formatTeeTime = $("#playteetime").val();
if(formatTeeTime==""){
alert('请输入开球时间');
return;
......@@ -250,24 +366,33 @@ function isRealNum(val){
<form action='/communeservice/eventGame/createGroupPost' method="post" id='batchCreateform'>
<input type="hidden" name="gameId" value="${eventGameGroupForm.gameId!}"/>
开始时间：<input type="time" name="formatTeeTime" id="beginteetime"/>
组&nbsp;&nbsp;&nbsp;数&nbsp;&nbsp;&nbsp;：<input type="text" name="zuShu"/>
&nbsp;每组间隔时间：<input type="text" name="jianGe"/>
<input type='button' id="batchCreateformButton" value="批量创建分组" style='margin-bottom: 10px;'>
</form>
<form action='/communeservice/eventGame/createSingleGroupPost' method="post" id='singleCreateform'>
<form action='/communeservice/eventGame/createSingleGroupPost' method="post" id='singleCreateform' style='float: left;'>
<input type="hidden" name="gameId" value='${eventGameGroupForm.gameId!}'/>
开球时间：<input type="time" name="formatTeeTime"/>
<input type='button' id="singleCreateformButton" value="创建单个分组" style='margin-bottom: 10px;'>
开球时间：<input type="time" name="formatTeeTime" id="playteetime"/>
<input type='button' id="singleCreateformButton" value="创建单个分组" style='margin-bottom: 10px;'/>
<input type='button' name="editGroupButton" value="修改分组" style='margin-left: 290px;margin-bottom: 10px;'/>
</form>
<input type='button' name="editGroupButton" value="修改分组" style='margin-left: 228px;margin-bottom: 10px;'>
<form action='/communeservice/eventGame/deleteGroup' method="post" id='deleteGroupform' style='float: left;'>
<input type="hidden" name="gameId" value='${eventGameGroupForm.gameId!}'/>
<input type="hidden" name="groupId" value='' id='groupIdForDelete' />
<input type='button' name="deleteGroupButton" value="删除分组" style='margin-left: 40px;margin-top: 2px;'>
<input type='button' name="addGroupPlayerButton" value="添加成员" style='margin-left: 35px;margin-top: 2px;'>
</form>
<table class="table table-bordered table-striped widthShow" id="tab1" style='margin-bottom:50px' align="center">
<tr align="center">
<td >分组</td><td >姓名</td><td >手机号</td><td >UID</td><td >操作</td>
<td >分组</td><td >姓名</td><td >手机号</td><td >性别</td> <td >备注</td> <td >操作</td>
</tr>
......@@ -286,8 +411,9 @@ function isRealNum(val){
</#if>
<td>${player.playerName!}</td>
<td>${player.mobilePhone!}</td>
<td>${player.uid!}</td>
<td width='150px'><input type='button' value='识别用户' name='supplierId' /> <input type='button' value='修改用户' name='editPlayer' /></td>
<td>${player.sex!}</td>
<td>${player.remark!}</td>
<td width='140px'><input type='button' value='识别' name='supplierId' /> <input type='button' value='修改' name='editPlayer' /> <input type='button' value='删除' name='deletePlayer' /></td>
</tr>
</#list>
<#else>
......@@ -300,6 +426,7 @@ function isRealNum(val){
<td></td>
<td></td>
<td></td>
<td></td>
</tr>
</#if>
</#list>
......@@ -340,6 +467,7 @@ function isRealNum(val){
<th>姓名</th>
<th>手机号</th>
<th>赛事日期</th>
<th>赛事产品名称</th>
<th style="text-align: center;"><i class="icon-wrench"></i></th>
</tr>
</thead>
......@@ -357,6 +485,7 @@ function isRealNum(val){
<th>昵称</th>
<th>UID</th>
<th>性别</th>
<th>社员到期时间</th>
<th style="text-align: center;"><i class="icon-wrench"></i></th>
</tr>
</thead>
......@@ -371,7 +500,8 @@ function isRealNum(val){
<tr>
<th>姓名</th>
<th>手机号</th>
<th>UID</th>
<th>赛事名称</th>
<th>赛事时间</th>
<th style="text-align: center;"><i class="icon-wrench"></i></th>
</tr>
</thead>
......@@ -407,11 +537,25 @@ function isRealNum(val){
<h3>修改用户</h3>
</div>
<div class="modal-body">
<form action='/communeservice/eventGame/editGroupPlayer' method="post" id='editGroupPlayerform'>
<table class="table table-bordered table-striped">
<tr id='editPlayerTr'>
<td>
<input type="hidden" name="gameId" value='${eventGameGroupForm.gameId!}'/>
<input type="hidden" name="id" value='' id='playerIdForEditPlayer' />
<span>用户名：</span><input type='text' name='playerName' id='playerNameForEditPlayer' /> <br/>
<span>手机号：</span><input type='text' name='mobilePhone' id='mobilePhoneForEditPlayer' /> <br/>
<span>备&nbsp;&nbsp;&nbsp;注：</span><input type='text' name='remark' id='remarkForEditPlayer' /> <br/>
<span>性&nbsp;&nbsp;&nbsp;别：</span>
<input type="radio" name="sex" value="M" style='margin-bottom:5px;' id='sex1ForEditPlayer'>男
&nbsp;&nbsp;<input type="radio" name="sex" value="F" style='margin-bottom:5px;margin-left:10px;' id='sex2ForEditPlayer'>女<br/>
</td>
<td style='text-align:center;vertical-align:middle'>
<input type='button' value='修改' id='editGroupPlayerButtonModal' />
</td>
</tr>
</table>
</form>
<div class="pagination pagination-mini">
<ul>
......@@ -441,6 +585,35 @@ function isRealNum(val){
</div>
</div>
<div class="modal hide fade" id="addGroupPlayerModal">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal">×</button>
<h3>添加成员</h3>
</div>
<div class="modal-body">
<form action='/communeservice/eventGame/addGroupPlayer' method="post" id='addGroupPlayerform'>
<table class="table table-bordered table-striped">
<tr id='addGroupPlayerTr'>
<td>
<input type="hidden" name="gameId" value='${eventGameGroupForm.gameId!}'/>
<input type="hidden" name="groupId" value='' id='groupIdForAddPlayer' />
<input type="hidden" name="groupNum" value='' id='groupNumForAddPlayer' />
<span>用户名：</span><input type='text' name='playerName' /> <br/>
<span>手机号：</span><input type='text' name='mobilePhone' /> <br/>
<span>备&nbsp;&nbsp;&nbsp;注：</span><input type='text' name='remark' /> <br/>
<span>性&nbsp;&nbsp;&nbsp;别：</span>
<input type="radio" name="sex" value="M" style='margin-bottom:5px;'>男
&nbsp;&nbsp;<input type="radio" name="sex" value="F" style='margin-bottom:5px;margin-left:10px;'>女<br/>
</td>
<td style='text-align:center;vertical-align:middle'>
<input type='button' value='添加' id='addGroupPlayerButtonModal' />
</td>
</tr>
</table>
</form>
</div>
</div>
<script id="table_template_saiShiTable" type="text/x-handlebars-template">
{{#each body}}
......@@ -448,6 +621,7 @@ function isRealNum(val){
<td>{{cName}} </td>
<td>{{mobilePhone}} </td>
<td>{{priceDate}} </td>
<td>{{productName}} </td>
<td><a id="J_saiShiTable">选择</a></td>
</tr>
{{/each}}
......@@ -461,6 +635,7 @@ function isRealNum(val){
<td>{{umNickName}} </td>
<td>{{uid}} </td>
<td>{{gender}} </td>
<td>{{myFormatDate communeAgainTime}} </td>
<td><a id="J_userInfoTable">选择</a></td>
</tr>
{{/each}}
......@@ -471,12 +646,14 @@ function isRealNum(val){
<tr>
<td>{{playerName}} </td>
<td>{{mobilePhone}} </td>
<td>{{uid}} </td>
<td>{{gameName}} </td>
<td>{{myFormatDate gameDate}}</td>
<td><a id="J_fenZuTable">选择</a></td>
</tr>
{{/each}}
</script>
<script id="table_template_otherTable" type="text/x-handlebars-template">
{{#each body}}
<tr>
......
src/main/webapp/WEB-INF/templates/market/eventGameList.ftl
......@@ -7,6 +7,11 @@
<form class="form-inline" action="/communeservice/eventGame/list" method="get">
<@com.textInputTwoDate "eventGameQueryForm.playDateStart" "eventGameQueryForm.playDateEnd" "style=\"margin-left: 5px;\"" "赛事时间"/>
<@com.textInput "eventGameQueryForm.courseId" "style=\"margin-left: 5px;\"" "球场id" "text"/>
<@com.textInput "eventGameQueryForm.playerName" "style=\"margin-left: 5px;\"" "打球人姓名" "text"/>
打球人组合：
<input type="text" id="playerName" name="firstPlayer" value="${firstPlayer!}" style="margin-left: 5px;" placeholder="打球人姓名或手机号" class="input-medium">
<input type="text" id="playerName" name="secondPlayer" value="${secondPlayer!}" style="margin-left: 5px;" placeholder="打球人姓名或手机号" class="input-medium">
<button type="submit" class="btn btn-primary">查询</button>
</form>
<table class="table table-bordered table-striped">
......
src/main/webapp/WEB-INF/templates/market/recommendPlayer.ftl
......@@ -47,7 +47,7 @@ $("#recommendSubmitButton").click(function(){
<tr>
<td width='500px'>${item.playerName!}</td>
<td width='500px'>${item.mobilePhone!}</td>
<td width='500px'>${item.times!}</td>
<td width='500px'><a href='/communeservice/eventGame/list?playDateStart=2014-01-01&playDateEnd=2020-01-01&playerName=&firstPlayer=${recommendContent!}&secondPlayer=${item.playerName!}'>${item.times!}</a></td>
<td width='500px'>${item.latestTime?string("yyyy-MM-dd")}</td>
</tr>
</#list>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment