Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
E
education
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
李丛阳
education
Commits
39fea793
Commit
39fea793
authored
May 29, 2018
by
YangZhaoJun1
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
解决bug
parent
88b1a87f
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
8 deletions
+8
-8
BAgency.java
...ain/java/org/rcisoft/business/bagency/entity/BAgency.java
+1
-1
BRooms.java
src/main/java/org/rcisoft/business/brooms/entity/BRooms.java
+1
-1
BRoomsServiceImpl.java
...isoft/business/brooms/service/impl/BRoomsServiceImpl.java
+2
-2
BChapterMapper.xml
...ources/mapper/business/bchapter/mapper/BChapterMapper.xml
+4
-4
No files found.
src/main/java/org/rcisoft/business/bagency/entity/BAgency.java
View file @
39fea793
...
...
@@ -29,7 +29,7 @@ public class BAgency extends IdEntity<BAgency> {
private
String
code
;
/*代理商名*/
@Length
(
min
=
1
,
max
=
100
,
message
=
"长度最小为1,最大为2
50"
)
@Length
(
min
=
1
,
max
=
50
,
message
=
"长度最小为1,最大为
50"
)
@NotBlank
private
String
name
;
...
...
src/main/java/org/rcisoft/business/brooms/entity/BRooms.java
View file @
39fea793
...
...
@@ -59,7 +59,7 @@ public class BRooms extends IdEntity<BRooms> {
private
String
plan
;
/*教室编号*/
@Length
(
min
=
1
,
max
=
50
,
message
=
"长度最短为1,最长为5
0"
)
@Length
(
min
=
1
,
max
=
10
,
message
=
"长度最短为1,最长为1
0"
)
@NotBlank
private
String
code
;
...
...
src/main/java/org/rcisoft/business/brooms/service/impl/BRoomsServiceImpl.java
View file @
39fea793
...
...
@@ -155,11 +155,11 @@ public class BRoomsServiceImpl implements BRoomsService {
result
+=
"表中第 "
+
index
+
" 行,编号 "
+
value
[
1
]
+
" 在表中重复 \n"
;
continue
;
}
if
(
value
[
1
].
length
()
>
5
0
){
if
(
value
[
1
].
length
()
>
1
0
){
result
+=
"表中第 "
+
index
+
" 行,编号 "
+
value
[
1
]
+
" 太长 \n"
;
continue
;
}
if
(
value
[
3
].
length
()
>
50
){
if
(
value
[
3
].
length
()
>
15
){
result
+=
"表中第 "
+
index
+
" 行,编号 "
+
value
[
3
]
+
" 太长 \n"
;
continue
;
}
...
...
src/main/resources/mapper/business/bchapter/mapper/BChapterMapper.xml
View file @
39fea793
...
...
@@ -86,12 +86,12 @@
SELECT DISTINCT bc.business_id,bc.is_test,bc.class_hour,
bc.chapter_name, bc.automatic,bc.sl_id,bc.experiment_type,
ROUND((SELECT AVG(bsc.score) from b_r_student_chapter bsc
where bsc.chapter_id = bc.business_id and score != '-1'),2) as average,
where bsc.chapter_id = bc.business_id and score != '-1'
and score != '999'
),2) as average,
(SELECT MAX(bsc.score) from b_r_student_chapter bsc
where bsc.chapter_id = bc.business_id and score != '-1') as maxScore,
where bsc.chapter_id = bc.business_id and score != '-1'
and score != '999'
) as maxScore,
(SELECT MIN(bsc.score) from b_r_student_chapter bsc
where bsc.chapter_id = bc.business_id and score != '-1') as minScore,
(SELECT COUNT(*) from b_r_student_chapter where
score = '-1'
where bsc.chapter_id = bc.business_id and score != '-1'
and score != '999'
) as minScore,
(SELECT COUNT(*) from b_r_student_chapter where
(score = '-1' or score = '999')
AND sl_id = #{slId} AND chapter_id = bc.business_id AND is_complete = '1') as waitingMark,
(SELECT COUNT(*) from b_r_student_chapter where sl_id = #{slId}
AND chapter_id = bc.business_id AND is_complete = '1') as submit,
...
...
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