Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
caosy
/
fun-golf-service
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
1
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
da3c5424
authored
Oct 16, 2023
by
caosy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
买劵活动排序
parent
41dfe015
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
36 additions
and
47 deletions
src/main/java/com/ctrip/fun/golf/dao/product/BuyVoucherActivityDao.java
src/main/java/com/ctrip/fun/golf/domain/product/BuyVoucherActivity.java
src/main/resources/debug/jdbc.properties
src/main/resources/development/jdbc.properties
src/main/resources/test/jdbc.properties
src/main/java/com/ctrip/fun/golf/dao/product/BuyVoucherActivityDao.java
View file @
da3c5424
...
...
@@ -24,6 +24,7 @@ public class BuyVoucherActivityDao extends GenericHibernateDao<BuyVoucherActivit
public
PagedEntityBean
<
BuyVoucherActivity
>
queryList
(
Object
queryObject
)
{
BuyVoucherActivityQuery
queryBean
=
(
BuyVoucherActivityQuery
)
queryObject
;
Criteria
criteria
=
this
.
getCriteria
(
BuyVoucherActivity
.
class
);
if
(
null
!=
queryBean
.
getId
())
{
criteria
.
add
(
Restrictions
.
eq
(
"id"
,
queryBean
.
getId
()));
...
...
@@ -48,6 +49,8 @@ public class BuyVoucherActivityDao extends GenericHibernateDao<BuyVoucherActivit
}
//MP
if
((
null
!=
queryBean
.
getRegionCode
())
&&
!(
"0"
).
equals
(
queryBean
.
getRegionCode
()))
{
queryBean
.
setSortField
(
"sort"
);
queryBean
.
setSortDirection
(
SortDirectionEnum
.
ASC
);
if
(
queryBean
.
getRegionCode
().
contains
(
","
)){
String
[]
split
=
queryBean
.
getRegionCode
().
split
(
","
);
criteria
.
add
(
Restrictions
.
or
(
Restrictions
.
eq
(
"regionCode"
,
split
[
0
])
...
...
@@ -58,8 +61,11 @@ public class BuyVoucherActivityDao extends GenericHibernateDao<BuyVoucherActivit
criteria
.
add
(
Restrictions
.
or
(
Restrictions
.
eq
(
"showPaths"
,
2
)
,
Restrictions
.
eq
(
"showPaths"
,
3
)));
}
else
{
// App
if
((
null
==
queryBean
.
getShowPaths
()||
(
""
).
equals
(
queryBean
.
getShowPaths
()))
&&
!(
"0"
).
equals
(
queryBean
.
getShowPaths
())
)
{
queryBean
.
setSortField
(
"sort"
);
queryBean
.
setSortDirection
(
SortDirectionEnum
.
ASC
);
criteria
.
add
(
Restrictions
.
or
(
Restrictions
.
eq
(
"showPaths"
,
1
)
,
Restrictions
.
eq
(
"showPaths"
,
3
)));
}
...
...
src/main/java/com/ctrip/fun/golf/domain/product/BuyVoucherActivity.java
View file @
da3c5424
...
...
@@ -61,6 +61,8 @@ public class BuyVoucherActivity implements java.io.Serializable {
private
Integer
version
;
//版本号
private
Integer
sort
;
//排序 升序
@Id
@GeneratedValue
(
strategy
=
IDENTITY
)
...
...
@@ -332,4 +334,12 @@ public class BuyVoucherActivity implements java.io.Serializable {
public
void
setVersion
(
Integer
version
)
{
this
.
version
=
version
;
}
public
Integer
getSort
()
{
return
sort
;
}
public
void
setSort
(
Integer
sort
)
{
this
.
sort
=
sort
;
}
}
src/main/resources/debug/jdbc.properties
View file @
da3c5424
#jdbc.url=jdbc:mysql://localhost:3306/fundb?useUnicode=true&characterEncoding=UTF8
#jdbc.username=root
#jdbc.password=123456
#
#jdbc.job.url=jdbc:mysql://localhost:3306/funtaskdb?useUnicode=true&characterEncoding=UTF8
#jdbc.job.username=root
#jdbc.job.password=123456
#jdbc.job.defaultAutoCommit=true
jdbc.url
=
jdbc:mysql://localhost:3306/fundb?useUnicode=true&characterEncoding=UTF8
jdbc.username
=
root
jdbc.password
=
123456
jdbc.url
=
jdbc:mysql://192.168.1.169:3306/fundb?useUnicode=true&characterEncoding=UTF8
jdbc.username
=
iwan
jdbc.password
=
123456789@qaz
jdbc.job.url
=
jdbc:mysql://192.168.1.169:3306/funtaskdb?useUnicode=true&characterEncoding=UTF8
jdbc.job.username
=
iwan
jdbc.job.password
=
123456789@qaz
jdbc.job.url
=
jdbc:mysql://localhost:3306/funtaskdb?useUnicode=true&characterEncoding=UTF8
jdbc.job.username
=
root
jdbc.job.password
=
123456
jdbc.job.defaultAutoCommit
=
true
src/main/resources/development/jdbc.properties
View file @
da3c5424
#jdbc.url=jdbc:mysql://localhost:3306/fundb?useUnicode=true&characterEncoding=UTF8
#jdbc.username=root
#jdbc.password=123456
#
#jdbc.job.url=jdbc:mysql://localhost:3306/funtaskdb?useUnicode=true&characterEncoding=UTF8
#jdbc.job.username=root
#jdbc.job.password=123456
#jdbc.job.defaultAutoCommit=true
jdbc.url
=
jdbc:mysql://localhost:3306/fundb?useUnicode=true&characterEncoding=UTF8
jdbc.username
=
root
jdbc.password
=
123456
jdbc.url
=
jdbc:mysql://192.168.1.169:3306/fundb?useUnicode=true&characterEncoding=UTF8
jdbc.username
=
iwan
jdbc.password
=
123456789@qaz
jdbc.job.url
=
jdbc:mysql://192.168.1.169:3306/funtaskdb?useUnicode=true&characterEncoding=UTF8
jdbc.job.username
=
iwan
jdbc.job.password
=
123456789@qaz
jdbc.job.url
=
jdbc:mysql://localhost:3306/funtaskdb?useUnicode=true&characterEncoding=UTF8
jdbc.job.username
=
root
jdbc.job.password
=
123456
jdbc.job.defaultAutoCommit
=
true
src/main/resources/test/jdbc.properties
View file @
da3c5424
#jdbc.url=jdbc:mysql://localhost:3306/fundb?useUnicode=true&characterEncoding=UTF8
#jdbc.username=root
#jdbc.password=123456
#
#jdbc.job.url=jdbc:mysql://localhost:3306/funtaskdb?useUnicode=true&characterEncoding=UTF8
#jdbc.job.username=root
#jdbc.job.password=123456
#jdbc.job.defaultAutoCommit=true
jdbc.url
=
jdbc:mysql://localhost:3306/fundb?useUnicode=true&characterEncoding=UTF8
jdbc.username
=
root
jdbc.password
=
123456
jdbc.url
=
jdbc:mysql://192.168.1.169:3306/fundb?useUnicode=true&characterEncoding=UTF8
jdbc.username
=
iwan
jdbc.password
=
123456789@qaz
jdbc.job.url
=
jdbc:mysql://192.168.1.169:3306/funtaskdb?useUnicode=true&characterEncoding=UTF8
jdbc.job.username
=
iwan
jdbc.job.password
=
123456789@qaz
jdbc.job.url
=
jdbc:mysql://localhost:3306/funtaskdb?useUnicode=true&characterEncoding=UTF8
jdbc.job.username
=
root
jdbc.job.password
=
123456
jdbc.job.defaultAutoCommit
=
true
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