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
23d6aaa5
Commit
23d6aaa5
authored
Jul 28, 2023
by
Ryan Loong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix 在没有选择学生的情况下报错的bug (BUG #3931)
parent
74d1e19b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
1 deletion
+8
-1
StudentInfoService.java
...xploring/engine/server/db/service/StudentInfoService.java
+4
-0
StudentController.java
.../cn/exploring/engine/server/wx/web/StudentController.java
+4
-1
No files found.
server-db/src/main/java/cn/exploring/engine/server/db/service/StudentInfoService.java
View file @
23d6aaa5
...
...
@@ -117,6 +117,10 @@ public class StudentInfoService {
.
field
(
StudentVo:
:
getCallTimes
,
maxCall
).
op
(
LessThan
.
class
)
.
build
());
if
(
Objects
.
isNull
(
record
))
{
return
null
;
}
increaseCallTimeByPrimaryKey
(
record
.
getId
());
return
record
;
}
...
...
server-wx-api/src/main/java/cn/exploring/engine/server/wx/web/StudentController.java
View file @
23d6aaa5
...
...
@@ -4,6 +4,7 @@ import cn.exploring.engine.server.core.util.ResponseUtil;
import
cn.exploring.engine.server.db.domain.StudentInfo
;
import
cn.exploring.engine.server.db.domain.vo.StudentInfoExcelImportResultVo
;
import
cn.exploring.engine.server.db.domain.vo.StudentInfoExcelImportVo
;
import
cn.exploring.engine.server.db.domain.vo.StudentVo
;
import
cn.exploring.engine.server.db.service.ClassService
;
import
cn.exploring.engine.server.db.service.StudentInfoService
;
import
com.google.common.collect.ImmutableMap
;
...
...
@@ -17,6 +18,7 @@ import javax.annotation.Nullable;
import
javax.annotation.Resource
;
import
java.util.List
;
import
java.util.Objects
;
import
java.util.Optional
;
@RestController
@RequestMapping
(
"/wx/student"
)
...
...
@@ -40,7 +42,8 @@ public class StudentController {
@GetMapping
(
"randomSelect"
)
public
Object
randomSelect
(
@RequestParam
Integer
classId
,
@Nullable
@RequestParam
Integer
maxCall
)
{
return
ResponseUtil
.
ok
(
studentInfoService
.
randomSelectStudentInfo
(
classId
,
maxCall
));
StudentVo
select
=
studentInfoService
.
randomSelectStudentInfo
(
classId
,
maxCall
);
return
Optional
.
ofNullable
(
select
).
map
(
ResponseUtil:
:
ok
).
orElse
(
ResponseUtil
.
fail
(
402
,
"未包含任何学生,请重新选择条件。"
));
}
@GetMapping
(
"pointList"
)
...
...
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