Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
E
engine-class-work
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
liuchengjiu
engine-class-work
Commits
94e87ddd
Commit
94e87ddd
authored
Feb 16, 2022
by
Mindfaker
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix
parent
a556a2b1
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
5 deletions
+12
-5
StudentInfo.java
...ava/cn/exploring/engine/server/db/domain/StudentInfo.java
+5
-1
StudentPointInfo.java
...n/exploring/engine/server/db/domain/StudentPointInfo.java
+1
-3
PointController.java
...va/cn/exploring/engine/server/wx/web/PointController.java
+6
-1
No files found.
server-db/src/main/java/cn/exploring/engine/server/db/domain/StudentInfo.java
View file @
94e87ddd
package
cn
.
exploring
.
engine
.
server
.
db
.
domain
;
import
org.springframework.format.annotation.DateTimeFormat
;
import
java.time.LocalDateTime
;
import
java.util.ArrayList
;
import
java.util.Arrays
;
...
...
@@ -75,6 +77,7 @@ public class StudentInfo {
*
* @mbg.generated
*/
@DateTimeFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
private
LocalDateTime
addTime
;
/**
...
...
@@ -84,6 +87,7 @@ public class StudentInfo {
*
* @mbg.generated
*/
@DateTimeFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
private
LocalDateTime
updateTime
;
/**
...
...
@@ -552,4 +556,4 @@ public class StudentInfo {
}
}
}
}
\ No newline at end of file
}
server-db/src/main/java/cn/exploring/engine/server/db/domain/StudentPointInfo.java
View file @
94e87ddd
package
cn
.
exploring
.
engine
.
server
.
db
.
domain
;
import
org.springframework.format.annotation.DateTimeFormat
;
import
java.time.LocalDateTime
;
import
java.util.ArrayList
;
import
java.util.Arrays
;
...
...
@@ -68,7 +66,6 @@ public class StudentPointInfo {
*
* @mbg.generated
*/
@DateTimeFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
private
LocalDateTime
recordTime
;
/**
...
...
@@ -78,6 +75,7 @@ public class StudentPointInfo {
*
* @mbg.generated
*/
private
LocalDateTime
addTime
;
/**
...
...
server-wx-api/src/main/java/cn/exploring/engine/server/wx/web/PointController.java
View file @
94e87ddd
...
...
@@ -3,6 +3,7 @@ package cn.exploring.engine.server.wx.web;
import
cn.exploring.engine.server.core.util.ResponseUtil
;
import
cn.exploring.engine.server.db.domain.StudentPointInfo
;
import
cn.exploring.engine.server.db.service.StudentPointService
;
import
org.springframework.util.StringUtils
;
import
org.springframework.validation.annotation.Validated
;
import
org.springframework.web.bind.annotation.*
;
...
...
@@ -18,9 +19,13 @@ public class PointController {
StudentPointService
pointService
;
@GetMapping
(
"selectPoint"
)
public
Object
selectPoint
(
@RequestParam
String
studentName
,
@RequestParam
String
studentUniqueId
,
@RequestParam
Integer
classId
,
@RequestParam
String
startTime
,
@RequestParam
String
endTime
,
public
Object
selectPoint
(
@RequestParam
String
studentName
,
@RequestParam
String
studentUniqueId
,
@RequestParam
Integer
classId
,
@RequestParam
String
startTime
,
@RequestParam
String
endTime
,
@RequestParam
(
required
=
false
,
defaultValue
=
"1"
)
Integer
page
,
@RequestParam
(
required
=
false
,
defaultValue
=
"10"
)
Integer
limit
,
@RequestParam
(
required
=
false
,
defaultValue
=
"add_time"
)
String
sort
,
@RequestParam
(
required
=
false
,
defaultValue
=
"desc"
)
String
order
)
{
studentUniqueId
=
StringUtils
.
isEmpty
(
studentUniqueId
)
?
null
:
studentUniqueId
;
studentName
=
StringUtils
.
isEmpty
(
studentName
)
?
null
:
studentName
;
startTime
=
StringUtils
.
isEmpty
(
startTime
)
?
null
:
startTime
;
endTime
=
StringUtils
.
isEmpty
(
endTime
)
?
null
:
endTime
;
return
ResponseUtil
.
ok
(
pointService
.
selectPointByWeb
(
studentName
,
studentUniqueId
,
classId
,
startTime
,
endTime
,
page
,
limit
,
sort
,
order
));
}
...
...
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