Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
caosy
/
fun-admin
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
454c1c0a
authored
Jul 18, 2018
by
chongli
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
会服亲密度优化
parent
a3411808
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
257 additions
and
21 deletions
src/main/java/com/ctrip/fun/admin/controller/JsonController.java
src/main/java/com/ctrip/fun/admin/controller/communeservice/EventGameController.java
src/main/java/com/ctrip/fun/admin/form/market/EventGameGroupForm.java
src/main/java/com/ctrip/fun/admin/form/market/EventGamePlayerForm.java
src/main/java/com/ctrip/fun/admin/form/market/EventGameQueryForm.java
src/main/java/com/ctrip/fun/admin/service/golf/EventCustomerInfoService.java
src/main/java/com/ctrip/fun/admin/service/market/EventGameGroupService.java
src/main/java/com/ctrip/fun/admin/service/market/EventGamePlayerService.java
src/main/resources/properties/service.properties
src/main/webapp/WEB-INF/templates/golf/gameList.ftl
src/main/webapp/WEB-INF/templates/market/createGroup.ftl
src/main/webapp/WEB-INF/templates/market/eventGameList.ftl
src/main/webapp/WEB-INF/templates/market/recommendPlayer.ftl
src/main/java/com/ctrip/fun/admin/controller/JsonController.java
View file @
454c1c0a
...
@@ -2338,6 +2338,9 @@ public class JsonController {
...
@@ -2338,6 +2338,9 @@ public class JsonController {
if
(
eventGamePlayerForm
.
getPlayerName
()!=
null
&&!
""
.
equals
(
eventGamePlayerForm
.
getPlayerName
())){
if
(
eventGamePlayerForm
.
getPlayerName
()!=
null
&&!
""
.
equals
(
eventGamePlayerForm
.
getPlayerName
())){
temp
.
setPlayerName
(
eventGamePlayerForm
.
getPlayerName
());
temp
.
setPlayerName
(
eventGamePlayerForm
.
getPlayerName
());
}
}
if
(
eventGamePlayerForm
.
getPlayerName
()!=
null
&&!
""
.
equals
(
eventGamePlayerForm
.
getPlayerName
())){
temp
.
setPlayerName
(
eventGamePlayerForm
.
getPlayerName
());
}
eventGamePlayerService
.
update
(
""
,
temp
);
eventGamePlayerService
.
update
(
""
,
temp
);
}
}
}
}
...
@@ -2366,6 +2369,8 @@ public class JsonController {
...
@@ -2366,6 +2369,8 @@ public class JsonController {
return
response
;
return
response
;
}
}
@RequestMapping
(
value
=
"/playerInfoList"
,
method
=
RequestMethod
.
GET
)
@RequestMapping
(
value
=
"/playerInfoList"
,
method
=
RequestMethod
.
GET
)
@ResponseStatus
(
HttpStatus
.
OK
)
@ResponseStatus
(
HttpStatus
.
OK
)
@ResponseBody
@ResponseBody
...
@@ -2380,15 +2385,15 @@ public class JsonController {
...
@@ -2380,15 +2385,15 @@ public class JsonController {
return
response
;
return
response
;
}
}
@RequestMapping
(
value
=
"/getEventCustomerInfoByName"
,
method
=
RequestMethod
.
GET
)
@RequestMapping
(
value
=
"/getEventCustomerInfoByName
OrPhone
"
,
method
=
RequestMethod
.
GET
)
@ResponseStatus
(
HttpStatus
.
OK
)
@ResponseStatus
(
HttpStatus
.
OK
)
@ResponseBody
@ResponseBody
public
Response
<
List
<
EventCustomerInfoBean
>>
getEventCustomerInfoByName
(
HttpServletRequest
request
,
@RequestParam
(
value
=
"
playerName"
,
required
=
false
)
String
playerNam
e
)
{
public
Response
<
List
<
EventCustomerInfoBean
>>
getEventCustomerInfoByName
(
HttpServletRequest
request
,
@RequestParam
(
value
=
"
nameOrPhone"
,
required
=
false
)
String
nameOrPhon
e
)
{
Response
<
List
<
EventCustomerInfoBean
>>
response
=
new
Response
<
List
<
EventCustomerInfoBean
>>();
Response
<
List
<
EventCustomerInfoBean
>>
response
=
new
Response
<
List
<
EventCustomerInfoBean
>>();
response
.
setStatus
(
ResponseStatusEnum
.
SUCCESS
.
getValue
());
response
.
setStatus
(
ResponseStatusEnum
.
SUCCESS
.
getValue
());
response
.
setMessage
(
ResponseStatusEnum
.
SUCCESS
.
getMsg
());
response
.
setMessage
(
ResponseStatusEnum
.
SUCCESS
.
getMsg
());
EventCustomerInfoQuery
query
=
new
EventCustomerInfoQuery
();
EventCustomerInfoQuery
query
=
new
EventCustomerInfoQuery
();
query
.
setcName
(
playerNam
e
);
query
.
setcName
(
nameOrPhon
e
);
List
<
EventCustomerInfoBean
>
list
=
eventCustomerInfoService
.
getEventCustomerInfoByName
(
query
);
List
<
EventCustomerInfoBean
>
list
=
eventCustomerInfoService
.
getEventCustomerInfoByName
(
query
);
response
.
setBody
(
list
);
response
.
setBody
(
list
);
return
response
;
return
response
;
...
@@ -2418,7 +2423,7 @@ public class JsonController {
...
@@ -2418,7 +2423,7 @@ public class JsonController {
EventGamePlayerQuery
query
=
new
EventGamePlayerQuery
();
EventGamePlayerQuery
query
=
new
EventGamePlayerQuery
();
query
.
setPlayerName
(
playerName
);
query
.
setPlayerName
(
playerName
);
query
.
setSortField
(
"id"
);
query
.
setSortField
(
"id"
);
PagedResponseBean
<
EventGamePlayerBean
>
pagedList
=
eventGamePlayerService
.
l
ist
(
""
,
query
);
PagedResponseBean
<
EventGamePlayerBean
>
pagedList
=
eventGamePlayerService
.
playerAllInfoL
ist
(
""
,
query
);
response
.
setBody
((
List
<
EventGamePlayerBean
>)
pagedList
.
getResult
());
response
.
setBody
((
List
<
EventGamePlayerBean
>)
pagedList
.
getResult
());
return
response
;
return
response
;
}
}
...
...
src/main/java/com/ctrip/fun/admin/controller/communeservice/EventGameController.java
View file @
454c1c0a
package
com
.
ctrip
.
fun
.
admin
.
controller
.
communeservice
;
package
com
.
ctrip
.
fun
.
admin
.
controller
.
communeservice
;
import
java.io.Serializable
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.Calendar
;
import
java.util.Calendar
;
import
java.util.Date
;
import
java.util.Date
;
...
@@ -15,6 +16,7 @@ import com.ctrip.fun.admin.service.market.EventGameService;
...
@@ -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.BeanConverter
;
import
com.ctrip.fun.common.core.util.DateUtil
;
import
com.ctrip.fun.common.core.util.DateUtil
;
import
com.ctrip.fun.common.vo.PagedResponseBean
;
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.SortDirectionEnum
;
import
com.ctrip.fun.common.vo.market.EventGameBean
;
import
com.ctrip.fun.common.vo.market.EventGameBean
;
import
com.ctrip.fun.common.vo.market.EventGameGroupBean
;
import
com.ctrip.fun.common.vo.market.EventGameGroupBean
;
...
@@ -24,12 +26,15 @@ import com.ctrip.fun.common.vo.market.EventGamePlayerQuery;
...
@@ -24,12 +26,15 @@ import com.ctrip.fun.common.vo.market.EventGamePlayerQuery;
import
com.ctrip.fun.common.vo.market.EventGameQuery
;
import
com.ctrip.fun.common.vo.market.EventGameQuery
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.http.HttpStatus
;
import
org.springframework.stereotype.Controller
;
import
org.springframework.stereotype.Controller
;
import
org.springframework.ui.ModelMap
;
import
org.springframework.ui.ModelMap
;
import
org.springframework.web.bind.annotation.ModelAttribute
;
import
org.springframework.web.bind.annotation.ModelAttribute
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestMethod
;
import
org.springframework.web.bind.annotation.RequestMethod
;
import
org.springframework.web.bind.annotation.RequestParam
;
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
;
import
javax.servlet.http.HttpServletRequest
;
...
@@ -53,22 +58,26 @@ public class EventGameController {
...
@@ -53,22 +58,26 @@ public class EventGameController {
if
(
null
!=
request
.
getParameter
(
"page"
))
{
if
(
null
!=
request
.
getParameter
(
"page"
))
{
currentPage
=
Integer
.
parseInt
(
request
.
getParameter
(
"page"
));
currentPage
=
Integer
.
parseInt
(
request
.
getParameter
(
"page"
));
}
}
if
(
form
.
getPlayDateStart
()==
null
){
Date
date
=
new
Date
();
//获取当前时间
Date
date
=
new
Date
();
//获取当前时间
Calendar
calendar
=
Calendar
.
getInstance
();
Calendar
calendar
=
Calendar
.
getInstance
();
calendar
.
setTime
(
date
);
calendar
.
setTime
(
date
);
calendar
.
add
(
Calendar
.
MONTH
,
-
6
);
//当前时间前去一个月,即一个月前的时间
if
(
form
.
getPlayDateStart
()==
null
){
calendar
.
add
(
Calendar
.
MONTH
,
-
5
);
//六个月前
form
.
setPlayDateStart
(
calendar
.
getTime
());
form
.
setPlayDateStart
(
calendar
.
getTime
());
}
}
if
(
form
.
getPlayDateEnd
()==
null
){
if
(
form
.
getPlayDateEnd
()==
null
){
form
.
setPlayDateEnd
(
DateUtil
.
getToday
());
calendar
.
add
(
Calendar
.
MONTH
,
6
);
//一个月后
form
.
setPlayDateEnd
(
calendar
.
getTime
());
}
}
EventGameQuery
query
=
new
EventGameQuery
();
EventGameQuery
query
=
new
EventGameQuery
();
query
.
setCourseId
(
form
.
getCourseId
());
query
.
setCourseId
(
form
.
getCourseId
());
query
.
setCourseName
(
form
.
getGameName
());
query
.
setCourseName
(
form
.
getGameName
());
query
.
setPlayDateStart
(
form
.
getPlayDateStart
());
query
.
setPlayDateStart
(
form
.
getPlayDateStart
());
query
.
setPlayDateEnd
(
form
.
getPlayDateEnd
());
query
.
setPlayDateEnd
(
form
.
getPlayDateEnd
());
query
.
setPlayerName
(
form
.
getPlayerName
());
query
.
setId
(
form
.
getId
());
query
.
setId
(
form
.
getId
());
query
.
setFirstPlayer
(
form
.
getFirstPlayer
());
query
.
setSecondPlayer
(
form
.
getSecondPlayer
());
query
.
setPagerOffset
(
currentPage
*
query
.
getPagerPerPage
());
query
.
setPagerOffset
(
currentPage
*
query
.
getPagerPerPage
());
query
.
setSortField
(
"createTime"
);
query
.
setSortField
(
"createTime"
);
...
@@ -79,7 +88,8 @@ public class EventGameController {
...
@@ -79,7 +88,8 @@ public class EventGameController {
model
.
put
(
"list"
,
response
.
getResult
());
model
.
put
(
"list"
,
response
.
getResult
());
model
.
put
(
"paginationData"
,
new
PaginationForm
(
currentPage
,
pageSize
,
pageCount
,
total
));
model
.
put
(
"paginationData"
,
new
PaginationForm
(
currentPage
,
pageSize
,
pageCount
,
total
));
model
.
put
(
"firstPlayer"
,
form
.
getFirstPlayer
());
model
.
put
(
"secondPlayer"
,
form
.
getSecondPlayer
());
return
"market/eventGameList"
;
return
"market/eventGameList"
;
}
}
...
@@ -123,7 +133,7 @@ public class EventGameController {
...
@@ -123,7 +133,7 @@ public class EventGameController {
//根据gameId获取该赛事的所有group(list)
//根据gameId获取该赛事的所有group(list)
EventGameGroupQuery
query
=
new
EventGameGroupQuery
();
EventGameGroupQuery
query
=
new
EventGameGroupQuery
();
query
.
setGameId
(
eventGameGroupForm
.
getGameId
());
query
.
setGameId
(
eventGameGroupForm
.
getGameId
());
query
.
setSortField
(
"group
Num
"
);
query
.
setSortField
(
"group
Time
"
);
query
.
setSortDirection
(
SortDirectionEnum
.
ASC
);
query
.
setSortDirection
(
SortDirectionEnum
.
ASC
);
PagedResponseBean
<
EventGameGroupBean
>
list
=
eventGameGroupService
.
list
(
""
,
query
);
PagedResponseBean
<
EventGameGroupBean
>
list
=
eventGameGroupService
.
list
(
""
,
query
);
//加载每个组中的人员信息
//加载每个组中的人员信息
...
@@ -147,8 +157,8 @@ public class EventGameController {
...
@@ -147,8 +157,8 @@ public class EventGameController {
public
String
createGroupPost
(
HttpServletRequest
request
,
@ModelAttribute
(
"eventGameGroupForm"
)
EventGameGroupForm
eventGameGroupForm
,
ModelMap
model
)
{
public
String
createGroupPost
(
HttpServletRequest
request
,
@ModelAttribute
(
"eventGameGroupForm"
)
EventGameGroupForm
eventGameGroupForm
,
ModelMap
model
)
{
//得到同一场赛事中当前最大组号
//得到同一场赛事中当前最大组号
int
maxGroupNum
=
0
;
int
maxGroupNum
=
0
;
//得到
同一场赛事中最大的组
时间
//得到
批量创建的开始
时间
int
maxGroupTime
=
360
;
int
beginGroupTime
=
eventGameGroupForm
.
getTeeTime
()
;
EventGameGroupQuery
query_max
=
new
EventGameGroupQuery
();
EventGameGroupQuery
query_max
=
new
EventGameGroupQuery
();
query_max
.
setGameId
(
eventGameGroupForm
.
getGameId
());
query_max
.
setGameId
(
eventGameGroupForm
.
getGameId
());
...
@@ -161,9 +171,6 @@ public class EventGameController {
...
@@ -161,9 +171,6 @@ public class EventGameController {
if
(
bean
.
getGroupNum
()>
maxGroupNum
){
if
(
bean
.
getGroupNum
()>
maxGroupNum
){
maxGroupNum
=
bean
.
getGroupNum
();
maxGroupNum
=
bean
.
getGroupNum
();
}
}
if
(
bean
.
getGroupTime
()>
maxGroupTime
){
maxGroupTime
=
bean
.
getGroupTime
();
}
}
}
}
}
...
@@ -172,7 +179,7 @@ public class EventGameController {
...
@@ -172,7 +179,7 @@ public class EventGameController {
EventGameGroupBean
bean
=
new
EventGameGroupBean
();
EventGameGroupBean
bean
=
new
EventGameGroupBean
();
bean
.
setGameId
(
eventGameGroupForm
.
getGameId
());
bean
.
setGameId
(
eventGameGroupForm
.
getGameId
());
bean
.
setGroupNum
(
maxGroupNum
+
i
);
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
);
int
groupid
=
eventGameGroupService
.
add
(
request
.
getAttribute
(
"userName"
).
toString
(),
bean
);
//更新player表中的groupID
//更新player表中的groupID
query
.
setGameId
(
eventGameGroupForm
.
getGameId
());
query
.
setGameId
(
eventGameGroupForm
.
getGameId
());
...
@@ -254,6 +261,78 @@ public class EventGameController {
...
@@ -254,6 +261,78 @@ public class EventGameController {
return
"market/recommendPlayer"
;
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
()
{
public
EventGameService
getService
()
{
return
service
;
return
service
;
}
}
...
...
src/main/java/com/ctrip/fun/admin/form/market/EventGameGroupForm.java
View file @
454c1c0a
...
@@ -6,7 +6,7 @@ public class EventGameGroupForm {
...
@@ -6,7 +6,7 @@ public class EventGameGroupForm {
private
Integer
gameId
;
// 球场id
private
Integer
gameId
;
// 球场id
private
Integer
zuShu
;
// 批量创建时的组数
private
Integer
zuShu
;
// 批量创建时的组数
private
Integer
jianGe
;
// 批量创建时的每组间隔时间
private
Integer
jianGe
;
// 批量创建时的每组间隔时间
private
String
formatTeeTime
;
//格式化TeeTime
private
String
formatTeeTime
;
//
前台传入的
格式化TeeTime
private
Integer
teeTime
;
private
Integer
teeTime
;
public
Integer
getId
()
{
public
Integer
getId
()
{
...
...
src/main/java/com/ctrip/fun/admin/form/market/EventGamePlayerForm.java
View file @
454c1c0a
...
@@ -8,9 +8,20 @@ public class EventGamePlayerForm {
...
@@ -8,9 +8,20 @@ public class EventGamePlayerForm {
private
String
sex
;
//性别
private
String
sex
;
//性别
private
Integer
candicate
;
//差点
private
Integer
candicate
;
//差点
private
String
remark
;
//备注
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
()
{
public
Integer
getId
()
{
return
id
;
return
id
;
}
}
...
@@ -67,4 +78,20 @@ public class EventGamePlayerForm {
...
@@ -67,4 +78,20 @@ public class EventGamePlayerForm {
this
.
playerName
=
playerName
;
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
View file @
454c1c0a
...
@@ -14,6 +14,11 @@ public class EventGameQueryForm {
...
@@ -14,6 +14,11 @@ public class EventGameQueryForm {
private
Date
playDateStart
;
// 赛事时间查询开始日期
private
Date
playDateStart
;
// 赛事时间查询开始日期
@DateTimeFormat
(
pattern
=
"yyyy-MM-dd"
)
@DateTimeFormat
(
pattern
=
"yyyy-MM-dd"
)
private
Date
playDateEnd
;
// 赛事时间查询结束日期
private
Date
playDateEnd
;
// 赛事时间查询结束日期
private
String
playerName
;
//打球人姓名
private
String
firstPlayer
;
//第一个打球人姓名或手机号
private
String
secondPlayer
;
//第二个打球人姓名或手机号
public
Integer
getId
()
{
public
Integer
getId
()
{
return
id
;
return
id
;
...
@@ -51,5 +56,23 @@ public class EventGameQueryForm {
...
@@ -51,5 +56,23 @@ public class EventGameQueryForm {
public
void
setPlayDateEnd
(
Date
playDateEnd
)
{
public
void
setPlayDateEnd
(
Date
playDateEnd
)
{
this
.
playDateEnd
=
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
View file @
454c1c0a
...
@@ -54,7 +54,7 @@ public class EventCustomerInfoService extends BaseService {
...
@@ -54,7 +54,7 @@ public class EventCustomerInfoService extends BaseService {
* 根据用户姓名查询其在赛事中留下的电话信息
* 根据用户姓名查询其在赛事中留下的电话信息
*/
*/
public
List
<
EventCustomerInfoBean
>
getEventCustomerInfoByName
(
EventCustomerInfoQuery
query
)
{
public
List
<
EventCustomerInfoBean
>
getEventCustomerInfoByName
(
EventCustomerInfoQuery
query
)
{
String
uri
=
super
.
getServiceUri
(
"uri.eventCustomer.getEventCustomerInfoByName"
);
String
uri
=
super
.
getServiceUri
(
"uri.eventCustomer.getEventCustomerInfoByName
OrPhone
"
);
Request
<
EventCustomerInfoQuery
>
request
=
new
Request
<
EventCustomerInfoQuery
>(
""
,
query
);
Request
<
EventCustomerInfoQuery
>
request
=
new
Request
<
EventCustomerInfoQuery
>(
""
,
query
);
HttpEntity
<
Request
<
EventCustomerInfoQuery
>>
entity
=
new
HttpEntity
<
Request
<
EventCustomerInfoQuery
>>(
request
);
HttpEntity
<
Request
<
EventCustomerInfoQuery
>>
entity
=
new
HttpEntity
<
Request
<
EventCustomerInfoQuery
>>(
request
);
Response
<
List
<
EventCustomerInfoBean
>>
response
=
null
;
Response
<
List
<
EventCustomerInfoBean
>>
response
=
null
;
...
...
src/main/java/com/ctrip/fun/admin/service/market/EventGameGroupService.java
View file @
454c1c0a
...
@@ -114,7 +114,7 @@ public class EventGameGroupService extends BaseService{
...
@@ -114,7 +114,7 @@ public class EventGameGroupService extends BaseService{
}
}
/**
/**
* 更新
模板
* 更新
组信息
*
*
* @param userId 用户ID
* @param userId 用户ID
* @param bean 模板实体
* @param bean 模板实体
...
@@ -147,4 +147,39 @@ public class EventGameGroupService extends BaseService{
...
@@ -147,4 +147,39 @@ public class EventGameGroupService extends BaseService{
return
retVal
;
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
View file @
454c1c0a
...
@@ -48,6 +48,36 @@ public class EventGamePlayerService extends BaseService{
...
@@ -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
* @param userId 用户ID
...
@@ -88,6 +118,32 @@ public class EventGamePlayerService extends BaseService{
...
@@ -88,6 +118,32 @@ public class EventGamePlayerService extends BaseService{
* @param query 查询条件
* @param query 查询条件
* @return 供应商列表
* @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
)
{
public
PagedResponseBean
<
EventGamePlayerBean
>
list
(
String
userId
,
EventGamePlayerQuery
query
)
{
PagedResponseBean
<
EventGamePlayerBean
>
responseBean
=
null
;
PagedResponseBean
<
EventGamePlayerBean
>
responseBean
=
null
;
String
uri
=
super
.
getServiceUri
(
"uri.eventGamePlayer.list"
);
String
uri
=
super
.
getServiceUri
(
"uri.eventGamePlayer.list"
);
...
@@ -113,6 +169,8 @@ public class EventGamePlayerService extends BaseService{
...
@@ -113,6 +169,8 @@ public class EventGamePlayerService extends BaseService{
return
responseBean
;
return
responseBean
;
}
}
//playerAllInfoList
/**
/**
* 更新模板
* 更新模板
*
*
...
...
src/main/resources/properties/service.properties
View file @
454c1c0a
...
@@ -457,15 +457,17 @@ uri.eventGameGroup.add=/fun-golf-service/eventGameGroup/add
...
@@ -457,15 +457,17 @@ uri.eventGameGroup.add=/fun-golf-service/eventGameGroup/add
uri.eventGameGroup.get
=
/fun-golf-service/eventGameGroup/get
uri.eventGameGroup.get
=
/fun-golf-service/eventGameGroup/get
uri.eventGameGroup.list
=
/fun-golf-service/eventGameGroup/list
uri.eventGameGroup.list
=
/fun-golf-service/eventGameGroup/list
uri.eventGameGroup.update
=
/fun-golf-service/eventGameGroup/update
uri.eventGameGroup.update
=
/fun-golf-service/eventGameGroup/update
uri.eventGameGroup.deleteGroup
=
/fun-golf-service/eventGameGroup/deleteGroup
#eventGameGroup
#eventGameGroup
uri.eventGamePlayer.add
=
/fun-golf-service/eventGamePlayer/add
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.get
=
/fun-golf-service/eventGamePlayer/get
uri.eventGamePlayer.list
=
/fun-golf-service/eventGamePlayer/list
uri.eventGamePlayer.list
=
/fun-golf-service/eventGamePlayer/list
uri.eventGamePlayer.update
=
/fun-golf-service/eventGamePlayer/update
uri.eventGamePlayer.update
=
/fun-golf-service/eventGamePlayer/update
uri.eventGamePlayer.playerInfoList
=
/fun-golf-service/eventGamePlayer/playerInfoList
uri.eventGamePlayer.playerInfoList
=
/fun-golf-service/eventGamePlayer/playerInfoList
uri.eventGamePlayer.recommendPlayerByName
=
/fun-golf-service/eventGamePlayer/recommendPlayerByName
uri.eventGamePlayer.recommendPlayerByName
=
/fun-golf-service/eventGamePlayer/recommendPlayerByName
uri.eventGamePlayer.recommendPlayerByPhone
=
/fun-golf-service/eventGamePlayer/recommendPlayerByPhone
uri.eventGamePlayer.recommendPlayerByPhone
=
/fun-golf-service/eventGamePlayer/recommendPlayerByPhone
uri.eventGamePlayer.playerAllInfoList
=
/fun-golf-service/eventGamePlayer/playerAllInfoList
#communeExt
#communeExt
uri.communeExt.list
=
/fun-golf-service/communeExt/list
uri.communeExt.list
=
/fun-golf-service/communeExt/list
uri.communeExt.get
=
/fun-golf-service/communeExt/get
uri.communeExt.get
=
/fun-golf-service/communeExt/get
...
@@ -500,7 +502,7 @@ uri.eventCustomer.importExcelGroupInfo=/fun-golf-service/eventCustomerInfo/impor
...
@@ -500,7 +502,7 @@ uri.eventCustomer.importExcelGroupInfo=/fun-golf-service/eventCustomerInfo/impor
uri.eventCustomer.importExcelRankList
=
/fun-golf-service/eventCustomerInfo/importExcelRankList
uri.eventCustomer.importExcelRankList
=
/fun-golf-service/eventCustomerInfo/importExcelRankList
uri.eventCustomer.listByResourceIdAndPriceDate
=
/fun-golf-service/eventCustomerInfo/listByResourceIdAndPriceDate
uri.eventCustomer.listByResourceIdAndPriceDate
=
/fun-golf-service/eventCustomerInfo/listByResourceIdAndPriceDate
uri.eventCustomer.findOrderPlayers
=
/fun-golf-service/eventCustomerInfo/findOrderPlayers
uri.eventCustomer.findOrderPlayers
=
/fun-golf-service/eventCustomerInfo/findOrderPlayers
uri.eventCustomer.getEventCustomerInfoByName
=
/fun-golf-service/eventCustomerInfo/getEventCustomerInfoByNam
e
uri.eventCustomer.getEventCustomerInfoByName
OrPhone
=
/fun-golf-service/eventCustomerInfo/getEventCustomerInfoByNameOrPhon
e
uri.eventCustomer.listGroupByResourceIdAndPriceDate
=
/fun-golf-service/eventCustomerInfo/listGroupByResourceIdAndPriceDate
uri.eventCustomer.listGroupByResourceIdAndPriceDate
=
/fun-golf-service/eventCustomerInfo/listGroupByResourceIdAndPriceDate
uri.eventCustomer.updateGroupNum
=
/fun-golf-service/eventCustomerInfo/updateGroupNum
uri.eventCustomer.updateGroupNum
=
/fun-golf-service/eventCustomerInfo/updateGroupNum
uri.eventCustomer.getByEventCustomerId
=
/fun-golf-service/eventCustomerInfo/getByEventCustomerId
uri.eventCustomer.getByEventCustomerId
=
/fun-golf-service/eventCustomerInfo/getByEventCustomerId
...
...
src/main/webapp/WEB-INF/templates/golf/gameList.ftl
View file @
454c1c0a
...
@@ -7,6 +7,8 @@
...
@@ -7,6 +7,8 @@
<@com.textInput "form.gameName" "style=\"margin-left: 5px;\"" "赛事名称"/>
<@com.textInput "form.gameName" "style=\"margin-left: 5px;\"" "赛事名称"/>
<@com.textInput "form.courseId" "style=\"margin-left: 5px;\"" "球场ID"/>
<@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.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="状态"/>
<@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>
<button id="J_submit" class="btn btn-primary">查询</button>
...
...
src/main/webapp/WEB-INF/templates/market/createGroup.ftl
View file @
454c1c0a
This diff is collapsed.
Click to expand it.
src/main/webapp/WEB-INF/templates/market/eventGameList.ftl
View file @
454c1c0a
...
@@ -7,6 +7,11 @@
...
@@ -7,6 +7,11 @@
<form class="form-inline" action="/communeservice/eventGame/list" method="get">
<form class="form-inline" action="/communeservice/eventGame/list" method="get">
<@com.textInputTwoDate "eventGameQueryForm.playDateStart" "eventGameQueryForm.playDateEnd" "style=\"margin-left: 5px;\"" "赛事时间"/>
<@com.textInputTwoDate "eventGameQueryForm.playDateStart" "eventGameQueryForm.playDateEnd" "style=\"margin-left: 5px;\"" "赛事时间"/>
<@com.textInput "eventGameQueryForm.courseId" "style=\"margin-left: 5px;\"" "球场id" "text"/>
<@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>
<button type="submit" class="btn btn-primary">查询</button>
</form>
</form>
<table class="table table-bordered table-striped">
<table class="table table-bordered table-striped">
...
...
src/main/webapp/WEB-INF/templates/market/recommendPlayer.ftl
View file @
454c1c0a
...
@@ -47,7 +47,7 @@ $("#recommendSubmitButton").click(function(){
...
@@ -47,7 +47,7 @@ $("#recommendSubmitButton").click(function(){
<tr>
<tr>
<td width='500px'>${item.playerName!}</td>
<td width='500px'>${item.playerName!}</td>
<td width='500px'>${item.mobilePhone!}</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>
<td width='500px'>${item.latestTime?string("yyyy-MM-dd")}</td>
</tr>
</tr>
</#list>
</#list>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment